updated pom version 1.0.8

imolainformatica · Oct 4, 2024 · deee75c · deee75c
1 parent 25c3c8b
commit deee75c
Show file tree

Hide file tree

Showing 7 changed files with 1,604 additions and 1,486 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # CHANGELOG
 
+1.0.8 . 
+- fix bug when handling generation of composed model with inline definitions
+
 1.0.7 - 30/05/2024
 - fix bug while handling generation of oneOf construct inside json schema
 - fix issue preventing generation of schemas in case of objects without properties, forcing generation with additionalProperties enabled

diff --git a/src/main/java/it/imolainformatica/openapi2jsonschema4j/impl/DraftV4JsonSchemaGenerator.java b/src/main/java/it/imolainformatica/openapi2jsonschema4j/impl/DraftV4JsonSchemaGenerator.java
@@ -41,7 +41,7 @@ public class DraftV4JsonSchemaGenerator extends BaseJsonSchemaGenerator implemen
 	private static final String EXTERNALDOCS = "externalDocs";
 	private static final String DEPRECATED = "deprecated";
 
-	private static final String ALLOF = "anyOf";
+	private static final String ALLOF = "allOf";
 	private static final String ONEOF = "oneOf";
 	private static final String ANYOF = "anyOf";
 
@@ -206,7 +206,9 @@ private void navigateModel(String originalRef, List<String> usedDefinition, Map<
 	private void lookComposedModel(List<Schema> schema, List<String> usedDefinition, Map<String, Object> res) {
 		if (schema!=null)
 			for (Schema m : schema) {
-				navigateModel(m.get$ref(), usedDefinition,res,null);
+				if (m.get$ref()!=null) {
+					navigateModel(m.get$ref(), usedDefinition, res, null);
+				}
 			}
 	}
 

diff --git a/src/test/java/it/imolainformatica/openapi2jsonschema4j/test/TestGeneration.java b/src/test/java/it/imolainformatica/openapi2jsonschema4j/test/TestGeneration.java
@@ -15,6 +15,11 @@ public void testPetStoreWithStrict() {
 		testForSwagger("petstore.json"); 
 	}
 
+	@Test
+	public void testPetStoreWithRegex() {
+		testForSwagger("petstoreInvalidRegex.json");
+	}
+
 
 	@Test
 	public void testPetStoreWithStrictAndDateFormatAndPattern() {

diff --git a/src/test/java/it/imolainformatica/openapi2jsonschema4j/test/TestGenerationFromOAS3.java b/src/test/java/it/imolainformatica/openapi2jsonschema4j/test/TestGenerationFromOAS3.java
@@ -25,4 +25,7 @@ public class TestGenerationFromOAS3 extends AbstractIT {
 
     @Test
     public void testOAS3WithComponentsInline() { testForSwagger("petstoreoas3ObjectInline.json");	}
+
+    @Test
+    public void testOAS3WithAllOf() { testForSwagger("petstoreoas3Allof.json");	}
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,4 +25,7 @@ public class TestGenerationFromOAS3 extends AbstractIT { @@
         @Test
         public void testOAS3WithComponentsInline() { testForSwagger("petstoreoas3ObjectInline.json");	}
+        @Test
+        public void testOAS3WithAllOf() { testForSwagger("petstoreoas3Allof.json");	}
     }