Avoid duplicate failure handling on syntax errors (#443)

metafacture · Sep 22, 2022 · f182204 · f182204
1 parent 318e5e9
commit f182204
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/metafacture-json/src/main/java/org/metafacture/json/JsonValidator.java b/metafacture-json/src/main/java/org/metafacture/json/JsonValidator.java
@@ -91,13 +91,17 @@ public void setWriteInvalid(final String writeInvalid) {
 
     @Override
     public void process(final String json) {
-        JSONObject object = null;
+        final JSONObject object;
         try {
             object = new JSONObject(json); // throws JSONException on syntax error
+            validate(json, object);
         }
         catch (final JSONException e) {
             handleInvalid(json, null, e.getMessage());
         }
+    }
+
+    private void validate(final String json, final JSONObject object) {
         try {
             initSchema();
             schema.validate(object); // throws ValidationException if invalid

diff --git a/metafacture-json/src/test/java/org/metafacture/json/JsonValidatorTest.java b/metafacture-json/src/test/java/org/metafacture/json/JsonValidatorTest.java
@@ -87,7 +87,7 @@ public void testShouldInvalidateSyntaxError() {
 
     @Test(expected = MetafactureException.class)
     public void testShouldCatchMissingSchemaFile() {
-        new JsonValidator("").process("");
+        new JsonValidator("").process("{}");
     }
 
     @Test(expected = MetafactureException.class)