refactor: simplify JSON Schema validation setup and update factorypath to use version 7.0.5-SNAPSHOT

Author: predic8

core/src/main/java/com/predic8/membrane/core/interceptor/schemavalidation/json/JSONYAMLSchemaValidator.java

@@ -49,7 +49,6 @@ public class JSONYAMLSchemaValidator extends AbstractMessageValidator {
 
     private final YAMLFactory factory = YAMLFactory.builder().enable(STRICT_DUPLICATE_DETECTION).build();
     private final ObjectMapper yamlObjectMapper = new ObjectMapper(factory);
-    private final ObjectMapper jsonObjectMapper = new ObjectMapper();
 
     public static final String SCHEMA_VERSION_2020_12 = "2020-12";
 
@@ -63,11 +62,6 @@ public class JSONYAMLSchemaValidator extends AbstractMessageValidator {
 
     private Map<String, String> schemaMappings = new HashMap<>();
 
-    /**
-     * JsonSchemaFactory instances are thread-safe provided its configuration is not modified.
-     */
-    SchemaRegistry jsonSchemaFactory;
-
     /**
      * JsonSchema instances are thread-safe provided its configuration is not modified.
      */
@@ -100,22 +94,25 @@ public String getName() {
     public void init() {
         super.init();
 
-        jsonSchemaFactory = SchemaRegistry.withDefaultDialect(schemaId, b -> b.schemaLoader(SchemaLoader.builder()
-                .schemaIdResolvers(r -> r.mappings(schemaMappings))
-                .resourceLoaders(rl -> rl.values(list -> list.addFirst(new MembraneSchemaLoader(resolver))))
-                .build()));
-
         try (InputStream in = resolver.resolve(jsonSchema)) {
-            InputFormat schemaFormat =
-                    (jsonSchema.endsWith(".yaml") || jsonSchema.endsWith(".yml")) ? YAML : JSON;
-
-            schema = jsonSchemaFactory.getSchema(SchemaLocation.of(jsonSchema), in, schemaFormat);
+            schema = getJsonSchemaFactory().getSchema(SchemaLocation.of(jsonSchema), in, getSchemaFormat());
             schema.initializeValidators();
         } catch (IOException e) {
             throw new RuntimeException("Cannot read JSON Schema from: " + jsonSchema, e);
         }
     }
 
+    private @NotNull InputFormat getSchemaFormat() {
+        return (jsonSchema.endsWith(".yaml") || jsonSchema.endsWith(".yml")) ? YAML : JSON;
+    }
+
+    private SchemaRegistry getJsonSchemaFactory() {
+        return SchemaRegistry.withDefaultDialect(schemaId, b -> b.schemaLoader(SchemaLoader.builder()
+                .schemaIdResolvers(r -> r.mappings(schemaMappings))
+                .resourceLoaders(rl -> rl.values(list -> list.addFirst(new MembraneSchemaLoader(resolver))))
+                .build()));
+    }
+
     public Outcome validateMessage(Exchange exc, Flow flow) throws Exception {
         return validateMessage(exc, flow, UTF_8);
     }

war/.factorypath

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><factorypath>
-    <factorypathentry enabled="true" id="M2_REPO/org/membrane-soa/service-proxy-annot/6.3.12-SNAPSHOT/service-proxy-annot-6.3.12-SNAPSHOT.jar" kind="VARJAR" runInBatchMode="false"/>
+    <factorypathentry enabled="true" id="M2_REPO/org/membrane-soa/service-proxy-annot/7.0.5-SNAPSHOT/service-proxy-annot-7.0.5-SNAPSHOT.jar" kind="VARJAR" runInBatchMode="false"/>
 </factorypath>