fix navigazione composed model

imolainformatica · Dec 3, 2024 · 2862cc2 · 2862cc2
1 parent 1a98099
commit 2862cc2
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 9 deletions.
diff --git a/src/main/java/it/imolainformatica/openapi2jsonschema4j/impl/DraftV4JsonSchemaGenerator.java b/src/main/java/it/imolainformatica/openapi2jsonschema4j/impl/DraftV4JsonSchemaGenerator.java
@@ -177,6 +177,14 @@ private void navigateModel(String originalRef, List<String> usedDefinition, Map<
 				Schema s = (Schema) res.get(ITEMS);
 				if (s.get$ref()!=null) {
 					navigateModel(s.get$ref(), usedDefinition, res, null);
+				} else if (s instanceof ComposedSchema) {
+					ComposedSchema cm = (ComposedSchema)s;
+					lookComposedModel(cm.getAllOf(),usedDefinition,res);
+					lookComposedModel(cm.getAnyOf(),usedDefinition,res);
+					lookComposedModel(cm.getOneOf(),usedDefinition,res);
+					if (cm.getNot()!=null) {
+						navigateModel(cm.getNot().get$ref(), usedDefinition, res, null);
+					}
 				}
 			}
 		} else if (ob instanceof ComposedSchema) {
@@ -239,6 +247,15 @@ private void navigateSchema(String propertyName, Schema p, List<String> usedDefi
 			if (mp.getAdditionalProperties() instanceof Schema ) {
 				navigateSchema(mp.getName(), (Schema)mp.getAdditionalProperties(), usedDefinition, res);
 			}
+		} else if (p instanceof ComposedSchema){
+			ComposedSchema cm = (ComposedSchema)p;
+			lookComposedModel(cm.getAllOf(),usedDefinition,res);
+			lookComposedModel(cm.getAnyOf(),usedDefinition,res);
+			lookComposedModel(cm.getOneOf(),usedDefinition,res);
+			if (cm.getNot()!=null) {
+				navigateModel(cm.getNot().get$ref(), usedDefinition, res, null);
+			}
+
 		} else {
 			log.debug(p.getClass() + " - nothing to do!");
 		}

diff --git a/...resources/expectedJsonSchemas/petstoreoas3ArrayAllofInline.json/updatepetresponse200.json b/...resources/expectedJsonSchemas/petstoreoas3ArrayAllofInline.json/updatepetresponse200.json
@@ -1,9 +1,40 @@
 {
   "components" : {
-    "schemas" : { }
+    "schemas" : {
+      "One" : {
+        "type" : "object",
+        "properties" : {
+          "property1" : {
+            "type" : "string"
+          }
+        },
+        "additionalProperties" : false
+      },
+      "Two" : {
+        "type" : "object",
+        "properties" : {
+          "property2" : {
+            "type" : "string"
+          }
+        },
+        "additionalProperties" : false
+      }
+    }
   },
   "$schema" : "http://json-schema.org/draft-04/schema#",
+  "additionalProperties" : false,
   "title" : "updatePetresponse200",
-  "type" : "array",
-  "items" : { }
+  "type" : "object",
+  "properties" : {
+    "id" : {
+      "type" : "array",
+      "items" : {
+        "oneOf" : [ {
+          "$ref" : "#/components/schemas/One"
+        }, {
+          "$ref" : "#/components/schemas/Two"
+        } ]
+      }
+    }
+  }
 }
diff --git a/src/test/resources/petstoreoas3ArrayAllofInline.json b/src/test/resources/petstoreoas3ArrayAllofInline.json
@@ -146,12 +146,16 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "type": "array",
-                  "items": {
-                    "oneOf": [
-                      {"$ref": "#/components/schemas/One"},
-                      {"$ref": "#/components/schemas/Two"}
-                    ]
+                  "properties": {
+                    "id": {
+                      "type": "array",
+                      "items": {
+                        "oneOf": [
+                          {"$ref": "#/components/schemas/One"},
+                          {"$ref": "#/components/schemas/Two"}
+                        ]
+                      }
+                    }
                   }
                 }
               }