Merge pull request #55 from CJSCommonPlatform/report-schema-file-fail…

…ed-parse

Report file that caused schema parse exception

CHANGELOG.md

@@ -5,6 +5,8 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 
 ## Unreleased
 
+### Changed
+- SchemaIdParser will now include which file caused a Json parsing exception
 
 ## [1.7.5] - 2019-10-23
 ### Changed

catalog-generation/src/main/java/uk/gov/justice/schema/catalog/generation/SchemaIdParser.java

@@ -16,6 +16,7 @@
 
 import javax.json.JsonObject;
 import javax.json.JsonReader;
+import javax.json.stream.JsonParsingException;
 
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
@@ -60,6 +61,8 @@ public Optional<URI> parse(final URL schemaFile) {
 
         } catch (final IOException e) {
             throw new CatalogGenerationException(format("Failed to extract id from schema file '%s'", schemaFile), e);
+        } catch (final JsonParsingException e) {
+            throw new CatalogGenerationException(format("Failed to parse schema file '%s'", schemaFile), e);
         }
     }
 }

catalog-generation/src/test/java/uk/gov/justice/schema/catalog/generation/SchemaIdParserTest.java

@@ -5,6 +5,7 @@
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.startsWith;
+import static org.hamcrest.core.StringContains.containsString;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 import static org.mockito.Matchers.argThat;
@@ -17,6 +18,8 @@
 import java.net.URL;
 import java.util.Optional;
 
+import javax.json.stream.JsonParsingException;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
@@ -73,4 +76,19 @@ public void shouldFailIfLoadingTheSchemaFileThrowsAnIOException() throws Excepti
             assertThat(expected.getMessage(), is("Failed to extract id from schema file 'file:/this/file/does/not/exist.json'"));
         }
     }
+
+    @Test
+    public void shouldFailIfTheSchemaDoesNotParse() throws Exception {
+
+        final URL schemaFile = getClass().getClassLoader().getResource("dodgy-schemas/schema-with-missing-curly-brace.json");
+
+        try {
+            schemaIdParser.parse(schemaFile);
+            fail();
+        } catch (final CatalogGenerationException expected) {
+            assertThat(expected.getCause(), is(instanceOf(JsonParsingException.class)));
+            assertThat(expected.getMessage(), containsString("Failed to parse schema file '"));
+            assertThat(expected.getMessage(), containsString("dodgy-schemas/schema-with-missing-curly-brace.json'"));
+        }
+    }
 }

catalog-generation/src/test/resources/dodgy-schemas/schema-with-missing-curly-brace.json

@@ -0,0 +1,21 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "id": "http://justice.gov.uk/context/person.json",
+  "type": "object",
+  "properties": {
+    "nino": {
+      "type": "string"
+    },
+    "name": {
+      "type": "string"
+    },
+    "correspondence_address":
+    {"$ref" : "http://justice.gov.uk/standards/complex_address.json#/definitions/complex_address2"}
+
+  ,
+  "required": [
+    "nino",
+    "name",
+    "correspondence_address"
+  ]
+}