Removes DuplicateLayerException and does not add same layer consecutively. (#128)

* Removes DuplicateLayerException and does not add same layer consecutively.

* Updates CHANGELOG.

* Adds integration test for project with empty resources and dependencies.

Author: coollog

CHANGELOG.md

@@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 - Null tag validation generating NullPointerException ([#125](https://github.com/google/jib/issues/125))
+- Build failure on project with no dependencies ([#126](https://github.com/google/jib/issues/126))
 
 ## 0.1.3
 ### Added

jib-core/src/main/java/com/google/cloud/tools/jib/builder/BuildAndPushContainerConfigurationStep.java

@@ -22,7 +22,6 @@
 import com.google.cloud.tools.jib.cache.CachedLayer;
 import com.google.cloud.tools.jib.hash.CountingDigestOutputStream;
 import com.google.cloud.tools.jib.http.Authorization;
-import com.google.cloud.tools.jib.image.DuplicateLayerException;
 import com.google.cloud.tools.jib.image.Image;
 import com.google.cloud.tools.jib.image.LayerPropertyNotFoundException;
 import com.google.cloud.tools.jib.image.json.ImageToJsonTranslator;
@@ -84,8 +83,8 @@ public ListenableFuture<BlobDescriptor> call() throws ExecutionException, Interr
    * {@code buildApplicationLayerFutures}.
    */
   private BlobDescriptor afterBaseImageLayerFuturesFuture()
-      throws ExecutionException, InterruptedException, LayerPropertyNotFoundException,
-          DuplicateLayerException, IOException, RegistryException {
+      throws ExecutionException, InterruptedException, LayerPropertyNotFoundException, IOException,
+          RegistryException {
     try (Timer timer = new Timer(buildConfiguration.getBuildLogger(), DESCRIPTION)) {
       RegistryClient registryClient =
           new RegistryClient(

jib-core/src/main/java/com/google/cloud/tools/jib/builder/PullAndCacheBaseImageLayerStep.java

@@ -23,7 +23,6 @@
 import com.google.cloud.tools.jib.cache.CachedLayer;
 import com.google.cloud.tools.jib.http.Authorization;
 import com.google.cloud.tools.jib.image.DescriptorDigest;
-import com.google.cloud.tools.jib.image.DuplicateLayerException;
 import com.google.cloud.tools.jib.image.LayerPropertyNotFoundException;
 import com.google.cloud.tools.jib.registry.RegistryClient;
 import com.google.cloud.tools.jib.registry.RegistryException;
@@ -57,8 +56,8 @@ class PullAndCacheBaseImageLayerStep implements Callable<CachedLayer> {
   /** Depends on {@code pullAuthorizationFuture}. */
   @Override
   public CachedLayer call()
-      throws IOException, RegistryException, LayerPropertyNotFoundException,
-          DuplicateLayerException, ExecutionException, InterruptedException {
+      throws IOException, RegistryException, LayerPropertyNotFoundException, ExecutionException,
+          InterruptedException {
     try (Timer ignored =
         new Timer(buildConfiguration.getBuildLogger(), String.format(DESCRIPTION, layerDigest))) {
       RegistryClient registryClient =

jib-core/src/main/java/com/google/cloud/tools/jib/builder/PullBaseImageStep.java

@@ -18,7 +18,6 @@
 
 import com.google.cloud.tools.jib.Timer;
 import com.google.cloud.tools.jib.http.Authorization;
-import com.google.cloud.tools.jib.image.DuplicateLayerException;
 import com.google.cloud.tools.jib.image.Image;
 import com.google.cloud.tools.jib.image.LayerCountMismatchException;
 import com.google.cloud.tools.jib.image.LayerPropertyNotFoundException;
@@ -55,8 +54,7 @@ class PullBaseImageStep implements Callable<Image> {
   @Override
   public Image call()
       throws IOException, RegistryException, LayerPropertyNotFoundException,
-          DuplicateLayerException, LayerCountMismatchException, ExecutionException,
-          InterruptedException {
+          LayerCountMismatchException, ExecutionException, InterruptedException {
     try (Timer ignored = new Timer(buildConfiguration.getBuildLogger(), DESCRIPTION)) {
       RegistryClient registryClient =
           new RegistryClient(

jib-core/src/main/java/com/google/cloud/tools/jib/builder/PushImageStep.java

@@ -20,7 +20,6 @@
 import com.google.cloud.tools.jib.blob.BlobDescriptor;
 import com.google.cloud.tools.jib.cache.CachedLayer;
 import com.google.cloud.tools.jib.http.Authorization;
-import com.google.cloud.tools.jib.image.DuplicateLayerException;
 import com.google.cloud.tools.jib.image.Image;
 import com.google.cloud.tools.jib.image.LayerPropertyNotFoundException;
 import com.google.cloud.tools.jib.image.json.BuildableManifestTemplate;
@@ -99,7 +98,7 @@ public Void call() throws ExecutionException, InterruptedException {
    */
   private Void afterPushBaseImageLayerFuturesFuture()
       throws IOException, RegistryException, ExecutionException, InterruptedException,
-          LayerPropertyNotFoundException, DuplicateLayerException {
+          LayerPropertyNotFoundException {
     try (Timer ignored = new Timer(buildConfiguration.getBuildLogger(), DESCRIPTION)) {
       RegistryClient registryClient =
           new RegistryClient(

jib-core/src/main/java/com/google/cloud/tools/jib/cache/Cache.java

@@ -17,7 +17,6 @@
 package com.google.cloud.tools.jib.cache;
 
 import com.google.cloud.tools.jib.cache.json.CacheMetadataTemplate;
-import com.google.cloud.tools.jib.image.DuplicateLayerException;
 import com.google.cloud.tools.jib.image.LayerPropertyNotFoundException;
 import com.google.cloud.tools.jib.json.JsonTemplateMapper;
 import com.google.common.annotations.VisibleForTesting;
@@ -85,7 +84,7 @@ public void close() throws IOException {
 
   /** Adds the cached layer to the cache metadata. */
   void addLayerToMetadata(CachedLayer cachedLayer, @Nullable LayerMetadata layerMetadata)
-      throws LayerPropertyNotFoundException, DuplicateLayerException {
+      throws LayerPropertyNotFoundException {
     cacheMetadata.addLayer(new CachedLayerWithMetadata(cachedLayer, layerMetadata));
   }
 

jib-core/src/main/java/com/google/cloud/tools/jib/cache/CacheMetadata.java

@@ -16,7 +16,6 @@
 
 package com.google.cloud.tools.jib.cache;
 
-import com.google.cloud.tools.jib.image.DuplicateLayerException;
 import com.google.cloud.tools.jib.image.ImageLayers;
 import com.google.cloud.tools.jib.image.LayerPropertyNotFoundException;
 import java.nio.file.Path;
@@ -77,7 +76,7 @@ ImageLayers<CachedLayerWithMetadata> filter() throws CacheMetadataCorruptedExcep
 
         return filteredLayers;
 
-      } catch (DuplicateLayerException | LayerPropertyNotFoundException ex) {
+      } catch (LayerPropertyNotFoundException ex) {
         throw new CacheMetadataCorruptedException(ex);
       }
     }
@@ -87,8 +86,7 @@ ImageLayers<CachedLayerWithMetadata> getLayers() {
     return layers;
   }
 
-  synchronized void addLayer(CachedLayerWithMetadata layer)
-      throws LayerPropertyNotFoundException, DuplicateLayerException {
+  synchronized void addLayer(CachedLayerWithMetadata layer) throws LayerPropertyNotFoundException {
     layers.add(layer);
   }
 

jib-core/src/main/java/com/google/cloud/tools/jib/cache/CacheMetadataTranslator.java

@@ -20,7 +20,6 @@
 import com.google.cloud.tools.jib.cache.json.CacheMetadataLayerObjectTemplate;
 import com.google.cloud.tools.jib.cache.json.CacheMetadataLayerPropertiesObjectTemplate;
 import com.google.cloud.tools.jib.cache.json.CacheMetadataTemplate;
-import com.google.cloud.tools.jib.image.DuplicateLayerException;
 import com.google.cloud.tools.jib.image.LayerPropertyNotFoundException;
 import java.nio.file.Path;
 
@@ -64,7 +63,7 @@ static CacheMetadata fromTemplate(CacheMetadataTemplate template, Path cacheDire
 
       return cacheMetadata;
 
-    } catch (DuplicateLayerException | LayerPropertyNotFoundException ex) {
+    } catch (LayerPropertyNotFoundException ex) {
       throw new CacheMetadataCorruptedException(ex);
     }
   }

jib-core/src/main/java/com/google/cloud/tools/jib/cache/CacheWriter.java

@@ -19,7 +19,6 @@
 import com.google.cloud.tools.jib.blob.BlobDescriptor;
 import com.google.cloud.tools.jib.hash.CountingDigestOutputStream;
 import com.google.cloud.tools.jib.image.DescriptorDigest;
-import com.google.cloud.tools.jib.image.DuplicateLayerException;
 import com.google.cloud.tools.jib.image.LayerBuilder;
 import com.google.cloud.tools.jib.image.LayerPropertyNotFoundException;
 import com.google.cloud.tools.jib.image.UnwrittenLayer;
@@ -53,7 +52,7 @@ public CacheWriter(Cache cache) {
    * @return the cached layer
    */
   public CachedLayer writeLayer(LayerBuilder layerBuilder)
-      throws IOException, LayerPropertyNotFoundException, DuplicateLayerException {
+      throws IOException, LayerPropertyNotFoundException {
     UnwrittenLayer unwrittenLayer = layerBuilder.build();
 
     // Writes to a temporary file first because the UnwrittenLayer needs to be written first to
@@ -108,7 +107,7 @@ public CountingOutputStream getLayerOutputStream(DescriptorDigest layerDigest)
    */
   public CachedLayer getCachedLayer(
       DescriptorDigest layerDigest, CountingOutputStream countingOutputStream)
-      throws IOException, LayerPropertyNotFoundException, DuplicateLayerException {
+      throws IOException, LayerPropertyNotFoundException {
     Path layerFile = getLayerFile(layerDigest);
     countingOutputStream.close();