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

Commit 2f3ff01

Browse files
spacetherspacether
authored
Java, adds if json schema keyword feature (#369)
* Adds IfValidator and passes in ifPathToSchemas to keyword validator * Fixes java tests * java 310 sample regen * Sample and doc regen
1 parent 8d47fb2 commit 2f3ff01

File tree

195 files changed

+1730
-168
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

195 files changed

+1730
-168
lines changed

‎docs/generators/java.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
287287
|ExclusiveMinimum|✓|OAS2,OAS3
288288
|ExclusiveMaximum|✓|OAS2,OAS3
289289
|Format|✓|OAS2,OAS3
290-
|If|✗|OAS3
290+
|If|✓|OAS3
291291
|Items|✓|OAS2,OAS3
292292
|MaxContains|✓|OAS3
293293
|MaxItems|✓|OAS2,OAS3

‎samples/client/3_0_3_unit_test/java/.openapi-generator/FILES

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ src/main/java/org/openapijsonschematools/client/schemas/validation/FloatValueMet
225225
src/main/java/org/openapijsonschematools/client/schemas/validation/FormatValidator.java
226226
src/main/java/org/openapijsonschematools/client/schemas/validation/FrozenList.java
227227
src/main/java/org/openapijsonschematools/client/schemas/validation/FrozenMap.java
228+
src/main/java/org/openapijsonschematools/client/schemas/validation/IfValidator.java
228229
src/main/java/org/openapijsonschematools/client/schemas/validation/IntegerEnumValidator.java
229230
src/main/java/org/openapijsonschematools/client/schemas/validation/IntegerValueMethod.java
230231
src/main/java/org/openapijsonschematools/client/schemas/validation/ItemsValidator.java

‎samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/AdditionalPropertiesValidator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ public AdditionalPropertiesValidator(Class<? extends JsonSchema> additionalPrope
2020
@Nullable Object arg,
2121
ValidationMetadata validationMetadata,
2222
@Nullable List<PathToSchemasMap> containsPathToSchemas,
23-
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
23+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas,
24+
@Nullable PathToSchemasMap ifPathToSchemas
2425
) {
2526
if (!(arg instanceof Map<?, ?> mapArg)) {
2627
return null;

‎samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/AllOfValidator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ public AllOfValidator(List<Class<? extends JsonSchema>> allOf) {
1616
@Nullable Object arg,
1717
ValidationMetadata validationMetadata,
1818
@Nullable List<PathToSchemasMap> containsPathToSchemas,
19-
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
19+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas,
20+
@Nullable PathToSchemasMap ifPathToSchemas
2021
) {
2122
PathToSchemasMap pathToSchemas = new PathToSchemasMap();
2223
for(Class<? extends JsonSchema> allOfClass: allOf) {

‎samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/AnyOfValidator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ public AnyOfValidator(List<Class<? extends JsonSchema>> anyOf) {
1919
@Nullable Object arg,
2020
ValidationMetadata validationMetadata,
2121
@Nullable List<PathToSchemasMap> containsPathToSchemas,
22-
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
22+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas,
23+
@Nullable PathToSchemasMap ifPathToSchemas
2324
) {
2425
PathToSchemasMap pathToSchemas = new PathToSchemasMap();
2526
List<Class<? extends JsonSchema>> validatedAnyOfClasses = new ArrayList<>();

‎samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ConstValidator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ public ConstValidator(@Nullable Object constValue) {
2020
@Nullable Object arg,
2121
ValidationMetadata validationMetadata,
2222
@Nullable List<PathToSchemasMap> containsPathToSchemas,
23-
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
23+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas,
24+
@Nullable PathToSchemasMap ifPathToSchemas
2425
) {
2526
if (arg instanceof Number) {
2627
BigDecimal castArg = getBigDecimal((Number) arg);

‎samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ContainsValidator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ public ContainsValidator(Class<? extends JsonSchema> contains) {
1919
@Nullable Object arg,
2020
ValidationMetadata validationMetadata,
2121
@Nullable List<PathToSchemasMap> containsPathToSchemas,
22-
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
22+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas,
23+
@Nullable PathToSchemasMap ifPathToSchemas
2324
) {
2425
if (!(arg instanceof List)) {
2526
return null;

‎samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/DependentRequiredValidator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ public DependentRequiredValidator(Map<String, Set<String>> dependentRequired) {
2121
@Nullable Object arg,
2222
ValidationMetadata validationMetadata,
2323
@Nullable List<PathToSchemasMap> containsPathToSchemas,
24-
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
24+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas,
25+
@Nullable PathToSchemasMap ifPathToSchemas
2526
) {
2627
if (!(arg instanceof Map)) {
2728
return null;

‎samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/DependentSchemasValidator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ public DependentSchemasValidator(Map<String, Class<? extends JsonSchema>> depend
2121
@Nullable Object arg,
2222
ValidationMetadata validationMetadata,
2323
@Nullable List<PathToSchemasMap> containsPathToSchemas,
24-
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
24+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas,
25+
@Nullable PathToSchemasMap ifPathToSchemas
2526
) {
2627
if (!(arg instanceof Map<?, ?> mapArg)) {
2728
return null;

‎samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/EnumValidator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ private boolean enumContainsArg(@Nullable Object arg){
2525
@Nullable Object arg,
2626
ValidationMetadata validationMetadata,
2727
@Nullable List<PathToSchemasMap> containsPathToSchemas,
28-
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
28+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas,
29+
@Nullable PathToSchemasMap ifPathToSchemas
2930
) {
3031
if (enumValues.isEmpty()) {
3132
throw new ValidationException("No value can match enum because enum is empty");

‎samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ExclusiveMaximumValidator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ public ExclusiveMaximumValidator(Number exclusiveMaximum) {
1818
@Nullable Object arg,
1919
ValidationMetadata validationMetadata,
2020
@Nullable List<PathToSchemasMap> containsPathToSchemas,
21-
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
21+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas,
22+
@Nullable PathToSchemasMap ifPathToSchemas
2223
) {
2324
if (!(arg instanceof Number)) {
2425
return null;

‎samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ExclusiveMinimumValidator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ public ExclusiveMinimumValidator(Number exclusiveMinimum) {
1818
@Nullable Object arg,
1919
ValidationMetadata validationMetadata,
2020
@Nullable List<PathToSchemasMap> containsPathToSchemas,
21-
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
21+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas,
22+
@Nullable PathToSchemasMap ifPathToSchemas
2223
) {
2324
if (!(arg instanceof Number)) {
2425
return null;

‎samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/FormatValidator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,8 @@ private Void validateStringFormat(String arg, ValidationMetadata validationMetad
149149
@Nullable Object arg,
150150
ValidationMetadata validationMetadata,
151151
@Nullable List<PathToSchemasMap> containsPathToSchemas,
152-
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
152+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas,
153+
@Nullable PathToSchemasMap ifPathToSchemas
153154
) {
154155
if (arg instanceof Number) {
155156
validateNumericFormat(

‎samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/IfValidator.java

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
package org.openapijsonschematools.client.schemas.validation;
2+
3+
import org.openapijsonschematools.client.exceptions.ValidationException;
4+
import org.openapijsonschematools.client.exceptions.InvalidTypeException;
5+
import org.checkerframework.checker.nullness.qual.Nullable;
6+
7+
import java.util.ArrayList;
8+
import java.util.LinkedHashMap;
9+
import java.util.LinkedHashSet;
10+
import java.util.List;
11+
import java.util.Map;
12+
import java.util.Set;
13+
14+
public class IfValidator implements KeywordValidator {
15+
public final Class<? extends JsonSchema> ifSchema;
16+
17+
public IfValidator(Class<? extends JsonSchema> ifSchema) {
18+
this.ifSchema = ifSchema;
19+
}
20+
21+
@Override
22+
public @Nullable PathToSchemasMap validate(
23+
JsonSchema schema,
24+
@Nullable Object arg,
25+
ValidationMetadata validationMetadata,
26+
@Nullable List<PathToSchemasMap> containsPathToSchemas,
27+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas,
28+
@Nullable PathToSchemasMap ifPathToSchemas
29+
) {
30+
if (ifPathToSchemas == null) {
31+
throw new ValidationException("Invalid type for ifPathToSchemas");
32+
}
33+
/*
34+
if is false use case
35+
ifPathToSchemas == {}
36+
no need to add any data to pathToSchemas
37+
38+
if true, then true -> true for whole schema
39+
so validate_then will add ifPathToSchemas data to pathToSchemas
40+
*/
41+
return null;
42+
}
43+
44+
public PathToSchemasMap getIfPathToSchemas(
45+
@Nullable Object arg,
46+
ValidationMetadata validationMetadata
47+
) {
48+
JsonSchema ifSchemaInstance = JsonSchemaFactory.getInstance(ifSchema);
49+
PathToSchemasMap pathToSchemas = new PathToSchemasMap();
50+
try {
51+
var otherPathToSchemas = JsonSchema.validate(ifSchemaInstance, arg, validationMetadata);
52+
pathToSchemas.update(otherPathToSchemas);
53+
} catch (ValidationException | InvalidTypeException ignored) {}
54+
return pathToSchemas;
55+
}
56+
}

‎samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ItemsValidator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ public ItemsValidator(Class<? extends JsonSchema> items) {
1818
@Nullable Object arg,
1919
ValidationMetadata validationMetadata,
2020
@Nullable List<PathToSchemasMap> containsPathToSchemas,
21-
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
21+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas,
22+
@Nullable PathToSchemasMap ifPathToSchemas
2223
) {
2324
if (!(arg instanceof List<?> listArg)) {
2425
return null;

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ public abstract class JsonSchema {
5454
public final @Nullable Map<String, Class<? extends JsonSchema>> dependentSchemas;
5555
public @Nullable Map<Pattern, Class<? extends JsonSchema>> patternProperties;
5656
public @Nullable List<Class<? extends JsonSchema>> prefixItems;
57+
public final @Nullable Class<? extends JsonSchema> ifSchema;
5758
private final LinkedHashMap<String, KeywordValidator> keywordToValidator;
5859

5960
protected JsonSchema(JsonSchemaInfo jsonSchemaInfo) {
@@ -292,6 +293,13 @@ protected JsonSchema(JsonSchemaInfo jsonSchemaInfo) {
292293
new PrefixItemsValidator(this.prefixItems)
293294
);
294295
}
296+
this.ifSchema = jsonSchemaInfo.ifSchema;
297+
if (this.ifSchema != null) {
298+
keywordToValidator.put(
299+
"if",
300+
new IfValidator(this.ifSchema)
301+
);
302+
}
295303
this.keywordToValidator = keywordToValidator;
296304
}
297305

@@ -316,6 +324,11 @@ public static PathToSchemasMap validate(
316324
if (patternPropertiesValidator != null) {
317325
patternPropertiesPathToSchemas = patternPropertiesValidator.getPatternPropertiesPathToSchemas(arg, validationMetadata);
318326
}
327+
@Nullable PathToSchemasMap ifPathToSchemas = null;
328+
KeywordValidator ifValidator = thisKeywordToValidator.get("if");
329+
if (ifValidator != null) {
330+
ifPathToSchemas = ifValidator.getIfPathToSchemas(arg, validationMetadata);
331+
}
319332
for (Map.Entry<String, KeywordValidator> entry: thisKeywordToValidator.entrySet()) {
320333
String jsonKeyword = entry.getKey();
321334
if (disabledKeywords.contains(jsonKeyword)) {
@@ -330,7 +343,8 @@ public static PathToSchemasMap validate(
330343
arg,
331344
validationMetadata,
332345
containsPathToSchemas,
333-
patternPropertiesPathToSchemas
346+
patternPropertiesPathToSchemas,
347+
ifPathToSchemas
334348
);
335349
if (otherPathToSchemas == null) {
336350
continue;

‎samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchemaInfo.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,4 +182,9 @@ public JsonSchemaInfo prefixItems(List<Class<? extends JsonSchema>> prefixItems)
182182
this.prefixItems = prefixItems;
183183
return this;
184184
}
185+
public @Nullable Class<? extends JsonSchema> ifSchema = null;
186+
public JsonSchemaInfo ifSchema(Class<? extends JsonSchema> ifSchema) {
187+
this.ifSchema = ifSchema;
188+
return this;
189+
}
185190
}

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ public interface KeywordValidator {
1212
@Nullable Object arg,
1313
ValidationMetadata validationMetadata,
1414
@Nullable List<PathToSchemasMap> containsPathToSchemas,
15-
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
15+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas,
16+
@Nullable PathToSchemasMap ifPathToSchemas
1617
) throws ValidationException;
1718

1819
default List<PathToSchemasMap> getContainsPathToSchemas(
@@ -28,4 +29,11 @@ default PathToSchemasMap getPatternPropertiesPathToSchemas(
2829
) {
2930
return new PathToSchemasMap();
3031
}
32+
33+
default PathToSchemasMap getIfPathToSchemas(
34+
@Nullable Object arg,
35+
ValidationMetadata validationMetadata
36+
) {
37+
return new PathToSchemasMap();
38+
}
3139
}

‎samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/MaxContainsValidator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ public MaxContainsValidator(int maxContains) {
1818
@Nullable Object arg,
1919
ValidationMetadata validationMetadata,
2020
@Nullable List<PathToSchemasMap> containsPathToSchemas,
21-
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
21+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas,
22+
@Nullable PathToSchemasMap ifPathToSchemas
2223
) {
2324
if (!(arg instanceof List)) {
2425
return null;

‎samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/MaxItemsValidator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ public MaxItemsValidator(int maxItems) {
1818
@Nullable Object arg,
1919
ValidationMetadata validationMetadata,
2020
@Nullable List<PathToSchemasMap> containsPathToSchemas,
21-
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
21+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas,
22+
@Nullable PathToSchemasMap ifPathToSchemas
2223
) {
2324
if (!(arg instanceof List)) {
2425
return null;

‎samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/MaxLengthValidator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ public MaxLengthValidator(int maxLength) {
1818
@Nullable Object arg,
1919
ValidationMetadata validationMetadata,
2020
@Nullable List<PathToSchemasMap> containsPathToSchemas,
21-
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
21+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas,
22+
@Nullable PathToSchemasMap ifPathToSchemas
2223
) {
2324
if (!(arg instanceof String)) {
2425
return null;

‎samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/MaxPropertiesValidator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ public MaxPropertiesValidator(int maxProperties) {
1919
@Nullable Object arg,
2020
ValidationMetadata validationMetadata,
2121
@Nullable List<PathToSchemasMap> containsPathToSchemas,
22-
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
22+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas,
23+
@Nullable PathToSchemasMap ifPathToSchemas
2324
) {
2425
if (!(arg instanceof Map)) {
2526
return null;

‎samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/MaximumValidator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ public MaximumValidator(Number maximum) {
1818
@Nullable Object arg,
1919
ValidationMetadata validationMetadata,
2020
@Nullable List<PathToSchemasMap> containsPathToSchemas,
21-
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
21+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas,
22+
@Nullable PathToSchemasMap ifPathToSchemas
2223
) {
2324
if (!(arg instanceof Number)) {
2425
return null;

‎samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/MinContainsValidator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ public MinContainsValidator(int minContains) {
1818
@Nullable Object arg,
1919
ValidationMetadata validationMetadata,
2020
@Nullable List<PathToSchemasMap> containsPathToSchemas,
21-
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
21+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas,
22+
@Nullable PathToSchemasMap ifPathToSchemas
2223
) {
2324
if (!(arg instanceof List)) {
2425
return null;

‎samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/MinItemsValidator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ public MinItemsValidator(int minItems) {
1818
@Nullable Object arg,
1919
ValidationMetadata validationMetadata,
2020
@Nullable List<PathToSchemasMap> containsPathToSchemas,
21-
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
21+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas,
22+
@Nullable PathToSchemasMap ifPathToSchemas
2223
) {
2324
if (!(arg instanceof List)) {
2425
return null;

‎samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/MinLengthValidator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ public MinLengthValidator(int minLength) {
1818
@Nullable Object arg,
1919
ValidationMetadata validationMetadata,
2020
@Nullable List<PathToSchemasMap> containsPathToSchemas,
21-
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
21+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas,
22+
@Nullable PathToSchemasMap ifPathToSchemas
2223
) {
2324
if (!(arg instanceof String)) {
2425
return null;

‎samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/MinPropertiesValidator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ public MinPropertiesValidator(int minProperties) {
1919
@Nullable Object arg,
2020
ValidationMetadata validationMetadata,
2121
@Nullable List<PathToSchemasMap> containsPathToSchemas,
22-
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
22+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas,
23+
@Nullable PathToSchemasMap ifPathToSchemas
2324
) {
2425
if (!(arg instanceof Map)) {
2526
return null;

‎samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/MinimumValidator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ public MinimumValidator(Number minimum) {
1818
@Nullable Object arg,
1919
ValidationMetadata validationMetadata,
2020
@Nullable List<PathToSchemasMap> containsPathToSchemas,
21-
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
21+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas,
22+
@Nullable PathToSchemasMap ifPathToSchemas
2223
) {
2324
if (!(arg instanceof Number)) {
2425
return null;

‎samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/MultipleOfValidator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ public MultipleOfValidator(BigDecimal multipleOf) {
1919
@Nullable Object arg,
2020
ValidationMetadata validationMetadata,
2121
@Nullable List<PathToSchemasMap> containsPathToSchemas,
22-
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
22+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas,
23+
@Nullable PathToSchemasMap ifPathToSchemas
2324
) {
2425
if (!(arg instanceof Number)) {
2526
return null;

‎samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/NotValidator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ public NotValidator(Class<? extends JsonSchema> not) {
2323
@Nullable Object arg,
2424
ValidationMetadata validationMetadata,
2525
@Nullable List<PathToSchemasMap> containsPathToSchemas,
26-
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
26+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas,
27+
@Nullable PathToSchemasMap ifPathToSchemas
2728
) {
2829
PathToSchemasMap pathToSchemas;
2930
try {

0 commit comments

Comments
 (0)