Regen 310sample

Author: spacether

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

@@ -287,10 +287,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

samples/client/3_1_0_unit_test/java/docs/components/schemas/MaxcontainsWithoutContainsIsIgnored.md

@@ -19,6 +19,7 @@ A schema class that validates payloads
 ### Field Summary
 | Modifier and Type | Field and Description |
 | ----------------- | ---------------------- |
+| Integer | maxContains = 1 |
 
 ### Method Summary
 | Modifier and Type | Method and Description |

samples/client/3_1_0_unit_test/java/docs/components/schemas/MincontainsWithoutContainsIsIgnored.md

@@ -19,6 +19,7 @@ A schema class that validates payloads
 ### Field Summary
 | Modifier and Type | Field and Description |
 | ----------------- | ---------------------- |
+| Integer | minContains = 1 |
 
 ### Method Summary
 | Modifier and Type | Method and Description |

samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/MaxcontainsWithoutContainsIsIgnored.java

@@ -46,6 +46,7 @@ public static class MaxcontainsWithoutContainsIsIgnored1 extends JsonSchema impl
 
         protected MaxcontainsWithoutContainsIsIgnored1() {
             super(new JsonSchemaInfo()
+                .maxContains(1)
             );
         }
 

samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/MincontainsWithoutContainsIsIgnored.java

@@ -46,6 +46,7 @@ public static class MincontainsWithoutContainsIsIgnored1 extends JsonSchema impl
 
         protected MincontainsWithoutContainsIsIgnored1() {
             super(new JsonSchemaInfo()
+                .minContains(1)
             );
         }
 

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

@@ -236,6 +236,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;
     }
 

samples/client/3_1_0_unit_test/java/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;
+    }
 }

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

@@ -0,0 +1,33 @@
+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,
+        List<PathToSchemasMap> containsPathToSchemas
+    ) {
+        if (!(arg instanceof List)) {
+            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;
+    }
+}

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

@@ -0,0 +1,33 @@
+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,
+        List<PathToSchemasMap> containsPathToSchemas
+    ) {
+        if (!(arg instanceof List)) {
+            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;
+    }
+}

src/main/resources/java/src/main/java/packagename/components/schemas/SchemaClass/_Schema_list.hbs

@@ -49,7 +49,7 @@ public static class {{jsonPathPiece.pascalCase}} extends JsonSchema implements L
         {{/if}}
         {{#neq maxContains null}}
             {{> src/main/java/packagename/components/schemas/SchemaClass/_maxContains }}
-        {{/if}}
+        {{/neq}}
         {{#neq minContains null}}
             {{> src/main/java/packagename/components/schemas/SchemaClass/_minContains }}
         {{/neq}}