Verify that REPO_TAGS can be processed as a JsonArray (#1355)

REPO_TAGS member may be null (JsonNull), so we need to make sure it is an instance of JsonArray Signed-off-by: Robin Raju <[email protected]> Co-authored-by: Roland Huß <[email protected]>
fabric8io · Aug 30, 2020 · b94598f · b94598f
1 parent 7a74393
commit b94598f
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 2 deletions.
diff --git a/src/main/java/io/fabric8/maven/docker/model/ImageDetails.java b/src/main/java/io/fabric8/maven/docker/model/ImageDetails.java
@@ -7,6 +7,7 @@
 import java.util.List;
 import java.util.Map;
 
+import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 
@@ -62,8 +63,8 @@ public Map<String, String> getLabels() {
     public List<String> getRepoTags() {
         List<String> repoTags = new ArrayList<>();
 
-        if (json.has(REPO_TAGS)) {
-            for(JsonElement item : json.getAsJsonArray(REPO_TAGS)) {
+        if (json.has(REPO_TAGS) && json.get(REPO_TAGS) instanceof JsonArray) {
+            for (JsonElement item : json.getAsJsonArray(REPO_TAGS)) {
                 repoTags.add(item.getAsString());
             }
         }

diff --git a/src/test/java/io/fabric8/maven/docker/model/ImageDetailsTest.java b/src/test/java/io/fabric8/maven/docker/model/ImageDetailsTest.java
@@ -3,6 +3,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import com.google.gson.JsonNull;
 import org.junit.Before;
 import org.junit.Test;
 import com.google.gson.JsonArray;
@@ -42,6 +43,41 @@ private void givenAnImageWithLabels() {
         json.add(ImageDetails.LABELS, labels);
     }
 
+    @Test
+    public void testImageWithRepoTags() {
+        givenImageData();
+        whenCreateImage();
+        thenRepoTagsSizeIs(2);
+    }
+
+    @Test
+    public void testImageWithNullRepoTags() {
+        givenAnImageWithNullRepoTags();
+        whenCreateImage();
+        thenRepoTagsSizeIs(0);
+    }
+
+    @Test
+    public void testImageWitEmptyRepoTags() {
+        givenAnImageWithEmptyRepoTags();
+        whenCreateImage();
+        thenRepoTagsSizeIs(0);
+    }
+
+    @Test
+    public void testImageWitNoRepoTags() {
+        whenCreateImage();
+        thenRepoTagsSizeIs(0);
+    }
+
+    private void givenAnImageWithNullRepoTags() {
+        json.add(ImageDetails.REPO_TAGS, JsonNull.INSTANCE);
+    }
+
+    private void givenAnImageWithEmptyRepoTags() {
+        json.add(ImageDetails.REPO_TAGS, new JsonArray());
+    }
+
     @Test
     public void testCreateImage() throws Exception {
         givenImageData();
@@ -68,6 +104,10 @@ private void thenLabelsSizeIs(int size) {
         assertEquals(size, image.getLabels().size());
     }
 
+    private void thenRepoTagsSizeIs(int size) {
+        assertEquals(size, image.getRepoTags().size());
+    }
+
     private void thenValidateImage() {
         assertEquals("b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc", image.getId());
         assertEquals("27cf784147099545", image.getParentId());