Removing AnnoCollectionRef as no longer used

Author: glenrobson

schema/v4/Annotation.json

@@ -126,14 +126,7 @@
         "body": {
             "type": "array",
             "items": {
-                "anyOf": [
-                    {
-                        "$ref": "Resource.json"
-                    },
-                    {
-                        "$ref": "Choice.json"
-                    }
-                ]
+                "$ref": "Resource.json"
             }
         },
         "target": {

schema/v4/AnnotationCollection.json

@@ -42,17 +42,10 @@
             "items": {
                 "$ref": "Resource.json"
             }
-        },
-        "items": {
-            "type": "array",
-            "items": {
-                "$ref": "Annotation.json"
-            }
         }
     },
     "required": [
         "id",
-        "type",
-        "items"
+        "type"
     ]
 }

schema/v4/AnnotationCollectionRef.json

@@ -75,14 +75,18 @@
         "annotations": {
             "type": "array",
             "items": {
-                "oneOf": [
-                    {
-                        "$ref": "AnnotationPage.json"
-                    },
-                    {
-                        "$ref": "AnnotationPageRef.json"
-                    }
-                ]
+                "if": {
+                    "type": "object",
+                    "required": [
+                        "items"
+                    ]
+                },
+                "then": {
+                    "$ref": "AnnotationPage.json"
+                },
+                "else": {
+                    "$ref": "AnnotationPageRef.json"
+                }
             }
         }
     },

schema/v4/Container.json

@@ -4,49 +4,55 @@
     "title": "Services",
     "type": "array",
     "items": {
-        "oneOf": [
-            {
-                "type": "object",
-                "title": "serviceV3",
-                "properties": {
-                    "id": { "$ref": "properties.json#/$defs/id" },
-                    "type": {
-                        "type": "string",
-                        "pattern": "^Service$",
-                        "default": "Service"
-                    },
-                    "profile": {
-                        "type": "string"
-                    },
-                    "service": {
-                        "$ref": "Service.json"
-                    }
+        "if": {
+            "type": "object",
+            "required": [
+                "id"
+            ]
+        },
+        "then": {
+            "type": "object",
+            "title": "serviceV3",
+            "properties": {
+                "id": {
+                    "$ref": "properties.json#/$defs/id"
                 },
-                "required": [
-                    "id",
-                    "type"
-                ]
+                "type": {
+                    "type": "string"
+                },
+                "profile": {
+                    "type": "string"
+                },
+                "service": {
+                    "$ref": "Service.json"
+                }
             },
-            {
-                "type": "object",
-                "title": "serviceV2",
-                "properties": {
-                    "@id": { "$ref": "properties.json#/$defs/id" },
-                    "@type": {
-                        "type": "string"
-                    },
-                    "profile": {
-                        "type": "string"
-                    },
-                    "service": {
-                        "$ref": "Service.json"
-                    }
+            "required": [
+                "id",
+                "type"
+            ]
+        },
+        "else": {
+            "type": "object",
+            "title": "serviceV2",
+            "properties": {
+                "@id": {
+                    "$ref": "properties.json#/$defs/id"
+                },
+                "@type": {
+                    "type": "string"
                 },
-                "required": [
-                    "@id",
-                    "@type"
-                ]
-            }
-        ]
+                "profile": {
+                    "type": "string"
+                },
+                "service": {
+                    "$ref": "Service.json"
+                }
+            },
+            "required": [
+                "@id",
+                "@type"
+            ]
+        }
     }
 }

schema/v4/service.json

@@ -24,7 +24,7 @@ def validate(instance):
             # Use the filename as a URI-like key for consistency
             uri = f"{BASE_URI}/{json_file.name}"
             schemas[uri] = schema_content
-            print(f"Loaded schema: {json_file.name}")
+            #print(f"Loaded schema: {json_file.name}")
         except (json.JSONDecodeError, IOError) as e:
             print(f"Failed to load schema from {json_file}: {e}")