add check for invalid ref

schema-core/src/main/java/org/opengroup/osdu/schema/util/SchemaResolver.java

@@ -59,13 +59,19 @@ public class SchemaResolver {
 
         for (Map.Entry<String, String> entry : refSchemas.entrySet()) {
 
-            JSONObject refSchema = new JSONObject(entry.getValue());
-            JSONObject refSchemaDef = fetchObjectFromJSON(refSchema, SchemaConstants.DEFINITIONS);
-            if (refSchemaDef != null)
-                definitionMap.putAll(refSchemaDef.toMap());
-            refSchema.remove(SchemaConstants.DEFINITIONS);
-            definitionMap.put(entry.getKey(), refSchema);
-
+            if (entry.getValue() == null) {
+                if (!definitionMap.containsKey(entry.getKey())) {
+                    throw new BadRequestException(
+                            String.format("Invalid input, %s no definition but provided as reference", entry.getKey()));
+                }
+            } else {
+                JSONObject refSchema = new JSONObject(entry.getValue());
+                JSONObject refSchemaDef = fetchObjectFromJSON(refSchema, SchemaConstants.DEFINITIONS);
+                if (refSchemaDef != null)
+                    definitionMap.putAll(refSchemaDef.toMap());
+                refSchema.remove(SchemaConstants.DEFINITIONS);
+                definitionMap.put(entry.getKey(), refSchema);
+            }
         }
         if (!definitionMap.isEmpty()) {
             originalSchema.put(SchemaConstants.DEFINITIONS, definitionMap);
@@ -119,6 +125,7 @@ public class SchemaResolver {
             throws BadRequestException, ApplicationException {
         String value = String.valueOf(object);
         if (value.startsWith("#")) {
+            refSchemas.put(value.substring(value.lastIndexOf('/') + 1), null);
             return value;
         } else if (value.startsWith("https")) {
             String refSchema = getSchemaFromExternal(value);

schema-core/src/test/java/org/opengroup/osdu/schema/util/SchemaResolverTest.java

@@ -118,4 +118,27 @@ public class SchemaResolverTest {
         fail("Should not succeed");
 
     }
+
+    @Test
+    public void testResolveSchema_noDefinitionForRef()
+            throws JSONException, BadRequestException, ApplicationException, NotFoundException, IOException {
+        String originalSchema = new FileUtils().read("/test_schema/originalSchemaWithRefButNoDefinition.json");
+        String referenceSchema = new FileUtils().read("/test_schema/referenceSchema.json");
+        Mockito.when(schemaService.getSchema("os:wks:anyCrsFeatureCollection.1.0")).thenReturn(referenceSchema);
+        expectedException.expect(BadRequestException.class);
+        expectedException.expectMessage(
+                "Invalid input, person no definition but provided as reference");
+        schemaResolver.resolveSchema(originalSchema);
+        fail("Should not succeed");
+    }
+
+    @Test
+    public void testResolveSchema_withDefinitionForRef()
+            throws JSONException, BadRequestException, ApplicationException, NotFoundException, IOException {
+        String resolvedSchema = new FileUtils().read("/test_schema/resolvedSchemaWithDefinition.json");
+        String originalSchema = new FileUtils().read("/test_schema/originalSchemaRefWithDefinition.json");
+        String referenceSchema = new FileUtils().read("/test_schema/referenceSchema.json");
+        Mockito.when(schemaService.getSchema("os:wks:anyCrsFeatureCollection.1.0")).thenReturn(referenceSchema);
+        JSONAssert.assertEquals(resolvedSchema, schemaResolver.resolveSchema(originalSchema), JSONCompareMode.NON_EXTENSIBLE);
+    }
 }
\ No newline at end of file

schema-core/src/test/resources/test_schema/originalSchema.json

@@ -10,9 +10,6 @@
         "description": "The well's original location as AnyCrsFeatureCollection - a structure similar to but distinct from GeoJSON.",
         "title": "Original CRS Location",
         "$ref": "os:wks:anyCrsFeatureCollection.1.0"
-      },
-       "allOf": {
-                "$ref": "#/definition/os:wks:well.1.0"
       },
       "locationWGS84": {
         "description": "The well's location as GeoJSON FeatureCollection.",

schema-core/src/test/resources/test_schema/originalSchemaRefWithDefinition.json

+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "x-os-lifecycle-state": "published",
+  "description": "The entity well.",
+  "title": "Well",
+  "type": "object",
+  "definitions": {
+    "person": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "$ref": "os:wks:anyCrsFeatureCollection.1.0"
+        }
+      }
+    }
+  },
+  "properties": {
+    "person": {
+      "description": "Information for person",
+      "title": "Information for person",
+      "$ref": "#/definitions/person"
+    },
+    "locationOriginalCRS": {
+      "description": "The well's original location as AnyCrsFeatureCollection - a structure similar to but distinct from GeoJSON.",
+      "title": "Original CRS Location",
+      "$ref": "os:wks:anyCrsFeatureCollection.1.0"
+    },
+    "locationWGS84": {
+      "description": "The well's location as GeoJSON FeatureCollection.",
+      "title": "WGS84 Location",
+      "$ref": "https://geojson.org/schema/FeatureCollection.json",
+      "example": {
+        "features": [
+          {
+            "geometry": {
+              "coordinates": [
+                -92.11569999999999,
+                29.8823,
+                153.4779442519685
+              ],
+              "type": "Point"
+            },
+            "type": "Feature",
+            "properties": {
+              "name": "Newton 2-31"
+            }
+          }
+        ],
+        "type": "FeatureCollection"
+      }
+    }
+  }
+
+}

