Merge branch 'process-internal-fragment' into 'master'

relax validation for internal schema fragments

See merge request !143

indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/PropertiesProcessor.java

@@ -108,22 +108,26 @@ public class PropertiesProcessor {
 
     private String getDefinitionIdentity(String definitionSubRef) {
         String[] components = definitionSubRef.split(":");
-        if (components.length < 4) {
-            throw new AppException(HttpStatus.SC_CONFLICT, "Wrong definition format:" + definitionSubRef,
-                    "Wrong definition format:" + definitionSubRef);
+        switch (components.length) {
+            case 1:
+                return components[0];
+            case 4:
+                return components[2];
         }
-
-        return components[2];
+        throw new AppException(HttpStatus.SC_CONFLICT, "Wrong definition format:" + definitionSubRef,
+                "Wrong definition format:" + definitionSubRef);
     }
 
     private String getDefinitionColonVersion(String definitionSubRef) {
         String[] components = definitionSubRef.split(":");
-        if (components.length < 4) {
-            throw new AppException(HttpStatus.SC_CONFLICT, "Wrong definition format:" + definitionSubRef,
-                    "Wrong definition format:" + definitionSubRef);
+        switch (components.length) {
+            case 1:
+                return ":1.0.0";
+            case 4:
+                return ":" + components[3];
         }
-
-        return ":" + components[3];
+        throw new AppException(HttpStatus.SC_CONFLICT, "Wrong definition format:" + definitionSubRef,
+                "Wrong definition format:" + definitionSubRef);
     }
 
     private Stream<Map<String, Object>> processOfItems(List<AllOfItem> allOf, List<AllOfItem> anyOf, List<AllOfItem> oneOf) {

indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/readme.md

@@ -5,7 +5,7 @@ Purpose
 -------
 
 The purpose of this document is to describe schema conversion from the
-Schema Service format to the Storage Service format.
+Schema Service formats to the Storage Service format.
 
 Storage Service schema has the following JSON format
 ----------------------------------------------------
@@ -162,7 +162,7 @@ For instance
 
 ```json
 opendes:wks:AbstractAnyCrsFeatureCollection:1.0.0
-opendes:wks:anyJsonFeatureCollection
+opendes:wks:anyJsonFeatureCollection:1.0.0
 ```
 
 Ignored definition(-s) name(-s) are not included into Storage Service schema:
@@ -318,14 +318,14 @@ For instance
 ```json
 {
   "definitions": {
-    "opendes:wks:wellboreData1:1.0.0": {
+    "wellboreData1": {
       "properties": {
         "prop1": {
           "type": "string"
         }
       }
     },
-    "opendes:wks:wellboreData2:1.0.0": {
+    "wellboreData2": {
       "properties": {
         "prop2": {
           "type": "string"
@@ -339,11 +339,11 @@ For instance
         {
           "anyOf": [
             {
-              "$ref": "#/definitions/opendes:wks:wellboreData1:1.0.0"
+              "$ref": "#/definitions/wellboreData1"
             } ],
           "oneOf": [
             {
-              "$ref": "#/definitions/opendes:wks:wellboreData2:1.0.0"
+              "$ref": "#/definitions/wellboreData2"
             }
           ]
         }

indexer-core/src/test/resources/converter/tags/allOf/allOf-inside-allOf.json

 {
   "definitions": {
-    "opendes:wks:wellboreData1:1.0.0": {
+    "wellboreData1": {
       "properties": {
         "prop1": {
           "type": "string"
         }
       }
     },
-    "opendes:wks:wellboreData2:1.0.0": {
+    "wellboreData2": {
       "properties": {
         "prop2": {
           "type": "string"
         }
       }
     },
-    "opendes:wks:wellboreData3:1.0.0": {
+    "wellboreData3": {
       "properties": {
         "prop3": {
           "type": "string"
         }
       }
     },
-    "opendes:wks:wellboreData4:1.0.0": {
+    "wellboreData4": {
       "properties": {
         "prop4": {
           "type": "string"
@@ -35,18 +35,18 @@
         {
           "allOf": [
             {
-              "$ref": "#/definitions/opendes:wks:wellboreData1:1.0.0"
+              "$ref": "#/definitions/wellboreData1"
             },
             {
-              "$ref": "#/definitions/opendes:wks:wellboreData2:1.0.0"
+              "$ref": "#/definitions/wellboreData2"
             }
           ]
         },
         {
-          "$ref": "#/definitions/opendes:wks:wellboreData3:1.0.0"
+          "$ref": "#/definitions/wellboreData3"
         },
         {
-          "$ref": "#/definitions/opendes:wks:wellboreData4:1.0.0"
+          "$ref": "#/definitions/wellboreData4"
         }
       ]
     }

indexer-core/src/test/resources/converter/tags/allOf/allOf-inside-property.json

 {
   "definitions": {
-    "opendes:wks:def1:1.0.0": {
+    "def1": {
       "properties": {
         "prop1": {
           "type": "string"
@@ -14,12 +14,12 @@
         "FacilityName": {
           "allOf": [
             {
-              "$ref": "#/definitions/opendes:wks:def1:1.0.0"
+              "$ref": "#/definitions/def1"
             },
             {
               "properties": {
                 "val" : {
-                "type": "string" }
+                  "type": "string" }
               }
             }
           ]

indexer-core/src/test/resources/converter/tags/allOf/indefinitions.json

 {
   "definitions": {
-    "opendes:wks:wellboreData1:1.0.0": {
+    "wellboreData1": {
       "properties": {
         "prop1": {
           "type": "string"
         }
       }
     },
-    "opendes:wks:wellboreData2:1.0.0": {
+    "wellboreData2": {
       "allOf": [
         {
-          "$ref": "#/definitions/opendes:wks:wellboreData1:1.0.0"
+          "$ref": "#/definitions/wellboreData1"
         }
       ]
     }
@@ -20,7 +20,7 @@
       "type": "object",
       "properties": {
         "Field": {
-          "$ref": "#/definitions/opendes:wks:wellboreData2:1.0.0"
+          "$ref": "#/definitions/wellboreData2"
         }
       }
     }

indexer-core/src/test/resources/converter/tags/mixAllAnyOneOf/mix.json

 {
   "definitions": {
-    "opendes:wks:wellboreData1:1.0.0": {
+    "wellboreData1": {
       "properties": {
         "prop1": {
           "type": "string"
         }
       }
     },
-    "opendes:wks:wellboreData2:1.0.0": {
+    "wellboreData2": {
       "properties": {
         "prop2": {
           "type": "string"
         }
       }
     },
-    "opendes:wks:wellboreData3:1.0.0": {
+    "wellboreData3": {
       "properties": {
         "prop3": {
           "type": "string"
         }
       }
     },
-    "opendes:wks:wellboreData4:1.0.0": {
+    "wellboreData4": {
       "properties": {
         "prop4": {
           "type": "string"
@@ -35,19 +35,19 @@
         {
           "anyOf": [
             {
-              "$ref": "#/definitions/opendes:wks:wellboreData1:1.0.0"
+              "$ref": "#/definitions/wellboreData1"
             } ],
           "oneOf": [
             {
-              "$ref": "#/definitions/opendes:wks:wellboreData2:1.0.0"
+              "$ref": "#/definitions/wellboreData2"
             }
           ]
         },
         {
-          "$ref": "#/definitions/opendes:wks:wellboreData3:1.0.0"
+          "$ref": "#/definitions/wellboreData3"
         },
         {
-          "$ref": "#/definitions/opendes:wks:wellboreData4:1.0.0"
+          "$ref": "#/definitions/wellboreData4"
         }
       ]
     }

indexer-core/src/test/resources/converter/tags/oneOf/indefinitions.json

 {
   "definitions": {
-    "opendes:wks:wellboreData1:1.0.0": {
+    "wellboreData1": {
       "properties": {
         "prop1": {
           "type": "string"
         }
       }
     },
-    "opendes:wks:wellboreData2:1.0.0": {
+    "wellboreData2": {
       "anyOf": [
         {
-          "$ref": "#/definitions/opendes:wks:wellboreData1:1.0.0"
+          "$ref": "#/definitions/wellboreData1"
         }
       ]
     }
@@ -20,7 +20,7 @@
       "type": "object",
       "properties": {
         "Field": {
-          "$ref": "#/definitions/opendes:wks:wellboreData2:1.0.0"
+          "$ref": "#/definitions/wellboreData2"
         }
       }
     }