Trims more away

openapi-json-schema-tools · Dec 19, 2023 · 901e2e9 · 901e2e9
1 parent 4c604ee
commit 901e2e9
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 158 deletions.
diff --git a/...lified/src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchema.java b/...lified/src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchema.java
@@ -19,53 +19,9 @@
 
 public abstract class JsonSchema {
     public final @Nullable Set<Class<?>> type;
-    private final @NonNull LinkedHashMap<String, KeywordValidator> keywordToValidator;
 
     protected JsonSchema(JsonSchemaInfo jsonSchemaInfo) {
-        LinkedHashMap<String, KeywordValidator> keywordToValidator = new LinkedHashMap<>();
         this.type = jsonSchemaInfo.type;
-        if (this.type != null) {
-            keywordToValidator.put(
-                    "type",
-                    new TypeValidator(this.type)
-            );
-        }
-        this.keywordToValidator = keywordToValidator;
-    }
-
-    public static PathToSchemasMap validate(
-            JsonSchema jsonSchema,
-            Object arg,
-            ValidationMetadata validationMetadata
-    ) throws ValidationException {
-        LinkedHashSet<String> disabledKeywords = validationMetadata.configuration().disabledKeywordFlags().getKeywords();
-        PathToSchemasMap pathToSchemas = new PathToSchemasMap();
-        LinkedHashMap<String, KeywordValidator> thisKeywordToValidator = jsonSchema.keywordToValidator;
-        if (thisKeywordToValidator != null) {
-            for (Map.Entry<String, KeywordValidator> entry: thisKeywordToValidator.entrySet()) {
-                String jsonKeyword = entry.getKey();
-                if (disabledKeywords.contains(jsonKeyword)) {
-                   continue;
-                }
-                KeywordValidator validator = entry.getValue();
-                PathToSchemasMap otherPathToSchemas = validator.validate(
-                        jsonSchema,
-                        arg,
-                        validationMetadata
-                );
-                if (otherPathToSchemas == null) {
-                    continue;
-                }
-                pathToSchemas.update(otherPathToSchemas);
-            }
-        }
-        List<Object> pathToItem = validationMetadata.pathToItem();
-        if (!pathToSchemas.containsKey(pathToItem)) {
-            pathToSchemas.put(validationMetadata.pathToItem(), new LinkedHashMap<>());
-        }
-        pathToSchemas.get(pathToItem).put(jsonSchema, null);
-
-        return pathToSchemas;
     }
 
     public static class PathToSchemasMap extends LinkedHashMap<List<Object>, LinkedHashMap<JsonSchema, Void>> {

diff --git a/...fied/src/main/java/org/openapijsonschematools/client/schemas/validation/KeywordEntry.java b/...fied/src/main/java/org/openapijsonschematools/client/schemas/validation/KeywordEntry.java
diff --git a/.../src/main/java/org/openapijsonschematools/client/schemas/validation/KeywordValidator.java b/.../src/main/java/org/openapijsonschematools/client/schemas/validation/KeywordValidator.java
diff --git a/...ied/src/main/java/org/openapijsonschematools/client/schemas/validation/TypeValidator.java b/...ied/src/main/java/org/openapijsonschematools/client/schemas/validation/TypeValidator.java
diff --git a/...ed/src/test/java/org/openapijsonschematools/client/schemas/validation/JsonSchemaTest.java b/...ed/src/test/java/org/openapijsonschematools/client/schemas/validation/JsonSchemaTest.java