schema-core/src/test/resources/test_schema/originalSchemaWithInvalidExternalPath.json

@@ -10,9 +10,6 @@
         "description": "The well's original location as AnyCrsFeatureCollection - a structure similar to but distinct from GeoJSON.",
         "title": "Original CRS Location",
         "$ref": "os:wks:anyCrsFeatureCollection.1.0.json"
-      },
-       "allOf": {
-                "$ref": "#/definition/os:wks:well.1.0"
       },
       "locationWGS84": {
         "description": "The well's location as GeoJSON FeatureCollection.",

schema-core/src/test/resources/test_schema/originalSchemaWithInvalidExternalPath2.json

@@ -10,9 +10,6 @@
         "description": "The well's original location as AnyCrsFeatureCollection - a structure similar to but distinct from GeoJSON.",
         "title": "Original CRS Location",
         "$ref": "os:wks:anyCrsFeatureCollection.1.0.json"
-      },
-       "allOf": {
-                "$ref": "#/definition/os:wks:well.1.0"
       },
       "locationWGS84": {
         "description": "The well's location as GeoJSON FeatureCollection.",

schema-core/src/test/resources/test_schema/originalSchemaWithInvalidExternalPath3.json

@@ -10,9 +10,6 @@
         "description": "The well's original location as AnyCrsFeatureCollection - a structure similar to but distinct from GeoJSON.",
         "title": "Original CRS Location",
         "$ref": "os:wks:anyCrsFeatureCollection.1.0.json"
-      },
-       "allOf": {
-                "$ref": "#/definition/os:wks:well.1.0"
       },
       "locationWGS84": {
         "description": "The well's location as GeoJSON FeatureCollection.",

schema-core/src/test/resources/test_schema/originalSchemaWithNoDefinitionBlock.json

@@ -9,9 +9,6 @@
         "description": "The well's original location as AnyCrsFeatureCollection - a structure similar to but distinct from GeoJSON.",
         "title": "Original CRS Location",
         "$ref": "os:wks:anyCrsFeatureCollection.1.0"
-      },
-       "allOf": {
-                "$ref": "#/definition/os:wks:well.1.0"
       },
       "locationWGS84": {
         "description": "The well's location as GeoJSON FeatureCollection.",

schema-core/src/test/resources/test_schema/originalSchemaWithRefButNoDefinition.json

+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "x-os-lifecycle-state": "published",
+  "description": "The entity well.",
+  "title": "Well",
+  "type": "object",
+  "properties": {
+    "person": {
+      "description": "Information for person",
+      "title": "Information for person",
+      "$ref": "#/definitions/person"
+    },
+    "locationOriginalCRS": {
+      "description": "The well's original location as AnyCrsFeatureCollection - a structure similar to but distinct from GeoJSON.",
+      "title": "Original CRS Location",
+      "$ref": "os:wks:anyCrsFeatureCollection.1.0"
+    },
+    "locationWGS84": {
+      "description": "The well's location as GeoJSON FeatureCollection.",
+      "title": "WGS84 Location",
+      "$ref": "https://geojson.org/schema/FeatureCollection.json",
+      "example": {
+        "features": [
+          {
+            "geometry": {
+              "coordinates": [
+                -92.11569999999999,
+                29.8823,
+                153.4779442519685
+              ],
+              "type": "Point"
+            },
+            "type": "Feature",
+            "properties": {
+              "name": "Newton 2-31"
+            }
+          }
+        ],
+        "type": "FeatureCollection"
+      }
+    }
+  }
+
+}

schema-core/src/test/resources/test_schema/originalSchemaWithRef_AttributeInJsonArray.json

@@ -12,9 +12,6 @@
       "$ref": "os:wks:anyCrsFeatureCollection.1.0"
     },
     "allOf": [
-      {
-        "$ref": "#/definition/os:wks:well.1.0"
-      },
       [
         {
           "$ref": "os:wks:anyCrsFeatureCollection.1.0"

schema-core/src/test/resources/test_schema/resolvedSchema.json

@@ -1062,9 +1062,6 @@
       "title": "Original CRS Location",
       "$ref": "#/definitions/os:wks:anyCrsFeatureCollection.1.0"
     },
-       "allOf": {
-                "$ref": "#/definition/os:wks:well.1.0"
-        },
     "locationWGS84": {
       "description": "The well's location as GeoJSON FeatureCollection.",
       "title": "WGS84 Location",

schema-core/src/test/resources/test_schema/resolvedSchema_Ref_AttributeInJsonArray.json

@@ -1063,9 +1063,6 @@
       "$ref": "#/definitions/os:wks:anyCrsFeatureCollection.1.0"
     },
     "allOf": [
-      {
-        "$ref": "#/definition/os:wks:well.1.0"
-      },
       [
         {
           "$ref": "#/definitions/os:wks:anyCrsFeatureCollection.1.0"

testing/schema-test-core/src/test/resources/input_payloads/postSchemaServiceWithRef_positiveScenario.json

@@ -17,9 +17,18 @@
    "description":"Theentitywell.",
    "title":"Well",
    "type":"object",
-   "definitions":{
-
-   },
+    "definitions":{
+      "anyCrsFeatureCollection.1.0": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "title": "anyCrsFeatureCollection",
+        "type": "object"
+      },
+      "slb..wks..well.1.0": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "title": "slb..wks..well",
+        "type": "object"
+      }
+    },
    "properties":{
       "locationOriginalCRS":{
          "description":"Thewell'soriginallocationasAnyCrsFeatureCollection-astructuresimilartobutdistinctfromGeoJSON.",