Gson parser behaves differently than other parsers

Author: onufryk

core-api/src/main/java/com/optimizely/ab/config/parser/GsonConfigParser.java

@@ -33,6 +33,9 @@ final class GsonConfigParser implements ConfigParser {
 
     @Override
     public ProjectConfig parseProjectConfig(@Nonnull String json) throws ConfigParseException {
+        if (json == null || json.length() == 0) {
+            throw new ConfigParseException("Unable to parse datafile: " + json);
+        }
         Gson gson = new GsonBuilder()
             .registerTypeAdapter(ProjectConfig.class, new ProjectConfigGsonDeserializer())
             .registerTypeAdapter(Audience.class, new AudienceGsonDeserializer())

core-api/src/test/java/com/optimizely/ab/config/parser/GsonConfigParserTest.java

@@ -86,4 +86,26 @@ public void validJsonRequiredFieldMissingExceptionWrapping() throws Exception {
         GsonConfigParser parser = new GsonConfigParser();
         parser.parseProjectConfig("{\"valid\": \"json\"}");
     }
+
+    /**
+     * Verify that empty string JSON results in a {@link ConfigParseException} being thrown.
+     */
+    @Test
+    public void emptyJsonExceptionWrapping() throws Exception {
+        thrown.expect(ConfigParseException.class);
+
+        GsonConfigParser parser = new GsonConfigParser();
+        parser.parseProjectConfig("");
+    }
+
+    /**
+     * Verify that null JSON results in a {@link ConfigParseException} being thrown.
+     */
+    @Test
+    public void nullJsonExceptionWrapping() throws Exception {
+        thrown.expect(ConfigParseException.class);
+
+        GsonConfigParser parser = new GsonConfigParser();
+        parser.parseProjectConfig(null);
+    }
 }

core-api/src/test/java/com/optimizely/ab/config/parser/JacksonConfigParserTest.java

@@ -86,4 +86,26 @@ public void validJsonRequiredFieldMissingExceptionWrapping() throws Exception {
         JacksonConfigParser parser = new JacksonConfigParser();
         parser.parseProjectConfig("{\"valid\": \"json\"}");
     }
+
+    /**
+     * Verify that empty string JSON results in a {@link ConfigParseException} being thrown.
+     */
+    @Test
+    public void emptyJsonExceptionWrapping() throws Exception {
+        thrown.expect(ConfigParseException.class);
+
+        JacksonConfigParser parser = new JacksonConfigParser();
+        parser.parseProjectConfig("");
+    }
+
+    /**
+     * Verify that null JSON results in a {@link ConfigParseException} being thrown.
+     */
+    @Test
+    public void nullJsonExceptionWrapping() throws Exception {
+        thrown.expect(ConfigParseException.class);
+
+        JacksonConfigParser parser = new JacksonConfigParser();
+        parser.parseProjectConfig(null);
+    }
 }

core-api/src/test/java/com/optimizely/ab/config/parser/JsonConfigParserTest.java

@@ -86,4 +86,26 @@ public void validJsonRequiredFieldMissingExceptionWrapping() throws Exception {
         JsonConfigParser parser = new JsonConfigParser();
         parser.parseProjectConfig("{\"valid\": \"json\"}");
     }
+
+    /**
+     * Verify that empty string JSON results in a {@link ConfigParseException} being thrown.
+     */
+    @Test
+    public void emptyJsonExceptionWrapping() throws Exception {
+        thrown.expect(ConfigParseException.class);
+
+        JsonConfigParser parser = new JsonConfigParser();
+        parser.parseProjectConfig("");
+    }
+
+    /**
+     * Verify that null JSON results in a {@link ConfigParseException} being thrown.
+     */
+    @Test
+    public void nullJsonExceptionWrapping() throws Exception {
+        thrown.expect(ConfigParseException.class);
+
+        JsonConfigParser parser = new JsonConfigParser();
+        parser.parseProjectConfig(null);
+    }
 }

core-api/src/test/java/com/optimizely/ab/config/parser/JsonSimpleConfigParserTest.java

@@ -86,4 +86,24 @@ public void validJsonRequiredFieldMissingExceptionWrapping() throws Exception {
         JsonSimpleConfigParser parser = new JsonSimpleConfigParser();
         parser.parseProjectConfig("{\"valid\": \"json\"}");
     }
+    /**
+     * Verify that empty string JSON results in a {@link ConfigParseException} being thrown.
+     */
+    @Test
+    public void emptyJsonExceptionWrapping() throws Exception {
+        thrown.expect(ConfigParseException.class);
+
+        JsonSimpleConfigParser parser = new JsonSimpleConfigParser();
+        parser.parseProjectConfig("");
+    }
+    /**
+     * Verify that null JSON results in a {@link ConfigParseException} being thrown.
+     */
+    @Test
+    public void nullJsonExceptionWrapping() throws Exception {
+        thrown.expect(ConfigParseException.class);
+
+        JsonSimpleConfigParser parser = new JsonSimpleConfigParser();
+        parser.parseProjectConfig(null);
+    }
 }