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

Commit 2f3ff01

Browse files
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");

0 commit comments

Comments
 (0)