openapi-json-schema-tools · spacether · Jan 12, 2024 · Jan 12, 2024 · Jan 12, 2024 · Jan 12, 2024
diff --git a/docs/generators/java.md b/docs/generators/java.md
@@ -289,12 +289,12 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |Format|✓|OAS2,OAS3
 |If|✗|OAS3
 |Items|✓|OAS2,OAS3
-|MaxContains|✗|OAS3
+|MaxContains|✓|OAS3
 |MaxItems|✓|OAS2,OAS3
 |MaxLength|✓|OAS2,OAS3
 |MaxProperties|✓|OAS2,OAS3
 |Maximum|✓|OAS2,OAS3
-|MinContains|✗|OAS3
+|MinContains|✓|OAS3
 |MinItems|✓|OAS2,OAS3
 |MinLength|✓|OAS2,OAS3
 |MinProperties|✓|OAS2,OAS3

diff --git a/samples/client/3_0_3_unit_test/java/.openapi-generator/FILES b/samples/client/3_0_3_unit_test/java/.openapi-generator/FILES
@@ -237,10 +237,12 @@ src/main/java/org/openapijsonschematools/client/schemas/validation/LongEnumValid
 src/main/java/org/openapijsonschematools/client/schemas/validation/LongValueMethod.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/MapSchemaValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/MapUtils.java
+src/main/java/org/openapijsonschematools/client/schemas/validation/MaxContainsValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/MaxItemsValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/MaxLengthValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/MaxPropertiesValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/MaximumValidator.java
+src/main/java/org/openapijsonschematools/client/schemas/validation/MinContainsValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/MinItemsValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/MinLengthValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/MinPropertiesValidator.java

