Skip to content
This repository was archived by the owner on Dec 25, 2024. It is now read-only.

Commit 901e2e9

Browse files
committed
Trims more away
1 parent 4c604ee commit 901e2e9

5 files changed

Lines changed: 0 additions & 158 deletions

File tree

samples/client/3_0_3_unit_test/java_simplified/src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchema.java

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -19,53 +19,9 @@
1919

2020
public abstract class JsonSchema {
2121
public final @Nullable Set<Class<?>> type;
22-
private final @NonNull LinkedHashMap<String, KeywordValidator> keywordToValidator;
2322

2423
protected JsonSchema(JsonSchemaInfo jsonSchemaInfo) {
25-
LinkedHashMap<String, KeywordValidator> keywordToValidator = new LinkedHashMap<>();
2624
this.type = jsonSchemaInfo.type;
27-
if (this.type != null) {
28-
keywordToValidator.put(
29-
"type",
30-
new TypeValidator(this.type)
31-
);
32-
}
33-
this.keywordToValidator = keywordToValidator;
34-
}
35-
36-
public static PathToSchemasMap validate(
37-
JsonSchema jsonSchema,
38-
Object arg,
39-
ValidationMetadata validationMetadata
40-
) throws ValidationException {
41-
LinkedHashSet<String> disabledKeywords = validationMetadata.configuration().disabledKeywordFlags().getKeywords();
42-
PathToSchemasMap pathToSchemas = new PathToSchemasMap();
43-
LinkedHashMap<String, KeywordValidator> thisKeywordToValidator = jsonSchema.keywordToValidator;
44-
if (thisKeywordToValidator != null) {
45-
for (Map.Entry<String, KeywordValidator> entry: thisKeywordToValidator.entrySet()) {
46-
String jsonKeyword = entry.getKey();
47-
if (disabledKeywords.contains(jsonKeyword)) {
48-
continue;
49-
}
50-
KeywordValidator validator = entry.getValue();
51-
PathToSchemasMap otherPathToSchemas = validator.validate(
52-
jsonSchema,
53-
arg,
54-
validationMetadata
55-
);
56-
if (otherPathToSchemas == null) {
57-
continue;
58-
}
59-
pathToSchemas.update(otherPathToSchemas);
60-
}
61-
}
62-
List<Object> pathToItem = validationMetadata.pathToItem();
63-
if (!pathToSchemas.containsKey(pathToItem)) {
64-
pathToSchemas.put(validationMetadata.pathToItem(), new LinkedHashMap<>());
65-
}
66-
pathToSchemas.get(pathToItem).put(jsonSchema, null);
67-
68-
return pathToSchemas;
6925
}
7026

7127
public static class PathToSchemasMap extends LinkedHashMap<List<Object>, LinkedHashMap<JsonSchema, Void>> {

samples/client/3_0_3_unit_test/java_simplified/src/main/java/org/openapijsonschematools/client/schemas/validation/KeywordEntry.java

Lines changed: 0 additions & 9 deletions
This file was deleted.

samples/client/3_0_3_unit_test/java_simplified/src/main/java/org/openapijsonschematools/client/schemas/validation/KeywordValidator.java

Lines changed: 0 additions & 12 deletions
This file was deleted.

samples/client/3_0_3_unit_test/java_simplified/src/main/java/org/openapijsonschematools/client/schemas/validation/TypeValidator.java

Lines changed: 0 additions & 38 deletions
This file was deleted.

samples/client/3_0_3_unit_test/java_simplified/src/test/java/org/openapijsonschematools/client/schemas/validation/JsonSchemaTest.java

Lines changed: 0 additions & 55 deletions
This file was deleted.

0 commit comments

Comments
 (0)