validate openapi 3.1

Author: hauner

openapi-parser/src/main/java/io/openapiparser/OpenApiResult30.java

@@ -95,7 +95,6 @@ public boolean validate (Validator validator, SchemaStore schemaStore) {
             for (OutputUnit error : errors) {
                 error.getError ();
                 error.getInstanceLocation ();
-
             }
 
             return false;

openapi-parser/src/main/java/io/openapiparser/OpenApiResult31.java

@@ -6,12 +6,17 @@
 package io.openapiparser;
 
 import io.openapiparser.model.v31.OpenApi;
-import io.openapiprocessor.jsonschema.schema.Bucket;
-import io.openapiprocessor.jsonschema.schema.DocumentStore;
-import io.openapiprocessor.jsonschema.schema.SchemaStore;
+import io.openapiprocessor.jsonschema.ouput.OutputConverter;
+import io.openapiprocessor.jsonschema.ouput.OutputUnit;
+import io.openapiprocessor.jsonschema.schema.*;
 import io.openapiprocessor.jsonschema.validator.Validator;
+import io.openapiprocessor.jsonschema.validator.steps.ValidationStep;
 
 import java.util.Collection;
+import java.util.Collections;
+import java.util.stream.Collectors;
+
+import static io.openapiparser.OpenApiSchemas.*;
 
 public class OpenApiResult31 implements OpenApiResult {
     @Deprecated
@@ -53,19 +58,55 @@ public <T> T getModel (Class<T> api) {
     }
 
     @Override
-    public boolean validate (Validator validator, SchemaStore schemaStore) {
-        // not yet supported...
-
-//        JsonSchema schema = schemaStore.addSchema (OPENAPI_SCHEMA_31_ID, OPENAPI_SCHEMA_31);
-//        JsonInstance instance = new JsonInstance (root.getRawValues (), context.getInstanceContext ());
-//        ValidationStep result = validator.validate (schema, instance);
-//        validationMessages = result.getMessages ();
-//        return validationMessages.isEmpty ();
-        return true;
+    public Collection<ValidationError> getValidationErrors () {
+        return validationErrors;
     }
 
     @Override
-    public Collection<ValidationError> getValidationErrors () {
-        return validationErrors;
+    public boolean validate (Validator validator, SchemaStore schemaStore) {
+        try {
+            schemaStore.register (OPENAPI_SCHEMA_31_ID, OPENAPI_SCHEMA_31);
+            JsonSchema schema = schemaStore.getSchema (OPENAPI_SCHEMA_31_ID, SchemaVersion.Draft202012);
+
+            Object bundle = bundle ();
+            JsonInstance instance = new JsonInstance (bundle);
+            ValidationStep result = validator.validate (schema, instance);
+
+            OutputConverter converter = new OutputConverter (Output.BASIC);
+            OutputUnit output = converter.convert (result);
+
+            if (output.isValid ()) {
+                validationErrors = Collections.emptyList ();
+                return true;
+            }
+
+            Collection<OutputUnit> errors = output.getErrors ();
+            assert errors != null;
+
+            validationErrors = errors
+                .stream ()
+                .map (e -> {
+                    return new ValidationError (
+                        e.getInstanceLocation (),
+                        e.getKeywordLocation (),
+                        e.getAbsoluteKeywordLocation (),
+                        e.getError ()
+                    );
+                })
+                .collect (Collectors.toList ());
+
+            for (OutputUnit error : errors) {
+                error.getError ();
+                error.getInstanceLocation ();
+            }
+
+            return false;
+        } catch (Exception ex) {
+            return true;
+        }
+    }
+
+    Object bundle () {
+        return new OpenApiBundler (context, documents, root).bundle ();
     }
 }