Handle JsonNulls while deserializing (#18)

gocd · Jul 3, 2018 · 28c9adc · 28c9adc
1 parent bfcec33
commit 28c9adc
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/main/java/cd/go/artifact/docker/registry/model/ArtifactPlanConfigTypeAdapter.java b/src/main/java/cd/go/artifact/docker/registry/model/ArtifactPlanConfigTypeAdapter.java
@@ -55,6 +55,11 @@ private boolean containsImageProperty(JsonObject jsonObject) {
     }
 
     private boolean isPropertyNotBlank(JsonObject jsonObject, String property) {
-        return StringUtils.isNotBlank(jsonObject.get(property).getAsString());
+        try {
+            JsonElement jsonElement = jsonObject.get(property);
+            return StringUtils.isNotBlank(jsonElement.getAsString());
+        } catch (UnsupportedOperationException e) {
+            return false;
+        }
     }
 }
diff --git a/src/test/java/cd/go/artifact/docker/registry/model/ArtifactPlanConfigTypeAdapterTest.java b/src/test/java/cd/go/artifact/docker/registry/model/ArtifactPlanConfigTypeAdapterTest.java
@@ -10,6 +10,7 @@
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.CoreMatchers.nullValue;
 import static org.junit.Assert.fail;
 
 
@@ -61,4 +62,14 @@ public void shouldThrowAnExceptionWhenBothBuildFileAndImageAreProvided() throws
             }
         }
     }
+
+
+    @Test
+    public void shouldParseConfigurationsWithJsonNull() throws JSONException {
+        String json = "{\"BuildFile\": null, \"Image\": \"alpine\"}";
+        ArtifactPlanConfig artifactPlanConfig = ArtifactPlanConfig.fromJSON(json);
+
+        assertThat(artifactPlanConfig).isInstanceOf(ImageTagArtifactPlanConfig.class);
+        assertThat(((ImageTagArtifactPlanConfig) artifactPlanConfig).getImage()).isEqualTo("alpine");
+    }
 }