Merge branch 'release/1.0.5'

Author: gcornacchia

CHANGELOG.md

@@ -1,5 +1,8 @@
 # CHANGELOG
 
+1.0.5 - 13/04/2023
+- removed additional "jsonSchema" field from json schema files when reading a swagger 2.0 file
+
 1.0.4 - 02/03/2023
 - fix bug handling additionalProperties if already defined with false value
 

assembly/assembly.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>it.imolinfo.maven.plugins</groupId>
 	<artifactId>openapi2jsonschema4j</artifactId>
-	<version>1.0.4</version>
+	<version>1.0.5</version>
 	<packaging>maven-plugin</packaging>
 
 	 <name>OpenAPI2JsonSchema4J</name>
@@ -158,27 +158,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>make-assembly-tipi-comuni</id>
-						<!-- this is used for inheritance merges -->
-						<phase>package</phase>
-						<!-- bind to the packaging phase -->
-						<goals>
-							<goal>single</goal>
-						</goals>
-						<configuration>
-							<finalName>${project.name}-${project.version}</finalName>
-							<appendAssemblyId>true</appendAssemblyId>
-							<descriptors>
-								<descriptor>assembly/assembly.xml</descriptor>
-							</descriptors>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>

assembly/dist/conf/environment.properties

@@ -38,6 +38,8 @@ public class DraftV4JsonSchemaGenerator extends BaseJsonSchemaGenerator implemen
 	private static final String WRITEONLY = "writeOnly";
 	private static final String EXTERNALDOCS = "externalDocs";
 	private static final String DEPRECATED = "deprecated";
+
+	private static final String JSONSCHEMA = "jsonSchema";
 	private static final String[] ignoreProperties = {ORIGINAL_REF,
 			EXAMPLESETFLAG,
 			EXAMPLE,
@@ -48,7 +50,8 @@ public class DraftV4JsonSchemaGenerator extends BaseJsonSchemaGenerator implemen
 			READONLY,
 			WRITEONLY,
 			EXTERNALDOCS,
-			DEPRECATED};
+			DEPRECATED,
+			JSONSCHEMA};
 	private static final List<String> ignorePropertiesList = Arrays.asList(ignoreProperties);
 	public static final String NULL = "null";
 	private boolean strict;

assembly/dist/conf/logback.xml

@@ -10,6 +10,7 @@
 import com.github.fge.jsonschema.core.report.ProcessingReport;
 import com.github.fge.jsonschema.main.JsonSchema;
 import com.github.fge.jsonschema.main.JsonSchemaFactory;
+import com.github.fge.jsonschema.processors.syntax.SyntaxValidator;
 import io.swagger.oas.inflector.examples.ExampleBuilder;
 import io.swagger.oas.inflector.examples.models.Example;
 import io.swagger.oas.inflector.processors.JsonNodeExampleSerializer;
@@ -74,6 +75,7 @@ private void testGeneratedJsonSchema(File f, Map<String, JsonNode> gen) throws P
             log.info("jsonExample={}",jsonExample);
             JsonSchemaFactory schemaFactory = JsonSchemaFactory.byDefault();
             JsonSchema jsonSchema = schemaFactory.getJsonSchema(jsonSchemaNode);
+            validateJsonSchemaSyntax(schemaFactory.getSyntaxValidator(), jsonSchemaNode);
             ProcessingReport rep = jsonSchema.validate(new ObjectMapper().readTree(jsonExample));
             log.info("processing report for model {} = {}",objName,rep);
             Assert.assertTrue("Il json generato non è valido in base al json schema per l'oggetto "+objName, rep.isSuccess());
@@ -83,5 +85,10 @@ private void testGeneratedJsonSchema(File f, Map<String, JsonNode> gen) throws P
 
 
 
+    }
+
+    private void validateJsonSchemaSyntax(SyntaxValidator syntaxValidator, JsonNode node) {
+        ProcessingReport rep =  syntaxValidator.validateSchema(node);
+        Assert.assertTrue(rep.isSuccess());
     }
 }