Updates IntJsonSchema

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

@@ -2,25 +2,20 @@
 
 import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags;
 import org.openapijsonschematools.client.exceptions.InvalidTypeException;
-import org.openapijsonschematools.client.schemas.validation.FormatValidator;
 import org.openapijsonschematools.client.schemas.validation.JsonSchema;
 import org.openapijsonschematools.client.schemas.validation.JsonSchemaInfo;
 import org.openapijsonschematools.client.configurations.SchemaConfiguration;
-import org.openapijsonschematools.client.schemas.validation.KeywordEntry;
 import org.openapijsonschematools.client.schemas.validation.PathToSchemasMap;
 import org.openapijsonschematools.client.schemas.validation.NumberSchemaValidator;
-import org.openapijsonschematools.client.schemas.validation.TypeValidator;
 import org.openapijsonschematools.client.exceptions.ValidationException;
 import org.openapijsonschematools.client.schemas.validation.ValidationMetadata;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
-import java.util.Map;
 
 public class IntJsonSchema extends JsonSchema implements NumberSchemaValidator {
  private static @Nullable IntJsonSchema instance = null;
@@ -44,11 +39,6 @@ public static IntJsonSchema getInstance() {
  return instance;
  }
 
- @Override
- public Number getNewInstance(Number arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
- return arg;
- }
-
  @Override
  public Number validate(Number arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
  Set<List<Object>> pathSet = new HashSet<>();
@@ -83,4 +73,12 @@ public double validate(double arg, SchemaConfiguration configuration) throws Val
  }
  throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be instantiated by this schema");
  }
+
+ @Override
+ public @Nullable Object validate(@Nullable Object arg, SchemaConfiguration configuration) throws InvalidTypeException, ValidationException {
+ if (arg instanceof Number) {
+ return validate((Number) arg, configuration);
+ }
+ throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be validated by this schema");
+ }
 }

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

@@ -2,25 +2,20 @@ package {{{packageName}}}.schemas;
 
 import {{{packageName}}}.configurations.JsonSchemaKeywordFlags;
 import {{{packageName}}}.exceptions.InvalidTypeException;
-import {{{packageName}}}.schemas.validation.FormatValidator;
 import {{{packageName}}}.schemas.validation.JsonSchema;
 import {{{packageName}}}.schemas.validation.JsonSchemaInfo;
 import {{{packageName}}}.configurations.SchemaConfiguration;
-import {{{packageName}}}.schemas.validation.KeywordEntry;
 import {{{packageName}}}.schemas.validation.PathToSchemasMap;
 import {{{packageName}}}.schemas.validation.NumberSchemaValidator;
-import {{{packageName}}}.schemas.validation.TypeValidator;
 import {{{packageName}}}.exceptions.ValidationException;
 import {{{packageName}}}.schemas.validation.ValidationMetadata;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
-import java.util.Map;
 
 public class IntJsonSchema extends JsonSchema implements NumberSchemaValidator {
  private static @Nullable IntJsonSchema instance = null;
@@ -44,11 +39,6 @@ public class IntJsonSchema extends JsonSchema implements NumberSchemaValidator {
  return instance;
  }
 
- @Override
- public Number getNewInstance(Number arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
- return arg;
- }
-
  @Override
  public Number validate(Number arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
  Set<List<Object>> pathSet = new HashSet<>();
@@ -83,4 +73,12 @@ public class IntJsonSchema extends JsonSchema implements NumberSchemaValidator {
  }
  throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be instantiated by this schema");
  }
+
+ @Override
+ public @Nullable Object validate(@Nullable Object arg, SchemaConfiguration configuration) throws InvalidTypeException, ValidationException {
+ if (arg instanceof Number) {
+ return validate((Number) arg, configuration);
+ }
+ throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be validated by this schema");
+ }
 }