simplify instance, remove context

hauner · hauner · commit dd83cb3f6ef2 · 2023-05-18T19:02:53.000+02:00
diff --git a/json-schema-validator/src/main/java/io/openapiprocessor/jsonschema/schema/JsonInstance.java b/json-schema-validator/src/main/java/io/openapiprocessor/jsonschema/schema/JsonInstance.java
@@ -15,28 +15,19 @@
 import java.util.Map;
 
 public class JsonInstance {
-    @Deprecated
-    private final JsonInstanceContext context;
-
     private final @Nullable Object value;
     private final JsonPointer location;
 
-    public JsonInstance (@Nullable Object value, JsonInstanceContext context) {
-        this.context = context;
+    public JsonInstance (@Nullable Object value) {
         this.value = value;
         this.location = JsonPointer.EMPTY;
     }
 
-    public JsonInstance (JsonPointer location, @Nullable Object value, JsonInstanceContext context) {
-        this.context = context;
+    public JsonInstance (JsonPointer location, @Nullable Object value) {
         this.value = value;
         this.location = location;
     }
 
-    public Scope getScope () {
-        return context.getScope ();
-    }
-
     public JsonPointer getLocation () {
         return location;
     }
@@ -52,22 +43,19 @@ public String getPath () {
     public JsonInstance getPropertyName (String propertyName) {
         return new JsonInstance (
             location.append (propertyName),
-            getPropertyKey (propertyName),
-            context);
+            getPropertyKey (propertyName));
     }
 
     public JsonInstance getValue (String property) {
         return new JsonInstance (
             location.append (property),
-            getPropertyValue (property),
-            context);
+            getPropertyValue (property));
     }
 
     public JsonInstance getValue (int idx) {
         return new JsonInstance (
             location.append (idx),
-            getArrayValue (idx),
-            context);
+            getArrayValue (idx));
     }
 
     public int getArraySize () {
@@ -120,11 +108,7 @@ public boolean isEqual (JsonInstance other) {
 
     @Override
     public String toString () {
-        String location = this.location.toString ();
-        if (location == null) {
-            return String.format ("%s", context.getScope ());
-        }
-        return String.format ("%s", this.location);
+        return String.format ("%s", this.location != null ? this.location : "/");
     }
 
     private @Nullable String getPropertyKey (String property) {
diff --git a/json-schema-validator/src/main/java/io/openapiprocessor/jsonschema/schema/JsonSchemaObject.java b/json-schema-validator/src/main/java/io/openapiprocessor/jsonschema/schema/JsonSchemaObject.java
@@ -383,13 +383,11 @@ public Collection<JsonInstance> getEnum () {
         else if (raw instanceof Collection) {
             List<JsonInstance> instances = new ArrayList<> ();
 
+            int index = 0;
             for (Object o : Types.asCol (raw)) {
-                Scope scope = context.getScope ().move (o);
-                JsonInstance instance = new JsonInstance (
-                    o, new JsonInstanceContext (scope, new ReferenceRegistry ())
-                );
-
+                JsonInstance instance = new JsonInstance (getLocation ().append ("enum").append (index), o);
                 instances.add (instance);
+                index++;
             }
 
             return Collections.unmodifiableCollection(instances);
@@ -406,8 +404,7 @@ o, new JsonInstanceContext (scope, new ReferenceRegistry ())
         }
 
         Object raw = schemaObject.getRawValue ("const");
-        Scope scope = raw != null ? context.getScope ().move (raw) : context.getScope ();
-        return new JsonInstance (raw, new JsonInstanceContext (scope, new ReferenceRegistry ()));
+        return new JsonInstance (getLocation ().append ("const"), raw);
     }
 
     @Override
diff --git a/json-schema-validator/src/main/java/io/openapiprocessor/jsonschema/validator/ValidationMessage.java b/json-schema-validator/src/main/java/io/openapiprocessor/jsonschema/validator/ValidationMessage.java
@@ -73,10 +73,6 @@ public String getSchemaPath () {
         return schema.getLocation ().toString ();
     }
 
-    public String getInstanceScope () {
-        return instance.getScope ().toString ();
-    }
-
     public String getInstancePath () {
         return instance.getPath ();
     }
diff --git a/json-schema-validator/src/main/java/io/openapiprocessor/jsonschema/validator/result/FullResultTextBuilder.java b/json-schema-validator/src/main/java/io/openapiprocessor/jsonschema/validator/result/FullResultTextBuilder.java
@@ -11,7 +11,7 @@ public class FullResultTextBuilder implements ResultTextBuilder {
 
     @Override
     public String getText (ValidationMessage message) {
-        String location = trim(lastPartOfPath(message.getInstanceScope ()), 20);
+        String location = trim(lastPartOfPath(message.getInstancePath ()), 20);
 
         String instancePath = message.getInstancePath ().length () != 0
             ? trim (message.getInstancePath (), 40)
diff --git a/json-schema-validator/src/main/java/io/openapiprocessor/jsonschema/validator/result/MessageCollector.java b/json-schema-validator/src/main/java/io/openapiprocessor/jsonschema/validator/result/MessageCollector.java
@@ -26,14 +26,14 @@ public LinkedList<Message> collect () {
     private void collect (Collection<ValidationMessage> messages) {
         for (ValidationMessage message : messages) {
             Message msg = new Message (
-                message.getInstanceScope (),
+                "",
                 message.getInstancePath (),
                 message.getSchemaPath (),
                 message.getText ()
             );
 
             if (!msg.isEmpty ()) {
-                MessageKey key = new MessageKey (message.getInstanceScope (), message.getInstancePath ());
+                MessageKey key = new MessageKey ("", message.getInstancePath ());
                 Collection<Message> scopeMessages = merged.computeIfAbsent (key, k -> new LinkedList<> ());
                 scopeMessages.add (msg);
             }
diff --git a/json-schema-validator/src/test/kotlin/io/openapiprocessor/jsonschema/validator/ValidationMessagePrinterSpec.kt b/json-schema-validator/src/test/kotlin/io/openapiprocessor/jsonschema/validator/ValidationMessagePrinterSpec.kt
@@ -23,12 +23,7 @@ class ValidationMessagePrinterSpec : StringSpec({
     )
     val schema = JsonSchemaObject(mapOf(), sctx)
 
-    val ictx = JsonInstanceContext(
-        scope,
-        ReferenceRegistry()
-    )
-    val instance = JsonInstance("value", ictx)
-
+    val instance = JsonInstance("value")
 
     val printer = ValidationMessagePrinter()
 
diff --git a/json-schema-validator/src/test/kotlin/io/openapiprocessor/jsonschema/validator/any/AnyOfStepSpec.kt b/json-schema-validator/src/test/kotlin/io/openapiprocessor/jsonschema/validator/any/AnyOfStepSpec.kt
@@ -26,16 +26,7 @@ class AnyOfStepSpec : StringSpec({
     )
     val schema = JsonSchemaObject(mapOf(), schemaContext)
 
-    val instanceContext = JsonInstanceContext(
-        Scope(
-            emptyUri(),
-            null,
-            SchemaVersion.getLatest()
-        ),
-        ReferenceRegistry()
-    )
-    val instance = JsonInstance("value", instanceContext)
-
+    val instance = JsonInstance("value")
 
     "step is valid without sub step error" {
         val step = AnyOfStep(schema, instance)
diff --git a/json-schema-validator/src/test/kotlin/io/openapiprocessor/jsonschema/validator/any/NotStepSpec.kt b/json-schema-validator/src/test/kotlin/io/openapiprocessor/jsonschema/validator/any/NotStepSpec.kt
@@ -26,14 +26,7 @@ class NotStepSpec : StringSpec({
     )
     val schema = JsonSchemaObject(mapOf(), schemaContext)
 
-    val instanceContext = JsonInstanceContext(
-        Scope(
-            emptyUri(),
-            null,
-            SchemaVersion.getLatest()
-        ), ReferenceRegistry()
-    )
-    val instance = JsonInstance("value", instanceContext)
+    val instance = JsonInstance("value")
 
     "step is valid if sub step is not" {
         val step = NotStep(schema, instance)
diff --git a/json-schema-validator/src/test/kotlin/io/openapiprocessor/jsonschema/validator/any/OneOfStepSpec.kt b/json-schema-validator/src/test/kotlin/io/openapiprocessor/jsonschema/validator/any/OneOfStepSpec.kt
@@ -24,14 +24,7 @@ class OneOfStepSpec : StringSpec({
     )
     val schema = JsonSchemaObject(mapOf(), schemaContext)
 
-    val instanceContext = JsonInstanceContext(
-        Scope(
-            UriSupport.emptyUri(),
-            null,
-            SchemaVersion.getLatest()
-        ), ReferenceRegistry()
-    )
-    val instance = JsonInstance("value", instanceContext)
+    val instance = JsonInstance("value")
 
     "step is valid without sub step error" {
         val step = OneOfStep(schema, instance)
diff --git a/json-schema-validator/src/test/kotlin/io/openapiprocessor/jsonschema/validator/support/Draft.kt b/json-schema-validator/src/test/kotlin/io/openapiprocessor/jsonschema/validator/support/Draft.kt
@@ -89,15 +89,7 @@ fun draftSpec(
     }
 
     fun createInstance(instance: Any?): JsonInstance {
-        val scope =
-            Scope(emptyUri(), emptyUri(), settings.version)
-        return JsonInstance(
-            instance,
-            JsonInstanceContext(
-                scope,
-                ReferenceRegistry()
-            )
-        )
+        return JsonInstance(JsonPointer.empty(), instance)
     }
 
     Files.walk(root)
diff --git a/json-schema-validator/src/test/kotlin/io/openapiprocessor/jsonschema/validator/support/InstanceBuilder.kt b/json-schema-validator/src/test/kotlin/io/openapiprocessor/jsonschema/validator/support/InstanceBuilder.kt
@@ -16,13 +16,6 @@ class InstanceBuilder(private val loader: DocumentLoader, private val documents:
             Resolver.Settings(version)
         )
         val resolverResult = resolver.resolve(version.schemaUri, document)
-        val instanceContext = JsonInstanceContext(
-            resolverResult.scope,
-            ReferenceRegistry()
-        )
-        return JsonInstance(
-            resolverResult.document,
-            instanceContext
-        )
+        return JsonInstance(resolverResult.document)
     }
 }
diff --git a/json-schema-validator/src/test/kotlin/io/openapiprocessor/jsonschema/validator/support/Steps.kt b/json-schema-validator/src/test/kotlin/io/openapiprocessor/jsonschema/validator/support/Steps.kt
@@ -20,10 +20,5 @@ fun createSchema(document: Map<String, Any>, location: JsonPointer, documentUri:
 }
 
 fun createInstance(document: Map<String, Any>, location: JsonPointer): JsonInstance {
-    val scope = createScope(createUri(""), document, SchemaVersion.Draft201909)
-    val context = JsonInstanceContext(
-        scope,
-        ReferenceRegistry()
-    )
-    return JsonInstance(location, document, context)
+    return JsonInstance(location, document)
 }
diff --git a/openapi-parser/src/main/java/io/openapiparser/OpenApiResult30.java b/openapi-parser/src/main/java/io/openapiparser/OpenApiResult30.java
@@ -65,10 +65,7 @@ public boolean validate (Validator validator, SchemaStore schemaStore) {
         JsonSchema schema = schemaStore.getSchema (OPENAPI_SCHEMA_30_ID, SchemaVersion.Draft4);
 
         Object bundle = bundle ();
-        JsonInstanceContext instanceContext = new JsonInstanceContext (root.getScope (), new ReferenceRegistry ());
-
-        JsonInstance instance = new JsonInstance (bundle, instanceContext);
-//        JsonInstance instance = new JsonInstance (root.getRawValues (), context.getInstanceContext ());
+        JsonInstance instance = new JsonInstance (bundle);
         ValidationStep result = validator.validate (schema, instance);
 
         OutputConverter converter = new OutputConverter (Output.FLAG);

Original file line number	Diff line number	Diff line change
`@@ -73,10 +73,6 @@ public String getSchemaPath () {`
`73`	`73`	`return schema.getLocation ().toString ();`
`74`	`74`	`}`
`75`	`75`
`76`		`- public String getInstanceScope () {`
`77`		`- return instance.getScope ().toString ();`
`78`		`- }`
`79`		`-`
`80`	`76`	`public String getInstancePath () {`
`81`	`77`	`return instance.getPath ();`
`82`	`78`	`}`