Java, adds if json schema keyword feature

docs/generators/java.md

@@ -287,7 +287,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |ExclusiveMinimum|✓|OAS2,OAS3
 |ExclusiveMaximum|✓|OAS2,OAS3
 |Format|✓|OAS2,OAS3
-|If|✗|OAS3
+|If|✓|OAS3
 |Items|✓|OAS2,OAS3
 |MaxContains|✓|OAS3
 |MaxItems|✓|OAS2,OAS3

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

@@ -225,6 +225,7 @@ src/main/java/org/openapijsonschematools/client/schemas/validation/FloatValueMet
 src/main/java/org/openapijsonschematools/client/schemas/validation/FormatValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/FrozenList.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/FrozenMap.java
+src/main/java/org/openapijsonschematools/client/schemas/validation/IfValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/IntegerEnumValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/IntegerValueMethod.java
 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

@@ -20,7 +20,8 @@ public AdditionalPropertiesValidator(Class<? extends JsonSchema> additionalPrope
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
         @Nullable List<PathToSchemasMap> containsPathToSchemas,
-        @Nullable PathToSchemasMap patternPropertiesPathToSchemas
+        @Nullable PathToSchemasMap patternPropertiesPathToSchemas,
+        @Nullable PathToSchemasMap ifPathToSchemas
     ) {
         if (!(arg instanceof Map<?, ?> mapArg)) {
             return null;

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

@@ -16,7 +16,8 @@ public AllOfValidator(List<Class<? extends JsonSchema>> allOf) {
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
         @Nullable List<PathToSchemasMap> containsPathToSchemas,
-        @Nullable PathToSchemasMap patternPropertiesPathToSchemas
+        @Nullable PathToSchemasMap patternPropertiesPathToSchemas,
+        @Nullable PathToSchemasMap ifPathToSchemas
     ) {
         PathToSchemasMap pathToSchemas = new PathToSchemasMap();
         for(Class<? extends JsonSchema> allOfClass: allOf) {

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

@@ -19,7 +19,8 @@ public AnyOfValidator(List<Class<? extends JsonSchema>> anyOf) {
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
         @Nullable List<PathToSchemasMap> containsPathToSchemas,
-        @Nullable PathToSchemasMap patternPropertiesPathToSchemas
+        @Nullable PathToSchemasMap patternPropertiesPathToSchemas,
+        @Nullable PathToSchemasMap ifPathToSchemas
     ) {
         PathToSchemasMap pathToSchemas = new PathToSchemasMap();
         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

@@ -20,7 +20,8 @@ public ConstValidator(@Nullable Object constValue) {
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
         @Nullable List<PathToSchemasMap> containsPathToSchemas,
-        @Nullable PathToSchemasMap patternPropertiesPathToSchemas
+        @Nullable PathToSchemasMap patternPropertiesPathToSchemas,
+        @Nullable PathToSchemasMap ifPathToSchemas
     ) {
         if (arg instanceof Number) {
             BigDecimal castArg = getBigDecimal((Number) arg);

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

@@ -19,7 +19,8 @@ public ContainsValidator(Class<? extends JsonSchema> contains) {
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
         @Nullable List<PathToSchemasMap> containsPathToSchemas,
-        @Nullable PathToSchemasMap patternPropertiesPathToSchemas
+        @Nullable PathToSchemasMap patternPropertiesPathToSchemas,
+        @Nullable PathToSchemasMap ifPathToSchemas
     ) {
         if (!(arg instanceof List)) {
             return null;

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

@@ -21,7 +21,8 @@ public DependentRequiredValidator(Map<String, Set<String>> dependentRequired) {
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
         @Nullable List<PathToSchemasMap> containsPathToSchemas,
-        @Nullable PathToSchemasMap patternPropertiesPathToSchemas
+        @Nullable PathToSchemasMap patternPropertiesPathToSchemas,
+        @Nullable PathToSchemasMap ifPathToSchemas
     ) {
         if (!(arg instanceof Map)) {
             return null;

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

@@ -21,7 +21,8 @@ public DependentSchemasValidator(Map<String, Class<? extends JsonSchema>> depend
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
         @Nullable List<PathToSchemasMap> containsPathToSchemas,
-        @Nullable PathToSchemasMap patternPropertiesPathToSchemas
+        @Nullable PathToSchemasMap patternPropertiesPathToSchemas,
+        @Nullable PathToSchemasMap ifPathToSchemas
     ) {
         if (!(arg instanceof Map<?, ?> mapArg)) {
             return null;

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

@@ -25,7 +25,8 @@ private boolean enumContainsArg(@Nullable Object arg){
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
         @Nullable List<PathToSchemasMap> containsPathToSchemas,
-        @Nullable PathToSchemasMap patternPropertiesPathToSchemas
+        @Nullable PathToSchemasMap patternPropertiesPathToSchemas,
+        @Nullable PathToSchemasMap ifPathToSchemas
     ) {
         if (enumValues.isEmpty()) {
             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

@@ -18,7 +18,8 @@ public ExclusiveMaximumValidator(Number exclusiveMaximum) {
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
         @Nullable List<PathToSchemasMap> containsPathToSchemas,
-        @Nullable PathToSchemasMap patternPropertiesPathToSchemas
+        @Nullable PathToSchemasMap patternPropertiesPathToSchemas,
+        @Nullable PathToSchemasMap ifPathToSchemas
     ) {
         if (!(arg instanceof Number)) {
             return null;

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

@@ -18,7 +18,8 @@ public ExclusiveMinimumValidator(Number exclusiveMinimum) {
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
         @Nullable List<PathToSchemasMap> containsPathToSchemas,
-        @Nullable PathToSchemasMap patternPropertiesPathToSchemas
+        @Nullable PathToSchemasMap patternPropertiesPathToSchemas,
+        @Nullable PathToSchemasMap ifPathToSchemas
     ) {
         if (!(arg instanceof Number)) {
             return null;

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

@@ -149,7 +149,8 @@ private Void validateStringFormat(String arg, ValidationMetadata validationMetad
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
         @Nullable List<PathToSchemasMap> containsPathToSchemas,
-        @Nullable PathToSchemasMap patternPropertiesPathToSchemas
+        @Nullable PathToSchemasMap patternPropertiesPathToSchemas,
+        @Nullable PathToSchemasMap ifPathToSchemas
     ) {
         if (arg instanceof Number) {
             validateNumericFormat(

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

@@ -0,0 +1,56 @@
+package org.openapijsonschematools.client.schemas.validation;
+
+import org.openapijsonschematools.client.exceptions.ValidationException;
+import org.openapijsonschematools.client.exceptions.InvalidTypeException;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class IfValidator implements KeywordValidator {
+    public final Class<? extends JsonSchema> ifSchema;
+
+    public IfValidator(Class<? extends JsonSchema> ifSchema) {
+        this.ifSchema = ifSchema;
+    }
+
+    @Override
+    public @Nullable PathToSchemasMap validate(
+        JsonSchema schema,
+        @Nullable Object arg,
+        ValidationMetadata validationMetadata,
+        @Nullable List<PathToSchemasMap> containsPathToSchemas,
+        @Nullable PathToSchemasMap patternPropertiesPathToSchemas,
+        @Nullable PathToSchemasMap ifPathToSchemas
+    ) {
+        if (ifPathToSchemas == null) {
+            throw new ValidationException("Invalid type for ifPathToSchemas");
+        }
+        /*
+        if is false use case
+        ifPathToSchemas == {}
+        no need to add any data to pathToSchemas
+
+        if true, then true -> true for whole schema
+        so validate_then will add ifPathToSchemas data to pathToSchemas
+        */
+        return null;
+    }
+
+    public PathToSchemasMap getIfPathToSchemas(
+        @Nullable Object arg,
+        ValidationMetadata validationMetadata
+    ) {
+        JsonSchema ifSchemaInstance = JsonSchemaFactory.getInstance(ifSchema);
+        PathToSchemasMap pathToSchemas = new PathToSchemasMap();
+        try {
+            var otherPathToSchemas = JsonSchema.validate(ifSchemaInstance, arg, validationMetadata);
+            pathToSchemas.update(otherPathToSchemas);
+        } catch (ValidationException | InvalidTypeException ignored) {}
+        return pathToSchemas;
+    }
+}

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

@@ -18,7 +18,8 @@ public ItemsValidator(Class<? extends JsonSchema> items) {
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
         @Nullable List<PathToSchemasMap> containsPathToSchemas,
-        @Nullable PathToSchemasMap patternPropertiesPathToSchemas
+        @Nullable PathToSchemasMap patternPropertiesPathToSchemas,
+        @Nullable PathToSchemasMap ifPathToSchemas
     ) {
         if (!(arg instanceof List<?> listArg)) {
             return null;

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

@@ -54,6 +54,7 @@ public abstract class JsonSchema {
     public final @Nullable Map<String, Class<? extends JsonSchema>> dependentSchemas;
     public @Nullable Map<Pattern, Class<? extends JsonSchema>> patternProperties;
     public @Nullable List<Class<? extends JsonSchema>> prefixItems;
+    public final @Nullable Class<? extends JsonSchema> ifSchema;
     private final LinkedHashMap<String, KeywordValidator> keywordToValidator;
 
     protected JsonSchema(JsonSchemaInfo jsonSchemaInfo) {
@@ -292,6 +293,13 @@ protected JsonSchema(JsonSchemaInfo jsonSchemaInfo) {
                     new PrefixItemsValidator(this.prefixItems)
             );
         }
+        this.ifSchema = jsonSchemaInfo.ifSchema;
+        if (this.ifSchema != null) {
+            keywordToValidator.put(
+                    "if",
+                    new IfValidator(this.ifSchema)
+            );
+        }
         this.keywordToValidator = keywordToValidator;
     }
 
@@ -316,6 +324,11 @@ public static PathToSchemasMap validate(
         if (patternPropertiesValidator != null) {
             patternPropertiesPathToSchemas = patternPropertiesValidator.getPatternPropertiesPathToSchemas(arg, validationMetadata);
         }
+        @Nullable PathToSchemasMap ifPathToSchemas = null;
+        KeywordValidator ifValidator = thisKeywordToValidator.get("if");
+        if (ifValidator != null) {
+            ifPathToSchemas = ifValidator.getIfPathToSchemas(arg, validationMetadata);
+        }
         for (Map.Entry<String, KeywordValidator> entry: thisKeywordToValidator.entrySet()) {
             String jsonKeyword = entry.getKey();
             if (disabledKeywords.contains(jsonKeyword)) {
@@ -330,7 +343,8 @@ public static PathToSchemasMap validate(
                     arg,
                     validationMetadata,
                     containsPathToSchemas,
-                    patternPropertiesPathToSchemas
+                    patternPropertiesPathToSchemas,
+                    ifPathToSchemas
             );
             if (otherPathToSchemas == null) {
                 continue;

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

@@ -182,4 +182,9 @@ public JsonSchemaInfo prefixItems(List<Class<? extends JsonSchema>> prefixItems)
         this.prefixItems = prefixItems;
         return this;
     }
+    public @Nullable Class<? extends JsonSchema> ifSchema = null;
+    public JsonSchemaInfo ifSchema(Class<? extends JsonSchema> ifSchema) {
+        this.ifSchema = ifSchema;
+        return this;
+    }
 }

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

@@ -12,7 +12,8 @@ public interface KeywordValidator {
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
         @Nullable List<PathToSchemasMap> containsPathToSchemas,
-        @Nullable PathToSchemasMap patternPropertiesPathToSchemas
+        @Nullable PathToSchemasMap patternPropertiesPathToSchemas,
+        @Nullable PathToSchemasMap ifPathToSchemas
     ) throws ValidationException;
 
     default List<PathToSchemasMap> getContainsPathToSchemas(
@@ -28,4 +29,11 @@ default PathToSchemasMap getPatternPropertiesPathToSchemas(
     ) {
         return new PathToSchemasMap();
     }
+
+    default PathToSchemasMap getIfPathToSchemas(
+        @Nullable Object arg,
+        ValidationMetadata validationMetadata
+    ) {
+        return new PathToSchemasMap();
+    }
 }

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

@@ -18,7 +18,8 @@ public MaxContainsValidator(int maxContains) {
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
         @Nullable List<PathToSchemasMap> containsPathToSchemas,
-        @Nullable PathToSchemasMap patternPropertiesPathToSchemas
+        @Nullable PathToSchemasMap patternPropertiesPathToSchemas,
+        @Nullable PathToSchemasMap ifPathToSchemas
     ) {
         if (!(arg instanceof List)) {
             return null;

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

@@ -18,7 +18,8 @@ public MaxItemsValidator(int maxItems) {
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
         @Nullable List<PathToSchemasMap> containsPathToSchemas,
-        @Nullable PathToSchemasMap patternPropertiesPathToSchemas
+        @Nullable PathToSchemasMap patternPropertiesPathToSchemas,
+        @Nullable PathToSchemasMap ifPathToSchemas
     ) {
         if (!(arg instanceof List)) {
             return null;

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

@@ -18,7 +18,8 @@ public MaxLengthValidator(int maxLength) {
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
         @Nullable List<PathToSchemasMap> containsPathToSchemas,
-        @Nullable PathToSchemasMap patternPropertiesPathToSchemas
+        @Nullable PathToSchemasMap patternPropertiesPathToSchemas,
+        @Nullable PathToSchemasMap ifPathToSchemas
     ) {
         if (!(arg instanceof String)) {
             return null;

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

@@ -19,7 +19,8 @@ public MaxPropertiesValidator(int maxProperties) {
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
         @Nullable List<PathToSchemasMap> containsPathToSchemas,
-        @Nullable PathToSchemasMap patternPropertiesPathToSchemas
+        @Nullable PathToSchemasMap patternPropertiesPathToSchemas,
+        @Nullable PathToSchemasMap ifPathToSchemas
     ) {
         if (!(arg instanceof Map)) {
             return null;

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

@@ -18,7 +18,8 @@ public MaximumValidator(Number maximum) {
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
         @Nullable List<PathToSchemasMap> containsPathToSchemas,
-        @Nullable PathToSchemasMap patternPropertiesPathToSchemas
+        @Nullable PathToSchemasMap patternPropertiesPathToSchemas,
+        @Nullable PathToSchemasMap ifPathToSchemas
     ) {
         if (!(arg instanceof Number)) {
             return null;

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

@@ -18,7 +18,8 @@ public MinContainsValidator(int minContains) {
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
         @Nullable List<PathToSchemasMap> containsPathToSchemas,
-        @Nullable PathToSchemasMap patternPropertiesPathToSchemas
+        @Nullable PathToSchemasMap patternPropertiesPathToSchemas,
+        @Nullable PathToSchemasMap ifPathToSchemas
     ) {
         if (!(arg instanceof List)) {
             return null;

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

@@ -18,7 +18,8 @@ public MinItemsValidator(int minItems) {
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
         @Nullable List<PathToSchemasMap> containsPathToSchemas,
-        @Nullable PathToSchemasMap patternPropertiesPathToSchemas
+        @Nullable PathToSchemasMap patternPropertiesPathToSchemas,
+        @Nullable PathToSchemasMap ifPathToSchemas
     ) {
         if (!(arg instanceof List)) {
             return null;

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

@@ -18,7 +18,8 @@ public MinLengthValidator(int minLength) {
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
         @Nullable List<PathToSchemasMap> containsPathToSchemas,
-        @Nullable PathToSchemasMap patternPropertiesPathToSchemas
+        @Nullable PathToSchemasMap patternPropertiesPathToSchemas,
+        @Nullable PathToSchemasMap ifPathToSchemas
     ) {
         if (!(arg instanceof String)) {
             return null;

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

@@ -19,7 +19,8 @@ public MinPropertiesValidator(int minProperties) {
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
         @Nullable List<PathToSchemasMap> containsPathToSchemas,
-        @Nullable PathToSchemasMap patternPropertiesPathToSchemas
+        @Nullable PathToSchemasMap patternPropertiesPathToSchemas,
+        @Nullable PathToSchemasMap ifPathToSchemas
     ) {
         if (!(arg instanceof Map)) {
             return null;

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

@@ -18,7 +18,8 @@ public MinimumValidator(Number minimum) {
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
         @Nullable List<PathToSchemasMap> containsPathToSchemas,
-        @Nullable PathToSchemasMap patternPropertiesPathToSchemas
+        @Nullable PathToSchemasMap patternPropertiesPathToSchemas,
+        @Nullable PathToSchemasMap ifPathToSchemas
     ) {
         if (!(arg instanceof Number)) {
             return null;

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

@@ -19,7 +19,8 @@ public MultipleOfValidator(BigDecimal multipleOf) {
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
         @Nullable List<PathToSchemasMap> containsPathToSchemas,
-        @Nullable PathToSchemasMap patternPropertiesPathToSchemas
+        @Nullable PathToSchemasMap patternPropertiesPathToSchemas,
+        @Nullable PathToSchemasMap ifPathToSchemas
     ) {
         if (!(arg instanceof Number)) {
             return null;

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

@@ -23,7 +23,8 @@ public NotValidator(Class<? extends JsonSchema> not) {
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
         @Nullable List<PathToSchemasMap> containsPathToSchemas,
-        @Nullable PathToSchemasMap patternPropertiesPathToSchemas
+        @Nullable PathToSchemasMap patternPropertiesPathToSchemas,
+        @Nullable PathToSchemasMap ifPathToSchemas
     ) {
         PathToSchemasMap pathToSchemas;
         try {