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

Commit f4a509e

Browse files
authored
Java, adds pattern properties (#366)
* Updates the java 310 spec to include patternProperties test cases * New schemas generated * Samples regen * Adds patternPropertiesPathToSchemas input to validate method * Adds missing patternProperties imports * Fixes java tests * Samples and docs regen
1 parent fed7bf9 commit f4a509e

File tree

201 files changed

+3627
-328
lines changed

Some content is hidden

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

201 files changed

+3627
-328
lines changed

docs/generators/java.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
304304
|Nullable|✓|OAS3
305305
|OneOf|✓|OAS3
306306
|Pattern|✓|OAS2,OAS3
307-
|PatternProperties||OAS3
307+
|PatternProperties||OAS3
308308
|PrefixItems|✗|OAS3
309309
|Properties|✓|OAS2,OAS3
310310
|PropertyNames|✓|OAS3

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

+1
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,7 @@ src/main/java/org/openapijsonschematools/client/schemas/validation/NullValueMeth
257257
src/main/java/org/openapijsonschematools/client/schemas/validation/NumberSchemaValidator.java
258258
src/main/java/org/openapijsonschematools/client/schemas/validation/OneOfValidator.java
259259
src/main/java/org/openapijsonschematools/client/schemas/validation/PathToSchemasMap.java
260+
src/main/java/org/openapijsonschematools/client/schemas/validation/PatternPropertiesValidator.java
260261
src/main/java/org/openapijsonschematools/client/schemas/validation/PatternValidator.java
261262
src/main/java/org/openapijsonschematools/client/schemas/validation/PropertiesValidator.java
262263
src/main/java/org/openapijsonschematools/client/schemas/validation/PropertyEntry.java

samples/client/3_0_3_unit_test/java/docs/components/schemas/PatternIsNotAnchored.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ A schema class that validates payloads
1919
### Field Summary
2020
| Modifier and Type | Field and Description |
2121
| ----------------- | ---------------------- |
22-
| Pattern | pattern =<br>&nbsp;&nbsp;&nbsp;&nbsp;"a+"<br>)))<br> |
22+
| Pattern | pattern = Pattern.compile(<br>&nbsp;&nbsp;&nbsp;&nbsp;"a+"<br>)<br> |
2323

2424
### Method Summary
2525
| Modifier and Type | Method and Description |

samples/client/3_0_3_unit_test/java/docs/components/schemas/PatternValidation.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ A schema class that validates payloads
1919
### Field Summary
2020
| Modifier and Type | Field and Description |
2121
| ----------------- | ---------------------- |
22-
| Pattern | pattern =<br>&nbsp;&nbsp;&nbsp;&nbsp;"^a*$"<br>)))<br> |
22+
| Pattern | pattern = Pattern.compile(<br>&nbsp;&nbsp;&nbsp;&nbsp;"^a*$"<br>)<br> |
2323

2424
### Method Summary
2525
| Modifier and Type | Method and Description |

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

