Updates Int32JsonSchema

samples/client/petstore/kotlin/src/main/kotlin/org/openapijsonschematools/client/schemas/Int32JsonSchema.kt

@@ -1,98 +1,93 @@
-package org.openapijsonschematools.client.schemas;
+package org.openapijsonschematools.client.schemas
 
-import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags;
-import org.openapijsonschematools.client.exceptions.ValidationException;
-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.PathToSchemasMap;
-import org.openapijsonschematools.client.schemas.validation.NumberSchemaValidator;
-import org.openapijsonschematools.client.schemas.validation.ValidationMetadata;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags
+import org.openapijsonschematools.client.configurations.SchemaConfiguration
+import org.openapijsonschematools.client.exceptions.ValidationException
+import org.openapijsonschematools.client.schemas.validation.JsonSchema
+import org.openapijsonschematools.client.schemas.validation.JsonSchemaInfo
+import org.openapijsonschematools.client.schemas.validation.NumberSchemaValidator
+import org.openapijsonschematools.client.schemas.validation.PathToSchemasMap
+import org.openapijsonschematools.client.schemas.validation.ValidationMetadata
 
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-
-public class Int32JsonSchema {
- public sealed interface Int32JsonSchema1Boxed permits Int32JsonSchema1BoxedNumber {
- @Nullable Object getData();
+class Int32JsonSchema {
+ sealed interface Int32JsonSchema1Boxed {
+ fun getData(): Any?
  }
- public record Int32JsonSchema1BoxedNumber(Number data) implements Int32JsonSchema1Boxed {
-  @Override
- public @Nullable Object getData() {
- return data;
+
+ data class Int32JsonSchema1BoxedNumber(val data: Number) : Int32JsonSchema1Boxed {
+ override fun getData(): Number {
+ return data
  }
  }
 
- public static class Int32JsonSchema1 extends JsonSchema<Int32JsonSchema1Boxed> implements NumberSchemaValidator<Int32JsonSchema1BoxedNumber> {
- private static @Nullable Int32JsonSchema1 instance = null;
-
- protected Int32JsonSchema1() {
- super(new JsonSchemaInfo()
- .type(Set.of(
- Integer.class,
- Float.class
- ))
- .format("int32")
- );
+ class Int32JsonSchema1 private constructor() : JsonSchema<Int32JsonSchema1Boxed>(
+ JsonSchemaInfo()
+ .type(
+ setOf(
+ Int::class.java,
+ Float::class.java
+ )
+ )
+ .format("int32")
+ ), NumberSchemaValidator<Int32JsonSchema1BoxedNumber> {
+ @Throws(ValidationException::class)
+ override fun validate(arg: Number, configuration: SchemaConfiguration?): Number {
+ val pathSet: MutableSet<List<Any>> = HashSet()
+ val pathToItem = listOf<Any>("args[0")
+ val castArg: Number = castToAllowedTypes(arg, pathToItem, pathSet)
+ val usedConfiguration = configuration ?: SchemaConfiguration(JsonSchemaKeywordFlags.Builder().build())
+ val validationMetadata =
+ ValidationMetadata(pathToItem, usedConfiguration, PathToSchemasMap(), LinkedHashSet())
+ val pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet)
+ return getNewInstance(castArg, validationMetadata.pathToItem, pathToSchemasMap)
  }
 
- public static Int32JsonSchema1 getInstance() {
- if (instance == null) {
- instance = new Int32JsonSchema1();
- }
- return instance;
+ @Throws(ValidationException::class)
+ fun validate(arg: Int, configuration: SchemaConfiguration?): Int {
+ return validate(arg as Number, configuration) as Int
  }
 
- @Override
- public Number validate(Number arg, SchemaConfiguration configuration) throws ValidationException {
- Set<List<Object>> pathSet = new HashSet<>();
- List<Object> pathToItem = List.of("args[0");
- Number castArg = castToAllowedTypes(arg, pathToItem, pathSet);
- SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(new JsonSchemaKeywordFlags.Builder().build()));
- ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, new PathToSchemasMap(), new LinkedHashSet<>());
- PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
- return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+ @Throws(ValidationException::class)
+ fun validate(arg: Float, configuration: SchemaConfiguration?): Float {
+ return validate(arg as Number, configuration) as Float
  }
 
- public int validate(int arg, SchemaConfiguration configuration) throws ValidationException {
- return (int) validate((Number) arg, configuration);
+ override fun getNewInstance(arg: Any?, pathToItem: List<Any>, pathToSchemas: PathToSchemasMap): Any? {
+ if (arg is Number) {
+ return getNewInstance(arg as Number?, pathToItem, pathToSchemas)
+ }
+ throw RuntimeException("Invalid input type=$javaClass. It can't be instantiated by this schema")
  }
 
- public float validate(float arg, SchemaConfiguration configuration) throws ValidationException {
- return (float) validate((Number) arg, configuration);
+ @Throws(ValidationException::class)
+ override fun validate(arg: Any?, configuration: SchemaConfiguration?): Number {
+ if (arg is Number) {
+ return validate(arg, configuration)
+ }
+ throw ValidationException("Invalid input type=$javaClass. It can't be validated by this schema")
  }
 
- @Override
- public @Nullable Object getNewInstance(@Nullable Object arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
- if (arg instanceof Number) {
- return getNewInstance((Number) arg, pathToItem, pathToSchemas);
- }
- throw new RuntimeException("Invalid input type="+getClass(arg)+". It can't be instantiated by this schema");
+ @Throws(ValidationException::class)
+ override fun validateAndBox(arg: Number, configuration: SchemaConfiguration?): Int32JsonSchema1BoxedNumber {
+ return Int32JsonSchema1BoxedNumber(validate(arg, configuration))
  }
 
- @Override
- public @Nullable Object validate(@Nullable Object arg, SchemaConfiguration configuration) throws ValidationException {
- if (arg instanceof Number) {
- return validate((Number) arg, configuration);
+ @Throws(ValidationException::class)
+ override fun validateAndBox(arg: Any?, configuration: SchemaConfiguration?): Int32JsonSchema1Boxed {
+ if (arg is Number) {
+ return validateAndBox(arg, configuration)
  }
- throw new ValidationException("Invalid input type="+getClass(arg)+". It can't be validated by this schema");
+ throw ValidationException("Invalid input type=$javaClass. It can't be validated by this schema")
  }
 
- @Override
- public Int32JsonSchema1BoxedNumber validateAndBox(Number arg, SchemaConfiguration configuration) throws ValidationException {
- return new Int32JsonSchema1BoxedNumber(validate(arg, configuration));
- }
+ companion object {
+ @Volatile
+ private var instance: Int32JsonSchema1? = null
 
- @Override
- public Int32JsonSchema1Boxed validateAndBox(@Nullable Object arg, SchemaConfiguration configuration) throws ValidationException {
- if (arg instanceof Number castArg) {
- return validateAndBox(castArg, configuration);
- }
- throw new ValidationException("Invalid input type="+getClass(arg)+". It can't be validated by this schema");
+ fun getInstance() =
+ instance ?: synchronized(this) {
+ instance ?: Int32JsonSchema1().also { instance = it }
+ }
  }
  }
 }

src/main/resources/kotlin/src/main/kotlin/packagename/schemas/Int32JsonSchema.hbs

@@ -8,91 +8,86 @@ import {{{packageName}}}.configurations.SchemaConfiguration;
 import {{{packageName}}}.schemas.validation.PathToSchemasMap;
 import {{{packageName}}}.schemas.validation.NumberSchemaValidator;
 import {{{packageName}}}.schemas.validation.ValidationMetadata;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-
-public class Int32JsonSchema {
- public sealed interface Int32JsonSchema1Boxed permits Int32JsonSchema1BoxedNumber {
- @Nullable Object getData();
+class Int32JsonSchema {
+ sealed interface Int32JsonSchema1Boxed {
+ fun getData(): Any?
  }
- public record Int32JsonSchema1BoxedNumber(Number data) implements Int32JsonSchema1Boxed {
-  @Override
- public @Nullable Object getData() {
- return data;
+
+ data class Int32JsonSchema1BoxedNumber(val data: Number) : Int32JsonSchema1Boxed {
+ override fun getData(): Number {
+ return data
  }
  }
 
- public static class Int32JsonSchema1 extends JsonSchema<Int32JsonSchema1Boxed> implements NumberSchemaValidator<Int32JsonSchema1BoxedNumber> {
- private static @Nullable Int32JsonSchema1 instance = null;
-
- protected Int32JsonSchema1() {
- super(new JsonSchemaInfo()
- .type(Set.of(
- Integer.class,
- Float.class
- ))
- .format("int32")
- );
+ class Int32JsonSchema1 private constructor() : JsonSchema<Int32JsonSchema1Boxed>(
+ JsonSchemaInfo()
+ .type(
+ setOf(
+ Int::class.java,
+ Float::class.java
+ )
+ )
+ .format("int32")
+ ), NumberSchemaValidator<Int32JsonSchema1BoxedNumber> {
+ @Throws(ValidationException::class)
+ override fun validate(arg: Number, configuration: SchemaConfiguration?): Number {
+ val pathSet: MutableSet<List<Any>> = HashSet()
+ val pathToItem = listOf<Any>("args[0")
+ val castArg: Number = castToAllowedTypes(arg, pathToItem, pathSet)
+ val usedConfiguration = configuration ?: SchemaConfiguration(JsonSchemaKeywordFlags.Builder().build())
+ val validationMetadata =
+ ValidationMetadata(pathToItem, usedConfiguration, PathToSchemasMap(), LinkedHashSet())
+ val pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet)
+ return getNewInstance(castArg, validationMetadata.pathToItem, pathToSchemasMap)
  }
 
- public static Int32JsonSchema1 getInstance() {
- if (instance == null) {
- instance = new Int32JsonSchema1();
- }
- return instance;
+ @Throws(ValidationException::class)
+ fun validate(arg: Int, configuration: SchemaConfiguration?): Int {
+ return validate(arg as Number, configuration) as Int
  }
 
- @Override
- public Number validate(Number arg, SchemaConfiguration configuration) throws ValidationException {
- Set<List<Object>> pathSet = new HashSet<>();
- List<Object> pathToItem = List.of("args[0");
- Number castArg = castToAllowedTypes(arg, pathToItem, pathSet);
- SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(new JsonSchemaKeywordFlags.Builder().build()));
- ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, new PathToSchemasMap(), new LinkedHashSet<>());
- PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
- return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+ @Throws(ValidationException::class)
+ fun validate(arg: Float, configuration: SchemaConfiguration?): Float {
+ return validate(arg as Number, configuration) as Float
  }
 
- public int validate(int arg, SchemaConfiguration configuration) throws ValidationException {
- return (int) validate((Number) arg, configuration);
+ override fun getNewInstance(arg: Any?, pathToItem: List<Any>, pathToSchemas: PathToSchemasMap): Any? {
+ if (arg is Number) {
+ return getNewInstance(arg as Number?, pathToItem, pathToSchemas)
+ }
+ throw RuntimeException("Invalid input type=$javaClass. It can't be instantiated by this schema")
  }
 
- public float validate(float arg, SchemaConfiguration configuration) throws ValidationException {
- return (float) validate((Number) arg, configuration);
+ @Throws(ValidationException::class)
+ override fun validate(arg: Any?, configuration: SchemaConfiguration?): Number {
+ if (arg is Number) {
+ return validate(arg, configuration)
+ }
+ throw ValidationException("Invalid input type=$javaClass. It can't be validated by this schema")
  }
 
- @Override
- public @Nullable Object getNewInstance(@Nullable Object arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
- if (arg instanceof Number) {
- return getNewInstance((Number) arg, pathToItem, pathToSchemas);
- }
- throw new RuntimeException("Invalid input type="+getClass(arg)+". It can't be instantiated by this schema");
+ @Throws(ValidationException::class)
+ override fun validateAndBox(arg: Number, configuration: SchemaConfiguration?): Int32JsonSchema1BoxedNumber {
+ return Int32JsonSchema1BoxedNumber(validate(arg, configuration))
  }
 
- @Override
- public @Nullable Object validate(@Nullable Object arg, SchemaConfiguration configuration) throws ValidationException {
- if (arg instanceof Number) {
- return validate((Number) arg, configuration);
+ @Throws(ValidationException::class)
+ override fun validateAndBox(arg: Any?, configuration: SchemaConfiguration?): Int32JsonSchema1Boxed {
+ if (arg is Number) {
+ return validateAndBox(arg, configuration)
  }
- throw new ValidationException("Invalid input type="+getClass(arg)+". It can't be validated by this schema");
+ throw ValidationException("Invalid input type=$javaClass. It can't be validated by this schema")
  }
 
- @Override
- public Int32JsonSchema1BoxedNumber validateAndBox(Number arg, SchemaConfiguration configuration) throws ValidationException {
- return new Int32JsonSchema1BoxedNumber(validate(arg, configuration));
- }
+ companion object {
+ @Volatile
+ private var instance: Int32JsonSchema1? = null
 
- @Override
- public Int32JsonSchema1Boxed validateAndBox(@Nullable Object arg, SchemaConfiguration configuration) throws ValidationException {
- if (arg instanceof Number castArg) {
- return validateAndBox(castArg, configuration);
- }
- throw new ValidationException("Invalid input type="+getClass(arg)+". It can't be validated by this schema");
+ fun getInstance() =
+ instance ?: synchronized(this) {
+ instance ?: Int32JsonSchema1().also { instance = it }
+ }
  }
  }
 }