fix: adjust code and schemas to the new update (wip)

Author: Pfeil

src/main/java/edu/kit/datamanager/ro_crate/entities/validation/JsonSchemaValidation.java

@@ -3,17 +3,19 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.networknt.schema.JsonSchema;
-import com.networknt.schema.JsonSchemaFactory;
-import com.networknt.schema.SpecVersion;
-import com.networknt.schema.ValidationMessage;
-
+import com.networknt.schema.AbsoluteIri;
+import com.networknt.schema.Error;
+import com.networknt.schema.Schema;
+import com.networknt.schema.SchemaLocation;
+import com.networknt.schema.SchemaRegistry;
+import com.networknt.schema.dialect.DialectId;
 import edu.kit.datamanager.ro_crate.objectmapper.MyObjectMapper;
 
-import java.net.URISyntaxException;
+import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
+import java.util.Collection;
 import java.util.Objects;
-import java.util.Set;
 
 /**
  * Implementation of the entity validation strategy that uses json schema.
@@ -27,19 +29,22 @@ public class JsonSchemaValidation implements EntityValidationStrategy {
       = Objects.requireNonNull(JsonSchemaValidation.class.getClassLoader()
       .getResource("json_schemas/entity_field_structure_schema.json"));
 
-  private JsonSchema entitySchema;
-  private JsonSchema entityFieldSchema;
+  private Schema entitySchema;
+  private Schema entityFieldSchema;
 
   /**
    *  Default constructor that uses the default schemas.
    */
   public JsonSchemaValidation() {
-    JsonSchemaFactory factory = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V201909);
-    try {
-      this.entitySchema = factory.getSchema(entitySchemaDefault.toURI());
-      this.entityFieldSchema = factory.getSchema(fieldSchemaDefault.toURI());
-    } catch (URISyntaxException e) {
-      e.printStackTrace();
+    SchemaRegistry factory = new SchemaRegistry.Builder()
+      .defaultDialectId(DialectId.DRAFT_2019_09)
+      .build();
+
+    try (InputStream entitySchemaStream = entitySchemaDefault.openStream(); InputStream fieldSchemaStream = fieldSchemaDefault.openStream()) {
+      this.entitySchema = factory.getSchema(entitySchemaStream);
+      this.entityFieldSchema = factory.getSchema(fieldSchemaStream);
+    } catch (IOException e) {
+        throw new RuntimeException(e);
     }
   }
 