+5-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ public AdditionalPropertiesValidator(Class<? extends JsonSchema> additionalPrope
1919
JsonSchema schema,
2020
@Nullable Object arg,
2121
ValidationMetadata validationMetadata,
22-
@Nullable List<PathToSchemasMap> containsPathToSchemas
22+
@Nullable List<PathToSchemasMap> containsPathToSchemas,
23+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
2324
) {
2425
if (!(arg instanceof Map<?, ?> mapArg)) {
2526
return null;
@@ -34,11 +35,13 @@ public AdditionalPropertiesValidator(Class<? extends JsonSchema> additionalPrope
3435
presentAdditionalProperties.removeAll(schema.properties.keySet());
3536
}
3637
PathToSchemasMap pathToSchemas = new PathToSchemasMap();
37-
// todo add handling for validatedPatternProperties
3838
for(String addPropName: presentAdditionalProperties) {
3939
@Nullable Object propValue = mapArg.get(addPropName);
4040
List<Object> propPathToItem = new ArrayList<>(validationMetadata.pathToItem());
4141
propPathToItem.add(addPropName);
42+
if (patternPropertiesPathToSchemas != null && patternPropertiesPathToSchemas.containsKey(propPathToItem)) {
43+
continue;
44+
}
4245
ValidationMetadata propValidationMetadata = new ValidationMetadata(
4346
propPathToItem,
4447
validationMetadata.configuration(),

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ public AllOfValidator(List<Class<? extends JsonSchema>> allOf) {
1515
JsonSchema schema,
1616
@Nullable Object arg,
1717
ValidationMetadata validationMetadata,
18-
@Nullable List<PathToSchemasMap> containsPathToSchemas
18+
@Nullable List<PathToSchemasMap> containsPathToSchemas,
19+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
1920
) {
2021
PathToSchemasMap pathToSchemas = new PathToSchemasMap();
2122
for(Class<? extends JsonSchema> allOfClass: allOf) {

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ public AnyOfValidator(List<Class<? extends JsonSchema>> anyOf) {
1818
JsonSchema schema,
1919
@Nullable Object arg,
2020
ValidationMetadata validationMetadata,
21-
@Nullable List<PathToSchemasMap> containsPathToSchemas
21+
@Nullable List<PathToSchemasMap> containsPathToSchemas,
22+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
2223
) {
2324
PathToSchemasMap pathToSchemas = new PathToSchemasMap();
2425
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

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ public ConstValidator(@Nullable Object constValue) {
1919
JsonSchema schema,
2020
@Nullable Object arg,
2121
ValidationMetadata validationMetadata,
22-
@Nullable List<PathToSchemasMap> containsPathToSchemas
22+
@Nullable List<PathToSchemasMap> containsPathToSchemas,
23+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
2324
) {
2425
if (arg instanceof Number) {
2526
BigDecimal castArg = getBigDecimal((Number) arg);

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ public ContainsValidator(Class<? extends JsonSchema> contains) {
1818
JsonSchema schema,
1919
@Nullable Object arg,
2020
ValidationMetadata validationMetadata,
21-
@Nullable List<PathToSchemasMap> containsPathToSchemas
21+
@Nullable List<PathToSchemasMap> containsPathToSchemas,
22+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
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/DependentRequiredValidator.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ public DependentRequiredValidator(Map<String, Set<String>> dependentRequired) {
2020
JsonSchema schema,
2121
@Nullable Object arg,
2222
ValidationMetadata validationMetadata,
23-
@Nullable List<PathToSchemasMap> containsPathToSchemas
23+
@Nullable List<PathToSchemasMap> containsPathToSchemas,
24+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
2425
) {
2526
if (!(arg instanceof Map)) {
2627
return null;

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ public DependentSchemasValidator(Map<String, Class<? extends JsonSchema>> depend
2020
JsonSchema schema,
2121
@Nullable Object arg,
2222
ValidationMetadata validationMetadata,
23-
@Nullable List<PathToSchemasMap> containsPathToSchemas
23+
@Nullable List<PathToSchemasMap> containsPathToSchemas,
24+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
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/EnumValidator.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ private boolean enumContainsArg(@Nullable Object arg){
2424
JsonSchema schema,
2525
@Nullable Object arg,
2626
ValidationMetadata validationMetadata,
27-
@Nullable List<PathToSchemasMap> containsPathToSchemas
27+
@Nullable List<PathToSchemasMap> containsPathToSchemas,
28+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
2829
) {
2930
if (enumValues.isEmpty()) {
3031
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

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ public ExclusiveMaximumValidator(Number exclusiveMaximum) {
1717
JsonSchema schema,
1818
@Nullable Object arg,
1919
ValidationMetadata validationMetadata,
20-
@Nullable List<PathToSchemasMap> containsPathToSchemas
20+
@Nullable List<PathToSchemasMap> containsPathToSchemas,
21+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
2122
) {
2223
if (!(arg instanceof Number)) {
2324
return null;

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ public ExclusiveMinimumValidator(Number exclusiveMinimum) {
1717
JsonSchema schema,
1818
@Nullable Object arg,
1919
ValidationMetadata validationMetadata,
20-
@Nullable List<PathToSchemasMap> containsPathToSchemas
20+
@Nullable List<PathToSchemasMap> containsPathToSchemas,
21+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
2122
) {
2223
if (!(arg instanceof Number)) {
2324
return null;

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,8 @@ private Void validateStringFormat(String arg, ValidationMetadata validationMetad
148148
JsonSchema schema,
149149
@Nullable Object arg,
150150
ValidationMetadata validationMetadata,
151-
@Nullable List<PathToSchemasMap> containsPathToSchemas
151+
@Nullable List<PathToSchemasMap> containsPathToSchemas,
152+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
152153
) {
153154
if (arg instanceof Number) {
154155
validateNumericFormat(

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ public ItemsValidator(Class<? extends JsonSchema> items) {
1717
JsonSchema schema,
1818
@Nullable Object arg,
1919
ValidationMetadata validationMetadata,
20-
@Nullable List<PathToSchemasMap> containsPathToSchemas
20+
@Nullable List<PathToSchemasMap> containsPathToSchemas,
21+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
2122
) {
2223
if (!(arg instanceof List)) {
2324
return null;

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

+15-1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ public abstract class JsonSchema {
5252
public final @Nullable Class<? extends JsonSchema> propertyNames;
5353
public @Nullable Map<String, Set<String>> dependentRequired;
5454
public final @Nullable Map<String, Class<? extends JsonSchema>> dependentSchemas;
55+
public @Nullable Map<Pattern, Class<? extends JsonSchema>> patternProperties;
5556
private final LinkedHashMap<String, KeywordValidator> keywordToValidator;
5657

5758
protected JsonSchema(JsonSchemaInfo jsonSchemaInfo) {
@@ -276,6 +277,13 @@ protected JsonSchema(JsonSchemaInfo jsonSchemaInfo) {
276277
new DependentSchemasValidator(this.dependentSchemas)
277278
);
278279
}
280+
this.patternProperties = jsonSchemaInfo.patternProperties;
281+
if (this.patternProperties != null) {
282+
keywordToValidator.put(
283+
"patternProperties",
284+
new PatternPropertiesValidator(this.patternProperties)
285+
);
286+
}
279287
this.keywordToValidator = keywordToValidator;
280288
}
281289

@@ -295,6 +303,11 @@ public static PathToSchemasMap validate(
295303
if (containsValidator != null) {
296304
containsPathToSchemas = containsValidator.getContainsPathToSchemas(arg, validationMetadata);
297305
}
306+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas = null;
307+
KeywordValidator patternPropertiesValidator = thisKeywordToValidator.get("patternProperties");
308+
if (patternPropertiesValidator != null) {
309+
patternPropertiesPathToSchemas = patternPropertiesValidator.getPatternPropertiesPathToSchemas(arg, validationMetadata);
310+
}
298311
for (Map.Entry<String, KeywordValidator> entry: thisKeywordToValidator.entrySet()) {
299312
String jsonKeyword = entry.getKey();
300313
if (disabledKeywords.contains(jsonKeyword)) {
@@ -308,7 +321,8 @@ public static PathToSchemasMap validate(
308321
jsonSchema,
309322
arg,
310323
validationMetadata,
311-
containsPathToSchemas
324+
containsPathToSchemas,
325+
patternPropertiesPathToSchemas
312326
);
313327
if (otherPathToSchemas == null) {
314328
continue;

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

+5
Original file line numberDiff line numberDiff line change
@@ -172,4 +172,9 @@ public JsonSchemaInfo dependentSchemas(Map<String, Class<? extends JsonSchema>>
172172
this.dependentSchemas = dependentSchemas;
173173
return this;
174174
}
175+
public @Nullable Map<Pattern, Class<? extends JsonSchema>> patternProperties = null;
176+
public JsonSchemaInfo patternProperties(Map<Pattern, Class<? extends JsonSchema>> patternProperties) {
177+
this.patternProperties = patternProperties;
178+
return this;
179+
}
175180
}

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

+9-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ public interface KeywordValidator {
1111
JsonSchema schema,
1212
@Nullable Object arg,
1313
ValidationMetadata validationMetadata,
14-
@Nullable List<PathToSchemasMap> containsPathToSchemas
14+
@Nullable List<PathToSchemasMap> containsPathToSchemas,
15+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
1516
) throws ValidationException;
1617

1718
default List<PathToSchemasMap> getContainsPathToSchemas(
@@ -20,4 +21,11 @@ default List<PathToSchemasMap> getContainsPathToSchemas(
2021
) {
2122
return new ArrayList<>();
2223
}
24+
25+
default PathToSchemasMap getPatternPropertiesPathToSchemas(
26+
@Nullable Object arg,
27+
ValidationMetadata validationMetadata
28+
) {
29+
return new PathToSchemasMap();
30+
}
2331
}

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ public MaxContainsValidator(int maxContains) {
1717
JsonSchema schema,
1818
@Nullable Object arg,
1919
ValidationMetadata validationMetadata,
20-
@Nullable List<PathToSchemasMap> containsPathToSchemas
20+
@Nullable List<PathToSchemasMap> containsPathToSchemas,
21+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
2122
) {
2223
if (!(arg instanceof List)) {
2324
return null;

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ public MaxItemsValidator(int maxItems) {
1717
JsonSchema schema,
1818
@Nullable Object arg,
1919
ValidationMetadata validationMetadata,
20-
@Nullable List<PathToSchemasMap> containsPathToSchemas
20+
@Nullable List<PathToSchemasMap> containsPathToSchemas,
21+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
2122
) {
2223
if (!(arg instanceof List)) {
2324
return null;

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ public MaxLengthValidator(int maxLength) {
1717
JsonSchema schema,
1818
@Nullable Object arg,
1919
ValidationMetadata validationMetadata,
20-
@Nullable List<PathToSchemasMap> containsPathToSchemas
20+
@Nullable List<PathToSchemasMap> containsPathToSchemas,
21+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
2122
) {
2223
if (!(arg instanceof String)) {
2324
return null;

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ public MaxPropertiesValidator(int maxProperties) {
1818
JsonSchema schema,
1919
@Nullable Object arg,
2020
ValidationMetadata validationMetadata,
21-
@Nullable List<PathToSchemasMap> containsPathToSchemas
21+
@Nullable List<PathToSchemasMap> containsPathToSchemas,
22+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
2223
) {
2324
if (!(arg instanceof Map)) {
2425
return null;

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ public MaximumValidator(Number maximum) {
1717
JsonSchema schema,
1818
@Nullable Object arg,
1919
ValidationMetadata validationMetadata,
20-
@Nullable List<PathToSchemasMap> containsPathToSchemas
20+
@Nullable List<PathToSchemasMap> containsPathToSchemas,
21+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
2122
) {
2223
if (!(arg instanceof Number)) {
2324
return null;

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ public MinContainsValidator(int minContains) {
1717
JsonSchema schema,
1818
@Nullable Object arg,
1919
ValidationMetadata validationMetadata,
20-
@Nullable List<PathToSchemasMap> containsPathToSchemas
20+
@Nullable List<PathToSchemasMap> containsPathToSchemas,
21+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
2122
) {
2223
if (!(arg instanceof List)) {
2324
return null;

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ public MinItemsValidator(int minItems) {
1717
JsonSchema schema,
1818
@Nullable Object arg,
1919
ValidationMetadata validationMetadata,
20-
@Nullable List<PathToSchemasMap> containsPathToSchemas
20+
@Nullable List<PathToSchemasMap> containsPathToSchemas,
21+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
2122
) {
2223
if (!(arg instanceof List)) {
2324
return null;

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ public MinLengthValidator(int minLength) {
1717
JsonSchema schema,
1818
@Nullable Object arg,
1919
ValidationMetadata validationMetadata,
20-
@Nullable List<PathToSchemasMap> containsPathToSchemas
20+
@Nullable List<PathToSchemasMap> containsPathToSchemas,
21+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
2122
) {
2223
if (!(arg instanceof String)) {
2324
return null;

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ public MinPropertiesValidator(int minProperties) {
1818
JsonSchema schema,
1919
@Nullable Object arg,
2020
ValidationMetadata validationMetadata,
21-
@Nullable List<PathToSchemasMap> containsPathToSchemas
21+
@Nullable List<PathToSchemasMap> containsPathToSchemas,
22+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
2223
) {
2324
if (!(arg instanceof Map)) {
2425
return null;

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ public MinimumValidator(Number minimum) {
1717
JsonSchema schema,
1818
@Nullable Object arg,
1919
ValidationMetadata validationMetadata,
20-
@Nullable List<PathToSchemasMap> containsPathToSchemas
20+
@Nullable List<PathToSchemasMap> containsPathToSchemas,
21+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
2122
) {
2223
if (!(arg instanceof Number)) {
2324
return null;

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ public MultipleOfValidator(BigDecimal multipleOf) {
1818
JsonSchema schema,
1919
@Nullable Object arg,
2020
ValidationMetadata validationMetadata,
21-
@Nullable List<PathToSchemasMap> containsPathToSchemas
21+
@Nullable List<PathToSchemasMap> containsPathToSchemas,
22+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
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/NotValidator.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ public NotValidator(Class<? extends JsonSchema> not) {
2222
JsonSchema schema,
2323
@Nullable Object arg,
2424
ValidationMetadata validationMetadata,
25-
@Nullable List<PathToSchemasMap> containsPathToSchemas
25+
@Nullable List<PathToSchemasMap> containsPathToSchemas,
26+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
2627
) {
2728
PathToSchemasMap pathToSchemas;
2829
try {

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ public OneOfValidator(List<Class<? extends JsonSchema>> oneOf) {
1818
JsonSchema schema,
1919
@Nullable Object arg,
2020
ValidationMetadata validationMetadata,
21-
@Nullable List<PathToSchemasMap> containsPathToSchemas
21+
@Nullable List<PathToSchemasMap> containsPathToSchemas,
22+
@Nullable PathToSchemasMap patternPropertiesPathToSchemas
2223
) {
2324
PathToSchemasMap pathToSchemas = new PathToSchemasMap();
2425
List<Class<? extends JsonSchema>> validatedOneOfClasses = new ArrayList<>();

0 commit comments

Comments
 (0)