diff --git a/...a/org/openapijsonschematools/client/schemas/validation/AdditionalPropertiesValidator.java b/...a/org/openapijsonschematools/client/schemas/validation/AdditionalPropertiesValidator.java
@@ -19,7 +19,7 @@ public AdditionalPropertiesValidator(Class<? extends JsonSchema> additionalPrope
         JsonSchema schema,
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
-        List<PathToSchemasMap> containsPathToSchemas
+        @Nullable List<PathToSchemasMap> containsPathToSchemas
     ) {
         if (!(arg instanceof Map<?, ?> mapArg)) {
             return null;

diff --git a/...va/src/main/java/org/openapijsonschematools/client/schemas/validation/AllOfValidator.java b/...va/src/main/java/org/openapijsonschematools/client/schemas/validation/AllOfValidator.java
@@ -15,7 +15,7 @@ public AllOfValidator(List<Class<? extends JsonSchema>> allOf) {
         JsonSchema schema,
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
-        List<PathToSchemasMap> containsPathToSchemas
+        @Nullable List<PathToSchemasMap> containsPathToSchemas
     ) {
         PathToSchemasMap pathToSchemas = new PathToSchemasMap();
         for(Class<? extends JsonSchema> allOfClass: allOf) {

diff --git a/...va/src/main/java/org/openapijsonschematools/client/schemas/validation/AnyOfValidator.java b/...va/src/main/java/org/openapijsonschematools/client/schemas/validation/AnyOfValidator.java
@@ -18,7 +18,7 @@ public AnyOfValidator(List<Class<? extends JsonSchema>> anyOf) {
         JsonSchema schema,
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
-        List<PathToSchemasMap> containsPathToSchemas
+        @Nullable List<PathToSchemasMap> containsPathToSchemas
     ) {
         PathToSchemasMap pathToSchemas = new PathToSchemasMap();
         List<Class<? extends JsonSchema>> validatedAnyOfClasses = new ArrayList<>();

diff --git a/...va/src/main/java/org/openapijsonschematools/client/schemas/validation/ConstValidator.java b/...va/src/main/java/org/openapijsonschematools/client/schemas/validation/ConstValidator.java
@@ -19,7 +19,7 @@ public ConstValidator(@Nullable Object constValue) {
         JsonSchema schema,
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
-        List<PathToSchemasMap> containsPathToSchemas
+        @Nullable List<PathToSchemasMap> containsPathToSchemas
     ) {
         if (arg instanceof Number) {
             BigDecimal castArg = getBigDecimal((Number) arg);

diff --git a/...src/main/java/org/openapijsonschematools/client/schemas/validation/ContainsValidator.java b/...src/main/java/org/openapijsonschematools/client/schemas/validation/ContainsValidator.java
@@ -18,12 +18,12 @@ public ContainsValidator(Class<? extends JsonSchema> contains) {
         JsonSchema schema,
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
-        List<PathToSchemasMap> containsPathToSchemas
+        @Nullable List<PathToSchemasMap> containsPathToSchemas
     ) {
         if (!(arg instanceof List)) {
             return null;
         }
-        if (containsPathToSchemas.isEmpty()) {
+        if (containsPathToSchemas == null || containsPathToSchemas.isEmpty()) {
             throw new ValidationException(
                 "Validation failed for contains keyword in class="+schema.getClass()
                 + " at pathToItem="+validationMetadata.pathToItem()+". No "
@@ -44,7 +44,7 @@ public List<PathToSchemasMap> getContainsPathToSchemas(
         if (!(arg instanceof List)) {
             return new ArrayList<>();
         }
-        List<PathToSchemasMap> containsPathToSchemas = new ArrayList<>();
+        @Nullable List<PathToSchemasMap> containsPathToSchemas = new ArrayList<>();
         int i = 0;
         for(Object itemValue: (List<?>) arg) {
             PathToSchemasMap thesePathToSchemas = new PathToSchemasMap();

diff --git a/...ava/src/main/java/org/openapijsonschematools/client/schemas/validation/EnumValidator.java b/...ava/src/main/java/org/openapijsonschematools/client/schemas/validation/EnumValidator.java
@@ -24,7 +24,7 @@ private boolean enumContainsArg(@Nullable Object arg){
         JsonSchema schema,
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
-        List<PathToSchemasMap> containsPathToSchemas
+        @Nullable List<PathToSchemasMap> containsPathToSchemas
     ) {
         if (enumValues.isEmpty()) {
             throw new ValidationException("No value can match enum because enum is empty");

diff --git a/.../java/org/openapijsonschematools/client/schemas/validation/ExclusiveMaximumValidator.java b/.../java/org/openapijsonschematools/client/schemas/validation/ExclusiveMaximumValidator.java
@@ -17,7 +17,7 @@ public ExclusiveMaximumValidator(Number exclusiveMaximum) {
         JsonSchema schema,
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
-        List<PathToSchemasMap> containsPathToSchemas
+        @Nullable List<PathToSchemasMap> containsPathToSchemas
     ) {
         if (!(arg instanceof Number)) {
             return null;

diff --git a/.../java/org/openapijsonschematools/client/schemas/validation/ExclusiveMinimumValidator.java b/.../java/org/openapijsonschematools/client/schemas/validation/ExclusiveMinimumValidator.java
@@ -17,7 +17,7 @@ public ExclusiveMinimumValidator(Number exclusiveMinimum) {
         JsonSchema schema,
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
-        List<PathToSchemasMap> containsPathToSchemas
+        @Nullable List<PathToSchemasMap> containsPathToSchemas
     ) {
         if (!(arg instanceof Number)) {
             return null;

diff --git a/...a/src/main/java/org/openapijsonschematools/client/schemas/validation/FormatValidator.java b/...a/src/main/java/org/openapijsonschematools/client/schemas/validation/FormatValidator.java
@@ -148,7 +148,7 @@ private Void validateStringFormat(String arg, ValidationMetadata validationMetad
         JsonSchema schema,
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
-        List<PathToSchemasMap> containsPathToSchemas
+        @Nullable List<PathToSchemasMap> containsPathToSchemas
     ) {
         if (arg instanceof Number) {
             validateNumericFormat(

diff --git a/...va/src/main/java/org/openapijsonschematools/client/schemas/validation/ItemsValidator.java b/...va/src/main/java/org/openapijsonschematools/client/schemas/validation/ItemsValidator.java
@@ -17,7 +17,7 @@ public ItemsValidator(Class<? extends JsonSchema> items) {
         JsonSchema schema,
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
-        List<PathToSchemasMap> containsPathToSchemas
+        @Nullable List<PathToSchemasMap> containsPathToSchemas
     ) {
         if (!(arg instanceof List)) {
             return null;

diff --git a/...t/java/src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchema.java b/...t/java/src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchema.java
@@ -47,6 +47,8 @@ public abstract class JsonSchema {
     public final @Nullable Object constValue;
     public final boolean constValueSet;
     public final @Nullable Class<? extends JsonSchema> contains;
+    public final @Nullable Integer maxContains;
+    public final @Nullable Integer minContains;
     private final LinkedHashMap<String, KeywordValidator> keywordToValidator;
 
     protected JsonSchema(JsonSchemaInfo jsonSchemaInfo) {
@@ -236,6 +238,20 @@ protected JsonSchema(JsonSchemaInfo jsonSchemaInfo) {
                     new ContainsValidator(this.contains)
             );
         }
+        this.maxContains = jsonSchemaInfo.maxContains;
+        if (this.maxContains != null) {
+            keywordToValidator.put(
+                    "maxContains",
+                    new MaxContainsValidator(this.maxContains)
+            );
+        }
+        this.minContains = jsonSchemaInfo.minContains;
+        if (this.minContains != null) {
+            keywordToValidator.put(
+                    "minContains",
+                    new MinContainsValidator(this.minContains)
+            );
+        }
         this.keywordToValidator = keywordToValidator;
     }
 
@@ -250,7 +266,7 @@ public static PathToSchemasMap validate(
         LinkedHashSet<String> disabledKeywords = validationMetadata.configuration().disabledKeywordFlags().getKeywords();
         PathToSchemasMap pathToSchemas = new PathToSchemasMap();
         LinkedHashMap<String, KeywordValidator> thisKeywordToValidator = jsonSchema.keywordToValidator;
-        List<PathToSchemasMap> containsPathToSchemas = new ArrayList<>();
+        @Nullable List<PathToSchemasMap> containsPathToSchemas = null;
         KeywordValidator containsValidator = thisKeywordToValidator.get("contains");
         if (containsValidator != null) {
             containsPathToSchemas = containsValidator.getContainsPathToSchemas(arg, validationMetadata);

diff --git a/...va/src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchemaInfo.java b/...va/src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchemaInfo.java
@@ -147,4 +147,14 @@ public JsonSchemaInfo contains(Class<? extends JsonSchema> contains) {
         this.contains = contains;
         return this;
     }
+    public @Nullable Integer maxContains = null;
+    public JsonSchemaInfo maxContains(Integer maxContains) {
+        this.maxContains = maxContains;
+        return this;
+    }
+    public @Nullable Integer minContains = null;
+    public JsonSchemaInfo minContains(Integer minContains) {
+        this.minContains = minContains;
+        return this;
+    }
 }
diff --git a/.../src/main/java/org/openapijsonschematools/client/schemas/validation/KeywordValidator.java b/.../src/main/java/org/openapijsonschematools/client/schemas/validation/KeywordValidator.java
@@ -11,7 +11,7 @@ public interface KeywordValidator {
         JsonSchema schema,
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
-        List<PathToSchemasMap> containsPathToSchemas
+        @Nullable List<PathToSchemasMap> containsPathToSchemas
     ) throws ValidationException;
 
     default List<PathToSchemasMap> getContainsPathToSchemas(

diff --git a/.../main/java/org/openapijsonschematools/client/schemas/validation/MaxContainsValidator.java b/.../main/java/org/openapijsonschematools/client/schemas/validation/MaxContainsValidator.java
@@ -0,0 +1,36 @@
+package org.openapijsonschematools.client.schemas.validation;
+
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.openapijsonschematools.client.exceptions.ValidationException;
+
+import java.util.List;
+
+public class MaxContainsValidator implements KeywordValidator {
+    public final int maxContains;
+
+    public MaxContainsValidator(int maxContains) {
+        this.maxContains = maxContains;
+    }
+
+    @Override
+    public @Nullable PathToSchemasMap validate(
+        JsonSchema schema,
+        @Nullable Object arg,
+        ValidationMetadata validationMetadata,
+        @Nullable List<PathToSchemasMap> containsPathToSchemas
+    ) {
+        if (!(arg instanceof List)) {
+            return null;
+        }
+        if (containsPathToSchemas == null) {
+            return null;
+        }
+        if (containsPathToSchemas.size() > maxContains) {
+            throw new ValidationException(
+                "Validation failed for maxContains keyword in class="+schema.getClass()+
+                " at pathToItem="+validationMetadata.pathToItem()+". Too many items validated to the contains schema."
+            );
+        }
+        return null;
+    }
+}
diff --git a/...src/main/java/org/openapijsonschematools/client/schemas/validation/MaxItemsValidator.java b/...src/main/java/org/openapijsonschematools/client/schemas/validation/MaxItemsValidator.java
@@ -17,7 +17,7 @@ public MaxItemsValidator(int maxItems) {
         JsonSchema schema,
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
-        List<PathToSchemasMap> containsPathToSchemas
+        @Nullable List<PathToSchemasMap> containsPathToSchemas
     ) {
         if (!(arg instanceof List)) {
             return null;

diff --git a/...rc/main/java/org/openapijsonschematools/client/schemas/validation/MaxLengthValidator.java b/...rc/main/java/org/openapijsonschematools/client/schemas/validation/MaxLengthValidator.java
@@ -17,7 +17,7 @@ public MaxLengthValidator(int maxLength) {
         JsonSchema schema,
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
-        List<PathToSchemasMap> containsPathToSchemas
+        @Nullable List<PathToSchemasMap> containsPathToSchemas
     ) {
         if (!(arg instanceof String)) {
             return null;

diff --git a/...ain/java/org/openapijsonschematools/client/schemas/validation/MaxPropertiesValidator.java b/...ain/java/org/openapijsonschematools/client/schemas/validation/MaxPropertiesValidator.java
@@ -18,7 +18,7 @@ public MaxPropertiesValidator(int maxProperties) {
         JsonSchema schema,
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
-        List<PathToSchemasMap> containsPathToSchemas
+        @Nullable List<PathToSchemasMap> containsPathToSchemas
     ) {
         if (!(arg instanceof Map)) {
             return null;

diff --git a/.../src/main/java/org/openapijsonschematools/client/schemas/validation/MaximumValidator.java b/.../src/main/java/org/openapijsonschematools/client/schemas/validation/MaximumValidator.java
@@ -17,7 +17,7 @@ public MaximumValidator(Number maximum) {
         JsonSchema schema,
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
-        List<PathToSchemasMap> containsPathToSchemas
+        @Nullable List<PathToSchemasMap> containsPathToSchemas
     ) {
         if (!(arg instanceof Number)) {
             return null;

diff --git a/.../main/java/org/openapijsonschematools/client/schemas/validation/MinContainsValidator.java b/.../main/java/org/openapijsonschematools/client/schemas/validation/MinContainsValidator.java
@@ -0,0 +1,36 @@
+package org.openapijsonschematools.client.schemas.validation;
+
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.openapijsonschematools.client.exceptions.ValidationException;
+
+import java.util.List;
+
+public class MinContainsValidator implements KeywordValidator {
+    public final int minContains;
+
+    public MinContainsValidator(int minContains) {
+        this.minContains = minContains;
+    }
+
+    @Override
+    public @Nullable PathToSchemasMap validate(
+        JsonSchema schema,
+        @Nullable Object arg,
+        ValidationMetadata validationMetadata,
+        @Nullable List<PathToSchemasMap> containsPathToSchemas
+    ) {
+        if (!(arg instanceof List)) {
+            return null;
+        }
+        if (containsPathToSchemas == null) {
+            return null;
+        }
+        if (containsPathToSchemas.size() < minContains) {
+            throw new ValidationException(
+                "Validation failed for minContains keyword in class="+schema.getClass()+
+                " at pathToItem="+validationMetadata.pathToItem()+". Too few items validated to the contains schema."
+            );
+        }
+        return null;
+    }
+}
diff --git a/...src/main/java/org/openapijsonschematools/client/schemas/validation/MinItemsValidator.java b/...src/main/java/org/openapijsonschematools/client/schemas/validation/MinItemsValidator.java
@@ -17,7 +17,7 @@ public MinItemsValidator(int minItems) {
         JsonSchema schema,
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
-        List<PathToSchemasMap> containsPathToSchemas
+        @Nullable List<PathToSchemasMap> containsPathToSchemas
     ) {
         if (!(arg instanceof List)) {
             return null;

diff --git a/...rc/main/java/org/openapijsonschematools/client/schemas/validation/MinLengthValidator.java b/...rc/main/java/org/openapijsonschematools/client/schemas/validation/MinLengthValidator.java
@@ -17,7 +17,7 @@ public MinLengthValidator(int minLength) {
         JsonSchema schema,
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
-        List<PathToSchemasMap> containsPathToSchemas
+        @Nullable List<PathToSchemasMap> containsPathToSchemas
     ) {
         if (!(arg instanceof String)) {
             return null;

diff --git a/...ain/java/org/openapijsonschematools/client/schemas/validation/MinPropertiesValidator.java b/...ain/java/org/openapijsonschematools/client/schemas/validation/MinPropertiesValidator.java
@@ -18,7 +18,7 @@ public MinPropertiesValidator(int minProperties) {
         JsonSchema schema,
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
-        List<PathToSchemasMap> containsPathToSchemas
+        @Nullable List<PathToSchemasMap> containsPathToSchemas
     ) {
         if (!(arg instanceof Map)) {
             return null;

diff --git a/.../src/main/java/org/openapijsonschematools/client/schemas/validation/MinimumValidator.java b/.../src/main/java/org/openapijsonschematools/client/schemas/validation/MinimumValidator.java
@@ -17,7 +17,7 @@ public MinimumValidator(Number minimum) {
         JsonSchema schema,
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
-        List<PathToSchemasMap> containsPathToSchemas
+        @Nullable List<PathToSchemasMap> containsPathToSchemas
     ) {
         if (!(arg instanceof Number)) {
             return null;

diff --git a/...c/main/java/org/openapijsonschematools/client/schemas/validation/MultipleOfValidator.java b/...c/main/java/org/openapijsonschematools/client/schemas/validation/MultipleOfValidator.java
@@ -18,7 +18,7 @@ public MultipleOfValidator(BigDecimal multipleOf) {
         JsonSchema schema,
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
-        List<PathToSchemasMap> containsPathToSchemas
+        @Nullable List<PathToSchemasMap> containsPathToSchemas
     ) {
         if (!(arg instanceof Number)) {
             return null;

diff --git a/...java/src/main/java/org/openapijsonschematools/client/schemas/validation/NotValidator.java b/...java/src/main/java/org/openapijsonschematools/client/schemas/validation/NotValidator.java
@@ -22,7 +22,7 @@ public NotValidator(Class<? extends JsonSchema> not) {
         JsonSchema schema,
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
-        List<PathToSchemasMap> containsPathToSchemas
+        @Nullable List<PathToSchemasMap> containsPathToSchemas
     ) {
         PathToSchemasMap pathToSchemas;
         try {

diff --git a/...va/src/main/java/org/openapijsonschematools/client/schemas/validation/OneOfValidator.java b/...va/src/main/java/org/openapijsonschematools/client/schemas/validation/OneOfValidator.java
@@ -18,7 +18,7 @@ public OneOfValidator(List<Class<? extends JsonSchema>> oneOf) {
         JsonSchema schema,
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
-        List<PathToSchemasMap> containsPathToSchemas
+        @Nullable List<PathToSchemasMap> containsPathToSchemas
     ) {
         PathToSchemasMap pathToSchemas = new PathToSchemasMap();
         List<Class<? extends JsonSchema>> validatedOneOfClasses = new ArrayList<>();

diff --git a/.../src/main/java/org/openapijsonschematools/client/schemas/validation/PatternValidator.java b/.../src/main/java/org/openapijsonschematools/client/schemas/validation/PatternValidator.java
@@ -18,7 +18,7 @@ public PatternValidator(Pattern pattern) {
         JsonSchema schema,
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
-        List<PathToSchemasMap> containsPathToSchemas
+        @Nullable List<PathToSchemasMap> containsPathToSchemas
     ) {
         if (!(arg instanceof String)) {
             return null;

diff --git a/...c/main/java/org/openapijsonschematools/client/schemas/validation/PropertiesValidator.java b/...c/main/java/org/openapijsonschematools/client/schemas/validation/PropertiesValidator.java
@@ -20,7 +20,7 @@ public PropertiesValidator(Map<String, Class<? extends JsonSchema>> properties)
         JsonSchema schema,
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
-        List<PathToSchemasMap> containsPathToSchemas
+        @Nullable List<PathToSchemasMap> containsPathToSchemas
     ) {
         if (!(arg instanceof Map<?, ?> mapArg)) {
             return null;

diff --git a/...src/main/java/org/openapijsonschematools/client/schemas/validation/RequiredValidator.java b/...src/main/java/org/openapijsonschematools/client/schemas/validation/RequiredValidator.java
@@ -20,7 +20,7 @@ public RequiredValidator(Set<String> required) {
         JsonSchema schema,
         @Nullable Object arg,
         ValidationMetadata validationMetadata,
-        List<PathToSchemasMap> containsPathToSchemas
+        @Nullable List<PathToSchemasMap> containsPathToSchemas
     ) {
         if (!(arg instanceof Map)) {
             return null;