@@ -50,16 +55,20 @@ public JsonSchemaValidation() {
    * @param fieldSchema schema for the field validation.
    */
   public JsonSchemaValidation(JsonNode entitySchema, JsonNode fieldSchema) {
-    JsonSchemaFactory factory = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V201909);
+    SchemaRegistry factory = new SchemaRegistry.Builder()
+      .defaultDialectId(DialectId.DRAFT_2019_09)
+      .build();
     this.entitySchema = factory.getSchema(entitySchema);
     this.entityFieldSchema = factory.getSchema(fieldSchema);
   }
 
   @Override
   public boolean validateEntity(JsonNode entity) {
-    Set<ValidationMessage> errors = this.entitySchema.validate(entity);
-    if (errors.size() != 0) {
-      System.err.println("This entity does not comply to the basic RO-Crate entity structure.");
+    Collection<Error> errors = this.entitySchema.validate(entity);
+    if (!errors.isEmpty()) {
+      System.err.println(
+        "This entity does not comply to the basic RO-Crate entity structure."
+      );
       errors.forEach(error -> System.err.println(error.getMessage()));
       return false;
     }
@@ -68,17 +77,23 @@ public boolean validateEntity(JsonNode entity) {
 
   @Override
   public boolean validateFieldOfEntity(JsonNode field) {
-    Set<ValidationMessage> errors = this.entityFieldSchema.validate(field);
+    Collection<Error> errors = this.entityFieldSchema.validate(field);
     if (!errors.isEmpty()) {
       ObjectMapper objectMapper = MyObjectMapper.getMapper();
       System.err.println("The property: ");
       try {
-        System.err.println(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(field));
+        System.err.println(
+          objectMapper
+            .writerWithDefaultPrettyPrinter()
+            .writeValueAsString(field)
+        );
       } catch (JsonProcessingException e) {
         e.printStackTrace();
       }
-      System.err.println("does not comply with the flattened structure"
-          + " of the RO-Crate json document.");
+      System.err.println(
+        "does not comply with the flattened structure" +
+          " of the RO-Crate json document."
+      );
       return false;
     }
     return true;

src/main/java/edu/kit/datamanager/ro_crate/validation/JsonSchemaValidation.java

@@ -2,32 +2,44 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.networknt.schema.JsonSchema;
-import com.networknt.schema.JsonSchemaFactory;
-import com.networknt.schema.SpecVersion;
-import com.networknt.schema.ValidationMessage;
+import com.networknt.schema.AbsoluteIri;
+import com.networknt.schema.Error;
+import com.networknt.schema.Schema;
+import com.networknt.schema.SchemaLocation;
+import com.networknt.schema.SchemaRegistry;
 
+import com.networknt.schema.dialect.DialectId;
 import edu.kit.datamanager.ro_crate.Crate;
 import edu.kit.datamanager.ro_crate.objectmapper.MyObjectMapper;
 
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.Collection;
 import java.util.Objects;
-import java.util.Set;
 
 /**
  * Validation of the crate metadata using JSON-schema.
  */
 public class JsonSchemaValidation implements ValidatorStrategy {
 
   private static final String defaultSchema = "json_schemas/default.json";
-  private JsonSchema schema;
+  private Schema schema;
 
   private void getSchema(URI schemaUri) {
-    JsonSchemaFactory factory = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V201909);
-    this.schema = factory.getSchema(schemaUri);
+    SchemaRegistry factory = new SchemaRegistry.Builder()
+            .defaultDialectId(DialectId.DRAFT_2019_09)
+            .build();
+    try (InputStream stream = schemaUri.toURL().openStream()) {
+      this.schema = factory.getSchema(stream);
+    } catch (MalformedURLException e) {
+        throw new RuntimeException(e);
+    } catch (IOException e) {
+        throw new RuntimeException(e);
+    }
   }
 
   /**
@@ -53,7 +65,9 @@ public JsonSchemaValidation(String schema) {
   }
 
   public JsonSchemaValidation(JsonNode schema) {
-    JsonSchemaFactory factory = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V201909);
+    SchemaRegistry factory = new SchemaRegistry.Builder()
+            .defaultDialectId(DialectId.DRAFT_2019_09)
+            .build();
     this.schema = factory.getSchema(schema);
   }
 
@@ -62,8 +76,8 @@ public boolean validate(Crate crate) {
     ObjectMapper objectMapper = MyObjectMapper.getMapper();
     try {
       final JsonNode good = objectMapper.readTree(crate.getJsonMetadata());
-      Set<ValidationMessage> errors = this.schema.validate(good);
-      if (errors.size() == 0) {
+      Collection<Error> errors = this.schema.validate(good);
+      if (errors.isEmpty()) {
         return true;
       } else {
         System.err.println("This crate does not validate against the this schema."

src/main/resources/json_schemas/default.json

@@ -11,7 +11,7 @@
         "type": "object",
         "patternProperties": {
           ".*": {
-            "$ref": "entity_field_structure_schema.json"
+            "$dynamicRef": "entity_field_structure_schema.json"
           }
         }
       }

src/main/resources/json_schemas/entity_schema.json

@@ -4,7 +4,7 @@
   "type": "object",
   "patternProperties": {
     ".*": {
-      "$ref": "entity_field_structure_schema.json"
+      "$dynamicRef": "entity_field_structure_schema.json"
     }
   }
 }