Requires validateToBoxed in JsonSchema

Author: spacether

samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/schemas/AnyTypeJsonSchema.java

@@ -30,7 +30,7 @@
 import java.util.Objects;
 import java.util.UUID;
 
-public class AnyTypeJsonSchema extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<FrozenList<@Nullable Object>>, MapSchemaValidator<FrozenMap<@Nullable Object>> {
+public class AnyTypeJsonSchema extends JsonSchema<AnyTypeJsonSchema.AnyTypeBoxed> implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<FrozenList<@Nullable Object>>, MapSchemaValidator<FrozenMap<@Nullable Object>> {
     private static @Nullable AnyTypeJsonSchema instance = null;
 
     protected AnyTypeJsonSchema() {
@@ -131,7 +131,7 @@ public String validate(UUID arg, SchemaConfiguration configuration) throws Valid
             if (schemas == null) {
                 throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
             }
-            JsonSchema itemSchema = schemas.entrySet().iterator().next().getKey();
+            JsonSchema<?> itemSchema = schemas.entrySet().iterator().next().getKey();
             @Nullable Object castItem = itemSchema.getNewInstance(item, itemPathToItem, pathToSchemas);
             items.add(castItem);
             i += 1;
@@ -260,6 +260,8 @@ private AnyTypeBoxedMap(FrozenMap<@Nullable Object> data) {
             this.data = data;
         }
     }
+
+    @Override
     public AnyTypeBoxed validateToBoxed(@Nullable Object arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
         if (arg == null) {
             return new AnyTypeBoxedVoid(validate((Void) null, configuration));

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

@@ -17,7 +17,7 @@
 import java.util.UUID;
 import java.util.regex.Pattern;
 
-public abstract class JsonSchema {
+public abstract class JsonSchema<T> {
     public final @Nullable Set<Class<?>> type;
     public final @Nullable String format;
     public final @Nullable Class<? extends JsonSchema> items;
@@ -223,6 +223,7 @@ protected JsonSchema(JsonSchemaInfo jsonSchemaInfo) {
 
     public abstract @Nullable Object getNewInstance(@Nullable Object arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) throws InvalidTypeException;
     public abstract @Nullable Object validate(@Nullable Object arg, SchemaConfiguration configuration) throws InvalidTypeException, ValidationException;
+    public abstract T validateToBoxed(@Nullable Object arg, SchemaConfiguration configuration) throws InvalidTypeException, ValidationException;
 
     private List<PathToSchemasMap> getContainsPathToSchemas(
             @Nullable Object arg,

src/main/resources/java/src/main/java/packagename/schemas/AnyTypeJsonSchema.hbs

@@ -30,7 +30,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.UUID;
 
-public class AnyTypeJsonSchema extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<FrozenList<@Nullable Object>>, MapSchemaValidator<FrozenMap<@Nullable Object>> {
+public class AnyTypeJsonSchema extends JsonSchemaJsonSchema<AnyTypeJsonSchema.AnyTypeBoxed> implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<FrozenList<@Nullable Object>>, MapSchemaValidator<FrozenMap<@Nullable Object>> {
     private static @Nullable AnyTypeJsonSchema instance = null;
 
     protected AnyTypeJsonSchema() {
@@ -260,6 +260,7 @@ public class AnyTypeJsonSchema extends JsonSchema implements NullSchemaValidator
             this.data = data;
         }
     }
+    @Override
     public AnyTypeBoxed validateToBoxed(@Nullable Object arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
         if (arg == null) {
             return new AnyTypeBoxedVoid(validate((Void) null, configuration));

src/main/resources/java/src/main/java/packagename/schemas/validation/JsonSchema.hbs

@@ -17,7 +17,7 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.regex.Pattern;
 
-public abstract class JsonSchema {
+public abstract class JsonSchema<T> {
     public final @Nullable Set<Class<?>> type;
     public final @Nullable String format;
     public final @Nullable Class<? extends JsonSchema> items;
@@ -223,6 +223,7 @@ public abstract class JsonSchema {
 
     public abstract @Nullable Object getNewInstance(@Nullable Object arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) throws InvalidTypeException;
     public abstract @Nullable Object validate(@Nullable Object arg, SchemaConfiguration configuration) throws InvalidTypeException, ValidationException;
+    public abstract T validateToBoxed(@Nullable Object arg, SchemaConfiguration configuration) throws InvalidTypeException, ValidationException;
 
     private List<PathToSchemasMap> getContainsPathToSchemas(
             @Nullable Object arg,