From 25e4ef46f0a6c83169ceeccc3b54f93816bb30b8 Mon Sep 17 00:00:00 2001 From: Chrimle <28791817+Chrimle@users.noreply.github.com> Date: Sun, 26 Jul 2026 17:30:55 +0200 Subject: [PATCH 01/13] Add Field Descriptions to `RecordWithAllConstraints` --- test/common/src/main/resources/api.yaml | 29 ++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/test/common/src/main/resources/api.yaml b/test/common/src/main/resources/api.yaml index 947cd868..b172114c 100644 --- a/test/common/src/main/resources/api.yaml +++ b/test/common/src/main/resources/api.yaml @@ -364,84 +364,111 @@ components: - stringRequiredNullable - stringRequiredPattern properties: + ### STRING FIELDS ### stringStandard: + description: "Non-required, non-nullable String field." type: string stringDefault: + description: "Non-required, non-nullable String field with a default value." type: string default: 'someDefaultValue' stringNullable: + description: "Non-required, nullable String field." type: string nullable: true stringRequired: + description: "Required, non-nullable String field." type: string stringRequiredNullable: + description: "Required, nullable String field." type: string nullable: true stringRequiredPattern: + description: "Required, non-nullable String field with a RegEx-pattern." type: string pattern: '^\d{3}-\d{2}-\d{4}$' stringEmailFormat: + description: "Non-required, non-nullable String field with Email format." type: string format: email stringUuidFormat: + description: "Non-required, non-nullable UUID field." type: string format: uuid stringMinLength: + description: "Non-required, non-nullable String field with minLength: 3." type: string minLength: 3 stringMaxLength: + description: "Non-required, non-nullable String field with maxLength: 7." type: string maxLength: 7 stringMinAndMaxLength: + description: "Non-required, non-nullable String with minLength: 3 and maxLength: 7." type: string minLength: 3 maxLength: 7 + ### ARRAY FIELDS ### arrayMinItems: + description: "Non-required, non-nullable List with minItems: 1." type: array minItems: 1 items: type: string arrayMaxItems: + description: "Non-required, non-nullable List with maxItems: 10." type: array maxItems: 10 items: type: string arrayMinAndMaxItems: + description: "Non-required, non-nullable List with minItems: 1 and maxItems: 10." type: array minItems: 1 maxItems: 10 items: type: string + ### INTEGER FIELDS ### intMinimum: + description: "Non-required, non-nullable Integer with minimum: 18." type: integer minimum: 18 intMaximum: + description: "Non-required, non-nullable Integer with maximum: 100." type: integer maximum: 100 intMinimumAndMaximum: + description: "Non-required, non-nullable Integer with minimum: 0 and maximum: 100." type: integer minimum: 0 maximum: 100 longMinimum: + description: "Non-required, non-nullable Long with minimum: 18." type: integer format: int64 minimum: 18 longMaximum: + description: "Non-required, non-nullable Long with maximum: 100." type: integer format: int64 maximum: 100 longMinimumAndMaximum: + description: "Non-required, non-nullable Long with minimum: 0 and maximum: 100." type: integer format: int64 minimum: 0 maximum: 100 + ### NUMBER FIELDS ### bigDecimalMinimum: + description: "Non-required, non-nullable BigDecimal with minimum: 0." type: number minimum: 0 bigDecimalMaximum: + description: "Non-required, non-nullable BigDecimal with maximum: 100." type: number maximum: 100 bigDecimalMinimumAndMaximum: + description: "Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100." type: number minimum: 0 - maximum: 100 \ No newline at end of file + maximum: 100 From 41f2624e37ef6d94e51c7edcf3b2df0284a17834 Mon Sep 17 00:00:00 2001 From: Chrimle <28791817+Chrimle@users.noreply.github.com> Date: Sun, 26 Jul 2026 17:36:21 +0200 Subject: [PATCH 02/13] Remove `ExampleRecordWithDefaultFields` test record --- test/common/src/main/resources/api.yaml | 8 - .../o2jrm/models/GeneratedRecordImpl.java | 6 - .../ExampleRecordWithDefaultFields.java | 132 -------------- .../RecordWithAllConstraints.java | 46 ++--- .../ExampleRecordWithDefaultFields.java | 135 -------------- .../RecordWithAllConstraints.java | 46 ++--- .../ExampleRecordWithDefaultFields.java | 132 -------------- .../RecordWithAllConstraints.java | 46 ++--- .../ExampleRecordWithDefaultFields.java | 132 -------------- .../RecordWithAllConstraints.java | 46 ++--- .../ExampleRecordWithDefaultFields.java | 169 ------------------ .../RecordWithAllConstraints.java | 92 +++++----- .../ExampleRecordWithDefaultFields.java | 134 -------------- .../RecordWithAllConstraints.java | 46 ++--- .../ExampleRecordWithDefaultFields.java | 132 -------------- .../standard/RecordWithAllConstraints.java | 46 ++--- .../ExampleRecordWithDefaultFields.java | 134 -------------- .../RecordWithAllConstraints.java | 46 ++--- .../ExampleRecordWithDefaultFields.java | 132 -------------- .../RecordWithAllConstraints.java | 46 ++--- .../ExampleRecordWithDefaultFields.java | 42 ----- .../RecordWithAllConstraints.java | 46 ++--- .../ExampleRecordWithDefaultFields.java | 45 ----- .../RecordWithAllConstraints.java | 46 ++--- .../ExampleRecordWithDefaultFields.java | 42 ----- .../RecordWithAllConstraints.java | 46 ++--- .../ExampleRecordWithDefaultFields.java | 42 ----- .../RecordWithAllConstraints.java | 46 ++--- .../ExampleRecordWithDefaultFields.java | 79 -------- .../RecordWithAllConstraints.java | 92 +++++----- .../ExampleRecordWithDefaultFields.java | 44 ----- .../RecordWithAllConstraints.java | 46 ++--- .../ExampleRecordWithDefaultFields.java | 42 ----- .../standard/RecordWithAllConstraints.java | 46 ++--- .../ExampleRecordWithDefaultFields.java | 44 ----- .../RecordWithAllConstraints.java | 46 ++--- .../ExampleRecordWithDefaultFields.java | 42 ----- .../RecordWithAllConstraints.java | 46 ++--- .../o2jrm/models/GeneratedRecordImpl.java | 6 - .../ExampleRecordWithDefaultFields.java | 132 -------------- .../RecordWithAllConstraints.java | 46 ++--- .../ExampleRecordWithDefaultFields.java | 135 -------------- .../RecordWithAllConstraints.java | 46 ++--- .../ExampleRecordWithDefaultFields.java | 132 -------------- .../RecordWithAllConstraints.java | 46 ++--- .../ExampleRecordWithDefaultFields.java | 132 -------------- .../RecordWithAllConstraints.java | 46 ++--- .../ExampleRecordWithDefaultFields.java | 169 ------------------ .../RecordWithAllConstraints.java | 92 +++++----- .../ExampleRecordWithDefaultFields.java | 134 -------------- .../RecordWithAllConstraints.java | 46 ++--- .../ExampleRecordWithDefaultFields.java | 132 -------------- .../standard/RecordWithAllConstraints.java | 46 ++--- .../ExampleRecordWithDefaultFields.java | 134 -------------- .../RecordWithAllConstraints.java | 46 ++--- .../ExampleRecordWithDefaultFields.java | 132 -------------- .../RecordWithAllConstraints.java | 46 ++--- .../ExampleRecordWithDefaultFields.java | 42 ----- .../RecordWithAllConstraints.java | 46 ++--- .../ExampleRecordWithDefaultFields.java | 45 ----- .../RecordWithAllConstraints.java | 46 ++--- .../ExampleRecordWithDefaultFields.java | 42 ----- .../RecordWithAllConstraints.java | 46 ++--- .../ExampleRecordWithDefaultFields.java | 42 ----- .../RecordWithAllConstraints.java | 46 ++--- .../ExampleRecordWithDefaultFields.java | 79 -------- .../RecordWithAllConstraints.java | 92 +++++----- .../ExampleRecordWithDefaultFields.java | 44 ----- .../RecordWithAllConstraints.java | 46 ++--- .../ExampleRecordWithDefaultFields.java | 42 ----- .../standard/RecordWithAllConstraints.java | 46 ++--- .../ExampleRecordWithDefaultFields.java | 44 ----- .../RecordWithAllConstraints.java | 46 ++--- .../ExampleRecordWithDefaultFields.java | 42 ----- .../RecordWithAllConstraints.java | 46 ++--- .../o2jrm/models/GeneratedRecordImpl.java | 6 - .../ExampleRecordWithDefaultFields.java | 30 ---- .../RecordWithAllConstraints.java | 46 ++--- .../ExampleRecordWithDefaultFields.java | 33 ---- .../RecordWithAllConstraints.java | 46 ++--- .../ExampleRecordWithDefaultFields.java | 30 ---- .../RecordWithAllConstraints.java | 46 ++--- .../ExampleRecordWithDefaultFields.java | 30 ---- .../RecordWithAllConstraints.java | 46 ++--- .../ExampleRecordWithDefaultFields.java | 67 ------- .../RecordWithAllConstraints.java | 92 +++++----- .../ExampleRecordWithDefaultFields.java | 32 ---- .../RecordWithAllConstraints.java | 46 ++--- .../ExampleRecordWithDefaultFields.java | 30 ---- .../standard/RecordWithAllConstraints.java | 46 ++--- .../ExampleRecordWithDefaultFields.java | 30 ---- .../RecordWithAllConstraints.java | 46 ++--- .../ExampleRecordWithDefaultFields.java | 30 ---- .../RecordWithAllConstraints.java | 46 ++--- 94 files changed, 1150 insertions(+), 4796 deletions(-) delete mode 100644 test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/ExampleRecordWithDefaultFields.java delete mode 100644 test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/ExampleRecordWithDefaultFields.java delete mode 100644 test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/ExampleRecordWithDefaultFields.java delete mode 100644 test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/ExampleRecordWithDefaultFields.java delete mode 100644 test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/ExampleRecordWithDefaultFields.java delete mode 100644 test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/ExampleRecordWithDefaultFields.java delete mode 100644 test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/ExampleRecordWithDefaultFields.java delete mode 100644 test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/ExampleRecordWithDefaultFields.java delete mode 100644 test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/ExampleRecordWithDefaultFields.java delete mode 100644 test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/ExampleRecordWithDefaultFields.java delete mode 100644 test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/ExampleRecordWithDefaultFields.java delete mode 100644 test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/ExampleRecordWithDefaultFields.java delete mode 100644 test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/ExampleRecordWithDefaultFields.java delete mode 100644 test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/ExampleRecordWithDefaultFields.java delete mode 100644 test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/ExampleRecordWithDefaultFields.java delete mode 100644 test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/ExampleRecordWithDefaultFields.java delete mode 100644 test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/ExampleRecordWithDefaultFields.java delete mode 100644 test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/ExampleRecordWithDefaultFields.java delete mode 100644 test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/ExampleRecordWithDefaultFields.java delete mode 100644 test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/ExampleRecordWithDefaultFields.java delete mode 100644 test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/ExampleRecordWithDefaultFields.java delete mode 100644 test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/ExampleRecordWithDefaultFields.java delete mode 100644 test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/ExampleRecordWithDefaultFields.java delete mode 100644 test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/ExampleRecordWithDefaultFields.java delete mode 100644 test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/ExampleRecordWithDefaultFields.java delete mode 100644 test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/ExampleRecordWithDefaultFields.java delete mode 100644 test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/ExampleRecordWithDefaultFields.java delete mode 100644 test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/ExampleRecordWithDefaultFields.java delete mode 100644 test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/ExampleRecordWithDefaultFields.java delete mode 100644 test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/ExampleRecordWithDefaultFields.java delete mode 100644 test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/ExampleRecordWithDefaultFields.java delete mode 100644 test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/ExampleRecordWithDefaultFields.java delete mode 100644 test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/ExampleRecordWithDefaultFields.java delete mode 100644 test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/ExampleRecordWithDefaultFields.java delete mode 100644 test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/ExampleRecordWithDefaultFields.java delete mode 100644 test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/ExampleRecordWithDefaultFields.java delete mode 100644 test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/ExampleRecordWithDefaultFields.java delete mode 100644 test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/ExampleRecordWithDefaultFields.java delete mode 100644 test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/ExampleRecordWithDefaultFields.java delete mode 100644 test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/ExampleRecordWithDefaultFields.java delete mode 100644 test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/ExampleRecordWithDefaultFields.java delete mode 100644 test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/ExampleRecordWithDefaultFields.java delete mode 100644 test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/ExampleRecordWithDefaultFields.java delete mode 100644 test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/ExampleRecordWithDefaultFields.java delete mode 100644 test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/ExampleRecordWithDefaultFields.java diff --git a/test/common/src/main/resources/api.yaml b/test/common/src/main/resources/api.yaml index b172114c..07344424 100644 --- a/test/common/src/main/resources/api.yaml +++ b/test/common/src/main/resources/api.yaml @@ -247,14 +247,6 @@ components: field1: type: boolean description: a boolean field - ExampleRecordWithDefaultFields: - type: object - description: Example of a Record with default fields - properties: - field1: - type: string - description: a String field with a default value - default: someDefaultValue ExampleImplementsEnum: type: string description: Example of an Enum which implements an interface. diff --git a/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java b/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java index 2236f75a..049bdd53 100644 --- a/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java +++ b/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java @@ -52,12 +52,6 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { List.of(), List.of(), GeneratedField.of("field1", Boolean.class).build()), - EXAMPLE_RECORD_WITH_DEFAULT_FIELDS( - "ExampleRecordWithDefaultFields", - false, - List.of(), - List.of(), - GeneratedField.of("field1", String.class).defaultValue("someDefaultValue").build()), EXAMPLE_RECORD_WITH_EXTRA_FIELD_ANNOTATIONS( "ExampleRecordWithExtraFieldAnnotations", false, diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/ExampleRecordWithDefaultFields.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/ExampleRecordWithDefaultFields.java deleted file mode 100644 index e30eae45..00000000 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Example OpenAPI Spec. - * An example OpenAPI-spec to generate example Java records. - * - * The version of the OpenAPI document: 0.0.1 - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - * - * This class was generated using custom mustache templates from - * openapi-to-java-records-mustache-templates. For further information, - * questions, requesting features or reporting issues, please visit: - * https://github.com/Chrimle/openapi-to-java-records-mustache-templates. - * Generated with Version: 3.11.0 - * - */ - -package io.github.chrimle.o2jrm.additionalEnumTypeAnnotations; - -import java.util.Objects; -import com.google.gson.TypeAdapter; -import com.google.gson.annotations.JsonAdapter; -import com.google.gson.annotations.SerializedName; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; -import java.io.IOException; -import java.util.Arrays; - -import com.google.gson.Gson; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.TypeAdapterFactory; -import com.google.gson.reflect.TypeToken; -import java.util.HashSet; -import java.util.Set; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) { - - /** A set containing the names of all instance fields defined in this class. */ - public static final HashSet openapiFields = - new HashSet<>( - Set.of("field1")); - - /** A set containing the names of all required fields defined in this class. */ - public static final HashSet openapiRequiredFields = new HashSet<>(); - - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } - - /** - * Validates the JSON Element and throws an exception if issues are found. - * - * @param jsonElement to validate. - * @throws IOException if the JSON Element is not a valid {@link ExampleRecordWithDefaultFields } object. - */ - public static void validateJsonElement(final JsonElement jsonElement) throws IOException { - for (final String key : jsonElement.getAsJsonObject().keySet()) { - if (!ExampleRecordWithDefaultFields.openapiFields.contains(key)) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "The field `%s` in the JSON string is not defined in the `ExampleRecordWithDefaultFields` properties. JSON: %s", - key, - jsonElement)); - } - } - - final JsonObject jsonObj = jsonElement.getAsJsonObject(); - - if (jsonObj.get("field1") != null && !jsonObj.get("field1").isJsonNull()) { - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - } - } - - /** - * Creates {@link TypeAdapter}s for {@link ExampleRecordWithDefaultFields }s and other - * assignable types. - */ - public static class CustomTypeAdapterFactory implements TypeAdapterFactory { - - /** - * {@inheritDoc} - * - * @param gson to create the {@link TypeAdapter} from. - * @param type to serialize/deserialize. - * @return an (anonymous) instance of {@link TypeAdapter}, or - * {@code null} if {@code T} is not assignable to {@link ExampleRecordWithDefaultFields }. - * @param class to serialize/deserialize. - */ - @SuppressWarnings("unchecked") - @Override - public TypeAdapter create(final Gson gson, final TypeToken type) { - if (!ExampleRecordWithDefaultFields.class.isAssignableFrom(type.getRawType())) { - return null; - } - final TypeAdapter elementAdapter = gson.getAdapter(JsonElement.class); - final TypeAdapter thisAdapter = - gson.getDelegateAdapter(this, TypeToken.get(ExampleRecordWithDefaultFields.class)); - - return (TypeAdapter) - new TypeAdapter() { - - @Override - public void write(final JsonWriter out, final ExampleRecordWithDefaultFields value) - throws IOException { - final JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - elementAdapter.write(out, obj); - } - - @Override - public ExampleRecordWithDefaultFields read(final JsonReader in) throws IOException { - final JsonElement jsonElement = elementAdapter.read(in); - validateJsonElement(jsonElement); - return thisAdapter.fromJsonTree(jsonElement); - } - }.nullSafe(); - } - } -} diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index ebe8a707..7bd36d30 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -43,29 +43,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/ExampleRecordWithDefaultFields.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/ExampleRecordWithDefaultFields.java deleted file mode 100644 index 1f9491c6..00000000 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,135 +0,0 @@ -/* - * Example OpenAPI Spec. - * An example OpenAPI-spec to generate example Java records. - * - * The version of the OpenAPI document: 0.0.1 - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - * - * This class was generated using custom mustache templates from - * openapi-to-java-records-mustache-templates. For further information, - * questions, requesting features or reporting issues, please visit: - * https://github.com/Chrimle/openapi-to-java-records-mustache-templates. - * Generated with Version: 3.11.0 - * - */ - -package io.github.chrimle.o2jrm.additionalModelTypeAnnotations; - -import java.util.Objects; -import com.google.gson.TypeAdapter; -import com.google.gson.annotations.JsonAdapter; -import com.google.gson.annotations.SerializedName; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; -import java.io.IOException; -import java.util.Arrays; - -import com.google.gson.Gson; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.TypeAdapterFactory; -import com.google.gson.reflect.TypeToken; -import java.util.HashSet; -import java.util.Set; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -@io.github.chrimle.o2jrm.test.annotations.TestAnnotationOne -@io.github.chrimle.o2jrm.test.annotations.TestAnnotationTwo -@io.github.chrimle.o2jrm.test.annotations.TestAnnotationThree -public record ExampleRecordWithDefaultFields(String field1) { - - /** A set containing the names of all instance fields defined in this class. */ - public static final HashSet openapiFields = - new HashSet<>( - Set.of("field1")); - - /** A set containing the names of all required fields defined in this class. */ - public static final HashSet openapiRequiredFields = new HashSet<>(); - - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } - - /** - * Validates the JSON Element and throws an exception if issues are found. - * - * @param jsonElement to validate. - * @throws IOException if the JSON Element is not a valid {@link ExampleRecordWithDefaultFields } object. - */ - public static void validateJsonElement(final JsonElement jsonElement) throws IOException { - for (final String key : jsonElement.getAsJsonObject().keySet()) { - if (!ExampleRecordWithDefaultFields.openapiFields.contains(key)) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "The field `%s` in the JSON string is not defined in the `ExampleRecordWithDefaultFields` properties. JSON: %s", - key, - jsonElement)); - } - } - - final JsonObject jsonObj = jsonElement.getAsJsonObject(); - - if (jsonObj.get("field1") != null && !jsonObj.get("field1").isJsonNull()) { - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - } - } - - /** - * Creates {@link TypeAdapter}s for {@link ExampleRecordWithDefaultFields }s and other - * assignable types. - */ - public static class CustomTypeAdapterFactory implements TypeAdapterFactory { - - /** - * {@inheritDoc} - * - * @param gson to create the {@link TypeAdapter} from. - * @param type to serialize/deserialize. - * @return an (anonymous) instance of {@link TypeAdapter}, or - * {@code null} if {@code T} is not assignable to {@link ExampleRecordWithDefaultFields }. - * @param class to serialize/deserialize. - */ - @SuppressWarnings("unchecked") - @Override - public TypeAdapter create(final Gson gson, final TypeToken type) { - if (!ExampleRecordWithDefaultFields.class.isAssignableFrom(type.getRawType())) { - return null; - } - final TypeAdapter elementAdapter = gson.getAdapter(JsonElement.class); - final TypeAdapter thisAdapter = - gson.getDelegateAdapter(this, TypeToken.get(ExampleRecordWithDefaultFields.class)); - - return (TypeAdapter) - new TypeAdapter() { - - @Override - public void write(final JsonWriter out, final ExampleRecordWithDefaultFields value) - throws IOException { - final JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - elementAdapter.write(out, obj); - } - - @Override - public ExampleRecordWithDefaultFields read(final JsonReader in) throws IOException { - final JsonElement jsonElement = elementAdapter.read(in); - validateJsonElement(jsonElement); - return thisAdapter.fromJsonTree(jsonElement); - } - }.nullSafe(); - } - } -} diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java index eda3696b..bfeac5d0 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -43,29 +43,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ @io.github.chrimle.o2jrm.test.annotations.TestAnnotationOne @io.github.chrimle.o2jrm.test.annotations.TestAnnotationTwo diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/ExampleRecordWithDefaultFields.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/ExampleRecordWithDefaultFields.java deleted file mode 100644 index 3c6ba87e..00000000 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Example OpenAPI Spec. - * An example OpenAPI-spec to generate example Java records. - * - * The version of the OpenAPI document: 0.0.1 - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - * - * This class was generated using custom mustache templates from - * openapi-to-java-records-mustache-templates. For further information, - * questions, requesting features or reporting issues, please visit: - * https://github.com/Chrimle/openapi-to-java-records-mustache-templates. - * Generated with Version: 3.11.0 - * - */ - -package io.github.chrimle.o2jrm.enumDefaultCaseAndCaseInsensitive; - -import java.util.Objects; -import com.google.gson.TypeAdapter; -import com.google.gson.annotations.JsonAdapter; -import com.google.gson.annotations.SerializedName; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; -import java.io.IOException; -import java.util.Arrays; - -import com.google.gson.Gson; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.TypeAdapterFactory; -import com.google.gson.reflect.TypeToken; -import java.util.HashSet; -import java.util.Set; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) { - - /** A set containing the names of all instance fields defined in this class. */ - public static final HashSet openapiFields = - new HashSet<>( - Set.of("field1")); - - /** A set containing the names of all required fields defined in this class. */ - public static final HashSet openapiRequiredFields = new HashSet<>(); - - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } - - /** - * Validates the JSON Element and throws an exception if issues are found. - * - * @param jsonElement to validate. - * @throws IOException if the JSON Element is not a valid {@link ExampleRecordWithDefaultFields } object. - */ - public static void validateJsonElement(final JsonElement jsonElement) throws IOException { - for (final String key : jsonElement.getAsJsonObject().keySet()) { - if (!ExampleRecordWithDefaultFields.openapiFields.contains(key)) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "The field `%s` in the JSON string is not defined in the `ExampleRecordWithDefaultFields` properties. JSON: %s", - key, - jsonElement)); - } - } - - final JsonObject jsonObj = jsonElement.getAsJsonObject(); - - if (jsonObj.get("field1") != null && !jsonObj.get("field1").isJsonNull()) { - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - } - } - - /** - * Creates {@link TypeAdapter}s for {@link ExampleRecordWithDefaultFields }s and other - * assignable types. - */ - public static class CustomTypeAdapterFactory implements TypeAdapterFactory { - - /** - * {@inheritDoc} - * - * @param gson to create the {@link TypeAdapter} from. - * @param type to serialize/deserialize. - * @return an (anonymous) instance of {@link TypeAdapter}, or - * {@code null} if {@code T} is not assignable to {@link ExampleRecordWithDefaultFields }. - * @param class to serialize/deserialize. - */ - @SuppressWarnings("unchecked") - @Override - public TypeAdapter create(final Gson gson, final TypeToken type) { - if (!ExampleRecordWithDefaultFields.class.isAssignableFrom(type.getRawType())) { - return null; - } - final TypeAdapter elementAdapter = gson.getAdapter(JsonElement.class); - final TypeAdapter thisAdapter = - gson.getDelegateAdapter(this, TypeToken.get(ExampleRecordWithDefaultFields.class)); - - return (TypeAdapter) - new TypeAdapter() { - - @Override - public void write(final JsonWriter out, final ExampleRecordWithDefaultFields value) - throws IOException { - final JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - elementAdapter.write(out, obj); - } - - @Override - public ExampleRecordWithDefaultFields read(final JsonReader in) throws IOException { - final JsonElement jsonElement = elementAdapter.read(in); - validateJsonElement(jsonElement); - return thisAdapter.fromJsonTree(jsonElement); - } - }.nullSafe(); - } - } -} diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index bf469689..5d4abbe6 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -43,29 +43,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/ExampleRecordWithDefaultFields.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/ExampleRecordWithDefaultFields.java deleted file mode 100644 index c9f18efb..00000000 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Example OpenAPI Spec. - * An example OpenAPI-spec to generate example Java records. - * - * The version of the OpenAPI document: 0.0.1 - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - * - * This class was generated using custom mustache templates from - * openapi-to-java-records-mustache-templates. For further information, - * questions, requesting features or reporting issues, please visit: - * https://github.com/Chrimle/openapi-to-java-records-mustache-templates. - * Generated with Version: 3.11.0 - * - */ - -package io.github.chrimle.o2jrm.enumUnknownDefaultCase; - -import java.util.Objects; -import com.google.gson.TypeAdapter; -import com.google.gson.annotations.JsonAdapter; -import com.google.gson.annotations.SerializedName; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; -import java.io.IOException; -import java.util.Arrays; - -import com.google.gson.Gson; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.TypeAdapterFactory; -import com.google.gson.reflect.TypeToken; -import java.util.HashSet; -import java.util.Set; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) { - - /** A set containing the names of all instance fields defined in this class. */ - public static final HashSet openapiFields = - new HashSet<>( - Set.of("field1")); - - /** A set containing the names of all required fields defined in this class. */ - public static final HashSet openapiRequiredFields = new HashSet<>(); - - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } - - /** - * Validates the JSON Element and throws an exception if issues are found. - * - * @param jsonElement to validate. - * @throws IOException if the JSON Element is not a valid {@link ExampleRecordWithDefaultFields } object. - */ - public static void validateJsonElement(final JsonElement jsonElement) throws IOException { - for (final String key : jsonElement.getAsJsonObject().keySet()) { - if (!ExampleRecordWithDefaultFields.openapiFields.contains(key)) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "The field `%s` in the JSON string is not defined in the `ExampleRecordWithDefaultFields` properties. JSON: %s", - key, - jsonElement)); - } - } - - final JsonObject jsonObj = jsonElement.getAsJsonObject(); - - if (jsonObj.get("field1") != null && !jsonObj.get("field1").isJsonNull()) { - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - } - } - - /** - * Creates {@link TypeAdapter}s for {@link ExampleRecordWithDefaultFields }s and other - * assignable types. - */ - public static class CustomTypeAdapterFactory implements TypeAdapterFactory { - - /** - * {@inheritDoc} - * - * @param gson to create the {@link TypeAdapter} from. - * @param type to serialize/deserialize. - * @return an (anonymous) instance of {@link TypeAdapter}, or - * {@code null} if {@code T} is not assignable to {@link ExampleRecordWithDefaultFields }. - * @param class to serialize/deserialize. - */ - @SuppressWarnings("unchecked") - @Override - public TypeAdapter create(final Gson gson, final TypeToken type) { - if (!ExampleRecordWithDefaultFields.class.isAssignableFrom(type.getRawType())) { - return null; - } - final TypeAdapter elementAdapter = gson.getAdapter(JsonElement.class); - final TypeAdapter thisAdapter = - gson.getDelegateAdapter(this, TypeToken.get(ExampleRecordWithDefaultFields.class)); - - return (TypeAdapter) - new TypeAdapter() { - - @Override - public void write(final JsonWriter out, final ExampleRecordWithDefaultFields value) - throws IOException { - final JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - elementAdapter.write(out, obj); - } - - @Override - public ExampleRecordWithDefaultFields read(final JsonReader in) throws IOException { - final JsonElement jsonElement = elementAdapter.read(in); - validateJsonElement(jsonElement); - return thisAdapter.fromJsonTree(jsonElement); - } - }.nullSafe(); - } - } -} diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java index fc2848a2..9143239d 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -43,29 +43,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/ExampleRecordWithDefaultFields.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/ExampleRecordWithDefaultFields.java deleted file mode 100644 index 4e5e3427..00000000 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,169 +0,0 @@ -/* - * Example OpenAPI Spec. - * An example OpenAPI-spec to generate example Java records. - * - * The version of the OpenAPI document: 0.0.1 - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - * - * This class was generated using custom mustache templates from - * openapi-to-java-records-mustache-templates. For further information, - * questions, requesting features or reporting issues, please visit: - * https://github.com/Chrimle/openapi-to-java-records-mustache-templates. - * Generated with Version: 3.11.0 - * - */ - -package io.github.chrimle.o2jrm.generateBuilders; - -import java.util.Objects; -import com.google.gson.TypeAdapter; -import com.google.gson.annotations.JsonAdapter; -import com.google.gson.annotations.SerializedName; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; -import java.io.IOException; -import java.util.Arrays; - -import com.google.gson.Gson; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.TypeAdapterFactory; -import com.google.gson.reflect.TypeToken; -import java.util.HashSet; -import java.util.Set; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) { - - /** A set containing the names of all instance fields defined in this class. */ - public static final HashSet openapiFields = - new HashSet<>( - Set.of("field1")); - - /** A set containing the names of all required fields defined in this class. */ - public static final HashSet openapiRequiredFields = new HashSet<>(); - - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } - - /** Builder class for {@link ExampleRecordWithDefaultFields }. */ - public static class Builder { - - private String field1; - - /** - * Sets the value of {@link ExampleRecordWithDefaultFields#field1 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field1 a String field with a default value. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field1(final String field1) { - this.field1 = field1; - return this; - } - - /** - * Builds a {@link ExampleRecordWithDefaultFields }-instance with the values provided in preceding - * builder methods. - * - *

NOTE: Pass-by-reference is used! - * - * @return a new {@link ExampleRecordWithDefaultFields }-instance. - */ - public ExampleRecordWithDefaultFields build() { - return new ExampleRecordWithDefaultFields( - field1); - } - } - - /** Creates a new {@link Builder}-instance. */ - public static ExampleRecordWithDefaultFields.Builder builder() { - return new ExampleRecordWithDefaultFields.Builder(); - } - - /** - * Validates the JSON Element and throws an exception if issues are found. - * - * @param jsonElement to validate. - * @throws IOException if the JSON Element is not a valid {@link ExampleRecordWithDefaultFields } object. - */ - public static void validateJsonElement(final JsonElement jsonElement) throws IOException { - for (final String key : jsonElement.getAsJsonObject().keySet()) { - if (!ExampleRecordWithDefaultFields.openapiFields.contains(key)) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "The field `%s` in the JSON string is not defined in the `ExampleRecordWithDefaultFields` properties. JSON: %s", - key, - jsonElement)); - } - } - - final JsonObject jsonObj = jsonElement.getAsJsonObject(); - - if (jsonObj.get("field1") != null && !jsonObj.get("field1").isJsonNull()) { - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - } - } - - /** - * Creates {@link TypeAdapter}s for {@link ExampleRecordWithDefaultFields }s and other - * assignable types. - */ - public static class CustomTypeAdapterFactory implements TypeAdapterFactory { - - /** - * {@inheritDoc} - * - * @param gson to create the {@link TypeAdapter} from. - * @param type to serialize/deserialize. - * @return an (anonymous) instance of {@link TypeAdapter}, or - * {@code null} if {@code T} is not assignable to {@link ExampleRecordWithDefaultFields }. - * @param class to serialize/deserialize. - */ - @SuppressWarnings("unchecked") - @Override - public TypeAdapter create(final Gson gson, final TypeToken type) { - if (!ExampleRecordWithDefaultFields.class.isAssignableFrom(type.getRawType())) { - return null; - } - final TypeAdapter elementAdapter = gson.getAdapter(JsonElement.class); - final TypeAdapter thisAdapter = - gson.getDelegateAdapter(this, TypeToken.get(ExampleRecordWithDefaultFields.class)); - - return (TypeAdapter) - new TypeAdapter() { - - @Override - public void write(final JsonWriter out, final ExampleRecordWithDefaultFields value) - throws IOException { - final JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - elementAdapter.write(out, obj); - } - - @Override - public ExampleRecordWithDefaultFields read(final JsonReader in) throws IOException { - final JsonElement jsonElement = elementAdapter.read(in); - validateJsonElement(jsonElement); - return thisAdapter.fromJsonTree(jsonElement); - } - }.nullSafe(); - } - } -} diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java index 97cc4ec1..c12fb5d9 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java @@ -43,29 +43,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, @@ -207,7 +207,7 @@ public static class Builder { * *

NOTE: Pass-by-reference is used! * - * @param stringStandard sets the value of stringStandard. + * @param stringStandard Non-required, non-nullable String field.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringStandard(final String stringStandard) { @@ -220,7 +220,7 @@ public Builder stringStandard(final String stringStandard) { * *

NOTE: Pass-by-reference is used! * - * @param stringDefault sets the value of stringDefault. + * @param stringDefault Non-required, non-nullable String field with a default value.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringDefault(final String stringDefault) { @@ -233,7 +233,7 @@ public Builder stringDefault(final String stringDefault) { * *

NOTE: Pass-by-reference is used! * - * @param stringNullable sets the value of stringNullable. + * @param stringNullable Non-required, nullable String field.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringNullable(final String stringNullable) { @@ -246,7 +246,7 @@ public Builder stringNullable(final String stringNullable) { * *

NOTE: Pass-by-reference is used! * - * @param stringRequired sets the value of stringRequired. + * @param stringRequired Required, non-nullable String field.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringRequired(final String stringRequired) { @@ -259,7 +259,7 @@ public Builder stringRequired(final String stringRequired) { * *

NOTE: Pass-by-reference is used! * - * @param stringRequiredNullable sets the value of stringRequiredNullable. + * @param stringRequiredNullable Required, nullable String field.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringRequiredNullable(final String stringRequiredNullable) { @@ -272,7 +272,7 @@ public Builder stringRequiredNullable(final String stringRequiredNullable) { * *

NOTE: Pass-by-reference is used! * - * @param stringRequiredPattern sets the value of stringRequiredPattern. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringRequiredPattern(final String stringRequiredPattern) { @@ -285,7 +285,7 @@ public Builder stringRequiredPattern(final String stringRequiredPattern) { * *

NOTE: Pass-by-reference is used! * - * @param stringEmailFormat sets the value of stringEmailFormat. + * @param stringEmailFormat Non-required, non-nullable String field with Email format.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringEmailFormat(final String stringEmailFormat) { @@ -298,7 +298,7 @@ public Builder stringEmailFormat(final String stringEmailFormat) { * *

NOTE: Pass-by-reference is used! * - * @param stringUuidFormat sets the value of stringUuidFormat. + * @param stringUuidFormat Non-required, non-nullable UUID field.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringUuidFormat(final UUID stringUuidFormat) { @@ -311,7 +311,7 @@ public Builder stringUuidFormat(final UUID stringUuidFormat) { * *

NOTE: Pass-by-reference is used! * - * @param stringMinLength sets the value of stringMinLength. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringMinLength(final String stringMinLength) { @@ -324,7 +324,7 @@ public Builder stringMinLength(final String stringMinLength) { * *

NOTE: Pass-by-reference is used! * - * @param stringMaxLength sets the value of stringMaxLength. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringMaxLength(final String stringMaxLength) { @@ -337,7 +337,7 @@ public Builder stringMaxLength(final String stringMaxLength) { * *

NOTE: Pass-by-reference is used! * - * @param stringMinAndMaxLength sets the value of stringMinAndMaxLength. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringMinAndMaxLength(final String stringMinAndMaxLength) { @@ -350,7 +350,7 @@ public Builder stringMinAndMaxLength(final String stringMinAndMaxLength) { * *

NOTE: Pass-by-reference is used! * - * @param arrayMinItems sets the value of arrayMinItems. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1.. * @return this {@link Builder}-instance for method-chaining. */ public Builder arrayMinItems(final List arrayMinItems) { @@ -363,7 +363,7 @@ public Builder arrayMinItems(final List arrayMinItems) { * *

NOTE: Pass-by-reference is used! * - * @param arrayMaxItems sets the value of arrayMaxItems. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10.. * @return this {@link Builder}-instance for method-chaining. */ public Builder arrayMaxItems(final List arrayMaxItems) { @@ -376,7 +376,7 @@ public Builder arrayMaxItems(final List arrayMaxItems) { * *

NOTE: Pass-by-reference is used! * - * @param arrayMinAndMaxItems sets the value of arrayMinAndMaxItems. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10.. * @return this {@link Builder}-instance for method-chaining. */ public Builder arrayMinAndMaxItems(final List arrayMinAndMaxItems) { @@ -389,7 +389,7 @@ public Builder arrayMinAndMaxItems(final List arrayMinAndMaxItems) { * *

NOTE: Pass-by-reference is used! * - * @param intMinimum sets the value of intMinimum. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18.. * @return this {@link Builder}-instance for method-chaining. */ public Builder intMinimum(final Integer intMinimum) { @@ -402,7 +402,7 @@ public Builder intMinimum(final Integer intMinimum) { * *

NOTE: Pass-by-reference is used! * - * @param intMaximum sets the value of intMaximum. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100.. * @return this {@link Builder}-instance for method-chaining. */ public Builder intMaximum(final Integer intMaximum) { @@ -415,7 +415,7 @@ public Builder intMaximum(final Integer intMaximum) { * *

NOTE: Pass-by-reference is used! * - * @param intMinimumAndMaximum sets the value of intMinimumAndMaximum. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100.. * @return this {@link Builder}-instance for method-chaining. */ public Builder intMinimumAndMaximum(final Integer intMinimumAndMaximum) { @@ -428,7 +428,7 @@ public Builder intMinimumAndMaximum(final Integer intMinimumAndMaximum) { * *

NOTE: Pass-by-reference is used! * - * @param longMinimum sets the value of longMinimum. + * @param longMinimum Non-required, non-nullable Long with minimum: 18.. * @return this {@link Builder}-instance for method-chaining. */ public Builder longMinimum(final Long longMinimum) { @@ -441,7 +441,7 @@ public Builder longMinimum(final Long longMinimum) { * *

NOTE: Pass-by-reference is used! * - * @param longMaximum sets the value of longMaximum. + * @param longMaximum Non-required, non-nullable Long with maximum: 100.. * @return this {@link Builder}-instance for method-chaining. */ public Builder longMaximum(final Long longMaximum) { @@ -454,7 +454,7 @@ public Builder longMaximum(final Long longMaximum) { * *

NOTE: Pass-by-reference is used! * - * @param longMinimumAndMaximum sets the value of longMinimumAndMaximum. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100.. * @return this {@link Builder}-instance for method-chaining. */ public Builder longMinimumAndMaximum(final Long longMinimumAndMaximum) { @@ -467,7 +467,7 @@ public Builder longMinimumAndMaximum(final Long longMinimumAndMaximum) { * *

NOTE: Pass-by-reference is used! * - * @param bigDecimalMinimum sets the value of bigDecimalMinimum. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0.. * @return this {@link Builder}-instance for method-chaining. */ public Builder bigDecimalMinimum(final BigDecimal bigDecimalMinimum) { @@ -480,7 +480,7 @@ public Builder bigDecimalMinimum(final BigDecimal bigDecimalMinimum) { * *

NOTE: Pass-by-reference is used! * - * @param bigDecimalMaximum sets the value of bigDecimalMaximum. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100.. * @return this {@link Builder}-instance for method-chaining. */ public Builder bigDecimalMaximum(final BigDecimal bigDecimalMaximum) { @@ -493,7 +493,7 @@ public Builder bigDecimalMaximum(final BigDecimal bigDecimalMaximum) { * *

NOTE: Pass-by-reference is used! * - * @param bigDecimalMinimumAndMaximum sets the value of bigDecimalMinimumAndMaximum. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100.. * @return this {@link Builder}-instance for method-chaining. */ public Builder bigDecimalMinimumAndMaximum(final BigDecimal bigDecimalMinimumAndMaximum) { diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/ExampleRecordWithDefaultFields.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/ExampleRecordWithDefaultFields.java deleted file mode 100644 index 3dc4b57c..00000000 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Example OpenAPI Spec. - * An example OpenAPI-spec to generate example Java records. - * - * The version of the OpenAPI document: 0.0.1 - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - * - * This class was generated using custom mustache templates from - * openapi-to-java-records-mustache-templates. For further information, - * questions, requesting features or reporting issues, please visit: - * https://github.com/Chrimle/openapi-to-java-records-mustache-templates. - * Generated with Version: 3.11.0 - * - */ - -package io.github.chrimle.o2jrm.serializableModel; - -import java.util.Objects; -import com.google.gson.TypeAdapter; -import com.google.gson.annotations.JsonAdapter; -import com.google.gson.annotations.SerializedName; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; -import java.io.IOException; -import java.util.Arrays; -import java.io.Serializable; - -import com.google.gson.Gson; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.TypeAdapterFactory; -import com.google.gson.reflect.TypeToken; -import java.util.HashSet; -import java.util.Set; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) - implements Serializable { - - /** A set containing the names of all instance fields defined in this class. */ - public static final HashSet openapiFields = - new HashSet<>( - Set.of("field1")); - - /** A set containing the names of all required fields defined in this class. */ - public static final HashSet openapiRequiredFields = new HashSet<>(); - - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } - - /** - * Validates the JSON Element and throws an exception if issues are found. - * - * @param jsonElement to validate. - * @throws IOException if the JSON Element is not a valid {@link ExampleRecordWithDefaultFields } object. - */ - public static void validateJsonElement(final JsonElement jsonElement) throws IOException { - for (final String key : jsonElement.getAsJsonObject().keySet()) { - if (!ExampleRecordWithDefaultFields.openapiFields.contains(key)) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "The field `%s` in the JSON string is not defined in the `ExampleRecordWithDefaultFields` properties. JSON: %s", - key, - jsonElement)); - } - } - - final JsonObject jsonObj = jsonElement.getAsJsonObject(); - - if (jsonObj.get("field1") != null && !jsonObj.get("field1").isJsonNull()) { - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - } - } - - /** - * Creates {@link TypeAdapter}s for {@link ExampleRecordWithDefaultFields }s and other - * assignable types. - */ - public static class CustomTypeAdapterFactory implements TypeAdapterFactory { - - /** - * {@inheritDoc} - * - * @param gson to create the {@link TypeAdapter} from. - * @param type to serialize/deserialize. - * @return an (anonymous) instance of {@link TypeAdapter}, or - * {@code null} if {@code T} is not assignable to {@link ExampleRecordWithDefaultFields }. - * @param class to serialize/deserialize. - */ - @SuppressWarnings("unchecked") - @Override - public TypeAdapter create(final Gson gson, final TypeToken type) { - if (!ExampleRecordWithDefaultFields.class.isAssignableFrom(type.getRawType())) { - return null; - } - final TypeAdapter elementAdapter = gson.getAdapter(JsonElement.class); - final TypeAdapter thisAdapter = - gson.getDelegateAdapter(this, TypeToken.get(ExampleRecordWithDefaultFields.class)); - - return (TypeAdapter) - new TypeAdapter() { - - @Override - public void write(final JsonWriter out, final ExampleRecordWithDefaultFields value) - throws IOException { - final JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - elementAdapter.write(out, obj); - } - - @Override - public ExampleRecordWithDefaultFields read(final JsonReader in) throws IOException { - final JsonElement jsonElement = elementAdapter.read(in); - validateJsonElement(jsonElement); - return thisAdapter.fromJsonTree(jsonElement); - } - }.nullSafe(); - } - } -} diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java index 5cf4d5b3..80f2ba6b 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java @@ -44,29 +44,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/ExampleRecordWithDefaultFields.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/ExampleRecordWithDefaultFields.java deleted file mode 100644 index 99276e09..00000000 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Example OpenAPI Spec. - * An example OpenAPI-spec to generate example Java records. - * - * The version of the OpenAPI document: 0.0.1 - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - * - * This class was generated using custom mustache templates from - * openapi-to-java-records-mustache-templates. For further information, - * questions, requesting features or reporting issues, please visit: - * https://github.com/Chrimle/openapi-to-java-records-mustache-templates. - * Generated with Version: 3.11.0 - * - */ - -package io.github.chrimle.o2jrm.standard; - -import java.util.Objects; -import com.google.gson.TypeAdapter; -import com.google.gson.annotations.JsonAdapter; -import com.google.gson.annotations.SerializedName; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; -import java.io.IOException; -import java.util.Arrays; - -import com.google.gson.Gson; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.TypeAdapterFactory; -import com.google.gson.reflect.TypeToken; -import java.util.HashSet; -import java.util.Set; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) { - - /** A set containing the names of all instance fields defined in this class. */ - public static final HashSet openapiFields = - new HashSet<>( - Set.of("field1")); - - /** A set containing the names of all required fields defined in this class. */ - public static final HashSet openapiRequiredFields = new HashSet<>(); - - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } - - /** - * Validates the JSON Element and throws an exception if issues are found. - * - * @param jsonElement to validate. - * @throws IOException if the JSON Element is not a valid {@link ExampleRecordWithDefaultFields } object. - */ - public static void validateJsonElement(final JsonElement jsonElement) throws IOException { - for (final String key : jsonElement.getAsJsonObject().keySet()) { - if (!ExampleRecordWithDefaultFields.openapiFields.contains(key)) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "The field `%s` in the JSON string is not defined in the `ExampleRecordWithDefaultFields` properties. JSON: %s", - key, - jsonElement)); - } - } - - final JsonObject jsonObj = jsonElement.getAsJsonObject(); - - if (jsonObj.get("field1") != null && !jsonObj.get("field1").isJsonNull()) { - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - } - } - - /** - * Creates {@link TypeAdapter}s for {@link ExampleRecordWithDefaultFields }s and other - * assignable types. - */ - public static class CustomTypeAdapterFactory implements TypeAdapterFactory { - - /** - * {@inheritDoc} - * - * @param gson to create the {@link TypeAdapter} from. - * @param type to serialize/deserialize. - * @return an (anonymous) instance of {@link TypeAdapter}, or - * {@code null} if {@code T} is not assignable to {@link ExampleRecordWithDefaultFields }. - * @param class to serialize/deserialize. - */ - @SuppressWarnings("unchecked") - @Override - public TypeAdapter create(final Gson gson, final TypeToken type) { - if (!ExampleRecordWithDefaultFields.class.isAssignableFrom(type.getRawType())) { - return null; - } - final TypeAdapter elementAdapter = gson.getAdapter(JsonElement.class); - final TypeAdapter thisAdapter = - gson.getDelegateAdapter(this, TypeToken.get(ExampleRecordWithDefaultFields.class)); - - return (TypeAdapter) - new TypeAdapter() { - - @Override - public void write(final JsonWriter out, final ExampleRecordWithDefaultFields value) - throws IOException { - final JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - elementAdapter.write(out, obj); - } - - @Override - public ExampleRecordWithDefaultFields read(final JsonReader in) throws IOException { - final JsonElement jsonElement = elementAdapter.read(in); - validateJsonElement(jsonElement); - return thisAdapter.fromJsonTree(jsonElement); - } - }.nullSafe(); - } - } -} diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java index bc939307..050693a8 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java @@ -43,29 +43,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/ExampleRecordWithDefaultFields.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/ExampleRecordWithDefaultFields.java deleted file mode 100644 index 050d9c82..00000000 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Example OpenAPI Spec. - * An example OpenAPI-spec to generate example Java records. - * - * The version of the OpenAPI document: 0.0.1 - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - * - * This class was generated using custom mustache templates from - * openapi-to-java-records-mustache-templates. For further information, - * questions, requesting features or reporting issues, please visit: - * https://github.com/Chrimle/openapi-to-java-records-mustache-templates. - * Generated with Version: 3.11.0 - * - */ - -package io.github.chrimle.o2jrm.useBeanValidation; - -import java.util.Objects; -import com.google.gson.TypeAdapter; -import com.google.gson.annotations.JsonAdapter; -import com.google.gson.annotations.SerializedName; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; -import java.io.IOException; -import java.util.Arrays; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; - -import com.google.gson.Gson; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.TypeAdapterFactory; -import com.google.gson.reflect.TypeToken; -import java.util.HashSet; -import java.util.Set; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) { - - /** A set containing the names of all instance fields defined in this class. */ - public static final HashSet openapiFields = - new HashSet<>( - Set.of("field1")); - - /** A set containing the names of all required fields defined in this class. */ - public static final HashSet openapiRequiredFields = new HashSet<>(); - - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } - - /** - * Validates the JSON Element and throws an exception if issues are found. - * - * @param jsonElement to validate. - * @throws IOException if the JSON Element is not a valid {@link ExampleRecordWithDefaultFields } object. - */ - public static void validateJsonElement(final JsonElement jsonElement) throws IOException { - for (final String key : jsonElement.getAsJsonObject().keySet()) { - if (!ExampleRecordWithDefaultFields.openapiFields.contains(key)) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "The field `%s` in the JSON string is not defined in the `ExampleRecordWithDefaultFields` properties. JSON: %s", - key, - jsonElement)); - } - } - - final JsonObject jsonObj = jsonElement.getAsJsonObject(); - - if (jsonObj.get("field1") != null && !jsonObj.get("field1").isJsonNull()) { - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - } - } - - /** - * Creates {@link TypeAdapter}s for {@link ExampleRecordWithDefaultFields }s and other - * assignable types. - */ - public static class CustomTypeAdapterFactory implements TypeAdapterFactory { - - /** - * {@inheritDoc} - * - * @param gson to create the {@link TypeAdapter} from. - * @param type to serialize/deserialize. - * @return an (anonymous) instance of {@link TypeAdapter}, or - * {@code null} if {@code T} is not assignable to {@link ExampleRecordWithDefaultFields }. - * @param class to serialize/deserialize. - */ - @SuppressWarnings("unchecked") - @Override - public TypeAdapter create(final Gson gson, final TypeToken type) { - if (!ExampleRecordWithDefaultFields.class.isAssignableFrom(type.getRawType())) { - return null; - } - final TypeAdapter elementAdapter = gson.getAdapter(JsonElement.class); - final TypeAdapter thisAdapter = - gson.getDelegateAdapter(this, TypeToken.get(ExampleRecordWithDefaultFields.class)); - - return (TypeAdapter) - new TypeAdapter() { - - @Override - public void write(final JsonWriter out, final ExampleRecordWithDefaultFields value) - throws IOException { - final JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - elementAdapter.write(out, obj); - } - - @Override - public ExampleRecordWithDefaultFields read(final JsonReader in) throws IOException { - final JsonElement jsonElement = elementAdapter.read(in); - validateJsonElement(jsonElement); - return thisAdapter.fromJsonTree(jsonElement); - } - }.nullSafe(); - } - } -} diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java index 4e2e6e16..45b24751 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java @@ -45,29 +45,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/ExampleRecordWithDefaultFields.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/ExampleRecordWithDefaultFields.java deleted file mode 100644 index bcd3744c..00000000 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Example OpenAPI Spec. - * An example OpenAPI-spec to generate example Java records. - * - * The version of the OpenAPI document: 0.0.1 - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - * - * This class was generated using custom mustache templates from - * openapi-to-java-records-mustache-templates. For further information, - * questions, requesting features or reporting issues, please visit: - * https://github.com/Chrimle/openapi-to-java-records-mustache-templates. - * Generated with Version: 3.11.0 - * - */ - -package io.github.chrimle.o2jrm.useEnumCaseInsensitive; - -import java.util.Objects; -import com.google.gson.TypeAdapter; -import com.google.gson.annotations.JsonAdapter; -import com.google.gson.annotations.SerializedName; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; -import java.io.IOException; -import java.util.Arrays; - -import com.google.gson.Gson; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.TypeAdapterFactory; -import com.google.gson.reflect.TypeToken; -import java.util.HashSet; -import java.util.Set; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) { - - /** A set containing the names of all instance fields defined in this class. */ - public static final HashSet openapiFields = - new HashSet<>( - Set.of("field1")); - - /** A set containing the names of all required fields defined in this class. */ - public static final HashSet openapiRequiredFields = new HashSet<>(); - - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } - - /** - * Validates the JSON Element and throws an exception if issues are found. - * - * @param jsonElement to validate. - * @throws IOException if the JSON Element is not a valid {@link ExampleRecordWithDefaultFields } object. - */ - public static void validateJsonElement(final JsonElement jsonElement) throws IOException { - for (final String key : jsonElement.getAsJsonObject().keySet()) { - if (!ExampleRecordWithDefaultFields.openapiFields.contains(key)) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "The field `%s` in the JSON string is not defined in the `ExampleRecordWithDefaultFields` properties. JSON: %s", - key, - jsonElement)); - } - } - - final JsonObject jsonObj = jsonElement.getAsJsonObject(); - - if (jsonObj.get("field1") != null && !jsonObj.get("field1").isJsonNull()) { - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - } - } - - /** - * Creates {@link TypeAdapter}s for {@link ExampleRecordWithDefaultFields }s and other - * assignable types. - */ - public static class CustomTypeAdapterFactory implements TypeAdapterFactory { - - /** - * {@inheritDoc} - * - * @param gson to create the {@link TypeAdapter} from. - * @param type to serialize/deserialize. - * @return an (anonymous) instance of {@link TypeAdapter}, or - * {@code null} if {@code T} is not assignable to {@link ExampleRecordWithDefaultFields }. - * @param class to serialize/deserialize. - */ - @SuppressWarnings("unchecked") - @Override - public TypeAdapter create(final Gson gson, final TypeToken type) { - if (!ExampleRecordWithDefaultFields.class.isAssignableFrom(type.getRawType())) { - return null; - } - final TypeAdapter elementAdapter = gson.getAdapter(JsonElement.class); - final TypeAdapter thisAdapter = - gson.getDelegateAdapter(this, TypeToken.get(ExampleRecordWithDefaultFields.class)); - - return (TypeAdapter) - new TypeAdapter() { - - @Override - public void write(final JsonWriter out, final ExampleRecordWithDefaultFields value) - throws IOException { - final JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - elementAdapter.write(out, obj); - } - - @Override - public ExampleRecordWithDefaultFields read(final JsonReader in) throws IOException { - final JsonElement jsonElement = elementAdapter.read(in); - validateJsonElement(jsonElement); - return thisAdapter.fromJsonTree(jsonElement); - } - }.nullSafe(); - } - } -} diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java index 5eb974da..3986138e 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -43,29 +43,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/ExampleRecordWithDefaultFields.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/ExampleRecordWithDefaultFields.java deleted file mode 100644 index 8c594384..00000000 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Example OpenAPI Spec. - * An example OpenAPI-spec to generate example Java records. - * - * The version of the OpenAPI document: 0.0.1 - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - * - * This class was generated using custom mustache templates from - * openapi-to-java-records-mustache-templates. For further information, - * questions, requesting features or reporting issues, please visit: - * https://github.com/Chrimle/openapi-to-java-records-mustache-templates. - * Generated with Version: 3.11.0 - * - */ - -package io.github.chrimle.o2jrm.webclient.additionalEnumTypeAnnotations; - -import java.util.Objects; -import java.util.Arrays; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) { - - @JsonCreator - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } -} diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index ff1bc370..3609e585 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -40,29 +40,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/ExampleRecordWithDefaultFields.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/ExampleRecordWithDefaultFields.java deleted file mode 100644 index 79bc3c8d..00000000 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Example OpenAPI Spec. - * An example OpenAPI-spec to generate example Java records. - * - * The version of the OpenAPI document: 0.0.1 - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - * - * This class was generated using custom mustache templates from - * openapi-to-java-records-mustache-templates. For further information, - * questions, requesting features or reporting issues, please visit: - * https://github.com/Chrimle/openapi-to-java-records-mustache-templates. - * Generated with Version: 3.11.0 - * - */ - -package io.github.chrimle.o2jrm.webclient.additionalModelTypeAnnotations; - -import java.util.Objects; -import java.util.Arrays; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -@io.github.chrimle.o2jrm.test.annotations.TestAnnotationOne -@io.github.chrimle.o2jrm.test.annotations.TestAnnotationTwo -@io.github.chrimle.o2jrm.test.annotations.TestAnnotationThree -public record ExampleRecordWithDefaultFields(String field1) { - - @JsonCreator - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } -} diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java index 92ef9749..ed28ff69 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -40,29 +40,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ @io.github.chrimle.o2jrm.test.annotations.TestAnnotationOne @io.github.chrimle.o2jrm.test.annotations.TestAnnotationTwo diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/ExampleRecordWithDefaultFields.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/ExampleRecordWithDefaultFields.java deleted file mode 100644 index 2f80567b..00000000 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Example OpenAPI Spec. - * An example OpenAPI-spec to generate example Java records. - * - * The version of the OpenAPI document: 0.0.1 - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - * - * This class was generated using custom mustache templates from - * openapi-to-java-records-mustache-templates. For further information, - * questions, requesting features or reporting issues, please visit: - * https://github.com/Chrimle/openapi-to-java-records-mustache-templates. - * Generated with Version: 3.11.0 - * - */ - -package io.github.chrimle.o2jrm.webclient.enumDefaultCaseAndCaseInsensitive; - -import java.util.Objects; -import java.util.Arrays; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) { - - @JsonCreator - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } -} diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index 9014aa8c..fbcad6b7 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -40,29 +40,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/ExampleRecordWithDefaultFields.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/ExampleRecordWithDefaultFields.java deleted file mode 100644 index 896ac886..00000000 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Example OpenAPI Spec. - * An example OpenAPI-spec to generate example Java records. - * - * The version of the OpenAPI document: 0.0.1 - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - * - * This class was generated using custom mustache templates from - * openapi-to-java-records-mustache-templates. For further information, - * questions, requesting features or reporting issues, please visit: - * https://github.com/Chrimle/openapi-to-java-records-mustache-templates. - * Generated with Version: 3.11.0 - * - */ - -package io.github.chrimle.o2jrm.webclient.enumUnknownDefaultCase; - -import java.util.Objects; -import java.util.Arrays; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) { - - @JsonCreator - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } -} diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java index 8849c1a4..3cb6750b 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -40,29 +40,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/ExampleRecordWithDefaultFields.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/ExampleRecordWithDefaultFields.java deleted file mode 100644 index d2912304..00000000 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Example OpenAPI Spec. - * An example OpenAPI-spec to generate example Java records. - * - * The version of the OpenAPI document: 0.0.1 - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - * - * This class was generated using custom mustache templates from - * openapi-to-java-records-mustache-templates. For further information, - * questions, requesting features or reporting issues, please visit: - * https://github.com/Chrimle/openapi-to-java-records-mustache-templates. - * Generated with Version: 3.11.0 - * - */ - -package io.github.chrimle.o2jrm.webclient.generateBuilders; - -import java.util.Objects; -import java.util.Arrays; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) { - - @JsonCreator - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } - - /** Builder class for {@link ExampleRecordWithDefaultFields }. */ - public static class Builder { - - private String field1; - - /** - * Sets the value of {@link ExampleRecordWithDefaultFields#field1 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field1 a String field with a default value. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field1(final String field1) { - this.field1 = field1; - return this; - } - - /** - * Builds a {@link ExampleRecordWithDefaultFields }-instance with the values provided in preceding - * builder methods. - * - *

NOTE: Pass-by-reference is used! - * - * @return a new {@link ExampleRecordWithDefaultFields }-instance. - */ - public ExampleRecordWithDefaultFields build() { - return new ExampleRecordWithDefaultFields( - field1); - } - } - - /** Creates a new {@link Builder}-instance. */ - public static ExampleRecordWithDefaultFields.Builder builder() { - return new ExampleRecordWithDefaultFields.Builder(); - } -} diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java index 0bae3409..9cf3d0ac 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java @@ -40,29 +40,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, @@ -171,7 +171,7 @@ public static class Builder { * *

NOTE: Pass-by-reference is used! * - * @param stringStandard sets the value of stringStandard. + * @param stringStandard Non-required, non-nullable String field.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringStandard(final String stringStandard) { @@ -184,7 +184,7 @@ public Builder stringStandard(final String stringStandard) { * *

NOTE: Pass-by-reference is used! * - * @param stringDefault sets the value of stringDefault. + * @param stringDefault Non-required, non-nullable String field with a default value.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringDefault(final String stringDefault) { @@ -197,7 +197,7 @@ public Builder stringDefault(final String stringDefault) { * *

NOTE: Pass-by-reference is used! * - * @param stringNullable sets the value of stringNullable. + * @param stringNullable Non-required, nullable String field.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringNullable(final String stringNullable) { @@ -210,7 +210,7 @@ public Builder stringNullable(final String stringNullable) { * *

NOTE: Pass-by-reference is used! * - * @param stringRequired sets the value of stringRequired. + * @param stringRequired Required, non-nullable String field.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringRequired(final String stringRequired) { @@ -223,7 +223,7 @@ public Builder stringRequired(final String stringRequired) { * *

NOTE: Pass-by-reference is used! * - * @param stringRequiredNullable sets the value of stringRequiredNullable. + * @param stringRequiredNullable Required, nullable String field.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringRequiredNullable(final String stringRequiredNullable) { @@ -236,7 +236,7 @@ public Builder stringRequiredNullable(final String stringRequiredNullable) { * *

NOTE: Pass-by-reference is used! * - * @param stringRequiredPattern sets the value of stringRequiredPattern. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringRequiredPattern(final String stringRequiredPattern) { @@ -249,7 +249,7 @@ public Builder stringRequiredPattern(final String stringRequiredPattern) { * *

NOTE: Pass-by-reference is used! * - * @param stringEmailFormat sets the value of stringEmailFormat. + * @param stringEmailFormat Non-required, non-nullable String field with Email format.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringEmailFormat(final String stringEmailFormat) { @@ -262,7 +262,7 @@ public Builder stringEmailFormat(final String stringEmailFormat) { * *

NOTE: Pass-by-reference is used! * - * @param stringUuidFormat sets the value of stringUuidFormat. + * @param stringUuidFormat Non-required, non-nullable UUID field.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringUuidFormat(final UUID stringUuidFormat) { @@ -275,7 +275,7 @@ public Builder stringUuidFormat(final UUID stringUuidFormat) { * *

NOTE: Pass-by-reference is used! * - * @param stringMinLength sets the value of stringMinLength. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringMinLength(final String stringMinLength) { @@ -288,7 +288,7 @@ public Builder stringMinLength(final String stringMinLength) { * *

NOTE: Pass-by-reference is used! * - * @param stringMaxLength sets the value of stringMaxLength. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringMaxLength(final String stringMaxLength) { @@ -301,7 +301,7 @@ public Builder stringMaxLength(final String stringMaxLength) { * *

NOTE: Pass-by-reference is used! * - * @param stringMinAndMaxLength sets the value of stringMinAndMaxLength. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringMinAndMaxLength(final String stringMinAndMaxLength) { @@ -314,7 +314,7 @@ public Builder stringMinAndMaxLength(final String stringMinAndMaxLength) { * *

NOTE: Pass-by-reference is used! * - * @param arrayMinItems sets the value of arrayMinItems. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1.. * @return this {@link Builder}-instance for method-chaining. */ public Builder arrayMinItems(final List arrayMinItems) { @@ -327,7 +327,7 @@ public Builder arrayMinItems(final List arrayMinItems) { * *

NOTE: Pass-by-reference is used! * - * @param arrayMaxItems sets the value of arrayMaxItems. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10.. * @return this {@link Builder}-instance for method-chaining. */ public Builder arrayMaxItems(final List arrayMaxItems) { @@ -340,7 +340,7 @@ public Builder arrayMaxItems(final List arrayMaxItems) { * *

NOTE: Pass-by-reference is used! * - * @param arrayMinAndMaxItems sets the value of arrayMinAndMaxItems. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10.. * @return this {@link Builder}-instance for method-chaining. */ public Builder arrayMinAndMaxItems(final List arrayMinAndMaxItems) { @@ -353,7 +353,7 @@ public Builder arrayMinAndMaxItems(final List arrayMinAndMaxItems) { * *

NOTE: Pass-by-reference is used! * - * @param intMinimum sets the value of intMinimum. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18.. * @return this {@link Builder}-instance for method-chaining. */ public Builder intMinimum(final Integer intMinimum) { @@ -366,7 +366,7 @@ public Builder intMinimum(final Integer intMinimum) { * *

NOTE: Pass-by-reference is used! * - * @param intMaximum sets the value of intMaximum. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100.. * @return this {@link Builder}-instance for method-chaining. */ public Builder intMaximum(final Integer intMaximum) { @@ -379,7 +379,7 @@ public Builder intMaximum(final Integer intMaximum) { * *

NOTE: Pass-by-reference is used! * - * @param intMinimumAndMaximum sets the value of intMinimumAndMaximum. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100.. * @return this {@link Builder}-instance for method-chaining. */ public Builder intMinimumAndMaximum(final Integer intMinimumAndMaximum) { @@ -392,7 +392,7 @@ public Builder intMinimumAndMaximum(final Integer intMinimumAndMaximum) { * *

NOTE: Pass-by-reference is used! * - * @param longMinimum sets the value of longMinimum. + * @param longMinimum Non-required, non-nullable Long with minimum: 18.. * @return this {@link Builder}-instance for method-chaining. */ public Builder longMinimum(final Long longMinimum) { @@ -405,7 +405,7 @@ public Builder longMinimum(final Long longMinimum) { * *

NOTE: Pass-by-reference is used! * - * @param longMaximum sets the value of longMaximum. + * @param longMaximum Non-required, non-nullable Long with maximum: 100.. * @return this {@link Builder}-instance for method-chaining. */ public Builder longMaximum(final Long longMaximum) { @@ -418,7 +418,7 @@ public Builder longMaximum(final Long longMaximum) { * *

NOTE: Pass-by-reference is used! * - * @param longMinimumAndMaximum sets the value of longMinimumAndMaximum. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100.. * @return this {@link Builder}-instance for method-chaining. */ public Builder longMinimumAndMaximum(final Long longMinimumAndMaximum) { @@ -431,7 +431,7 @@ public Builder longMinimumAndMaximum(final Long longMinimumAndMaximum) { * *

NOTE: Pass-by-reference is used! * - * @param bigDecimalMinimum sets the value of bigDecimalMinimum. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0.. * @return this {@link Builder}-instance for method-chaining. */ public Builder bigDecimalMinimum(final BigDecimal bigDecimalMinimum) { @@ -444,7 +444,7 @@ public Builder bigDecimalMinimum(final BigDecimal bigDecimalMinimum) { * *

NOTE: Pass-by-reference is used! * - * @param bigDecimalMaximum sets the value of bigDecimalMaximum. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100.. * @return this {@link Builder}-instance for method-chaining. */ public Builder bigDecimalMaximum(final BigDecimal bigDecimalMaximum) { @@ -457,7 +457,7 @@ public Builder bigDecimalMaximum(final BigDecimal bigDecimalMaximum) { * *

NOTE: Pass-by-reference is used! * - * @param bigDecimalMinimumAndMaximum sets the value of bigDecimalMinimumAndMaximum. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100.. * @return this {@link Builder}-instance for method-chaining. */ public Builder bigDecimalMinimumAndMaximum(final BigDecimal bigDecimalMinimumAndMaximum) { diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/ExampleRecordWithDefaultFields.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/ExampleRecordWithDefaultFields.java deleted file mode 100644 index 67502915..00000000 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Example OpenAPI Spec. - * An example OpenAPI-spec to generate example Java records. - * - * The version of the OpenAPI document: 0.0.1 - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - * - * This class was generated using custom mustache templates from - * openapi-to-java-records-mustache-templates. For further information, - * questions, requesting features or reporting issues, please visit: - * https://github.com/Chrimle/openapi-to-java-records-mustache-templates. - * Generated with Version: 3.11.0 - * - */ - -package io.github.chrimle.o2jrm.webclient.serializableModel; - -import java.util.Objects; -import java.util.Arrays; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import java.io.Serializable; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) - implements Serializable { - - @JsonCreator - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } -} diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java index 249a66b7..ec90cfe7 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java @@ -41,29 +41,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/ExampleRecordWithDefaultFields.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/ExampleRecordWithDefaultFields.java deleted file mode 100644 index 2cfb3e2a..00000000 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Example OpenAPI Spec. - * An example OpenAPI-spec to generate example Java records. - * - * The version of the OpenAPI document: 0.0.1 - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - * - * This class was generated using custom mustache templates from - * openapi-to-java-records-mustache-templates. For further information, - * questions, requesting features or reporting issues, please visit: - * https://github.com/Chrimle/openapi-to-java-records-mustache-templates. - * Generated with Version: 3.11.0 - * - */ - -package io.github.chrimle.o2jrm.webclient.standard; - -import java.util.Objects; -import java.util.Arrays; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) { - - @JsonCreator - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } -} diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java index 6968efb1..a1fe435d 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java @@ -40,29 +40,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/ExampleRecordWithDefaultFields.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/ExampleRecordWithDefaultFields.java deleted file mode 100644 index 1a52d1d0..00000000 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Example OpenAPI Spec. - * An example OpenAPI-spec to generate example Java records. - * - * The version of the OpenAPI document: 0.0.1 - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - * - * This class was generated using custom mustache templates from - * openapi-to-java-records-mustache-templates. For further information, - * questions, requesting features or reporting issues, please visit: - * https://github.com/Chrimle/openapi-to-java-records-mustache-templates. - * Generated with Version: 3.11.0 - * - */ - -package io.github.chrimle.o2jrm.webclient.useBeanValidation; - -import java.util.Objects; -import java.util.Arrays; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) { - - @JsonCreator - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } -} diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java index 71f31842..d1fbd280 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java @@ -42,29 +42,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/ExampleRecordWithDefaultFields.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/ExampleRecordWithDefaultFields.java deleted file mode 100644 index 3ec2d6e7..00000000 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Example OpenAPI Spec. - * An example OpenAPI-spec to generate example Java records. - * - * The version of the OpenAPI document: 0.0.1 - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - * - * This class was generated using custom mustache templates from - * openapi-to-java-records-mustache-templates. For further information, - * questions, requesting features or reporting issues, please visit: - * https://github.com/Chrimle/openapi-to-java-records-mustache-templates. - * Generated with Version: 3.11.0 - * - */ - -package io.github.chrimle.o2jrm.webclient.useEnumCaseInsensitive; - -import java.util.Objects; -import java.util.Arrays; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) { - - @JsonCreator - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } -} diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java index 6d59544b..d37d4b15 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -40,29 +40,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, diff --git a/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java b/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java index 328a1f6e..76dc8306 100644 --- a/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java +++ b/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java @@ -52,12 +52,6 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { List.of(), List.of(), GeneratedField.of("field1", Boolean.class).build()), - EXAMPLE_RECORD_WITH_DEFAULT_FIELDS( - "ExampleRecordWithDefaultFields", - false, - List.of(), - List.of(), - GeneratedField.of("field1", String.class).defaultValue("someDefaultValue").build()), EXAMPLE_RECORD_WITH_EXTRA_FIELD_ANNOTATIONS( "ExampleRecordWithExtraFieldAnnotations", false, diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/ExampleRecordWithDefaultFields.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/ExampleRecordWithDefaultFields.java deleted file mode 100644 index e30eae45..00000000 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Example OpenAPI Spec. - * An example OpenAPI-spec to generate example Java records. - * - * The version of the OpenAPI document: 0.0.1 - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - * - * This class was generated using custom mustache templates from - * openapi-to-java-records-mustache-templates. For further information, - * questions, requesting features or reporting issues, please visit: - * https://github.com/Chrimle/openapi-to-java-records-mustache-templates. - * Generated with Version: 3.11.0 - * - */ - -package io.github.chrimle.o2jrm.additionalEnumTypeAnnotations; - -import java.util.Objects; -import com.google.gson.TypeAdapter; -import com.google.gson.annotations.JsonAdapter; -import com.google.gson.annotations.SerializedName; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; -import java.io.IOException; -import java.util.Arrays; - -import com.google.gson.Gson; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.TypeAdapterFactory; -import com.google.gson.reflect.TypeToken; -import java.util.HashSet; -import java.util.Set; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) { - - /** A set containing the names of all instance fields defined in this class. */ - public static final HashSet openapiFields = - new HashSet<>( - Set.of("field1")); - - /** A set containing the names of all required fields defined in this class. */ - public static final HashSet openapiRequiredFields = new HashSet<>(); - - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } - - /** - * Validates the JSON Element and throws an exception if issues are found. - * - * @param jsonElement to validate. - * @throws IOException if the JSON Element is not a valid {@link ExampleRecordWithDefaultFields } object. - */ - public static void validateJsonElement(final JsonElement jsonElement) throws IOException { - for (final String key : jsonElement.getAsJsonObject().keySet()) { - if (!ExampleRecordWithDefaultFields.openapiFields.contains(key)) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "The field `%s` in the JSON string is not defined in the `ExampleRecordWithDefaultFields` properties. JSON: %s", - key, - jsonElement)); - } - } - - final JsonObject jsonObj = jsonElement.getAsJsonObject(); - - if (jsonObj.get("field1") != null && !jsonObj.get("field1").isJsonNull()) { - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - } - } - - /** - * Creates {@link TypeAdapter}s for {@link ExampleRecordWithDefaultFields }s and other - * assignable types. - */ - public static class CustomTypeAdapterFactory implements TypeAdapterFactory { - - /** - * {@inheritDoc} - * - * @param gson to create the {@link TypeAdapter} from. - * @param type to serialize/deserialize. - * @return an (anonymous) instance of {@link TypeAdapter}, or - * {@code null} if {@code T} is not assignable to {@link ExampleRecordWithDefaultFields }. - * @param class to serialize/deserialize. - */ - @SuppressWarnings("unchecked") - @Override - public TypeAdapter create(final Gson gson, final TypeToken type) { - if (!ExampleRecordWithDefaultFields.class.isAssignableFrom(type.getRawType())) { - return null; - } - final TypeAdapter elementAdapter = gson.getAdapter(JsonElement.class); - final TypeAdapter thisAdapter = - gson.getDelegateAdapter(this, TypeToken.get(ExampleRecordWithDefaultFields.class)); - - return (TypeAdapter) - new TypeAdapter() { - - @Override - public void write(final JsonWriter out, final ExampleRecordWithDefaultFields value) - throws IOException { - final JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - elementAdapter.write(out, obj); - } - - @Override - public ExampleRecordWithDefaultFields read(final JsonReader in) throws IOException { - final JsonElement jsonElement = elementAdapter.read(in); - validateJsonElement(jsonElement); - return thisAdapter.fromJsonTree(jsonElement); - } - }.nullSafe(); - } - } -} diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index ebe8a707..7bd36d30 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -43,29 +43,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/ExampleRecordWithDefaultFields.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/ExampleRecordWithDefaultFields.java deleted file mode 100644 index 1f9491c6..00000000 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,135 +0,0 @@ -/* - * Example OpenAPI Spec. - * An example OpenAPI-spec to generate example Java records. - * - * The version of the OpenAPI document: 0.0.1 - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - * - * This class was generated using custom mustache templates from - * openapi-to-java-records-mustache-templates. For further information, - * questions, requesting features or reporting issues, please visit: - * https://github.com/Chrimle/openapi-to-java-records-mustache-templates. - * Generated with Version: 3.11.0 - * - */ - -package io.github.chrimle.o2jrm.additionalModelTypeAnnotations; - -import java.util.Objects; -import com.google.gson.TypeAdapter; -import com.google.gson.annotations.JsonAdapter; -import com.google.gson.annotations.SerializedName; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; -import java.io.IOException; -import java.util.Arrays; - -import com.google.gson.Gson; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.TypeAdapterFactory; -import com.google.gson.reflect.TypeToken; -import java.util.HashSet; -import java.util.Set; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -@io.github.chrimle.o2jrm.test.annotations.TestAnnotationOne -@io.github.chrimle.o2jrm.test.annotations.TestAnnotationTwo -@io.github.chrimle.o2jrm.test.annotations.TestAnnotationThree -public record ExampleRecordWithDefaultFields(String field1) { - - /** A set containing the names of all instance fields defined in this class. */ - public static final HashSet openapiFields = - new HashSet<>( - Set.of("field1")); - - /** A set containing the names of all required fields defined in this class. */ - public static final HashSet openapiRequiredFields = new HashSet<>(); - - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } - - /** - * Validates the JSON Element and throws an exception if issues are found. - * - * @param jsonElement to validate. - * @throws IOException if the JSON Element is not a valid {@link ExampleRecordWithDefaultFields } object. - */ - public static void validateJsonElement(final JsonElement jsonElement) throws IOException { - for (final String key : jsonElement.getAsJsonObject().keySet()) { - if (!ExampleRecordWithDefaultFields.openapiFields.contains(key)) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "The field `%s` in the JSON string is not defined in the `ExampleRecordWithDefaultFields` properties. JSON: %s", - key, - jsonElement)); - } - } - - final JsonObject jsonObj = jsonElement.getAsJsonObject(); - - if (jsonObj.get("field1") != null && !jsonObj.get("field1").isJsonNull()) { - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - } - } - - /** - * Creates {@link TypeAdapter}s for {@link ExampleRecordWithDefaultFields }s and other - * assignable types. - */ - public static class CustomTypeAdapterFactory implements TypeAdapterFactory { - - /** - * {@inheritDoc} - * - * @param gson to create the {@link TypeAdapter} from. - * @param type to serialize/deserialize. - * @return an (anonymous) instance of {@link TypeAdapter}, or - * {@code null} if {@code T} is not assignable to {@link ExampleRecordWithDefaultFields }. - * @param class to serialize/deserialize. - */ - @SuppressWarnings("unchecked") - @Override - public TypeAdapter create(final Gson gson, final TypeToken type) { - if (!ExampleRecordWithDefaultFields.class.isAssignableFrom(type.getRawType())) { - return null; - } - final TypeAdapter elementAdapter = gson.getAdapter(JsonElement.class); - final TypeAdapter thisAdapter = - gson.getDelegateAdapter(this, TypeToken.get(ExampleRecordWithDefaultFields.class)); - - return (TypeAdapter) - new TypeAdapter() { - - @Override - public void write(final JsonWriter out, final ExampleRecordWithDefaultFields value) - throws IOException { - final JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - elementAdapter.write(out, obj); - } - - @Override - public ExampleRecordWithDefaultFields read(final JsonReader in) throws IOException { - final JsonElement jsonElement = elementAdapter.read(in); - validateJsonElement(jsonElement); - return thisAdapter.fromJsonTree(jsonElement); - } - }.nullSafe(); - } - } -} diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java index eda3696b..bfeac5d0 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -43,29 +43,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ @io.github.chrimle.o2jrm.test.annotations.TestAnnotationOne @io.github.chrimle.o2jrm.test.annotations.TestAnnotationTwo diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/ExampleRecordWithDefaultFields.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/ExampleRecordWithDefaultFields.java deleted file mode 100644 index 3c6ba87e..00000000 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Example OpenAPI Spec. - * An example OpenAPI-spec to generate example Java records. - * - * The version of the OpenAPI document: 0.0.1 - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - * - * This class was generated using custom mustache templates from - * openapi-to-java-records-mustache-templates. For further information, - * questions, requesting features or reporting issues, please visit: - * https://github.com/Chrimle/openapi-to-java-records-mustache-templates. - * Generated with Version: 3.11.0 - * - */ - -package io.github.chrimle.o2jrm.enumDefaultCaseAndCaseInsensitive; - -import java.util.Objects; -import com.google.gson.TypeAdapter; -import com.google.gson.annotations.JsonAdapter; -import com.google.gson.annotations.SerializedName; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; -import java.io.IOException; -import java.util.Arrays; - -import com.google.gson.Gson; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.TypeAdapterFactory; -import com.google.gson.reflect.TypeToken; -import java.util.HashSet; -import java.util.Set; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) { - - /** A set containing the names of all instance fields defined in this class. */ - public static final HashSet openapiFields = - new HashSet<>( - Set.of("field1")); - - /** A set containing the names of all required fields defined in this class. */ - public static final HashSet openapiRequiredFields = new HashSet<>(); - - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } - - /** - * Validates the JSON Element and throws an exception if issues are found. - * - * @param jsonElement to validate. - * @throws IOException if the JSON Element is not a valid {@link ExampleRecordWithDefaultFields } object. - */ - public static void validateJsonElement(final JsonElement jsonElement) throws IOException { - for (final String key : jsonElement.getAsJsonObject().keySet()) { - if (!ExampleRecordWithDefaultFields.openapiFields.contains(key)) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "The field `%s` in the JSON string is not defined in the `ExampleRecordWithDefaultFields` properties. JSON: %s", - key, - jsonElement)); - } - } - - final JsonObject jsonObj = jsonElement.getAsJsonObject(); - - if (jsonObj.get("field1") != null && !jsonObj.get("field1").isJsonNull()) { - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - } - } - - /** - * Creates {@link TypeAdapter}s for {@link ExampleRecordWithDefaultFields }s and other - * assignable types. - */ - public static class CustomTypeAdapterFactory implements TypeAdapterFactory { - - /** - * {@inheritDoc} - * - * @param gson to create the {@link TypeAdapter} from. - * @param type to serialize/deserialize. - * @return an (anonymous) instance of {@link TypeAdapter}, or - * {@code null} if {@code T} is not assignable to {@link ExampleRecordWithDefaultFields }. - * @param class to serialize/deserialize. - */ - @SuppressWarnings("unchecked") - @Override - public TypeAdapter create(final Gson gson, final TypeToken type) { - if (!ExampleRecordWithDefaultFields.class.isAssignableFrom(type.getRawType())) { - return null; - } - final TypeAdapter elementAdapter = gson.getAdapter(JsonElement.class); - final TypeAdapter thisAdapter = - gson.getDelegateAdapter(this, TypeToken.get(ExampleRecordWithDefaultFields.class)); - - return (TypeAdapter) - new TypeAdapter() { - - @Override - public void write(final JsonWriter out, final ExampleRecordWithDefaultFields value) - throws IOException { - final JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - elementAdapter.write(out, obj); - } - - @Override - public ExampleRecordWithDefaultFields read(final JsonReader in) throws IOException { - final JsonElement jsonElement = elementAdapter.read(in); - validateJsonElement(jsonElement); - return thisAdapter.fromJsonTree(jsonElement); - } - }.nullSafe(); - } - } -} diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index bf469689..5d4abbe6 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -43,29 +43,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/ExampleRecordWithDefaultFields.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/ExampleRecordWithDefaultFields.java deleted file mode 100644 index c9f18efb..00000000 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Example OpenAPI Spec. - * An example OpenAPI-spec to generate example Java records. - * - * The version of the OpenAPI document: 0.0.1 - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - * - * This class was generated using custom mustache templates from - * openapi-to-java-records-mustache-templates. For further information, - * questions, requesting features or reporting issues, please visit: - * https://github.com/Chrimle/openapi-to-java-records-mustache-templates. - * Generated with Version: 3.11.0 - * - */ - -package io.github.chrimle.o2jrm.enumUnknownDefaultCase; - -import java.util.Objects; -import com.google.gson.TypeAdapter; -import com.google.gson.annotations.JsonAdapter; -import com.google.gson.annotations.SerializedName; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; -import java.io.IOException; -import java.util.Arrays; - -import com.google.gson.Gson; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.TypeAdapterFactory; -import com.google.gson.reflect.TypeToken; -import java.util.HashSet; -import java.util.Set; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) { - - /** A set containing the names of all instance fields defined in this class. */ - public static final HashSet openapiFields = - new HashSet<>( - Set.of("field1")); - - /** A set containing the names of all required fields defined in this class. */ - public static final HashSet openapiRequiredFields = new HashSet<>(); - - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } - - /** - * Validates the JSON Element and throws an exception if issues are found. - * - * @param jsonElement to validate. - * @throws IOException if the JSON Element is not a valid {@link ExampleRecordWithDefaultFields } object. - */ - public static void validateJsonElement(final JsonElement jsonElement) throws IOException { - for (final String key : jsonElement.getAsJsonObject().keySet()) { - if (!ExampleRecordWithDefaultFields.openapiFields.contains(key)) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "The field `%s` in the JSON string is not defined in the `ExampleRecordWithDefaultFields` properties. JSON: %s", - key, - jsonElement)); - } - } - - final JsonObject jsonObj = jsonElement.getAsJsonObject(); - - if (jsonObj.get("field1") != null && !jsonObj.get("field1").isJsonNull()) { - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - } - } - - /** - * Creates {@link TypeAdapter}s for {@link ExampleRecordWithDefaultFields }s and other - * assignable types. - */ - public static class CustomTypeAdapterFactory implements TypeAdapterFactory { - - /** - * {@inheritDoc} - * - * @param gson to create the {@link TypeAdapter} from. - * @param type to serialize/deserialize. - * @return an (anonymous) instance of {@link TypeAdapter}, or - * {@code null} if {@code T} is not assignable to {@link ExampleRecordWithDefaultFields }. - * @param class to serialize/deserialize. - */ - @SuppressWarnings("unchecked") - @Override - public TypeAdapter create(final Gson gson, final TypeToken type) { - if (!ExampleRecordWithDefaultFields.class.isAssignableFrom(type.getRawType())) { - return null; - } - final TypeAdapter elementAdapter = gson.getAdapter(JsonElement.class); - final TypeAdapter thisAdapter = - gson.getDelegateAdapter(this, TypeToken.get(ExampleRecordWithDefaultFields.class)); - - return (TypeAdapter) - new TypeAdapter() { - - @Override - public void write(final JsonWriter out, final ExampleRecordWithDefaultFields value) - throws IOException { - final JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - elementAdapter.write(out, obj); - } - - @Override - public ExampleRecordWithDefaultFields read(final JsonReader in) throws IOException { - final JsonElement jsonElement = elementAdapter.read(in); - validateJsonElement(jsonElement); - return thisAdapter.fromJsonTree(jsonElement); - } - }.nullSafe(); - } - } -} diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java index fc2848a2..9143239d 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -43,29 +43,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/ExampleRecordWithDefaultFields.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/ExampleRecordWithDefaultFields.java deleted file mode 100644 index 4e5e3427..00000000 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,169 +0,0 @@ -/* - * Example OpenAPI Spec. - * An example OpenAPI-spec to generate example Java records. - * - * The version of the OpenAPI document: 0.0.1 - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - * - * This class was generated using custom mustache templates from - * openapi-to-java-records-mustache-templates. For further information, - * questions, requesting features or reporting issues, please visit: - * https://github.com/Chrimle/openapi-to-java-records-mustache-templates. - * Generated with Version: 3.11.0 - * - */ - -package io.github.chrimle.o2jrm.generateBuilders; - -import java.util.Objects; -import com.google.gson.TypeAdapter; -import com.google.gson.annotations.JsonAdapter; -import com.google.gson.annotations.SerializedName; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; -import java.io.IOException; -import java.util.Arrays; - -import com.google.gson.Gson; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.TypeAdapterFactory; -import com.google.gson.reflect.TypeToken; -import java.util.HashSet; -import java.util.Set; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) { - - /** A set containing the names of all instance fields defined in this class. */ - public static final HashSet openapiFields = - new HashSet<>( - Set.of("field1")); - - /** A set containing the names of all required fields defined in this class. */ - public static final HashSet openapiRequiredFields = new HashSet<>(); - - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } - - /** Builder class for {@link ExampleRecordWithDefaultFields }. */ - public static class Builder { - - private String field1; - - /** - * Sets the value of {@link ExampleRecordWithDefaultFields#field1 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field1 a String field with a default value. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field1(final String field1) { - this.field1 = field1; - return this; - } - - /** - * Builds a {@link ExampleRecordWithDefaultFields }-instance with the values provided in preceding - * builder methods. - * - *

NOTE: Pass-by-reference is used! - * - * @return a new {@link ExampleRecordWithDefaultFields }-instance. - */ - public ExampleRecordWithDefaultFields build() { - return new ExampleRecordWithDefaultFields( - field1); - } - } - - /** Creates a new {@link Builder}-instance. */ - public static ExampleRecordWithDefaultFields.Builder builder() { - return new ExampleRecordWithDefaultFields.Builder(); - } - - /** - * Validates the JSON Element and throws an exception if issues are found. - * - * @param jsonElement to validate. - * @throws IOException if the JSON Element is not a valid {@link ExampleRecordWithDefaultFields } object. - */ - public static void validateJsonElement(final JsonElement jsonElement) throws IOException { - for (final String key : jsonElement.getAsJsonObject().keySet()) { - if (!ExampleRecordWithDefaultFields.openapiFields.contains(key)) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "The field `%s` in the JSON string is not defined in the `ExampleRecordWithDefaultFields` properties. JSON: %s", - key, - jsonElement)); - } - } - - final JsonObject jsonObj = jsonElement.getAsJsonObject(); - - if (jsonObj.get("field1") != null && !jsonObj.get("field1").isJsonNull()) { - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - } - } - - /** - * Creates {@link TypeAdapter}s for {@link ExampleRecordWithDefaultFields }s and other - * assignable types. - */ - public static class CustomTypeAdapterFactory implements TypeAdapterFactory { - - /** - * {@inheritDoc} - * - * @param gson to create the {@link TypeAdapter} from. - * @param type to serialize/deserialize. - * @return an (anonymous) instance of {@link TypeAdapter}, or - * {@code null} if {@code T} is not assignable to {@link ExampleRecordWithDefaultFields }. - * @param class to serialize/deserialize. - */ - @SuppressWarnings("unchecked") - @Override - public TypeAdapter create(final Gson gson, final TypeToken type) { - if (!ExampleRecordWithDefaultFields.class.isAssignableFrom(type.getRawType())) { - return null; - } - final TypeAdapter elementAdapter = gson.getAdapter(JsonElement.class); - final TypeAdapter thisAdapter = - gson.getDelegateAdapter(this, TypeToken.get(ExampleRecordWithDefaultFields.class)); - - return (TypeAdapter) - new TypeAdapter() { - - @Override - public void write(final JsonWriter out, final ExampleRecordWithDefaultFields value) - throws IOException { - final JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - elementAdapter.write(out, obj); - } - - @Override - public ExampleRecordWithDefaultFields read(final JsonReader in) throws IOException { - final JsonElement jsonElement = elementAdapter.read(in); - validateJsonElement(jsonElement); - return thisAdapter.fromJsonTree(jsonElement); - } - }.nullSafe(); - } - } -} diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java index 97cc4ec1..c12fb5d9 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java @@ -43,29 +43,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, @@ -207,7 +207,7 @@ public static class Builder { * *

NOTE: Pass-by-reference is used! * - * @param stringStandard sets the value of stringStandard. + * @param stringStandard Non-required, non-nullable String field.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringStandard(final String stringStandard) { @@ -220,7 +220,7 @@ public Builder stringStandard(final String stringStandard) { * *

NOTE: Pass-by-reference is used! * - * @param stringDefault sets the value of stringDefault. + * @param stringDefault Non-required, non-nullable String field with a default value.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringDefault(final String stringDefault) { @@ -233,7 +233,7 @@ public Builder stringDefault(final String stringDefault) { * *

NOTE: Pass-by-reference is used! * - * @param stringNullable sets the value of stringNullable. + * @param stringNullable Non-required, nullable String field.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringNullable(final String stringNullable) { @@ -246,7 +246,7 @@ public Builder stringNullable(final String stringNullable) { * *

NOTE: Pass-by-reference is used! * - * @param stringRequired sets the value of stringRequired. + * @param stringRequired Required, non-nullable String field.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringRequired(final String stringRequired) { @@ -259,7 +259,7 @@ public Builder stringRequired(final String stringRequired) { * *

NOTE: Pass-by-reference is used! * - * @param stringRequiredNullable sets the value of stringRequiredNullable. + * @param stringRequiredNullable Required, nullable String field.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringRequiredNullable(final String stringRequiredNullable) { @@ -272,7 +272,7 @@ public Builder stringRequiredNullable(final String stringRequiredNullable) { * *

NOTE: Pass-by-reference is used! * - * @param stringRequiredPattern sets the value of stringRequiredPattern. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringRequiredPattern(final String stringRequiredPattern) { @@ -285,7 +285,7 @@ public Builder stringRequiredPattern(final String stringRequiredPattern) { * *

NOTE: Pass-by-reference is used! * - * @param stringEmailFormat sets the value of stringEmailFormat. + * @param stringEmailFormat Non-required, non-nullable String field with Email format.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringEmailFormat(final String stringEmailFormat) { @@ -298,7 +298,7 @@ public Builder stringEmailFormat(final String stringEmailFormat) { * *

NOTE: Pass-by-reference is used! * - * @param stringUuidFormat sets the value of stringUuidFormat. + * @param stringUuidFormat Non-required, non-nullable UUID field.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringUuidFormat(final UUID stringUuidFormat) { @@ -311,7 +311,7 @@ public Builder stringUuidFormat(final UUID stringUuidFormat) { * *

NOTE: Pass-by-reference is used! * - * @param stringMinLength sets the value of stringMinLength. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringMinLength(final String stringMinLength) { @@ -324,7 +324,7 @@ public Builder stringMinLength(final String stringMinLength) { * *

NOTE: Pass-by-reference is used! * - * @param stringMaxLength sets the value of stringMaxLength. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringMaxLength(final String stringMaxLength) { @@ -337,7 +337,7 @@ public Builder stringMaxLength(final String stringMaxLength) { * *

NOTE: Pass-by-reference is used! * - * @param stringMinAndMaxLength sets the value of stringMinAndMaxLength. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringMinAndMaxLength(final String stringMinAndMaxLength) { @@ -350,7 +350,7 @@ public Builder stringMinAndMaxLength(final String stringMinAndMaxLength) { * *

NOTE: Pass-by-reference is used! * - * @param arrayMinItems sets the value of arrayMinItems. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1.. * @return this {@link Builder}-instance for method-chaining. */ public Builder arrayMinItems(final List arrayMinItems) { @@ -363,7 +363,7 @@ public Builder arrayMinItems(final List arrayMinItems) { * *

NOTE: Pass-by-reference is used! * - * @param arrayMaxItems sets the value of arrayMaxItems. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10.. * @return this {@link Builder}-instance for method-chaining. */ public Builder arrayMaxItems(final List arrayMaxItems) { @@ -376,7 +376,7 @@ public Builder arrayMaxItems(final List arrayMaxItems) { * *

NOTE: Pass-by-reference is used! * - * @param arrayMinAndMaxItems sets the value of arrayMinAndMaxItems. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10.. * @return this {@link Builder}-instance for method-chaining. */ public Builder arrayMinAndMaxItems(final List arrayMinAndMaxItems) { @@ -389,7 +389,7 @@ public Builder arrayMinAndMaxItems(final List arrayMinAndMaxItems) { * *

NOTE: Pass-by-reference is used! * - * @param intMinimum sets the value of intMinimum. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18.. * @return this {@link Builder}-instance for method-chaining. */ public Builder intMinimum(final Integer intMinimum) { @@ -402,7 +402,7 @@ public Builder intMinimum(final Integer intMinimum) { * *

NOTE: Pass-by-reference is used! * - * @param intMaximum sets the value of intMaximum. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100.. * @return this {@link Builder}-instance for method-chaining. */ public Builder intMaximum(final Integer intMaximum) { @@ -415,7 +415,7 @@ public Builder intMaximum(final Integer intMaximum) { * *

NOTE: Pass-by-reference is used! * - * @param intMinimumAndMaximum sets the value of intMinimumAndMaximum. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100.. * @return this {@link Builder}-instance for method-chaining. */ public Builder intMinimumAndMaximum(final Integer intMinimumAndMaximum) { @@ -428,7 +428,7 @@ public Builder intMinimumAndMaximum(final Integer intMinimumAndMaximum) { * *

NOTE: Pass-by-reference is used! * - * @param longMinimum sets the value of longMinimum. + * @param longMinimum Non-required, non-nullable Long with minimum: 18.. * @return this {@link Builder}-instance for method-chaining. */ public Builder longMinimum(final Long longMinimum) { @@ -441,7 +441,7 @@ public Builder longMinimum(final Long longMinimum) { * *

NOTE: Pass-by-reference is used! * - * @param longMaximum sets the value of longMaximum. + * @param longMaximum Non-required, non-nullable Long with maximum: 100.. * @return this {@link Builder}-instance for method-chaining. */ public Builder longMaximum(final Long longMaximum) { @@ -454,7 +454,7 @@ public Builder longMaximum(final Long longMaximum) { * *

NOTE: Pass-by-reference is used! * - * @param longMinimumAndMaximum sets the value of longMinimumAndMaximum. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100.. * @return this {@link Builder}-instance for method-chaining. */ public Builder longMinimumAndMaximum(final Long longMinimumAndMaximum) { @@ -467,7 +467,7 @@ public Builder longMinimumAndMaximum(final Long longMinimumAndMaximum) { * *

NOTE: Pass-by-reference is used! * - * @param bigDecimalMinimum sets the value of bigDecimalMinimum. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0.. * @return this {@link Builder}-instance for method-chaining. */ public Builder bigDecimalMinimum(final BigDecimal bigDecimalMinimum) { @@ -480,7 +480,7 @@ public Builder bigDecimalMinimum(final BigDecimal bigDecimalMinimum) { * *

NOTE: Pass-by-reference is used! * - * @param bigDecimalMaximum sets the value of bigDecimalMaximum. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100.. * @return this {@link Builder}-instance for method-chaining. */ public Builder bigDecimalMaximum(final BigDecimal bigDecimalMaximum) { @@ -493,7 +493,7 @@ public Builder bigDecimalMaximum(final BigDecimal bigDecimalMaximum) { * *

NOTE: Pass-by-reference is used! * - * @param bigDecimalMinimumAndMaximum sets the value of bigDecimalMinimumAndMaximum. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100.. * @return this {@link Builder}-instance for method-chaining. */ public Builder bigDecimalMinimumAndMaximum(final BigDecimal bigDecimalMinimumAndMaximum) { diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/ExampleRecordWithDefaultFields.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/ExampleRecordWithDefaultFields.java deleted file mode 100644 index 3dc4b57c..00000000 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Example OpenAPI Spec. - * An example OpenAPI-spec to generate example Java records. - * - * The version of the OpenAPI document: 0.0.1 - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - * - * This class was generated using custom mustache templates from - * openapi-to-java-records-mustache-templates. For further information, - * questions, requesting features or reporting issues, please visit: - * https://github.com/Chrimle/openapi-to-java-records-mustache-templates. - * Generated with Version: 3.11.0 - * - */ - -package io.github.chrimle.o2jrm.serializableModel; - -import java.util.Objects; -import com.google.gson.TypeAdapter; -import com.google.gson.annotations.JsonAdapter; -import com.google.gson.annotations.SerializedName; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; -import java.io.IOException; -import java.util.Arrays; -import java.io.Serializable; - -import com.google.gson.Gson; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.TypeAdapterFactory; -import com.google.gson.reflect.TypeToken; -import java.util.HashSet; -import java.util.Set; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) - implements Serializable { - - /** A set containing the names of all instance fields defined in this class. */ - public static final HashSet openapiFields = - new HashSet<>( - Set.of("field1")); - - /** A set containing the names of all required fields defined in this class. */ - public static final HashSet openapiRequiredFields = new HashSet<>(); - - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } - - /** - * Validates the JSON Element and throws an exception if issues are found. - * - * @param jsonElement to validate. - * @throws IOException if the JSON Element is not a valid {@link ExampleRecordWithDefaultFields } object. - */ - public static void validateJsonElement(final JsonElement jsonElement) throws IOException { - for (final String key : jsonElement.getAsJsonObject().keySet()) { - if (!ExampleRecordWithDefaultFields.openapiFields.contains(key)) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "The field `%s` in the JSON string is not defined in the `ExampleRecordWithDefaultFields` properties. JSON: %s", - key, - jsonElement)); - } - } - - final JsonObject jsonObj = jsonElement.getAsJsonObject(); - - if (jsonObj.get("field1") != null && !jsonObj.get("field1").isJsonNull()) { - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - } - } - - /** - * Creates {@link TypeAdapter}s for {@link ExampleRecordWithDefaultFields }s and other - * assignable types. - */ - public static class CustomTypeAdapterFactory implements TypeAdapterFactory { - - /** - * {@inheritDoc} - * - * @param gson to create the {@link TypeAdapter} from. - * @param type to serialize/deserialize. - * @return an (anonymous) instance of {@link TypeAdapter}, or - * {@code null} if {@code T} is not assignable to {@link ExampleRecordWithDefaultFields }. - * @param class to serialize/deserialize. - */ - @SuppressWarnings("unchecked") - @Override - public TypeAdapter create(final Gson gson, final TypeToken type) { - if (!ExampleRecordWithDefaultFields.class.isAssignableFrom(type.getRawType())) { - return null; - } - final TypeAdapter elementAdapter = gson.getAdapter(JsonElement.class); - final TypeAdapter thisAdapter = - gson.getDelegateAdapter(this, TypeToken.get(ExampleRecordWithDefaultFields.class)); - - return (TypeAdapter) - new TypeAdapter() { - - @Override - public void write(final JsonWriter out, final ExampleRecordWithDefaultFields value) - throws IOException { - final JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - elementAdapter.write(out, obj); - } - - @Override - public ExampleRecordWithDefaultFields read(final JsonReader in) throws IOException { - final JsonElement jsonElement = elementAdapter.read(in); - validateJsonElement(jsonElement); - return thisAdapter.fromJsonTree(jsonElement); - } - }.nullSafe(); - } - } -} diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java index 5cf4d5b3..80f2ba6b 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java @@ -44,29 +44,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/ExampleRecordWithDefaultFields.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/ExampleRecordWithDefaultFields.java deleted file mode 100644 index 99276e09..00000000 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Example OpenAPI Spec. - * An example OpenAPI-spec to generate example Java records. - * - * The version of the OpenAPI document: 0.0.1 - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - * - * This class was generated using custom mustache templates from - * openapi-to-java-records-mustache-templates. For further information, - * questions, requesting features or reporting issues, please visit: - * https://github.com/Chrimle/openapi-to-java-records-mustache-templates. - * Generated with Version: 3.11.0 - * - */ - -package io.github.chrimle.o2jrm.standard; - -import java.util.Objects; -import com.google.gson.TypeAdapter; -import com.google.gson.annotations.JsonAdapter; -import com.google.gson.annotations.SerializedName; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; -import java.io.IOException; -import java.util.Arrays; - -import com.google.gson.Gson; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.TypeAdapterFactory; -import com.google.gson.reflect.TypeToken; -import java.util.HashSet; -import java.util.Set; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) { - - /** A set containing the names of all instance fields defined in this class. */ - public static final HashSet openapiFields = - new HashSet<>( - Set.of("field1")); - - /** A set containing the names of all required fields defined in this class. */ - public static final HashSet openapiRequiredFields = new HashSet<>(); - - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } - - /** - * Validates the JSON Element and throws an exception if issues are found. - * - * @param jsonElement to validate. - * @throws IOException if the JSON Element is not a valid {@link ExampleRecordWithDefaultFields } object. - */ - public static void validateJsonElement(final JsonElement jsonElement) throws IOException { - for (final String key : jsonElement.getAsJsonObject().keySet()) { - if (!ExampleRecordWithDefaultFields.openapiFields.contains(key)) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "The field `%s` in the JSON string is not defined in the `ExampleRecordWithDefaultFields` properties. JSON: %s", - key, - jsonElement)); - } - } - - final JsonObject jsonObj = jsonElement.getAsJsonObject(); - - if (jsonObj.get("field1") != null && !jsonObj.get("field1").isJsonNull()) { - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - } - } - - /** - * Creates {@link TypeAdapter}s for {@link ExampleRecordWithDefaultFields }s and other - * assignable types. - */ - public static class CustomTypeAdapterFactory implements TypeAdapterFactory { - - /** - * {@inheritDoc} - * - * @param gson to create the {@link TypeAdapter} from. - * @param type to serialize/deserialize. - * @return an (anonymous) instance of {@link TypeAdapter}, or - * {@code null} if {@code T} is not assignable to {@link ExampleRecordWithDefaultFields }. - * @param class to serialize/deserialize. - */ - @SuppressWarnings("unchecked") - @Override - public TypeAdapter create(final Gson gson, final TypeToken type) { - if (!ExampleRecordWithDefaultFields.class.isAssignableFrom(type.getRawType())) { - return null; - } - final TypeAdapter elementAdapter = gson.getAdapter(JsonElement.class); - final TypeAdapter thisAdapter = - gson.getDelegateAdapter(this, TypeToken.get(ExampleRecordWithDefaultFields.class)); - - return (TypeAdapter) - new TypeAdapter() { - - @Override - public void write(final JsonWriter out, final ExampleRecordWithDefaultFields value) - throws IOException { - final JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - elementAdapter.write(out, obj); - } - - @Override - public ExampleRecordWithDefaultFields read(final JsonReader in) throws IOException { - final JsonElement jsonElement = elementAdapter.read(in); - validateJsonElement(jsonElement); - return thisAdapter.fromJsonTree(jsonElement); - } - }.nullSafe(); - } - } -} diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java index bc939307..050693a8 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java @@ -43,29 +43,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/ExampleRecordWithDefaultFields.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/ExampleRecordWithDefaultFields.java deleted file mode 100644 index 442c3503..00000000 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Example OpenAPI Spec. - * An example OpenAPI-spec to generate example Java records. - * - * The version of the OpenAPI document: 0.0.1 - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - * - * This class was generated using custom mustache templates from - * openapi-to-java-records-mustache-templates. For further information, - * questions, requesting features or reporting issues, please visit: - * https://github.com/Chrimle/openapi-to-java-records-mustache-templates. - * Generated with Version: 3.11.0 - * - */ - -package io.github.chrimle.o2jrm.useBeanValidation; - -import java.util.Objects; -import com.google.gson.TypeAdapter; -import com.google.gson.annotations.JsonAdapter; -import com.google.gson.annotations.SerializedName; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; -import java.io.IOException; -import java.util.Arrays; -import javax.validation.constraints.*; -import javax.validation.Valid; - -import com.google.gson.Gson; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.TypeAdapterFactory; -import com.google.gson.reflect.TypeToken; -import java.util.HashSet; -import java.util.Set; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) { - - /** A set containing the names of all instance fields defined in this class. */ - public static final HashSet openapiFields = - new HashSet<>( - Set.of("field1")); - - /** A set containing the names of all required fields defined in this class. */ - public static final HashSet openapiRequiredFields = new HashSet<>(); - - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } - - /** - * Validates the JSON Element and throws an exception if issues are found. - * - * @param jsonElement to validate. - * @throws IOException if the JSON Element is not a valid {@link ExampleRecordWithDefaultFields } object. - */ - public static void validateJsonElement(final JsonElement jsonElement) throws IOException { - for (final String key : jsonElement.getAsJsonObject().keySet()) { - if (!ExampleRecordWithDefaultFields.openapiFields.contains(key)) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "The field `%s` in the JSON string is not defined in the `ExampleRecordWithDefaultFields` properties. JSON: %s", - key, - jsonElement)); - } - } - - final JsonObject jsonObj = jsonElement.getAsJsonObject(); - - if (jsonObj.get("field1") != null && !jsonObj.get("field1").isJsonNull()) { - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - } - } - - /** - * Creates {@link TypeAdapter}s for {@link ExampleRecordWithDefaultFields }s and other - * assignable types. - */ - public static class CustomTypeAdapterFactory implements TypeAdapterFactory { - - /** - * {@inheritDoc} - * - * @param gson to create the {@link TypeAdapter} from. - * @param type to serialize/deserialize. - * @return an (anonymous) instance of {@link TypeAdapter}, or - * {@code null} if {@code T} is not assignable to {@link ExampleRecordWithDefaultFields }. - * @param class to serialize/deserialize. - */ - @SuppressWarnings("unchecked") - @Override - public TypeAdapter create(final Gson gson, final TypeToken type) { - if (!ExampleRecordWithDefaultFields.class.isAssignableFrom(type.getRawType())) { - return null; - } - final TypeAdapter elementAdapter = gson.getAdapter(JsonElement.class); - final TypeAdapter thisAdapter = - gson.getDelegateAdapter(this, TypeToken.get(ExampleRecordWithDefaultFields.class)); - - return (TypeAdapter) - new TypeAdapter() { - - @Override - public void write(final JsonWriter out, final ExampleRecordWithDefaultFields value) - throws IOException { - final JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - elementAdapter.write(out, obj); - } - - @Override - public ExampleRecordWithDefaultFields read(final JsonReader in) throws IOException { - final JsonElement jsonElement = elementAdapter.read(in); - validateJsonElement(jsonElement); - return thisAdapter.fromJsonTree(jsonElement); - } - }.nullSafe(); - } - } -} diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java index 2d930a37..99f07448 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java @@ -45,29 +45,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/ExampleRecordWithDefaultFields.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/ExampleRecordWithDefaultFields.java deleted file mode 100644 index bcd3744c..00000000 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Example OpenAPI Spec. - * An example OpenAPI-spec to generate example Java records. - * - * The version of the OpenAPI document: 0.0.1 - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - * - * This class was generated using custom mustache templates from - * openapi-to-java-records-mustache-templates. For further information, - * questions, requesting features or reporting issues, please visit: - * https://github.com/Chrimle/openapi-to-java-records-mustache-templates. - * Generated with Version: 3.11.0 - * - */ - -package io.github.chrimle.o2jrm.useEnumCaseInsensitive; - -import java.util.Objects; -import com.google.gson.TypeAdapter; -import com.google.gson.annotations.JsonAdapter; -import com.google.gson.annotations.SerializedName; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; -import java.io.IOException; -import java.util.Arrays; - -import com.google.gson.Gson; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.TypeAdapterFactory; -import com.google.gson.reflect.TypeToken; -import java.util.HashSet; -import java.util.Set; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) { - - /** A set containing the names of all instance fields defined in this class. */ - public static final HashSet openapiFields = - new HashSet<>( - Set.of("field1")); - - /** A set containing the names of all required fields defined in this class. */ - public static final HashSet openapiRequiredFields = new HashSet<>(); - - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } - - /** - * Validates the JSON Element and throws an exception if issues are found. - * - * @param jsonElement to validate. - * @throws IOException if the JSON Element is not a valid {@link ExampleRecordWithDefaultFields } object. - */ - public static void validateJsonElement(final JsonElement jsonElement) throws IOException { - for (final String key : jsonElement.getAsJsonObject().keySet()) { - if (!ExampleRecordWithDefaultFields.openapiFields.contains(key)) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "The field `%s` in the JSON string is not defined in the `ExampleRecordWithDefaultFields` properties. JSON: %s", - key, - jsonElement)); - } - } - - final JsonObject jsonObj = jsonElement.getAsJsonObject(); - - if (jsonObj.get("field1") != null && !jsonObj.get("field1").isJsonNull()) { - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - } - } - - /** - * Creates {@link TypeAdapter}s for {@link ExampleRecordWithDefaultFields }s and other - * assignable types. - */ - public static class CustomTypeAdapterFactory implements TypeAdapterFactory { - - /** - * {@inheritDoc} - * - * @param gson to create the {@link TypeAdapter} from. - * @param type to serialize/deserialize. - * @return an (anonymous) instance of {@link TypeAdapter}, or - * {@code null} if {@code T} is not assignable to {@link ExampleRecordWithDefaultFields }. - * @param class to serialize/deserialize. - */ - @SuppressWarnings("unchecked") - @Override - public TypeAdapter create(final Gson gson, final TypeToken type) { - if (!ExampleRecordWithDefaultFields.class.isAssignableFrom(type.getRawType())) { - return null; - } - final TypeAdapter elementAdapter = gson.getAdapter(JsonElement.class); - final TypeAdapter thisAdapter = - gson.getDelegateAdapter(this, TypeToken.get(ExampleRecordWithDefaultFields.class)); - - return (TypeAdapter) - new TypeAdapter() { - - @Override - public void write(final JsonWriter out, final ExampleRecordWithDefaultFields value) - throws IOException { - final JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - elementAdapter.write(out, obj); - } - - @Override - public ExampleRecordWithDefaultFields read(final JsonReader in) throws IOException { - final JsonElement jsonElement = elementAdapter.read(in); - validateJsonElement(jsonElement); - return thisAdapter.fromJsonTree(jsonElement); - } - }.nullSafe(); - } - } -} diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java index 5eb974da..3986138e 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -43,29 +43,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/ExampleRecordWithDefaultFields.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/ExampleRecordWithDefaultFields.java deleted file mode 100644 index 8c594384..00000000 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Example OpenAPI Spec. - * An example OpenAPI-spec to generate example Java records. - * - * The version of the OpenAPI document: 0.0.1 - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - * - * This class was generated using custom mustache templates from - * openapi-to-java-records-mustache-templates. For further information, - * questions, requesting features or reporting issues, please visit: - * https://github.com/Chrimle/openapi-to-java-records-mustache-templates. - * Generated with Version: 3.11.0 - * - */ - -package io.github.chrimle.o2jrm.webclient.additionalEnumTypeAnnotations; - -import java.util.Objects; -import java.util.Arrays; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) { - - @JsonCreator - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } -} diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index ff1bc370..3609e585 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -40,29 +40,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/ExampleRecordWithDefaultFields.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/ExampleRecordWithDefaultFields.java deleted file mode 100644 index 79bc3c8d..00000000 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Example OpenAPI Spec. - * An example OpenAPI-spec to generate example Java records. - * - * The version of the OpenAPI document: 0.0.1 - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - * - * This class was generated using custom mustache templates from - * openapi-to-java-records-mustache-templates. For further information, - * questions, requesting features or reporting issues, please visit: - * https://github.com/Chrimle/openapi-to-java-records-mustache-templates. - * Generated with Version: 3.11.0 - * - */ - -package io.github.chrimle.o2jrm.webclient.additionalModelTypeAnnotations; - -import java.util.Objects; -import java.util.Arrays; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -@io.github.chrimle.o2jrm.test.annotations.TestAnnotationOne -@io.github.chrimle.o2jrm.test.annotations.TestAnnotationTwo -@io.github.chrimle.o2jrm.test.annotations.TestAnnotationThree -public record ExampleRecordWithDefaultFields(String field1) { - - @JsonCreator - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } -} diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java index 92ef9749..ed28ff69 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -40,29 +40,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ @io.github.chrimle.o2jrm.test.annotations.TestAnnotationOne @io.github.chrimle.o2jrm.test.annotations.TestAnnotationTwo diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/ExampleRecordWithDefaultFields.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/ExampleRecordWithDefaultFields.java deleted file mode 100644 index 2f80567b..00000000 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Example OpenAPI Spec. - * An example OpenAPI-spec to generate example Java records. - * - * The version of the OpenAPI document: 0.0.1 - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - * - * This class was generated using custom mustache templates from - * openapi-to-java-records-mustache-templates. For further information, - * questions, requesting features or reporting issues, please visit: - * https://github.com/Chrimle/openapi-to-java-records-mustache-templates. - * Generated with Version: 3.11.0 - * - */ - -package io.github.chrimle.o2jrm.webclient.enumDefaultCaseAndCaseInsensitive; - -import java.util.Objects; -import java.util.Arrays; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) { - - @JsonCreator - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } -} diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index 9014aa8c..fbcad6b7 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -40,29 +40,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/ExampleRecordWithDefaultFields.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/ExampleRecordWithDefaultFields.java deleted file mode 100644 index 896ac886..00000000 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Example OpenAPI Spec. - * An example OpenAPI-spec to generate example Java records. - * - * The version of the OpenAPI document: 0.0.1 - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - * - * This class was generated using custom mustache templates from - * openapi-to-java-records-mustache-templates. For further information, - * questions, requesting features or reporting issues, please visit: - * https://github.com/Chrimle/openapi-to-java-records-mustache-templates. - * Generated with Version: 3.11.0 - * - */ - -package io.github.chrimle.o2jrm.webclient.enumUnknownDefaultCase; - -import java.util.Objects; -import java.util.Arrays; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) { - - @JsonCreator - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } -} diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java index 8849c1a4..3cb6750b 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -40,29 +40,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/ExampleRecordWithDefaultFields.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/ExampleRecordWithDefaultFields.java deleted file mode 100644 index d2912304..00000000 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Example OpenAPI Spec. - * An example OpenAPI-spec to generate example Java records. - * - * The version of the OpenAPI document: 0.0.1 - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - * - * This class was generated using custom mustache templates from - * openapi-to-java-records-mustache-templates. For further information, - * questions, requesting features or reporting issues, please visit: - * https://github.com/Chrimle/openapi-to-java-records-mustache-templates. - * Generated with Version: 3.11.0 - * - */ - -package io.github.chrimle.o2jrm.webclient.generateBuilders; - -import java.util.Objects; -import java.util.Arrays; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) { - - @JsonCreator - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } - - /** Builder class for {@link ExampleRecordWithDefaultFields }. */ - public static class Builder { - - private String field1; - - /** - * Sets the value of {@link ExampleRecordWithDefaultFields#field1 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field1 a String field with a default value. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field1(final String field1) { - this.field1 = field1; - return this; - } - - /** - * Builds a {@link ExampleRecordWithDefaultFields }-instance with the values provided in preceding - * builder methods. - * - *

NOTE: Pass-by-reference is used! - * - * @return a new {@link ExampleRecordWithDefaultFields }-instance. - */ - public ExampleRecordWithDefaultFields build() { - return new ExampleRecordWithDefaultFields( - field1); - } - } - - /** Creates a new {@link Builder}-instance. */ - public static ExampleRecordWithDefaultFields.Builder builder() { - return new ExampleRecordWithDefaultFields.Builder(); - } -} diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java index 0bae3409..9cf3d0ac 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java @@ -40,29 +40,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, @@ -171,7 +171,7 @@ public static class Builder { * *

NOTE: Pass-by-reference is used! * - * @param stringStandard sets the value of stringStandard. + * @param stringStandard Non-required, non-nullable String field.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringStandard(final String stringStandard) { @@ -184,7 +184,7 @@ public Builder stringStandard(final String stringStandard) { * *

NOTE: Pass-by-reference is used! * - * @param stringDefault sets the value of stringDefault. + * @param stringDefault Non-required, non-nullable String field with a default value.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringDefault(final String stringDefault) { @@ -197,7 +197,7 @@ public Builder stringDefault(final String stringDefault) { * *

NOTE: Pass-by-reference is used! * - * @param stringNullable sets the value of stringNullable. + * @param stringNullable Non-required, nullable String field.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringNullable(final String stringNullable) { @@ -210,7 +210,7 @@ public Builder stringNullable(final String stringNullable) { * *

NOTE: Pass-by-reference is used! * - * @param stringRequired sets the value of stringRequired. + * @param stringRequired Required, non-nullable String field.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringRequired(final String stringRequired) { @@ -223,7 +223,7 @@ public Builder stringRequired(final String stringRequired) { * *

NOTE: Pass-by-reference is used! * - * @param stringRequiredNullable sets the value of stringRequiredNullable. + * @param stringRequiredNullable Required, nullable String field.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringRequiredNullable(final String stringRequiredNullable) { @@ -236,7 +236,7 @@ public Builder stringRequiredNullable(final String stringRequiredNullable) { * *

NOTE: Pass-by-reference is used! * - * @param stringRequiredPattern sets the value of stringRequiredPattern. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringRequiredPattern(final String stringRequiredPattern) { @@ -249,7 +249,7 @@ public Builder stringRequiredPattern(final String stringRequiredPattern) { * *

NOTE: Pass-by-reference is used! * - * @param stringEmailFormat sets the value of stringEmailFormat. + * @param stringEmailFormat Non-required, non-nullable String field with Email format.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringEmailFormat(final String stringEmailFormat) { @@ -262,7 +262,7 @@ public Builder stringEmailFormat(final String stringEmailFormat) { * *

NOTE: Pass-by-reference is used! * - * @param stringUuidFormat sets the value of stringUuidFormat. + * @param stringUuidFormat Non-required, non-nullable UUID field.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringUuidFormat(final UUID stringUuidFormat) { @@ -275,7 +275,7 @@ public Builder stringUuidFormat(final UUID stringUuidFormat) { * *

NOTE: Pass-by-reference is used! * - * @param stringMinLength sets the value of stringMinLength. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringMinLength(final String stringMinLength) { @@ -288,7 +288,7 @@ public Builder stringMinLength(final String stringMinLength) { * *

NOTE: Pass-by-reference is used! * - * @param stringMaxLength sets the value of stringMaxLength. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringMaxLength(final String stringMaxLength) { @@ -301,7 +301,7 @@ public Builder stringMaxLength(final String stringMaxLength) { * *

NOTE: Pass-by-reference is used! * - * @param stringMinAndMaxLength sets the value of stringMinAndMaxLength. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringMinAndMaxLength(final String stringMinAndMaxLength) { @@ -314,7 +314,7 @@ public Builder stringMinAndMaxLength(final String stringMinAndMaxLength) { * *

NOTE: Pass-by-reference is used! * - * @param arrayMinItems sets the value of arrayMinItems. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1.. * @return this {@link Builder}-instance for method-chaining. */ public Builder arrayMinItems(final List arrayMinItems) { @@ -327,7 +327,7 @@ public Builder arrayMinItems(final List arrayMinItems) { * *

NOTE: Pass-by-reference is used! * - * @param arrayMaxItems sets the value of arrayMaxItems. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10.. * @return this {@link Builder}-instance for method-chaining. */ public Builder arrayMaxItems(final List arrayMaxItems) { @@ -340,7 +340,7 @@ public Builder arrayMaxItems(final List arrayMaxItems) { * *

NOTE: Pass-by-reference is used! * - * @param arrayMinAndMaxItems sets the value of arrayMinAndMaxItems. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10.. * @return this {@link Builder}-instance for method-chaining. */ public Builder arrayMinAndMaxItems(final List arrayMinAndMaxItems) { @@ -353,7 +353,7 @@ public Builder arrayMinAndMaxItems(final List arrayMinAndMaxItems) { * *

NOTE: Pass-by-reference is used! * - * @param intMinimum sets the value of intMinimum. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18.. * @return this {@link Builder}-instance for method-chaining. */ public Builder intMinimum(final Integer intMinimum) { @@ -366,7 +366,7 @@ public Builder intMinimum(final Integer intMinimum) { * *

NOTE: Pass-by-reference is used! * - * @param intMaximum sets the value of intMaximum. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100.. * @return this {@link Builder}-instance for method-chaining. */ public Builder intMaximum(final Integer intMaximum) { @@ -379,7 +379,7 @@ public Builder intMaximum(final Integer intMaximum) { * *

NOTE: Pass-by-reference is used! * - * @param intMinimumAndMaximum sets the value of intMinimumAndMaximum. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100.. * @return this {@link Builder}-instance for method-chaining. */ public Builder intMinimumAndMaximum(final Integer intMinimumAndMaximum) { @@ -392,7 +392,7 @@ public Builder intMinimumAndMaximum(final Integer intMinimumAndMaximum) { * *

NOTE: Pass-by-reference is used! * - * @param longMinimum sets the value of longMinimum. + * @param longMinimum Non-required, non-nullable Long with minimum: 18.. * @return this {@link Builder}-instance for method-chaining. */ public Builder longMinimum(final Long longMinimum) { @@ -405,7 +405,7 @@ public Builder longMinimum(final Long longMinimum) { * *

NOTE: Pass-by-reference is used! * - * @param longMaximum sets the value of longMaximum. + * @param longMaximum Non-required, non-nullable Long with maximum: 100.. * @return this {@link Builder}-instance for method-chaining. */ public Builder longMaximum(final Long longMaximum) { @@ -418,7 +418,7 @@ public Builder longMaximum(final Long longMaximum) { * *

NOTE: Pass-by-reference is used! * - * @param longMinimumAndMaximum sets the value of longMinimumAndMaximum. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100.. * @return this {@link Builder}-instance for method-chaining. */ public Builder longMinimumAndMaximum(final Long longMinimumAndMaximum) { @@ -431,7 +431,7 @@ public Builder longMinimumAndMaximum(final Long longMinimumAndMaximum) { * *

NOTE: Pass-by-reference is used! * - * @param bigDecimalMinimum sets the value of bigDecimalMinimum. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0.. * @return this {@link Builder}-instance for method-chaining. */ public Builder bigDecimalMinimum(final BigDecimal bigDecimalMinimum) { @@ -444,7 +444,7 @@ public Builder bigDecimalMinimum(final BigDecimal bigDecimalMinimum) { * *

NOTE: Pass-by-reference is used! * - * @param bigDecimalMaximum sets the value of bigDecimalMaximum. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100.. * @return this {@link Builder}-instance for method-chaining. */ public Builder bigDecimalMaximum(final BigDecimal bigDecimalMaximum) { @@ -457,7 +457,7 @@ public Builder bigDecimalMaximum(final BigDecimal bigDecimalMaximum) { * *

NOTE: Pass-by-reference is used! * - * @param bigDecimalMinimumAndMaximum sets the value of bigDecimalMinimumAndMaximum. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100.. * @return this {@link Builder}-instance for method-chaining. */ public Builder bigDecimalMinimumAndMaximum(final BigDecimal bigDecimalMinimumAndMaximum) { diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/ExampleRecordWithDefaultFields.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/ExampleRecordWithDefaultFields.java deleted file mode 100644 index 67502915..00000000 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Example OpenAPI Spec. - * An example OpenAPI-spec to generate example Java records. - * - * The version of the OpenAPI document: 0.0.1 - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - * - * This class was generated using custom mustache templates from - * openapi-to-java-records-mustache-templates. For further information, - * questions, requesting features or reporting issues, please visit: - * https://github.com/Chrimle/openapi-to-java-records-mustache-templates. - * Generated with Version: 3.11.0 - * - */ - -package io.github.chrimle.o2jrm.webclient.serializableModel; - -import java.util.Objects; -import java.util.Arrays; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import java.io.Serializable; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) - implements Serializable { - - @JsonCreator - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } -} diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java index 249a66b7..ec90cfe7 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java @@ -41,29 +41,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/ExampleRecordWithDefaultFields.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/ExampleRecordWithDefaultFields.java deleted file mode 100644 index 2cfb3e2a..00000000 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Example OpenAPI Spec. - * An example OpenAPI-spec to generate example Java records. - * - * The version of the OpenAPI document: 0.0.1 - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - * - * This class was generated using custom mustache templates from - * openapi-to-java-records-mustache-templates. For further information, - * questions, requesting features or reporting issues, please visit: - * https://github.com/Chrimle/openapi-to-java-records-mustache-templates. - * Generated with Version: 3.11.0 - * - */ - -package io.github.chrimle.o2jrm.webclient.standard; - -import java.util.Objects; -import java.util.Arrays; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) { - - @JsonCreator - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } -} diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java index 6968efb1..a1fe435d 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java @@ -40,29 +40,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/ExampleRecordWithDefaultFields.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/ExampleRecordWithDefaultFields.java deleted file mode 100644 index ed621491..00000000 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Example OpenAPI Spec. - * An example OpenAPI-spec to generate example Java records. - * - * The version of the OpenAPI document: 0.0.1 - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - * - * This class was generated using custom mustache templates from - * openapi-to-java-records-mustache-templates. For further information, - * questions, requesting features or reporting issues, please visit: - * https://github.com/Chrimle/openapi-to-java-records-mustache-templates. - * Generated with Version: 3.11.0 - * - */ - -package io.github.chrimle.o2jrm.webclient.useBeanValidation; - -import java.util.Objects; -import java.util.Arrays; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) { - - @JsonCreator - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } -} diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java index 32dc7b19..536d4fd5 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java @@ -42,29 +42,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/ExampleRecordWithDefaultFields.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/ExampleRecordWithDefaultFields.java deleted file mode 100644 index 3ec2d6e7..00000000 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Example OpenAPI Spec. - * An example OpenAPI-spec to generate example Java records. - * - * The version of the OpenAPI document: 0.0.1 - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - * - * This class was generated using custom mustache templates from - * openapi-to-java-records-mustache-templates. For further information, - * questions, requesting features or reporting issues, please visit: - * https://github.com/Chrimle/openapi-to-java-records-mustache-templates. - * Generated with Version: 3.11.0 - * - */ - -package io.github.chrimle.o2jrm.webclient.useEnumCaseInsensitive; - -import java.util.Objects; -import java.util.Arrays; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.annotation.JsonTypeName; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) { - - @JsonCreator - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } -} diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java index 6d59544b..d37d4b15 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -40,29 +40,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, diff --git a/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java b/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java index 328a1f6e..76dc8306 100644 --- a/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java +++ b/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java @@ -52,12 +52,6 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { List.of(), List.of(), GeneratedField.of("field1", Boolean.class).build()), - EXAMPLE_RECORD_WITH_DEFAULT_FIELDS( - "ExampleRecordWithDefaultFields", - false, - List.of(), - List.of(), - GeneratedField.of("field1", String.class).defaultValue("someDefaultValue").build()), EXAMPLE_RECORD_WITH_EXTRA_FIELD_ANNOTATIONS( "ExampleRecordWithExtraFieldAnnotations", false, diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/ExampleRecordWithDefaultFields.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/ExampleRecordWithDefaultFields.java deleted file mode 100644 index 677abefa..00000000 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,30 +0,0 @@ -package io.github.chrimle.o2jrm.additionalEnumTypeAnnotations; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import org.springframework.lang.Nullable; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import jakarta.validation.Valid; -import jakarta.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import jakarta.annotation.Generated; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) { - - @JsonCreator - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } -} diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index 68a1a61a..115b5aa6 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -26,29 +26,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/ExampleRecordWithDefaultFields.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/ExampleRecordWithDefaultFields.java deleted file mode 100644 index 19a6860b..00000000 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,33 +0,0 @@ -package io.github.chrimle.o2jrm.additionalModelTypeAnnotations; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import org.springframework.lang.Nullable; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import jakarta.validation.Valid; -import jakarta.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import jakarta.annotation.Generated; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -@io.github.chrimle.o2jrm.test.annotations.TestAnnotationOne -@io.github.chrimle.o2jrm.test.annotations.TestAnnotationTwo -@io.github.chrimle.o2jrm.test.annotations.TestAnnotationThree -public record ExampleRecordWithDefaultFields(String field1) { - - @JsonCreator - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } -} diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java index 7f290c77..af68b1ca 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -26,29 +26,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ @io.github.chrimle.o2jrm.test.annotations.TestAnnotationOne @io.github.chrimle.o2jrm.test.annotations.TestAnnotationTwo diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/ExampleRecordWithDefaultFields.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/ExampleRecordWithDefaultFields.java deleted file mode 100644 index e673e2a7..00000000 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,30 +0,0 @@ -package io.github.chrimle.o2jrm.enumDefaultCaseAndCaseInsensitive; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import org.springframework.lang.Nullable; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import jakarta.validation.Valid; -import jakarta.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import jakarta.annotation.Generated; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) { - - @JsonCreator - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } -} diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index 97020816..212622cf 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -26,29 +26,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/ExampleRecordWithDefaultFields.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/ExampleRecordWithDefaultFields.java deleted file mode 100644 index f5517052..00000000 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,30 +0,0 @@ -package io.github.chrimle.o2jrm.enumUnknownDefaultCase; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import org.springframework.lang.Nullable; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import jakarta.validation.Valid; -import jakarta.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import jakarta.annotation.Generated; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) { - - @JsonCreator - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } -} diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java index eca2cc3e..057366b7 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -26,29 +26,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/ExampleRecordWithDefaultFields.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/ExampleRecordWithDefaultFields.java deleted file mode 100644 index d8ed44c0..00000000 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,67 +0,0 @@ -package io.github.chrimle.o2jrm.generateBuilders; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import org.springframework.lang.Nullable; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import jakarta.validation.Valid; -import jakarta.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import jakarta.annotation.Generated; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) { - - @JsonCreator - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } - - /** Builder class for {@link ExampleRecordWithDefaultFields }. */ - public static class Builder { - - private String field1; - - /** - * Sets the value of {@link ExampleRecordWithDefaultFields#field1 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field1 a String field with a default value. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field1(final String field1) { - this.field1 = field1; - return this; - } - - /** - * Builds a {@link ExampleRecordWithDefaultFields }-instance with the values provided in preceding - * builder methods. - * - *

NOTE: Pass-by-reference is used! - * - * @return a new {@link ExampleRecordWithDefaultFields }-instance. - */ - public ExampleRecordWithDefaultFields build() { - return new ExampleRecordWithDefaultFields( - field1); - } - } - - /** Creates a new {@link Builder}-instance. */ - public static ExampleRecordWithDefaultFields.Builder builder() { - return new ExampleRecordWithDefaultFields.Builder(); - } -} diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java index ce0bc65d..55a73fbe 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java @@ -26,29 +26,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, @@ -157,7 +157,7 @@ public static class Builder { * *

NOTE: Pass-by-reference is used! * - * @param stringStandard sets the value of stringStandard. + * @param stringStandard Non-required, non-nullable String field.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringStandard(final String stringStandard) { @@ -170,7 +170,7 @@ public Builder stringStandard(final String stringStandard) { * *

NOTE: Pass-by-reference is used! * - * @param stringDefault sets the value of stringDefault. + * @param stringDefault Non-required, non-nullable String field with a default value.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringDefault(final String stringDefault) { @@ -183,7 +183,7 @@ public Builder stringDefault(final String stringDefault) { * *

NOTE: Pass-by-reference is used! * - * @param stringNullable sets the value of stringNullable. + * @param stringNullable Non-required, nullable String field.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringNullable(final String stringNullable) { @@ -196,7 +196,7 @@ public Builder stringNullable(final String stringNullable) { * *

NOTE: Pass-by-reference is used! * - * @param stringRequired sets the value of stringRequired. + * @param stringRequired Required, non-nullable String field.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringRequired(final String stringRequired) { @@ -209,7 +209,7 @@ public Builder stringRequired(final String stringRequired) { * *

NOTE: Pass-by-reference is used! * - * @param stringRequiredNullable sets the value of stringRequiredNullable. + * @param stringRequiredNullable Required, nullable String field.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringRequiredNullable(final String stringRequiredNullable) { @@ -222,7 +222,7 @@ public Builder stringRequiredNullable(final String stringRequiredNullable) { * *

NOTE: Pass-by-reference is used! * - * @param stringRequiredPattern sets the value of stringRequiredPattern. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringRequiredPattern(final String stringRequiredPattern) { @@ -235,7 +235,7 @@ public Builder stringRequiredPattern(final String stringRequiredPattern) { * *

NOTE: Pass-by-reference is used! * - * @param stringEmailFormat sets the value of stringEmailFormat. + * @param stringEmailFormat Non-required, non-nullable String field with Email format.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringEmailFormat(final String stringEmailFormat) { @@ -248,7 +248,7 @@ public Builder stringEmailFormat(final String stringEmailFormat) { * *

NOTE: Pass-by-reference is used! * - * @param stringUuidFormat sets the value of stringUuidFormat. + * @param stringUuidFormat Non-required, non-nullable UUID field.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringUuidFormat(final UUID stringUuidFormat) { @@ -261,7 +261,7 @@ public Builder stringUuidFormat(final UUID stringUuidFormat) { * *

NOTE: Pass-by-reference is used! * - * @param stringMinLength sets the value of stringMinLength. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringMinLength(final String stringMinLength) { @@ -274,7 +274,7 @@ public Builder stringMinLength(final String stringMinLength) { * *

NOTE: Pass-by-reference is used! * - * @param stringMaxLength sets the value of stringMaxLength. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringMaxLength(final String stringMaxLength) { @@ -287,7 +287,7 @@ public Builder stringMaxLength(final String stringMaxLength) { * *

NOTE: Pass-by-reference is used! * - * @param stringMinAndMaxLength sets the value of stringMinAndMaxLength. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7.. * @return this {@link Builder}-instance for method-chaining. */ public Builder stringMinAndMaxLength(final String stringMinAndMaxLength) { @@ -300,7 +300,7 @@ public Builder stringMinAndMaxLength(final String stringMinAndMaxLength) { * *

NOTE: Pass-by-reference is used! * - * @param arrayMinItems sets the value of arrayMinItems. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1.. * @return this {@link Builder}-instance for method-chaining. */ public Builder arrayMinItems(final List arrayMinItems) { @@ -313,7 +313,7 @@ public Builder arrayMinItems(final List arrayMinItems) { * *

NOTE: Pass-by-reference is used! * - * @param arrayMaxItems sets the value of arrayMaxItems. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10.. * @return this {@link Builder}-instance for method-chaining. */ public Builder arrayMaxItems(final List arrayMaxItems) { @@ -326,7 +326,7 @@ public Builder arrayMaxItems(final List arrayMaxItems) { * *

NOTE: Pass-by-reference is used! * - * @param arrayMinAndMaxItems sets the value of arrayMinAndMaxItems. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10.. * @return this {@link Builder}-instance for method-chaining. */ public Builder arrayMinAndMaxItems(final List arrayMinAndMaxItems) { @@ -339,7 +339,7 @@ public Builder arrayMinAndMaxItems(final List arrayMinAndMaxItems) { * *

NOTE: Pass-by-reference is used! * - * @param intMinimum sets the value of intMinimum. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18.. * @return this {@link Builder}-instance for method-chaining. */ public Builder intMinimum(final Integer intMinimum) { @@ -352,7 +352,7 @@ public Builder intMinimum(final Integer intMinimum) { * *

NOTE: Pass-by-reference is used! * - * @param intMaximum sets the value of intMaximum. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100.. * @return this {@link Builder}-instance for method-chaining. */ public Builder intMaximum(final Integer intMaximum) { @@ -365,7 +365,7 @@ public Builder intMaximum(final Integer intMaximum) { * *

NOTE: Pass-by-reference is used! * - * @param intMinimumAndMaximum sets the value of intMinimumAndMaximum. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100.. * @return this {@link Builder}-instance for method-chaining. */ public Builder intMinimumAndMaximum(final Integer intMinimumAndMaximum) { @@ -378,7 +378,7 @@ public Builder intMinimumAndMaximum(final Integer intMinimumAndMaximum) { * *

NOTE: Pass-by-reference is used! * - * @param longMinimum sets the value of longMinimum. + * @param longMinimum Non-required, non-nullable Long with minimum: 18.. * @return this {@link Builder}-instance for method-chaining. */ public Builder longMinimum(final Long longMinimum) { @@ -391,7 +391,7 @@ public Builder longMinimum(final Long longMinimum) { * *

NOTE: Pass-by-reference is used! * - * @param longMaximum sets the value of longMaximum. + * @param longMaximum Non-required, non-nullable Long with maximum: 100.. * @return this {@link Builder}-instance for method-chaining. */ public Builder longMaximum(final Long longMaximum) { @@ -404,7 +404,7 @@ public Builder longMaximum(final Long longMaximum) { * *

NOTE: Pass-by-reference is used! * - * @param longMinimumAndMaximum sets the value of longMinimumAndMaximum. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100.. * @return this {@link Builder}-instance for method-chaining. */ public Builder longMinimumAndMaximum(final Long longMinimumAndMaximum) { @@ -417,7 +417,7 @@ public Builder longMinimumAndMaximum(final Long longMinimumAndMaximum) { * *

NOTE: Pass-by-reference is used! * - * @param bigDecimalMinimum sets the value of bigDecimalMinimum. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0.. * @return this {@link Builder}-instance for method-chaining. */ public Builder bigDecimalMinimum(final BigDecimal bigDecimalMinimum) { @@ -430,7 +430,7 @@ public Builder bigDecimalMinimum(final BigDecimal bigDecimalMinimum) { * *

NOTE: Pass-by-reference is used! * - * @param bigDecimalMaximum sets the value of bigDecimalMaximum. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100.. * @return this {@link Builder}-instance for method-chaining. */ public Builder bigDecimalMaximum(final BigDecimal bigDecimalMaximum) { @@ -443,7 +443,7 @@ public Builder bigDecimalMaximum(final BigDecimal bigDecimalMaximum) { * *

NOTE: Pass-by-reference is used! * - * @param bigDecimalMinimumAndMaximum sets the value of bigDecimalMinimumAndMaximum. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100.. * @return this {@link Builder}-instance for method-chaining. */ public Builder bigDecimalMinimumAndMaximum(final BigDecimal bigDecimalMinimumAndMaximum) { diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/ExampleRecordWithDefaultFields.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/ExampleRecordWithDefaultFields.java deleted file mode 100644 index a1e1ed27..00000000 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,32 +0,0 @@ -package io.github.chrimle.o2jrm.serializableModel; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import org.springframework.lang.Nullable; -import org.openapitools.jackson.nullable.JsonNullable; -import java.io.Serializable; -import java.time.OffsetDateTime; -import jakarta.validation.Valid; -import jakarta.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import jakarta.annotation.Generated; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) - implements Serializable { - - @JsonCreator - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } -} diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java index 65731c6b..d06c7248 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java @@ -27,29 +27,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/ExampleRecordWithDefaultFields.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/ExampleRecordWithDefaultFields.java deleted file mode 100644 index 77e46821..00000000 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,30 +0,0 @@ -package io.github.chrimle.o2jrm.standard; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import org.springframework.lang.Nullable; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import jakarta.validation.Valid; -import jakarta.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import jakarta.annotation.Generated; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) { - - @JsonCreator - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } -} diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java index d5512420..c00696fd 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java @@ -26,29 +26,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/ExampleRecordWithDefaultFields.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/ExampleRecordWithDefaultFields.java deleted file mode 100644 index 8ffc0a71..00000000 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,30 +0,0 @@ -package io.github.chrimle.o2jrm.useBeanValidation; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import org.springframework.lang.Nullable; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import jakarta.validation.Valid; -import jakarta.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import jakarta.annotation.Generated; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) { - - @JsonCreator - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } -} diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java index 60803b86..3147f0f6 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java @@ -26,29 +26,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/ExampleRecordWithDefaultFields.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/ExampleRecordWithDefaultFields.java deleted file mode 100644 index 54f7922d..00000000 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/ExampleRecordWithDefaultFields.java +++ /dev/null @@ -1,30 +0,0 @@ -package io.github.chrimle.o2jrm.useEnumCaseInsensitive; - -import java.net.URI; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import org.springframework.lang.Nullable; -import org.openapitools.jackson.nullable.JsonNullable; -import java.time.OffsetDateTime; -import jakarta.validation.Valid; -import jakarta.validation.constraints.*; -import io.swagger.v3.oas.annotations.media.Schema; - - -import java.util.*; -import jakarta.annotation.Generated; - -/** - * Example of a Record with default fields - * - * @param field1 a String field with a default value - */ -public record ExampleRecordWithDefaultFields(String field1) { - - @JsonCreator - public ExampleRecordWithDefaultFields(final String field1) { - this.field1 = Objects.requireNonNullElse(field1, "someDefaultValue"); - } -} diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java index 4aeeb335..bd97dbb3 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -26,29 +26,29 @@ /** * Example of a Record which has fields with constraints * - * @param stringStandard String. - * @param stringDefault String. - * @param stringNullable String. - * @param stringRequired String. - * @param stringRequiredNullable String. - * @param stringRequiredPattern String. - * @param stringEmailFormat String. - * @param stringUuidFormat UUID. - * @param stringMinLength String. - * @param stringMaxLength String. - * @param stringMinAndMaxLength String. - * @param arrayMinItems List. - * @param arrayMaxItems List. - * @param arrayMinAndMaxItems List. - * @param intMinimum Integer. - * @param intMaximum Integer. - * @param intMinimumAndMaximum Integer. - * @param longMinimum Long. - * @param longMaximum Long. - * @param longMinimumAndMaximum Long. - * @param bigDecimalMinimum BigDecimal. - * @param bigDecimalMaximum BigDecimal. - * @param bigDecimalMinimumAndMaximum BigDecimal. + * @param stringStandard Non-required, non-nullable String field. + * @param stringDefault Non-required, non-nullable String field with a default value. + * @param stringNullable Non-required, nullable String field. + * @param stringRequired Required, non-nullable String field. + * @param stringRequiredNullable Required, nullable String field. + * @param stringRequiredPattern Required, non-nullable String field with a RegEx-pattern. + * @param stringEmailFormat Non-required, non-nullable String field with Email format. + * @param stringUuidFormat Non-required, non-nullable UUID field. + * @param stringMinLength Non-required, non-nullable String field with minLength: 3. + * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. + * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayMinItems Non-required, non-nullable List with minItems: 1. + * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. + * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param intMinimum Non-required, non-nullable Integer with minimum: 18. + * @param intMaximum Non-required, non-nullable Integer with maximum: 100. + * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longMinimum Non-required, non-nullable Long with minimum: 18. + * @param longMaximum Non-required, non-nullable Long with maximum: 100. + * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. + * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. + * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( String stringStandard, From 5d3d41b2a7ea6d3c9e17f0918305a7dc340795f7 Mon Sep 17 00:00:00 2001 From: Chrimle <28791817+Chrimle@users.noreply.github.com> Date: Sun, 26 Jul 2026 17:45:54 +0200 Subject: [PATCH 03/13] Update `RecordWithAllConstraints` test record --- test/common/src/main/resources/api.yaml | 13 ++++ .../o2jrm/models/GeneratedRecordImpl.java | 5 ++ .../RecordWithAllConstraints.java | 31 +++++++++- .../RecordWithAllConstraints.java | 31 +++++++++- .../RecordWithAllConstraints.java | 31 +++++++++- .../RecordWithAllConstraints.java | 31 +++++++++- .../RecordWithAllConstraints.java | 61 ++++++++++++++++++- .../RecordWithAllConstraints.java | 31 +++++++++- .../standard/RecordWithAllConstraints.java | 31 +++++++++- .../RecordWithAllConstraints.java | 31 +++++++++- .../RecordWithAllConstraints.java | 31 +++++++++- .../RecordWithAllConstraints.java | 8 +++ .../RecordWithAllConstraints.java | 8 +++ .../RecordWithAllConstraints.java | 8 +++ .../RecordWithAllConstraints.java | 8 +++ .../RecordWithAllConstraints.java | 38 ++++++++++++ .../RecordWithAllConstraints.java | 8 +++ .../standard/RecordWithAllConstraints.java | 8 +++ .../RecordWithAllConstraints.java | 8 +++ .../RecordWithAllConstraints.java | 8 +++ .../o2jrm/models/GeneratedRecordImpl.java | 5 ++ .../RecordWithAllConstraints.java | 31 +++++++++- .../RecordWithAllConstraints.java | 31 +++++++++- .../RecordWithAllConstraints.java | 31 +++++++++- .../RecordWithAllConstraints.java | 31 +++++++++- .../RecordWithAllConstraints.java | 61 ++++++++++++++++++- .../RecordWithAllConstraints.java | 31 +++++++++- .../standard/RecordWithAllConstraints.java | 31 +++++++++- .../RecordWithAllConstraints.java | 31 +++++++++- .../RecordWithAllConstraints.java | 31 +++++++++- .../RecordWithAllConstraints.java | 8 +++ .../RecordWithAllConstraints.java | 8 +++ .../RecordWithAllConstraints.java | 8 +++ .../RecordWithAllConstraints.java | 8 +++ .../RecordWithAllConstraints.java | 38 ++++++++++++ .../RecordWithAllConstraints.java | 8 +++ .../standard/RecordWithAllConstraints.java | 8 +++ .../RecordWithAllConstraints.java | 8 +++ .../RecordWithAllConstraints.java | 8 +++ .../o2jrm/models/GeneratedRecordImpl.java | 5 ++ .../RecordWithAllConstraints.java | 8 +++ .../RecordWithAllConstraints.java | 8 +++ .../RecordWithAllConstraints.java | 8 +++ .../RecordWithAllConstraints.java | 8 +++ .../RecordWithAllConstraints.java | 38 ++++++++++++ .../RecordWithAllConstraints.java | 8 +++ .../standard/RecordWithAllConstraints.java | 8 +++ .../RecordWithAllConstraints.java | 8 +++ .../RecordWithAllConstraints.java | 8 +++ 49 files changed, 934 insertions(+), 18 deletions(-) diff --git a/test/common/src/main/resources/api.yaml b/test/common/src/main/resources/api.yaml index 07344424..550babb4 100644 --- a/test/common/src/main/resources/api.yaml +++ b/test/common/src/main/resources/api.yaml @@ -355,6 +355,7 @@ components: - stringRequired - stringRequiredNullable - stringRequiredPattern + - arrayRequiredNullable properties: ### STRING FIELDS ### stringStandard: @@ -401,6 +402,18 @@ components: minLength: 3 maxLength: 7 ### ARRAY FIELDS ### + arrayNullable: + description: "Non-required, nullable List." + type: array + nullable: true + items: + type: string + arrayRequiredNullable: + description: "Required, nullable List." + type: array + nullable: true + items: + type: string arrayMinItems: description: "Non-required, non-nullable List with minItems: 1." type: array diff --git a/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java b/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java index 049bdd53..cf050ea3 100644 --- a/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java +++ b/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java @@ -139,6 +139,11 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { GeneratedField.of("stringMinLength", String.class).minLength(3).build(), GeneratedField.of("stringMaxLength", String.class).maxLength(7).build(), GeneratedField.of("stringMinAndMaxLength", String.class).minLength(3).maxLength(7).build(), + GeneratedField.of("arrayNullable", List.class, String.class).isNullable(true).build(), + GeneratedField.of("arrayRequiredNullable", List.class, String.class) + .isRequired(true) + .isNullable(true) + .build(), GeneratedField.of("arrayMinItems", List.class, String.class).minItems(1).build(), GeneratedField.of("arrayMaxItems", List.class, String.class).maxItems(10).build(), GeneratedField.of("arrayMinAndMaxItems", List.class, String.class) diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index 7bd36d30..70d9d5be 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -54,6 +54,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -79,6 +81,8 @@ public record RecordWithAllConstraints( String stringMinLength, String stringMaxLength, String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, @@ -106,6 +110,8 @@ public record RecordWithAllConstraints( "stringMinLength", "stringMaxLength", "stringMinAndMaxLength", + "arrayNullable", + "arrayRequiredNullable", "arrayMinItems", "arrayMaxItems", "arrayMinAndMaxItems", @@ -124,7 +130,8 @@ public record RecordWithAllConstraints( new HashSet<>( Set.of("stringRequired", "stringRequiredNullable", - "stringRequiredPattern")); + "stringRequiredPattern", + "arrayRequiredNullable")); public RecordWithAllConstraints( final String stringStandard, @@ -138,6 +145,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -161,6 +170,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); @@ -318,6 +329,24 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("arrayNullable") != null && !jsonObj.get("arrayNullable").isJsonNull()) { + if (!jsonObj.get("arrayNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayNullable"))); + } + } + + if (!jsonObj.get("arrayRequiredNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayRequiredNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayRequiredNullable"))); + } + if (jsonObj.get("arrayMinItems") != null && !jsonObj.get("arrayMinItems").isJsonNull()) { if (!jsonObj.get("arrayMinItems").isJsonArray()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java index bfeac5d0..4155b6c4 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -54,6 +54,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -82,6 +84,8 @@ public record RecordWithAllConstraints( String stringMinLength, String stringMaxLength, String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, @@ -109,6 +113,8 @@ public record RecordWithAllConstraints( "stringMinLength", "stringMaxLength", "stringMinAndMaxLength", + "arrayNullable", + "arrayRequiredNullable", "arrayMinItems", "arrayMaxItems", "arrayMinAndMaxItems", @@ -127,7 +133,8 @@ public record RecordWithAllConstraints( new HashSet<>( Set.of("stringRequired", "stringRequiredNullable", - "stringRequiredPattern")); + "stringRequiredPattern", + "arrayRequiredNullable")); public RecordWithAllConstraints( final String stringStandard, @@ -141,6 +148,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -164,6 +173,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); @@ -321,6 +332,24 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("arrayNullable") != null && !jsonObj.get("arrayNullable").isJsonNull()) { + if (!jsonObj.get("arrayNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayNullable"))); + } + } + + if (!jsonObj.get("arrayRequiredNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayRequiredNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayRequiredNullable"))); + } + if (jsonObj.get("arrayMinItems") != null && !jsonObj.get("arrayMinItems").isJsonNull()) { if (!jsonObj.get("arrayMinItems").isJsonArray()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index 5d4abbe6..f6867a03 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -54,6 +54,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -79,6 +81,8 @@ public record RecordWithAllConstraints( String stringMinLength, String stringMaxLength, String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, @@ -106,6 +110,8 @@ public record RecordWithAllConstraints( "stringMinLength", "stringMaxLength", "stringMinAndMaxLength", + "arrayNullable", + "arrayRequiredNullable", "arrayMinItems", "arrayMaxItems", "arrayMinAndMaxItems", @@ -124,7 +130,8 @@ public record RecordWithAllConstraints( new HashSet<>( Set.of("stringRequired", "stringRequiredNullable", - "stringRequiredPattern")); + "stringRequiredPattern", + "arrayRequiredNullable")); public RecordWithAllConstraints( final String stringStandard, @@ -138,6 +145,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -161,6 +170,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); @@ -318,6 +329,24 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("arrayNullable") != null && !jsonObj.get("arrayNullable").isJsonNull()) { + if (!jsonObj.get("arrayNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayNullable"))); + } + } + + if (!jsonObj.get("arrayRequiredNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayRequiredNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayRequiredNullable"))); + } + if (jsonObj.get("arrayMinItems") != null && !jsonObj.get("arrayMinItems").isJsonNull()) { if (!jsonObj.get("arrayMinItems").isJsonArray()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java index 9143239d..f1367d2b 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -54,6 +54,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -79,6 +81,8 @@ public record RecordWithAllConstraints( String stringMinLength, String stringMaxLength, String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, @@ -106,6 +110,8 @@ public record RecordWithAllConstraints( "stringMinLength", "stringMaxLength", "stringMinAndMaxLength", + "arrayNullable", + "arrayRequiredNullable", "arrayMinItems", "arrayMaxItems", "arrayMinAndMaxItems", @@ -124,7 +130,8 @@ public record RecordWithAllConstraints( new HashSet<>( Set.of("stringRequired", "stringRequiredNullable", - "stringRequiredPattern")); + "stringRequiredPattern", + "arrayRequiredNullable")); public RecordWithAllConstraints( final String stringStandard, @@ -138,6 +145,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -161,6 +170,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); @@ -318,6 +329,24 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("arrayNullable") != null && !jsonObj.get("arrayNullable").isJsonNull()) { + if (!jsonObj.get("arrayNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayNullable"))); + } + } + + if (!jsonObj.get("arrayRequiredNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayRequiredNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayRequiredNullable"))); + } + if (jsonObj.get("arrayMinItems") != null && !jsonObj.get("arrayMinItems").isJsonNull()) { if (!jsonObj.get("arrayMinItems").isJsonArray()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java index c12fb5d9..6786f5ad 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java @@ -54,6 +54,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -79,6 +81,8 @@ public record RecordWithAllConstraints( String stringMinLength, String stringMaxLength, String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, @@ -106,6 +110,8 @@ public record RecordWithAllConstraints( "stringMinLength", "stringMaxLength", "stringMinAndMaxLength", + "arrayNullable", + "arrayRequiredNullable", "arrayMinItems", "arrayMaxItems", "arrayMinAndMaxItems", @@ -124,7 +130,8 @@ public record RecordWithAllConstraints( new HashSet<>( Set.of("stringRequired", "stringRequiredNullable", - "stringRequiredPattern")); + "stringRequiredPattern", + "arrayRequiredNullable")); public RecordWithAllConstraints( final String stringStandard, @@ -138,6 +145,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -161,6 +170,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); @@ -189,6 +200,8 @@ public static class Builder { private String stringMinLength; private String stringMaxLength; private String stringMinAndMaxLength; + private List arrayNullable; + private List arrayRequiredNullable; private List arrayMinItems; private List arrayMaxItems; private List arrayMinAndMaxItems; @@ -345,6 +358,32 @@ public Builder stringMinAndMaxLength(final String stringMinAndMaxLength) { return this; } + /** + * Sets the value of {@link RecordWithAllConstraints#arrayNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param arrayNullable Non-required, nullable List.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder arrayNullable(final List arrayNullable) { + this.arrayNullable = arrayNullable; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#arrayRequiredNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param arrayRequiredNullable Required, nullable List.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder arrayRequiredNullable(final List arrayRequiredNullable) { + this.arrayRequiredNullable = arrayRequiredNullable; + return this; + } + /** * Sets the value of {@link RecordWithAllConstraints#arrayMinItems }. * @@ -522,6 +561,8 @@ public RecordWithAllConstraints build() { stringMinLength, stringMaxLength, stringMinAndMaxLength, + arrayNullable, + arrayRequiredNullable, arrayMinItems, arrayMaxItems, arrayMinAndMaxItems, @@ -685,6 +726,24 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("arrayNullable") != null && !jsonObj.get("arrayNullable").isJsonNull()) { + if (!jsonObj.get("arrayNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayNullable"))); + } + } + + if (!jsonObj.get("arrayRequiredNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayRequiredNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayRequiredNullable"))); + } + if (jsonObj.get("arrayMinItems") != null && !jsonObj.get("arrayMinItems").isJsonNull()) { if (!jsonObj.get("arrayMinItems").isJsonArray()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java index 80f2ba6b..8e662df9 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java @@ -55,6 +55,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -80,6 +82,8 @@ public record RecordWithAllConstraints( String stringMinLength, String stringMaxLength, String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, @@ -108,6 +112,8 @@ public record RecordWithAllConstraints( "stringMinLength", "stringMaxLength", "stringMinAndMaxLength", + "arrayNullable", + "arrayRequiredNullable", "arrayMinItems", "arrayMaxItems", "arrayMinAndMaxItems", @@ -126,7 +132,8 @@ public record RecordWithAllConstraints( new HashSet<>( Set.of("stringRequired", "stringRequiredNullable", - "stringRequiredPattern")); + "stringRequiredPattern", + "arrayRequiredNullable")); public RecordWithAllConstraints( final String stringStandard, @@ -140,6 +147,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -163,6 +172,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); @@ -320,6 +331,24 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("arrayNullable") != null && !jsonObj.get("arrayNullable").isJsonNull()) { + if (!jsonObj.get("arrayNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayNullable"))); + } + } + + if (!jsonObj.get("arrayRequiredNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayRequiredNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayRequiredNullable"))); + } + if (jsonObj.get("arrayMinItems") != null && !jsonObj.get("arrayMinItems").isJsonNull()) { if (!jsonObj.get("arrayMinItems").isJsonArray()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java index 050693a8..0c3bd8f6 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java @@ -54,6 +54,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -79,6 +81,8 @@ public record RecordWithAllConstraints( String stringMinLength, String stringMaxLength, String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, @@ -106,6 +110,8 @@ public record RecordWithAllConstraints( "stringMinLength", "stringMaxLength", "stringMinAndMaxLength", + "arrayNullable", + "arrayRequiredNullable", "arrayMinItems", "arrayMaxItems", "arrayMinAndMaxItems", @@ -124,7 +130,8 @@ public record RecordWithAllConstraints( new HashSet<>( Set.of("stringRequired", "stringRequiredNullable", - "stringRequiredPattern")); + "stringRequiredPattern", + "arrayRequiredNullable")); public RecordWithAllConstraints( final String stringStandard, @@ -138,6 +145,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -161,6 +170,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); @@ -318,6 +329,24 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("arrayNullable") != null && !jsonObj.get("arrayNullable").isJsonNull()) { + if (!jsonObj.get("arrayNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayNullable"))); + } + } + + if (!jsonObj.get("arrayRequiredNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayRequiredNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayRequiredNullable"))); + } + if (jsonObj.get("arrayMinItems") != null && !jsonObj.get("arrayMinItems").isJsonNull()) { if (!jsonObj.get("arrayMinItems").isJsonArray()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java index 45b24751..5cc84aea 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java @@ -56,6 +56,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -81,6 +83,8 @@ public record RecordWithAllConstraints( @Size(min = 3) String stringMinLength, @Size(max = 7) String stringMaxLength, @Size(min = 3, max = 7) String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, @Size(min = 1) List arrayMinItems, @Size(max = 10) List arrayMaxItems, @Size(min = 1, max = 10) List arrayMinAndMaxItems, @@ -108,6 +112,8 @@ public record RecordWithAllConstraints( "stringMinLength", "stringMaxLength", "stringMinAndMaxLength", + "arrayNullable", + "arrayRequiredNullable", "arrayMinItems", "arrayMaxItems", "arrayMinAndMaxItems", @@ -126,7 +132,8 @@ public record RecordWithAllConstraints( new HashSet<>( Set.of("stringRequired", "stringRequiredNullable", - "stringRequiredPattern")); + "stringRequiredPattern", + "arrayRequiredNullable")); public RecordWithAllConstraints( final String stringStandard, @@ -140,6 +147,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -163,6 +172,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); @@ -320,6 +331,24 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("arrayNullable") != null && !jsonObj.get("arrayNullable").isJsonNull()) { + if (!jsonObj.get("arrayNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayNullable"))); + } + } + + if (!jsonObj.get("arrayRequiredNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayRequiredNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayRequiredNullable"))); + } + if (jsonObj.get("arrayMinItems") != null && !jsonObj.get("arrayMinItems").isJsonNull()) { if (!jsonObj.get("arrayMinItems").isJsonArray()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java index 3986138e..4e06ae4d 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -54,6 +54,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -79,6 +81,8 @@ public record RecordWithAllConstraints( String stringMinLength, String stringMaxLength, String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, @@ -106,6 +110,8 @@ public record RecordWithAllConstraints( "stringMinLength", "stringMaxLength", "stringMinAndMaxLength", + "arrayNullable", + "arrayRequiredNullable", "arrayMinItems", "arrayMaxItems", "arrayMinAndMaxItems", @@ -124,7 +130,8 @@ public record RecordWithAllConstraints( new HashSet<>( Set.of("stringRequired", "stringRequiredNullable", - "stringRequiredPattern")); + "stringRequiredPattern", + "arrayRequiredNullable")); public RecordWithAllConstraints( final String stringStandard, @@ -138,6 +145,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -161,6 +170,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); @@ -318,6 +329,24 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("arrayNullable") != null && !jsonObj.get("arrayNullable").isJsonNull()) { + if (!jsonObj.get("arrayNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayNullable"))); + } + } + + if (!jsonObj.get("arrayRequiredNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayRequiredNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayRequiredNullable"))); + } + if (jsonObj.get("arrayMinItems") != null && !jsonObj.get("arrayMinItems").isJsonNull()) { if (!jsonObj.get("arrayMinItems").isJsonArray()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index 3609e585..527c6c25 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -51,6 +51,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -76,6 +78,8 @@ public record RecordWithAllConstraints( String stringMinLength, String stringMaxLength, String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, @@ -102,6 +106,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -125,6 +131,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java index ed28ff69..01b9e73c 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -51,6 +51,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -79,6 +81,8 @@ public record RecordWithAllConstraints( String stringMinLength, String stringMaxLength, String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, @@ -105,6 +109,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -128,6 +134,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index fbcad6b7..5ac287ea 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -51,6 +51,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -76,6 +78,8 @@ public record RecordWithAllConstraints( String stringMinLength, String stringMaxLength, String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, @@ -102,6 +106,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -125,6 +131,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java index 3cb6750b..03bcaf5f 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -51,6 +51,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -76,6 +78,8 @@ public record RecordWithAllConstraints( String stringMinLength, String stringMaxLength, String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, @@ -102,6 +106,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -125,6 +131,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java index 9cf3d0ac..5173285e 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java @@ -51,6 +51,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -76,6 +78,8 @@ public record RecordWithAllConstraints( String stringMinLength, String stringMaxLength, String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, @@ -102,6 +106,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -125,6 +131,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); @@ -153,6 +161,8 @@ public static class Builder { private String stringMinLength; private String stringMaxLength; private String stringMinAndMaxLength; + private List arrayNullable; + private List arrayRequiredNullable; private List arrayMinItems; private List arrayMaxItems; private List arrayMinAndMaxItems; @@ -309,6 +319,32 @@ public Builder stringMinAndMaxLength(final String stringMinAndMaxLength) { return this; } + /** + * Sets the value of {@link RecordWithAllConstraints#arrayNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param arrayNullable Non-required, nullable List.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder arrayNullable(final List arrayNullable) { + this.arrayNullable = arrayNullable; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#arrayRequiredNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param arrayRequiredNullable Required, nullable List.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder arrayRequiredNullable(final List arrayRequiredNullable) { + this.arrayRequiredNullable = arrayRequiredNullable; + return this; + } + /** * Sets the value of {@link RecordWithAllConstraints#arrayMinItems }. * @@ -486,6 +522,8 @@ public RecordWithAllConstraints build() { stringMinLength, stringMaxLength, stringMinAndMaxLength, + arrayNullable, + arrayRequiredNullable, arrayMinItems, arrayMaxItems, arrayMinAndMaxItems, diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java index ec90cfe7..84e20191 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java @@ -52,6 +52,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -77,6 +79,8 @@ public record RecordWithAllConstraints( String stringMinLength, String stringMaxLength, String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, @@ -104,6 +108,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -127,6 +133,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java index a1fe435d..828c48a5 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java @@ -51,6 +51,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -76,6 +78,8 @@ public record RecordWithAllConstraints( String stringMinLength, String stringMaxLength, String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, @@ -102,6 +106,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -125,6 +131,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java index d1fbd280..b1279445 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java @@ -53,6 +53,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -78,6 +80,8 @@ public record RecordWithAllConstraints( @Size(min = 3) String stringMinLength, @Size(max = 7) String stringMaxLength, @Size(min = 3, max = 7) String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, @Size(min = 1) List arrayMinItems, @Size(max = 10) List arrayMaxItems, @Size(min = 1, max = 10) List arrayMinAndMaxItems, @@ -104,6 +108,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -127,6 +133,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java index d37d4b15..945b78e0 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -51,6 +51,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -76,6 +78,8 @@ public record RecordWithAllConstraints( String stringMinLength, String stringMaxLength, String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, @@ -102,6 +106,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -125,6 +131,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); diff --git a/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java b/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java index 76dc8306..ab2390e0 100644 --- a/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java +++ b/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java @@ -139,6 +139,11 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { GeneratedField.of("stringMinLength", String.class).minLength(3).build(), GeneratedField.of("stringMaxLength", String.class).maxLength(7).build(), GeneratedField.of("stringMinAndMaxLength", String.class).minLength(3).maxLength(7).build(), + GeneratedField.of("arrayNullable", List.class, String.class).isNullable(true).build(), + GeneratedField.of("arrayRequiredNullable", List.class, String.class) + .isRequired(true) + .isNullable(true) + .build(), GeneratedField.of("arrayMinItems", List.class, String.class).minItems(1).build(), GeneratedField.of("arrayMaxItems", List.class, String.class).maxItems(10).build(), GeneratedField.of("arrayMinAndMaxItems", List.class, String.class) diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index 7bd36d30..70d9d5be 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -54,6 +54,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -79,6 +81,8 @@ public record RecordWithAllConstraints( String stringMinLength, String stringMaxLength, String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, @@ -106,6 +110,8 @@ public record RecordWithAllConstraints( "stringMinLength", "stringMaxLength", "stringMinAndMaxLength", + "arrayNullable", + "arrayRequiredNullable", "arrayMinItems", "arrayMaxItems", "arrayMinAndMaxItems", @@ -124,7 +130,8 @@ public record RecordWithAllConstraints( new HashSet<>( Set.of("stringRequired", "stringRequiredNullable", - "stringRequiredPattern")); + "stringRequiredPattern", + "arrayRequiredNullable")); public RecordWithAllConstraints( final String stringStandard, @@ -138,6 +145,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -161,6 +170,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); @@ -318,6 +329,24 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("arrayNullable") != null && !jsonObj.get("arrayNullable").isJsonNull()) { + if (!jsonObj.get("arrayNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayNullable"))); + } + } + + if (!jsonObj.get("arrayRequiredNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayRequiredNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayRequiredNullable"))); + } + if (jsonObj.get("arrayMinItems") != null && !jsonObj.get("arrayMinItems").isJsonNull()) { if (!jsonObj.get("arrayMinItems").isJsonArray()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java index bfeac5d0..4155b6c4 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -54,6 +54,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -82,6 +84,8 @@ public record RecordWithAllConstraints( String stringMinLength, String stringMaxLength, String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, @@ -109,6 +113,8 @@ public record RecordWithAllConstraints( "stringMinLength", "stringMaxLength", "stringMinAndMaxLength", + "arrayNullable", + "arrayRequiredNullable", "arrayMinItems", "arrayMaxItems", "arrayMinAndMaxItems", @@ -127,7 +133,8 @@ public record RecordWithAllConstraints( new HashSet<>( Set.of("stringRequired", "stringRequiredNullable", - "stringRequiredPattern")); + "stringRequiredPattern", + "arrayRequiredNullable")); public RecordWithAllConstraints( final String stringStandard, @@ -141,6 +148,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -164,6 +173,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); @@ -321,6 +332,24 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("arrayNullable") != null && !jsonObj.get("arrayNullable").isJsonNull()) { + if (!jsonObj.get("arrayNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayNullable"))); + } + } + + if (!jsonObj.get("arrayRequiredNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayRequiredNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayRequiredNullable"))); + } + if (jsonObj.get("arrayMinItems") != null && !jsonObj.get("arrayMinItems").isJsonNull()) { if (!jsonObj.get("arrayMinItems").isJsonArray()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index 5d4abbe6..f6867a03 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -54,6 +54,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -79,6 +81,8 @@ public record RecordWithAllConstraints( String stringMinLength, String stringMaxLength, String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, @@ -106,6 +110,8 @@ public record RecordWithAllConstraints( "stringMinLength", "stringMaxLength", "stringMinAndMaxLength", + "arrayNullable", + "arrayRequiredNullable", "arrayMinItems", "arrayMaxItems", "arrayMinAndMaxItems", @@ -124,7 +130,8 @@ public record RecordWithAllConstraints( new HashSet<>( Set.of("stringRequired", "stringRequiredNullable", - "stringRequiredPattern")); + "stringRequiredPattern", + "arrayRequiredNullable")); public RecordWithAllConstraints( final String stringStandard, @@ -138,6 +145,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -161,6 +170,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); @@ -318,6 +329,24 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("arrayNullable") != null && !jsonObj.get("arrayNullable").isJsonNull()) { + if (!jsonObj.get("arrayNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayNullable"))); + } + } + + if (!jsonObj.get("arrayRequiredNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayRequiredNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayRequiredNullable"))); + } + if (jsonObj.get("arrayMinItems") != null && !jsonObj.get("arrayMinItems").isJsonNull()) { if (!jsonObj.get("arrayMinItems").isJsonArray()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java index 9143239d..f1367d2b 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -54,6 +54,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -79,6 +81,8 @@ public record RecordWithAllConstraints( String stringMinLength, String stringMaxLength, String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, @@ -106,6 +110,8 @@ public record RecordWithAllConstraints( "stringMinLength", "stringMaxLength", "stringMinAndMaxLength", + "arrayNullable", + "arrayRequiredNullable", "arrayMinItems", "arrayMaxItems", "arrayMinAndMaxItems", @@ -124,7 +130,8 @@ public record RecordWithAllConstraints( new HashSet<>( Set.of("stringRequired", "stringRequiredNullable", - "stringRequiredPattern")); + "stringRequiredPattern", + "arrayRequiredNullable")); public RecordWithAllConstraints( final String stringStandard, @@ -138,6 +145,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -161,6 +170,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); @@ -318,6 +329,24 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("arrayNullable") != null && !jsonObj.get("arrayNullable").isJsonNull()) { + if (!jsonObj.get("arrayNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayNullable"))); + } + } + + if (!jsonObj.get("arrayRequiredNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayRequiredNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayRequiredNullable"))); + } + if (jsonObj.get("arrayMinItems") != null && !jsonObj.get("arrayMinItems").isJsonNull()) { if (!jsonObj.get("arrayMinItems").isJsonArray()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java index c12fb5d9..6786f5ad 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java @@ -54,6 +54,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -79,6 +81,8 @@ public record RecordWithAllConstraints( String stringMinLength, String stringMaxLength, String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, @@ -106,6 +110,8 @@ public record RecordWithAllConstraints( "stringMinLength", "stringMaxLength", "stringMinAndMaxLength", + "arrayNullable", + "arrayRequiredNullable", "arrayMinItems", "arrayMaxItems", "arrayMinAndMaxItems", @@ -124,7 +130,8 @@ public record RecordWithAllConstraints( new HashSet<>( Set.of("stringRequired", "stringRequiredNullable", - "stringRequiredPattern")); + "stringRequiredPattern", + "arrayRequiredNullable")); public RecordWithAllConstraints( final String stringStandard, @@ -138,6 +145,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -161,6 +170,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); @@ -189,6 +200,8 @@ public static class Builder { private String stringMinLength; private String stringMaxLength; private String stringMinAndMaxLength; + private List arrayNullable; + private List arrayRequiredNullable; private List arrayMinItems; private List arrayMaxItems; private List arrayMinAndMaxItems; @@ -345,6 +358,32 @@ public Builder stringMinAndMaxLength(final String stringMinAndMaxLength) { return this; } + /** + * Sets the value of {@link RecordWithAllConstraints#arrayNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param arrayNullable Non-required, nullable List.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder arrayNullable(final List arrayNullable) { + this.arrayNullable = arrayNullable; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#arrayRequiredNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param arrayRequiredNullable Required, nullable List.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder arrayRequiredNullable(final List arrayRequiredNullable) { + this.arrayRequiredNullable = arrayRequiredNullable; + return this; + } + /** * Sets the value of {@link RecordWithAllConstraints#arrayMinItems }. * @@ -522,6 +561,8 @@ public RecordWithAllConstraints build() { stringMinLength, stringMaxLength, stringMinAndMaxLength, + arrayNullable, + arrayRequiredNullable, arrayMinItems, arrayMaxItems, arrayMinAndMaxItems, @@ -685,6 +726,24 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("arrayNullable") != null && !jsonObj.get("arrayNullable").isJsonNull()) { + if (!jsonObj.get("arrayNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayNullable"))); + } + } + + if (!jsonObj.get("arrayRequiredNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayRequiredNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayRequiredNullable"))); + } + if (jsonObj.get("arrayMinItems") != null && !jsonObj.get("arrayMinItems").isJsonNull()) { if (!jsonObj.get("arrayMinItems").isJsonArray()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java index 80f2ba6b..8e662df9 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java @@ -55,6 +55,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -80,6 +82,8 @@ public record RecordWithAllConstraints( String stringMinLength, String stringMaxLength, String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, @@ -108,6 +112,8 @@ public record RecordWithAllConstraints( "stringMinLength", "stringMaxLength", "stringMinAndMaxLength", + "arrayNullable", + "arrayRequiredNullable", "arrayMinItems", "arrayMaxItems", "arrayMinAndMaxItems", @@ -126,7 +132,8 @@ public record RecordWithAllConstraints( new HashSet<>( Set.of("stringRequired", "stringRequiredNullable", - "stringRequiredPattern")); + "stringRequiredPattern", + "arrayRequiredNullable")); public RecordWithAllConstraints( final String stringStandard, @@ -140,6 +147,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -163,6 +172,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); @@ -320,6 +331,24 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("arrayNullable") != null && !jsonObj.get("arrayNullable").isJsonNull()) { + if (!jsonObj.get("arrayNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayNullable"))); + } + } + + if (!jsonObj.get("arrayRequiredNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayRequiredNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayRequiredNullable"))); + } + if (jsonObj.get("arrayMinItems") != null && !jsonObj.get("arrayMinItems").isJsonNull()) { if (!jsonObj.get("arrayMinItems").isJsonArray()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java index 050693a8..0c3bd8f6 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java @@ -54,6 +54,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -79,6 +81,8 @@ public record RecordWithAllConstraints( String stringMinLength, String stringMaxLength, String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, @@ -106,6 +110,8 @@ public record RecordWithAllConstraints( "stringMinLength", "stringMaxLength", "stringMinAndMaxLength", + "arrayNullable", + "arrayRequiredNullable", "arrayMinItems", "arrayMaxItems", "arrayMinAndMaxItems", @@ -124,7 +130,8 @@ public record RecordWithAllConstraints( new HashSet<>( Set.of("stringRequired", "stringRequiredNullable", - "stringRequiredPattern")); + "stringRequiredPattern", + "arrayRequiredNullable")); public RecordWithAllConstraints( final String stringStandard, @@ -138,6 +145,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -161,6 +170,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); @@ -318,6 +329,24 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("arrayNullable") != null && !jsonObj.get("arrayNullable").isJsonNull()) { + if (!jsonObj.get("arrayNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayNullable"))); + } + } + + if (!jsonObj.get("arrayRequiredNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayRequiredNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayRequiredNullable"))); + } + if (jsonObj.get("arrayMinItems") != null && !jsonObj.get("arrayMinItems").isJsonNull()) { if (!jsonObj.get("arrayMinItems").isJsonArray()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java index 99f07448..05c1285d 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java @@ -56,6 +56,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -81,6 +83,8 @@ public record RecordWithAllConstraints( @Size(min = 3) String stringMinLength, @Size(max = 7) String stringMaxLength, @Size(min = 3, max = 7) String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, @Size(min = 1) List arrayMinItems, @Size(max = 10) List arrayMaxItems, @Size(min = 1, max = 10) List arrayMinAndMaxItems, @@ -108,6 +112,8 @@ public record RecordWithAllConstraints( "stringMinLength", "stringMaxLength", "stringMinAndMaxLength", + "arrayNullable", + "arrayRequiredNullable", "arrayMinItems", "arrayMaxItems", "arrayMinAndMaxItems", @@ -126,7 +132,8 @@ public record RecordWithAllConstraints( new HashSet<>( Set.of("stringRequired", "stringRequiredNullable", - "stringRequiredPattern")); + "stringRequiredPattern", + "arrayRequiredNullable")); public RecordWithAllConstraints( final String stringStandard, @@ -140,6 +147,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -163,6 +172,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); @@ -320,6 +331,24 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("arrayNullable") != null && !jsonObj.get("arrayNullable").isJsonNull()) { + if (!jsonObj.get("arrayNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayNullable"))); + } + } + + if (!jsonObj.get("arrayRequiredNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayRequiredNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayRequiredNullable"))); + } + if (jsonObj.get("arrayMinItems") != null && !jsonObj.get("arrayMinItems").isJsonNull()) { if (!jsonObj.get("arrayMinItems").isJsonArray()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java index 3986138e..4e06ae4d 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -54,6 +54,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -79,6 +81,8 @@ public record RecordWithAllConstraints( String stringMinLength, String stringMaxLength, String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, @@ -106,6 +110,8 @@ public record RecordWithAllConstraints( "stringMinLength", "stringMaxLength", "stringMinAndMaxLength", + "arrayNullable", + "arrayRequiredNullable", "arrayMinItems", "arrayMaxItems", "arrayMinAndMaxItems", @@ -124,7 +130,8 @@ public record RecordWithAllConstraints( new HashSet<>( Set.of("stringRequired", "stringRequiredNullable", - "stringRequiredPattern")); + "stringRequiredPattern", + "arrayRequiredNullable")); public RecordWithAllConstraints( final String stringStandard, @@ -138,6 +145,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -161,6 +170,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); @@ -318,6 +329,24 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("arrayNullable") != null && !jsonObj.get("arrayNullable").isJsonNull()) { + if (!jsonObj.get("arrayNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayNullable"))); + } + } + + if (!jsonObj.get("arrayRequiredNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayRequiredNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayRequiredNullable"))); + } + if (jsonObj.get("arrayMinItems") != null && !jsonObj.get("arrayMinItems").isJsonNull()) { if (!jsonObj.get("arrayMinItems").isJsonArray()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index 3609e585..527c6c25 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -51,6 +51,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -76,6 +78,8 @@ public record RecordWithAllConstraints( String stringMinLength, String stringMaxLength, String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, @@ -102,6 +106,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -125,6 +131,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java index ed28ff69..01b9e73c 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -51,6 +51,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -79,6 +81,8 @@ public record RecordWithAllConstraints( String stringMinLength, String stringMaxLength, String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, @@ -105,6 +109,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -128,6 +134,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index fbcad6b7..5ac287ea 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -51,6 +51,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -76,6 +78,8 @@ public record RecordWithAllConstraints( String stringMinLength, String stringMaxLength, String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, @@ -102,6 +106,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -125,6 +131,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java index 3cb6750b..03bcaf5f 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -51,6 +51,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -76,6 +78,8 @@ public record RecordWithAllConstraints( String stringMinLength, String stringMaxLength, String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, @@ -102,6 +106,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -125,6 +131,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java index 9cf3d0ac..5173285e 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java @@ -51,6 +51,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -76,6 +78,8 @@ public record RecordWithAllConstraints( String stringMinLength, String stringMaxLength, String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, @@ -102,6 +106,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -125,6 +131,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); @@ -153,6 +161,8 @@ public static class Builder { private String stringMinLength; private String stringMaxLength; private String stringMinAndMaxLength; + private List arrayNullable; + private List arrayRequiredNullable; private List arrayMinItems; private List arrayMaxItems; private List arrayMinAndMaxItems; @@ -309,6 +319,32 @@ public Builder stringMinAndMaxLength(final String stringMinAndMaxLength) { return this; } + /** + * Sets the value of {@link RecordWithAllConstraints#arrayNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param arrayNullable Non-required, nullable List.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder arrayNullable(final List arrayNullable) { + this.arrayNullable = arrayNullable; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#arrayRequiredNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param arrayRequiredNullable Required, nullable List.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder arrayRequiredNullable(final List arrayRequiredNullable) { + this.arrayRequiredNullable = arrayRequiredNullable; + return this; + } + /** * Sets the value of {@link RecordWithAllConstraints#arrayMinItems }. * @@ -486,6 +522,8 @@ public RecordWithAllConstraints build() { stringMinLength, stringMaxLength, stringMinAndMaxLength, + arrayNullable, + arrayRequiredNullable, arrayMinItems, arrayMaxItems, arrayMinAndMaxItems, diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java index ec90cfe7..84e20191 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java @@ -52,6 +52,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -77,6 +79,8 @@ public record RecordWithAllConstraints( String stringMinLength, String stringMaxLength, String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, @@ -104,6 +108,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -127,6 +133,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java index a1fe435d..828c48a5 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java @@ -51,6 +51,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -76,6 +78,8 @@ public record RecordWithAllConstraints( String stringMinLength, String stringMaxLength, String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, @@ -102,6 +106,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -125,6 +131,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java index 536d4fd5..42cdb8b0 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java @@ -53,6 +53,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -78,6 +80,8 @@ public record RecordWithAllConstraints( @Size(min = 3) String stringMinLength, @Size(max = 7) String stringMaxLength, @Size(min = 3, max = 7) String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, @Size(min = 1) List arrayMinItems, @Size(max = 10) List arrayMaxItems, @Size(min = 1, max = 10) List arrayMinAndMaxItems, @@ -104,6 +108,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -127,6 +133,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java index d37d4b15..945b78e0 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -51,6 +51,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -76,6 +78,8 @@ public record RecordWithAllConstraints( String stringMinLength, String stringMaxLength, String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, @@ -102,6 +106,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -125,6 +131,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); diff --git a/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java b/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java index 76dc8306..ab2390e0 100644 --- a/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java +++ b/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java @@ -139,6 +139,11 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { GeneratedField.of("stringMinLength", String.class).minLength(3).build(), GeneratedField.of("stringMaxLength", String.class).maxLength(7).build(), GeneratedField.of("stringMinAndMaxLength", String.class).minLength(3).maxLength(7).build(), + GeneratedField.of("arrayNullable", List.class, String.class).isNullable(true).build(), + GeneratedField.of("arrayRequiredNullable", List.class, String.class) + .isRequired(true) + .isNullable(true) + .build(), GeneratedField.of("arrayMinItems", List.class, String.class).minItems(1).build(), GeneratedField.of("arrayMaxItems", List.class, String.class).maxItems(10).build(), GeneratedField.of("arrayMinAndMaxItems", List.class, String.class) diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index 115b5aa6..1cc3df82 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -37,6 +37,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -62,6 +64,8 @@ public record RecordWithAllConstraints( @Size(min = 3) String stringMinLength, @Size(max = 7) String stringMaxLength, @Size(min = 3, max = 7) String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, @Size(min = 1) List arrayMinItems, @Size(max = 10) List arrayMaxItems, @Size(min = 1, max = 10) List arrayMinAndMaxItems, @@ -88,6 +92,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -111,6 +117,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java index af68b1ca..d6ac8bcd 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -37,6 +37,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -65,6 +67,8 @@ public record RecordWithAllConstraints( @Size(min = 3) String stringMinLength, @Size(max = 7) String stringMaxLength, @Size(min = 3, max = 7) String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, @Size(min = 1) List arrayMinItems, @Size(max = 10) List arrayMaxItems, @Size(min = 1, max = 10) List arrayMinAndMaxItems, @@ -91,6 +95,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -114,6 +120,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index 212622cf..982b4103 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -37,6 +37,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -62,6 +64,8 @@ public record RecordWithAllConstraints( @Size(min = 3) String stringMinLength, @Size(max = 7) String stringMaxLength, @Size(min = 3, max = 7) String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, @Size(min = 1) List arrayMinItems, @Size(max = 10) List arrayMaxItems, @Size(min = 1, max = 10) List arrayMinAndMaxItems, @@ -88,6 +92,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -111,6 +117,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java index 057366b7..e399bc9a 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -37,6 +37,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -62,6 +64,8 @@ public record RecordWithAllConstraints( @Size(min = 3) String stringMinLength, @Size(max = 7) String stringMaxLength, @Size(min = 3, max = 7) String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, @Size(min = 1) List arrayMinItems, @Size(max = 10) List arrayMaxItems, @Size(min = 1, max = 10) List arrayMinAndMaxItems, @@ -88,6 +92,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -111,6 +117,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java index 55a73fbe..4d61b469 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java @@ -37,6 +37,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -62,6 +64,8 @@ public record RecordWithAllConstraints( @Size(min = 3) String stringMinLength, @Size(max = 7) String stringMaxLength, @Size(min = 3, max = 7) String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, @Size(min = 1) List arrayMinItems, @Size(max = 10) List arrayMaxItems, @Size(min = 1, max = 10) List arrayMinAndMaxItems, @@ -88,6 +92,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -111,6 +117,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); @@ -139,6 +147,8 @@ public static class Builder { private String stringMinLength; private String stringMaxLength; private String stringMinAndMaxLength; + private List arrayNullable; + private List arrayRequiredNullable; private List arrayMinItems; private List arrayMaxItems; private List arrayMinAndMaxItems; @@ -295,6 +305,32 @@ public Builder stringMinAndMaxLength(final String stringMinAndMaxLength) { return this; } + /** + * Sets the value of {@link RecordWithAllConstraints#arrayNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param arrayNullable Non-required, nullable List.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder arrayNullable(final List arrayNullable) { + this.arrayNullable = arrayNullable; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#arrayRequiredNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param arrayRequiredNullable Required, nullable List.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder arrayRequiredNullable(final List arrayRequiredNullable) { + this.arrayRequiredNullable = arrayRequiredNullable; + return this; + } + /** * Sets the value of {@link RecordWithAllConstraints#arrayMinItems }. * @@ -472,6 +508,8 @@ public RecordWithAllConstraints build() { stringMinLength, stringMaxLength, stringMinAndMaxLength, + arrayNullable, + arrayRequiredNullable, arrayMinItems, arrayMaxItems, arrayMinAndMaxItems, diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java index d06c7248..3eedeac4 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java @@ -38,6 +38,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -63,6 +65,8 @@ public record RecordWithAllConstraints( @Size(min = 3) String stringMinLength, @Size(max = 7) String stringMaxLength, @Size(min = 3, max = 7) String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, @Size(min = 1) List arrayMinItems, @Size(max = 10) List arrayMaxItems, @Size(min = 1, max = 10) List arrayMinAndMaxItems, @@ -90,6 +94,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -113,6 +119,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java index c00696fd..68fd9cbf 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java @@ -37,6 +37,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -62,6 +64,8 @@ public record RecordWithAllConstraints( @Size(min = 3) String stringMinLength, @Size(max = 7) String stringMaxLength, @Size(min = 3, max = 7) String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, @Size(min = 1) List arrayMinItems, @Size(max = 10) List arrayMaxItems, @Size(min = 1, max = 10) List arrayMinAndMaxItems, @@ -88,6 +92,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -111,6 +117,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java index 3147f0f6..d65ba2d6 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java @@ -37,6 +37,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -62,6 +64,8 @@ public record RecordWithAllConstraints( @Size(min = 3) String stringMinLength, @Size(max = 7) String stringMaxLength, @Size(min = 3, max = 7) String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, @Size(min = 1) List arrayMinItems, @Size(max = 10) List arrayMaxItems, @Size(min = 1, max = 10) List arrayMinAndMaxItems, @@ -88,6 +92,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -111,6 +117,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java index bd97dbb3..969afc50 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -37,6 +37,8 @@ * @param stringMinLength Non-required, non-nullable String field with minLength: 3. * @param stringMaxLength Non-required, non-nullable String field with maxLength: 7. * @param stringMinAndMaxLength Non-required, non-nullable String with minLength: 3 and maxLength: 7. + * @param arrayNullable Non-required, nullable List. + * @param arrayRequiredNullable Required, nullable List. * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. @@ -62,6 +64,8 @@ public record RecordWithAllConstraints( @Size(min = 3) String stringMinLength, @Size(max = 7) String stringMaxLength, @Size(min = 3, max = 7) String stringMinAndMaxLength, + List arrayNullable, + List arrayRequiredNullable, @Size(min = 1) List arrayMinItems, @Size(max = 10) List arrayMaxItems, @Size(min = 1, max = 10) List arrayMinAndMaxItems, @@ -88,6 +92,8 @@ public RecordWithAllConstraints( final String stringMinLength, final String stringMaxLength, final String stringMinAndMaxLength, + final List arrayNullable, + final List arrayRequiredNullable, final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, @@ -111,6 +117,8 @@ public RecordWithAllConstraints( this.stringMinLength = stringMinLength; this.stringMaxLength = stringMaxLength; this.stringMinAndMaxLength = stringMinAndMaxLength; + this.arrayNullable = arrayNullable; + this.arrayRequiredNullable = arrayRequiredNullable; this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); From 8d14b1403fa824130a5079bbda86c7efa3fe105d Mon Sep 17 00:00:00 2001 From: Chrimle <28791817+Chrimle@users.noreply.github.com> Date: Sun, 26 Jul 2026 18:17:01 +0200 Subject: [PATCH 04/13] Update `RecordWithAllConstraints` test record --- test/common/src/main/resources/api.yaml | 28 ++++ .../o2jrm/models/GeneratedRecordImpl.java | 13 ++ .../RecordWithAllConstraints.java | 63 ++++++++- .../RecordWithAllConstraints.java | 63 ++++++++- .../RecordWithAllConstraints.java | 63 ++++++++- .../RecordWithAllConstraints.java | 63 ++++++++- .../RecordWithAllConstraints.java | 123 +++++++++++++++++- .../RecordWithAllConstraints.java | 63 ++++++++- .../standard/RecordWithAllConstraints.java | 63 ++++++++- .../RecordWithAllConstraints.java | 63 ++++++++- .../RecordWithAllConstraints.java | 63 ++++++++- .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 76 +++++++++++ .../RecordWithAllConstraints.java | 16 +++ .../standard/RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../o2jrm/models/GeneratedRecordImpl.java | 13 ++ .../RecordWithAllConstraints.java | 63 ++++++++- .../RecordWithAllConstraints.java | 63 ++++++++- .../RecordWithAllConstraints.java | 63 ++++++++- .../RecordWithAllConstraints.java | 63 ++++++++- .../RecordWithAllConstraints.java | 123 +++++++++++++++++- .../RecordWithAllConstraints.java | 63 ++++++++- .../standard/RecordWithAllConstraints.java | 63 ++++++++- .../RecordWithAllConstraints.java | 63 ++++++++- .../RecordWithAllConstraints.java | 63 ++++++++- .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 76 +++++++++++ .../RecordWithAllConstraints.java | 16 +++ .../standard/RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../o2jrm/models/GeneratedRecordImpl.java | 13 ++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 76 +++++++++++ .../RecordWithAllConstraints.java | 16 +++ .../standard/RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ 49 files changed, 1897 insertions(+), 36 deletions(-) diff --git a/test/common/src/main/resources/api.yaml b/test/common/src/main/resources/api.yaml index 550babb4..85b29fd6 100644 --- a/test/common/src/main/resources/api.yaml +++ b/test/common/src/main/resources/api.yaml @@ -352,11 +352,39 @@ components: type: object description: Example of a Record which has fields with constraints required: + # FIXME: BUG, gets annotated @NotNull + #- booleanRequired + #- booleanRequiredDefault + - booleanRequiredNullable - stringRequired - stringRequiredNullable - stringRequiredPattern - arrayRequiredNullable properties: + ### BOOLEAN FIELDS ### + booleanStandard: + description: "Non-required, non-nullable Boolean field." + type: boolean + booleanDefault: + description: "Non-required, non-nullable Boolean with a default value." + type: boolean + default: true + booleanNullable: + description: "Non-required, nullable Boolean field." + type: boolean + nullable: true + # FIXME: BUG, gets annotated @NotNull + # booleanRequired: + # description: "Required, non-nullable Boolean field." + # type: boolean + # booleanRequiredDefault: + # description: "Required, non-nullable Boolean field with a default value." + # type: boolean + # default: true + booleanRequiredNullable: + description: "Required, nullable Boolean field." + type: boolean + nullable: true ### STRING FIELDS ### stringStandard: description: "Non-required, non-nullable String field." diff --git a/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java b/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java index cf050ea3..2b45bc5b 100644 --- a/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java +++ b/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java @@ -118,6 +118,19 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { false, List.of(), List.of(), + GeneratedField.of("booleanStandard", Boolean.class).build(), + GeneratedField.of("booleanDefault", Boolean.class).defaultValue(Boolean.TRUE).build(), + GeneratedField.of("booleanNullable", Boolean.class).isNullable(true).build(), + // FIXME: BUG, gets annotated @NotNull + // GeneratedField.of("booleanRequired", Boolean.class).isRequired(true).build(), + // GeneratedField.of("booleanRequiredDefault", Boolean.class) + // .isRequired(true) + // .defaultValue(Boolean.TRUE) + // .build(), + GeneratedField.of("booleanRequiredNullable", Boolean.class) + .isRequired(true) + .isNullable(true) + .build(), GeneratedField.of("stringStandard", String.class).build(), GeneratedField.of("stringDefault", String.class).defaultValue("someDefaultValue").build(), GeneratedField.of("stringNullable", String.class).isNullable(true).build(), diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index 70d9d5be..58a1958d 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -43,6 +43,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -70,6 +74,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -99,7 +107,11 @@ public record RecordWithAllConstraints( /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("stringStandard", + Set.of("booleanStandard", + "booleanDefault", + "booleanNullable", + "booleanRequiredNullable", + "stringStandard", "stringDefault", "stringNullable", "stringRequired", @@ -128,12 +140,17 @@ public record RecordWithAllConstraints( /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("stringRequired", + Set.of("booleanRequiredNullable", + "stringRequired", "stringRequiredNullable", "stringRequiredPattern", "arrayRequiredNullable")); public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -159,6 +176,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; @@ -225,6 +246,44 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); + if (jsonObj.get("booleanStandard") != null && !jsonObj.get("booleanStandard").isJsonNull()) { + if (!jsonObj.get("booleanStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanStandard"))); + } + } + + if (jsonObj.get("booleanDefault") != null && !jsonObj.get("booleanDefault").isJsonNull()) { + if (!jsonObj.get("booleanDefault").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanDefault` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanDefault"))); + } + } + + if (jsonObj.get("booleanNullable") != null && !jsonObj.get("booleanNullable").isJsonNull()) { + if (!jsonObj.get("booleanNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanNullable"))); + } + } + + if (!jsonObj.get("booleanRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequiredNullable"))); + } + if (jsonObj.get("stringStandard") != null && !jsonObj.get("stringStandard").isJsonNull()) { if (!jsonObj.get("stringStandard").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java index 4155b6c4..a3a1ddcc 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -43,6 +43,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -73,6 +77,10 @@ @io.github.chrimle.o2jrm.test.annotations.TestAnnotationTwo @io.github.chrimle.o2jrm.test.annotations.TestAnnotationThree public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -102,7 +110,11 @@ public record RecordWithAllConstraints( /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("stringStandard", + Set.of("booleanStandard", + "booleanDefault", + "booleanNullable", + "booleanRequiredNullable", + "stringStandard", "stringDefault", "stringNullable", "stringRequired", @@ -131,12 +143,17 @@ public record RecordWithAllConstraints( /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("stringRequired", + Set.of("booleanRequiredNullable", + "stringRequired", "stringRequiredNullable", "stringRequiredPattern", "arrayRequiredNullable")); public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -162,6 +179,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; @@ -228,6 +249,44 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); + if (jsonObj.get("booleanStandard") != null && !jsonObj.get("booleanStandard").isJsonNull()) { + if (!jsonObj.get("booleanStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanStandard"))); + } + } + + if (jsonObj.get("booleanDefault") != null && !jsonObj.get("booleanDefault").isJsonNull()) { + if (!jsonObj.get("booleanDefault").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanDefault` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanDefault"))); + } + } + + if (jsonObj.get("booleanNullable") != null && !jsonObj.get("booleanNullable").isJsonNull()) { + if (!jsonObj.get("booleanNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanNullable"))); + } + } + + if (!jsonObj.get("booleanRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequiredNullable"))); + } + if (jsonObj.get("stringStandard") != null && !jsonObj.get("stringStandard").isJsonNull()) { if (!jsonObj.get("stringStandard").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index f6867a03..2a0d9c8d 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -43,6 +43,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -70,6 +74,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -99,7 +107,11 @@ public record RecordWithAllConstraints( /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("stringStandard", + Set.of("booleanStandard", + "booleanDefault", + "booleanNullable", + "booleanRequiredNullable", + "stringStandard", "stringDefault", "stringNullable", "stringRequired", @@ -128,12 +140,17 @@ public record RecordWithAllConstraints( /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("stringRequired", + Set.of("booleanRequiredNullable", + "stringRequired", "stringRequiredNullable", "stringRequiredPattern", "arrayRequiredNullable")); public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -159,6 +176,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; @@ -225,6 +246,44 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); + if (jsonObj.get("booleanStandard") != null && !jsonObj.get("booleanStandard").isJsonNull()) { + if (!jsonObj.get("booleanStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanStandard"))); + } + } + + if (jsonObj.get("booleanDefault") != null && !jsonObj.get("booleanDefault").isJsonNull()) { + if (!jsonObj.get("booleanDefault").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanDefault` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanDefault"))); + } + } + + if (jsonObj.get("booleanNullable") != null && !jsonObj.get("booleanNullable").isJsonNull()) { + if (!jsonObj.get("booleanNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanNullable"))); + } + } + + if (!jsonObj.get("booleanRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequiredNullable"))); + } + if (jsonObj.get("stringStandard") != null && !jsonObj.get("stringStandard").isJsonNull()) { if (!jsonObj.get("stringStandard").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java index f1367d2b..19a11b92 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -43,6 +43,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -70,6 +74,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -99,7 +107,11 @@ public record RecordWithAllConstraints( /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("stringStandard", + Set.of("booleanStandard", + "booleanDefault", + "booleanNullable", + "booleanRequiredNullable", + "stringStandard", "stringDefault", "stringNullable", "stringRequired", @@ -128,12 +140,17 @@ public record RecordWithAllConstraints( /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("stringRequired", + Set.of("booleanRequiredNullable", + "stringRequired", "stringRequiredNullable", "stringRequiredPattern", "arrayRequiredNullable")); public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -159,6 +176,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; @@ -225,6 +246,44 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); + if (jsonObj.get("booleanStandard") != null && !jsonObj.get("booleanStandard").isJsonNull()) { + if (!jsonObj.get("booleanStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanStandard"))); + } + } + + if (jsonObj.get("booleanDefault") != null && !jsonObj.get("booleanDefault").isJsonNull()) { + if (!jsonObj.get("booleanDefault").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanDefault` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanDefault"))); + } + } + + if (jsonObj.get("booleanNullable") != null && !jsonObj.get("booleanNullable").isJsonNull()) { + if (!jsonObj.get("booleanNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanNullable"))); + } + } + + if (!jsonObj.get("booleanRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequiredNullable"))); + } + if (jsonObj.get("stringStandard") != null && !jsonObj.get("stringStandard").isJsonNull()) { if (!jsonObj.get("stringStandard").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java index 6786f5ad..f4f5af15 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java @@ -43,6 +43,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -70,6 +74,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -99,7 +107,11 @@ public record RecordWithAllConstraints( /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("stringStandard", + Set.of("booleanStandard", + "booleanDefault", + "booleanNullable", + "booleanRequiredNullable", + "stringStandard", "stringDefault", "stringNullable", "stringRequired", @@ -128,12 +140,17 @@ public record RecordWithAllConstraints( /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("stringRequired", + Set.of("booleanRequiredNullable", + "stringRequired", "stringRequiredNullable", "stringRequiredPattern", "arrayRequiredNullable")); public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -159,6 +176,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; @@ -189,6 +210,10 @@ public RecordWithAllConstraints( /** Builder class for {@link RecordWithAllConstraints }. */ public static class Builder { + private Boolean booleanStandard; + private Boolean booleanDefault; + private Boolean booleanNullable; + private Boolean booleanRequiredNullable; private String stringStandard; private String stringDefault; private String stringNullable; @@ -215,6 +240,58 @@ public static class Builder { private BigDecimal bigDecimalMaximum; private BigDecimal bigDecimalMinimumAndMaximum; + /** + * Sets the value of {@link RecordWithAllConstraints#booleanStandard }. + * + *

NOTE: Pass-by-reference is used! + * + * @param booleanStandard Non-required, non-nullable Boolean field.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder booleanStandard(final Boolean booleanStandard) { + this.booleanStandard = booleanStandard; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#booleanDefault }. + * + *

NOTE: Pass-by-reference is used! + * + * @param booleanDefault Non-required, non-nullable Boolean with a default value.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder booleanDefault(final Boolean booleanDefault) { + this.booleanDefault = booleanDefault; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#booleanNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param booleanNullable Non-required, nullable Boolean field.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder booleanNullable(final Boolean booleanNullable) { + this.booleanNullable = booleanNullable; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#booleanRequiredNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param booleanRequiredNullable Required, nullable Boolean field.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder booleanRequiredNullable(final Boolean booleanRequiredNullable) { + this.booleanRequiredNullable = booleanRequiredNullable; + return this; + } + /** * Sets the value of {@link RecordWithAllConstraints#stringStandard }. * @@ -550,6 +627,10 @@ public Builder bigDecimalMinimumAndMaximum(final BigDecimal bigDecimalMinimumAnd */ public RecordWithAllConstraints build() { return new RecordWithAllConstraints( + booleanStandard, + booleanDefault, + booleanNullable, + booleanRequiredNullable, stringStandard, stringDefault, stringNullable, @@ -622,6 +703,44 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); + if (jsonObj.get("booleanStandard") != null && !jsonObj.get("booleanStandard").isJsonNull()) { + if (!jsonObj.get("booleanStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanStandard"))); + } + } + + if (jsonObj.get("booleanDefault") != null && !jsonObj.get("booleanDefault").isJsonNull()) { + if (!jsonObj.get("booleanDefault").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanDefault` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanDefault"))); + } + } + + if (jsonObj.get("booleanNullable") != null && !jsonObj.get("booleanNullable").isJsonNull()) { + if (!jsonObj.get("booleanNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanNullable"))); + } + } + + if (!jsonObj.get("booleanRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequiredNullable"))); + } + if (jsonObj.get("stringStandard") != null && !jsonObj.get("stringStandard").isJsonNull()) { if (!jsonObj.get("stringStandard").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java index 8e662df9..2d7ded9d 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java @@ -44,6 +44,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -71,6 +75,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -101,7 +109,11 @@ public record RecordWithAllConstraints( /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("stringStandard", + Set.of("booleanStandard", + "booleanDefault", + "booleanNullable", + "booleanRequiredNullable", + "stringStandard", "stringDefault", "stringNullable", "stringRequired", @@ -130,12 +142,17 @@ public record RecordWithAllConstraints( /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("stringRequired", + Set.of("booleanRequiredNullable", + "stringRequired", "stringRequiredNullable", "stringRequiredPattern", "arrayRequiredNullable")); public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -161,6 +178,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; @@ -227,6 +248,44 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); + if (jsonObj.get("booleanStandard") != null && !jsonObj.get("booleanStandard").isJsonNull()) { + if (!jsonObj.get("booleanStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanStandard"))); + } + } + + if (jsonObj.get("booleanDefault") != null && !jsonObj.get("booleanDefault").isJsonNull()) { + if (!jsonObj.get("booleanDefault").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanDefault` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanDefault"))); + } + } + + if (jsonObj.get("booleanNullable") != null && !jsonObj.get("booleanNullable").isJsonNull()) { + if (!jsonObj.get("booleanNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanNullable"))); + } + } + + if (!jsonObj.get("booleanRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequiredNullable"))); + } + if (jsonObj.get("stringStandard") != null && !jsonObj.get("stringStandard").isJsonNull()) { if (!jsonObj.get("stringStandard").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java index 0c3bd8f6..41f5493b 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java @@ -43,6 +43,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -70,6 +74,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -99,7 +107,11 @@ public record RecordWithAllConstraints( /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("stringStandard", + Set.of("booleanStandard", + "booleanDefault", + "booleanNullable", + "booleanRequiredNullable", + "stringStandard", "stringDefault", "stringNullable", "stringRequired", @@ -128,12 +140,17 @@ public record RecordWithAllConstraints( /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("stringRequired", + Set.of("booleanRequiredNullable", + "stringRequired", "stringRequiredNullable", "stringRequiredPattern", "arrayRequiredNullable")); public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -159,6 +176,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; @@ -225,6 +246,44 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); + if (jsonObj.get("booleanStandard") != null && !jsonObj.get("booleanStandard").isJsonNull()) { + if (!jsonObj.get("booleanStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanStandard"))); + } + } + + if (jsonObj.get("booleanDefault") != null && !jsonObj.get("booleanDefault").isJsonNull()) { + if (!jsonObj.get("booleanDefault").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanDefault` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanDefault"))); + } + } + + if (jsonObj.get("booleanNullable") != null && !jsonObj.get("booleanNullable").isJsonNull()) { + if (!jsonObj.get("booleanNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanNullable"))); + } + } + + if (!jsonObj.get("booleanRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequiredNullable"))); + } + if (jsonObj.get("stringStandard") != null && !jsonObj.get("stringStandard").isJsonNull()) { if (!jsonObj.get("stringStandard").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java index 5cc84aea..b59d8617 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java @@ -45,6 +45,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -72,6 +76,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -101,7 +109,11 @@ public record RecordWithAllConstraints( /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("stringStandard", + Set.of("booleanStandard", + "booleanDefault", + "booleanNullable", + "booleanRequiredNullable", + "stringStandard", "stringDefault", "stringNullable", "stringRequired", @@ -130,12 +142,17 @@ public record RecordWithAllConstraints( /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("stringRequired", + Set.of("booleanRequiredNullable", + "stringRequired", "stringRequiredNullable", "stringRequiredPattern", "arrayRequiredNullable")); public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -161,6 +178,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; @@ -227,6 +248,44 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); + if (jsonObj.get("booleanStandard") != null && !jsonObj.get("booleanStandard").isJsonNull()) { + if (!jsonObj.get("booleanStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanStandard"))); + } + } + + if (jsonObj.get("booleanDefault") != null && !jsonObj.get("booleanDefault").isJsonNull()) { + if (!jsonObj.get("booleanDefault").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanDefault` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanDefault"))); + } + } + + if (jsonObj.get("booleanNullable") != null && !jsonObj.get("booleanNullable").isJsonNull()) { + if (!jsonObj.get("booleanNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanNullable"))); + } + } + + if (!jsonObj.get("booleanRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequiredNullable"))); + } + if (jsonObj.get("stringStandard") != null && !jsonObj.get("stringStandard").isJsonNull()) { if (!jsonObj.get("stringStandard").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java index 4e06ae4d..6381ae90 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -43,6 +43,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -70,6 +74,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -99,7 +107,11 @@ public record RecordWithAllConstraints( /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("stringStandard", + Set.of("booleanStandard", + "booleanDefault", + "booleanNullable", + "booleanRequiredNullable", + "stringStandard", "stringDefault", "stringNullable", "stringRequired", @@ -128,12 +140,17 @@ public record RecordWithAllConstraints( /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("stringRequired", + Set.of("booleanRequiredNullable", + "stringRequired", "stringRequiredNullable", "stringRequiredPattern", "arrayRequiredNullable")); public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -159,6 +176,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; @@ -225,6 +246,44 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); + if (jsonObj.get("booleanStandard") != null && !jsonObj.get("booleanStandard").isJsonNull()) { + if (!jsonObj.get("booleanStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanStandard"))); + } + } + + if (jsonObj.get("booleanDefault") != null && !jsonObj.get("booleanDefault").isJsonNull()) { + if (!jsonObj.get("booleanDefault").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanDefault` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanDefault"))); + } + } + + if (jsonObj.get("booleanNullable") != null && !jsonObj.get("booleanNullable").isJsonNull()) { + if (!jsonObj.get("booleanNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanNullable"))); + } + } + + if (!jsonObj.get("booleanRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequiredNullable"))); + } + if (jsonObj.get("stringStandard") != null && !jsonObj.get("stringStandard").isJsonNull()) { if (!jsonObj.get("stringStandard").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index 527c6c25..c0d88a2a 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -40,6 +40,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -67,6 +71,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -95,6 +103,10 @@ public record RecordWithAllConstraints( @JsonCreator public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -120,6 +132,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java index 01b9e73c..85bee5ce 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -40,6 +40,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -70,6 +74,10 @@ @io.github.chrimle.o2jrm.test.annotations.TestAnnotationTwo @io.github.chrimle.o2jrm.test.annotations.TestAnnotationThree public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -98,6 +106,10 @@ public record RecordWithAllConstraints( @JsonCreator public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -123,6 +135,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index 5ac287ea..dab88cc2 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -40,6 +40,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -67,6 +71,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -95,6 +103,10 @@ public record RecordWithAllConstraints( @JsonCreator public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -120,6 +132,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java index 03bcaf5f..b4210fa8 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -40,6 +40,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -67,6 +71,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -95,6 +103,10 @@ public record RecordWithAllConstraints( @JsonCreator public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -120,6 +132,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java index 5173285e..1ccff615 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java @@ -40,6 +40,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -67,6 +71,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -95,6 +103,10 @@ public record RecordWithAllConstraints( @JsonCreator public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -120,6 +132,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; @@ -150,6 +166,10 @@ public RecordWithAllConstraints( /** Builder class for {@link RecordWithAllConstraints }. */ public static class Builder { + private Boolean booleanStandard; + private Boolean booleanDefault; + private Boolean booleanNullable; + private Boolean booleanRequiredNullable; private String stringStandard; private String stringDefault; private String stringNullable; @@ -176,6 +196,58 @@ public static class Builder { private BigDecimal bigDecimalMaximum; private BigDecimal bigDecimalMinimumAndMaximum; + /** + * Sets the value of {@link RecordWithAllConstraints#booleanStandard }. + * + *

NOTE: Pass-by-reference is used! + * + * @param booleanStandard Non-required, non-nullable Boolean field.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder booleanStandard(final Boolean booleanStandard) { + this.booleanStandard = booleanStandard; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#booleanDefault }. + * + *

NOTE: Pass-by-reference is used! + * + * @param booleanDefault Non-required, non-nullable Boolean with a default value.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder booleanDefault(final Boolean booleanDefault) { + this.booleanDefault = booleanDefault; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#booleanNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param booleanNullable Non-required, nullable Boolean field.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder booleanNullable(final Boolean booleanNullable) { + this.booleanNullable = booleanNullable; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#booleanRequiredNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param booleanRequiredNullable Required, nullable Boolean field.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder booleanRequiredNullable(final Boolean booleanRequiredNullable) { + this.booleanRequiredNullable = booleanRequiredNullable; + return this; + } + /** * Sets the value of {@link RecordWithAllConstraints#stringStandard }. * @@ -511,6 +583,10 @@ public Builder bigDecimalMinimumAndMaximum(final BigDecimal bigDecimalMinimumAnd */ public RecordWithAllConstraints build() { return new RecordWithAllConstraints( + booleanStandard, + booleanDefault, + booleanNullable, + booleanRequiredNullable, stringStandard, stringDefault, stringNullable, diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java index 84e20191..d83bd200 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java @@ -41,6 +41,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -68,6 +72,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -97,6 +105,10 @@ public record RecordWithAllConstraints( @JsonCreator public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -122,6 +134,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java index 828c48a5..4b12a1ed 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java @@ -40,6 +40,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -67,6 +71,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -95,6 +103,10 @@ public record RecordWithAllConstraints( @JsonCreator public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -120,6 +132,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java index b1279445..782a9506 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java @@ -42,6 +42,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -69,6 +73,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -97,6 +105,10 @@ public record RecordWithAllConstraints( @JsonCreator public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -122,6 +134,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java index 945b78e0..c8df3bef 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -40,6 +40,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -67,6 +71,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -95,6 +103,10 @@ public record RecordWithAllConstraints( @JsonCreator public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -120,6 +132,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; diff --git a/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java b/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java index ab2390e0..f3f15e65 100644 --- a/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java +++ b/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java @@ -118,6 +118,19 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { false, List.of(), List.of(), + GeneratedField.of("booleanStandard", Boolean.class).build(), + GeneratedField.of("booleanDefault", Boolean.class).defaultValue(Boolean.TRUE).build(), + GeneratedField.of("booleanNullable", Boolean.class).isNullable(true).build(), + // FIXME: BUG, gets annotated @NotNull + // GeneratedField.of("booleanRequired", Boolean.class).isRequired(true).build(), + // GeneratedField.of("booleanRequiredDefault", Boolean.class) + // .isRequired(true) + // .defaultValue(Boolean.TRUE) + // .build(), + GeneratedField.of("booleanRequiredNullable", Boolean.class) + .isRequired(true) + .isNullable(true) + .build(), GeneratedField.of("stringStandard", String.class).build(), GeneratedField.of("stringDefault", String.class).defaultValue("someDefaultValue").build(), GeneratedField.of("stringNullable", String.class).isNullable(true).build(), diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index 70d9d5be..58a1958d 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -43,6 +43,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -70,6 +74,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -99,7 +107,11 @@ public record RecordWithAllConstraints( /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("stringStandard", + Set.of("booleanStandard", + "booleanDefault", + "booleanNullable", + "booleanRequiredNullable", + "stringStandard", "stringDefault", "stringNullable", "stringRequired", @@ -128,12 +140,17 @@ public record RecordWithAllConstraints( /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("stringRequired", + Set.of("booleanRequiredNullable", + "stringRequired", "stringRequiredNullable", "stringRequiredPattern", "arrayRequiredNullable")); public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -159,6 +176,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; @@ -225,6 +246,44 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); + if (jsonObj.get("booleanStandard") != null && !jsonObj.get("booleanStandard").isJsonNull()) { + if (!jsonObj.get("booleanStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanStandard"))); + } + } + + if (jsonObj.get("booleanDefault") != null && !jsonObj.get("booleanDefault").isJsonNull()) { + if (!jsonObj.get("booleanDefault").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanDefault` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanDefault"))); + } + } + + if (jsonObj.get("booleanNullable") != null && !jsonObj.get("booleanNullable").isJsonNull()) { + if (!jsonObj.get("booleanNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanNullable"))); + } + } + + if (!jsonObj.get("booleanRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequiredNullable"))); + } + if (jsonObj.get("stringStandard") != null && !jsonObj.get("stringStandard").isJsonNull()) { if (!jsonObj.get("stringStandard").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java index 4155b6c4..a3a1ddcc 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -43,6 +43,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -73,6 +77,10 @@ @io.github.chrimle.o2jrm.test.annotations.TestAnnotationTwo @io.github.chrimle.o2jrm.test.annotations.TestAnnotationThree public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -102,7 +110,11 @@ public record RecordWithAllConstraints( /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("stringStandard", + Set.of("booleanStandard", + "booleanDefault", + "booleanNullable", + "booleanRequiredNullable", + "stringStandard", "stringDefault", "stringNullable", "stringRequired", @@ -131,12 +143,17 @@ public record RecordWithAllConstraints( /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("stringRequired", + Set.of("booleanRequiredNullable", + "stringRequired", "stringRequiredNullable", "stringRequiredPattern", "arrayRequiredNullable")); public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -162,6 +179,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; @@ -228,6 +249,44 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); + if (jsonObj.get("booleanStandard") != null && !jsonObj.get("booleanStandard").isJsonNull()) { + if (!jsonObj.get("booleanStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanStandard"))); + } + } + + if (jsonObj.get("booleanDefault") != null && !jsonObj.get("booleanDefault").isJsonNull()) { + if (!jsonObj.get("booleanDefault").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanDefault` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanDefault"))); + } + } + + if (jsonObj.get("booleanNullable") != null && !jsonObj.get("booleanNullable").isJsonNull()) { + if (!jsonObj.get("booleanNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanNullable"))); + } + } + + if (!jsonObj.get("booleanRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequiredNullable"))); + } + if (jsonObj.get("stringStandard") != null && !jsonObj.get("stringStandard").isJsonNull()) { if (!jsonObj.get("stringStandard").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index f6867a03..2a0d9c8d 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -43,6 +43,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -70,6 +74,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -99,7 +107,11 @@ public record RecordWithAllConstraints( /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("stringStandard", + Set.of("booleanStandard", + "booleanDefault", + "booleanNullable", + "booleanRequiredNullable", + "stringStandard", "stringDefault", "stringNullable", "stringRequired", @@ -128,12 +140,17 @@ public record RecordWithAllConstraints( /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("stringRequired", + Set.of("booleanRequiredNullable", + "stringRequired", "stringRequiredNullable", "stringRequiredPattern", "arrayRequiredNullable")); public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -159,6 +176,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; @@ -225,6 +246,44 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); + if (jsonObj.get("booleanStandard") != null && !jsonObj.get("booleanStandard").isJsonNull()) { + if (!jsonObj.get("booleanStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanStandard"))); + } + } + + if (jsonObj.get("booleanDefault") != null && !jsonObj.get("booleanDefault").isJsonNull()) { + if (!jsonObj.get("booleanDefault").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanDefault` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanDefault"))); + } + } + + if (jsonObj.get("booleanNullable") != null && !jsonObj.get("booleanNullable").isJsonNull()) { + if (!jsonObj.get("booleanNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanNullable"))); + } + } + + if (!jsonObj.get("booleanRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequiredNullable"))); + } + if (jsonObj.get("stringStandard") != null && !jsonObj.get("stringStandard").isJsonNull()) { if (!jsonObj.get("stringStandard").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java index f1367d2b..19a11b92 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -43,6 +43,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -70,6 +74,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -99,7 +107,11 @@ public record RecordWithAllConstraints( /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("stringStandard", + Set.of("booleanStandard", + "booleanDefault", + "booleanNullable", + "booleanRequiredNullable", + "stringStandard", "stringDefault", "stringNullable", "stringRequired", @@ -128,12 +140,17 @@ public record RecordWithAllConstraints( /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("stringRequired", + Set.of("booleanRequiredNullable", + "stringRequired", "stringRequiredNullable", "stringRequiredPattern", "arrayRequiredNullable")); public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -159,6 +176,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; @@ -225,6 +246,44 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); + if (jsonObj.get("booleanStandard") != null && !jsonObj.get("booleanStandard").isJsonNull()) { + if (!jsonObj.get("booleanStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanStandard"))); + } + } + + if (jsonObj.get("booleanDefault") != null && !jsonObj.get("booleanDefault").isJsonNull()) { + if (!jsonObj.get("booleanDefault").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanDefault` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanDefault"))); + } + } + + if (jsonObj.get("booleanNullable") != null && !jsonObj.get("booleanNullable").isJsonNull()) { + if (!jsonObj.get("booleanNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanNullable"))); + } + } + + if (!jsonObj.get("booleanRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequiredNullable"))); + } + if (jsonObj.get("stringStandard") != null && !jsonObj.get("stringStandard").isJsonNull()) { if (!jsonObj.get("stringStandard").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java index 6786f5ad..f4f5af15 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java @@ -43,6 +43,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -70,6 +74,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -99,7 +107,11 @@ public record RecordWithAllConstraints( /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("stringStandard", + Set.of("booleanStandard", + "booleanDefault", + "booleanNullable", + "booleanRequiredNullable", + "stringStandard", "stringDefault", "stringNullable", "stringRequired", @@ -128,12 +140,17 @@ public record RecordWithAllConstraints( /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("stringRequired", + Set.of("booleanRequiredNullable", + "stringRequired", "stringRequiredNullable", "stringRequiredPattern", "arrayRequiredNullable")); public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -159,6 +176,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; @@ -189,6 +210,10 @@ public RecordWithAllConstraints( /** Builder class for {@link RecordWithAllConstraints }. */ public static class Builder { + private Boolean booleanStandard; + private Boolean booleanDefault; + private Boolean booleanNullable; + private Boolean booleanRequiredNullable; private String stringStandard; private String stringDefault; private String stringNullable; @@ -215,6 +240,58 @@ public static class Builder { private BigDecimal bigDecimalMaximum; private BigDecimal bigDecimalMinimumAndMaximum; + /** + * Sets the value of {@link RecordWithAllConstraints#booleanStandard }. + * + *

NOTE: Pass-by-reference is used! + * + * @param booleanStandard Non-required, non-nullable Boolean field.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder booleanStandard(final Boolean booleanStandard) { + this.booleanStandard = booleanStandard; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#booleanDefault }. + * + *

NOTE: Pass-by-reference is used! + * + * @param booleanDefault Non-required, non-nullable Boolean with a default value.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder booleanDefault(final Boolean booleanDefault) { + this.booleanDefault = booleanDefault; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#booleanNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param booleanNullable Non-required, nullable Boolean field.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder booleanNullable(final Boolean booleanNullable) { + this.booleanNullable = booleanNullable; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#booleanRequiredNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param booleanRequiredNullable Required, nullable Boolean field.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder booleanRequiredNullable(final Boolean booleanRequiredNullable) { + this.booleanRequiredNullable = booleanRequiredNullable; + return this; + } + /** * Sets the value of {@link RecordWithAllConstraints#stringStandard }. * @@ -550,6 +627,10 @@ public Builder bigDecimalMinimumAndMaximum(final BigDecimal bigDecimalMinimumAnd */ public RecordWithAllConstraints build() { return new RecordWithAllConstraints( + booleanStandard, + booleanDefault, + booleanNullable, + booleanRequiredNullable, stringStandard, stringDefault, stringNullable, @@ -622,6 +703,44 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); + if (jsonObj.get("booleanStandard") != null && !jsonObj.get("booleanStandard").isJsonNull()) { + if (!jsonObj.get("booleanStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanStandard"))); + } + } + + if (jsonObj.get("booleanDefault") != null && !jsonObj.get("booleanDefault").isJsonNull()) { + if (!jsonObj.get("booleanDefault").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanDefault` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanDefault"))); + } + } + + if (jsonObj.get("booleanNullable") != null && !jsonObj.get("booleanNullable").isJsonNull()) { + if (!jsonObj.get("booleanNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanNullable"))); + } + } + + if (!jsonObj.get("booleanRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequiredNullable"))); + } + if (jsonObj.get("stringStandard") != null && !jsonObj.get("stringStandard").isJsonNull()) { if (!jsonObj.get("stringStandard").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java index 8e662df9..2d7ded9d 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java @@ -44,6 +44,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -71,6 +75,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -101,7 +109,11 @@ public record RecordWithAllConstraints( /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("stringStandard", + Set.of("booleanStandard", + "booleanDefault", + "booleanNullable", + "booleanRequiredNullable", + "stringStandard", "stringDefault", "stringNullable", "stringRequired", @@ -130,12 +142,17 @@ public record RecordWithAllConstraints( /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("stringRequired", + Set.of("booleanRequiredNullable", + "stringRequired", "stringRequiredNullable", "stringRequiredPattern", "arrayRequiredNullable")); public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -161,6 +178,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; @@ -227,6 +248,44 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); + if (jsonObj.get("booleanStandard") != null && !jsonObj.get("booleanStandard").isJsonNull()) { + if (!jsonObj.get("booleanStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanStandard"))); + } + } + + if (jsonObj.get("booleanDefault") != null && !jsonObj.get("booleanDefault").isJsonNull()) { + if (!jsonObj.get("booleanDefault").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanDefault` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanDefault"))); + } + } + + if (jsonObj.get("booleanNullable") != null && !jsonObj.get("booleanNullable").isJsonNull()) { + if (!jsonObj.get("booleanNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanNullable"))); + } + } + + if (!jsonObj.get("booleanRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequiredNullable"))); + } + if (jsonObj.get("stringStandard") != null && !jsonObj.get("stringStandard").isJsonNull()) { if (!jsonObj.get("stringStandard").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java index 0c3bd8f6..41f5493b 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java @@ -43,6 +43,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -70,6 +74,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -99,7 +107,11 @@ public record RecordWithAllConstraints( /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("stringStandard", + Set.of("booleanStandard", + "booleanDefault", + "booleanNullable", + "booleanRequiredNullable", + "stringStandard", "stringDefault", "stringNullable", "stringRequired", @@ -128,12 +140,17 @@ public record RecordWithAllConstraints( /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("stringRequired", + Set.of("booleanRequiredNullable", + "stringRequired", "stringRequiredNullable", "stringRequiredPattern", "arrayRequiredNullable")); public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -159,6 +176,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; @@ -225,6 +246,44 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); + if (jsonObj.get("booleanStandard") != null && !jsonObj.get("booleanStandard").isJsonNull()) { + if (!jsonObj.get("booleanStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanStandard"))); + } + } + + if (jsonObj.get("booleanDefault") != null && !jsonObj.get("booleanDefault").isJsonNull()) { + if (!jsonObj.get("booleanDefault").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanDefault` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanDefault"))); + } + } + + if (jsonObj.get("booleanNullable") != null && !jsonObj.get("booleanNullable").isJsonNull()) { + if (!jsonObj.get("booleanNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanNullable"))); + } + } + + if (!jsonObj.get("booleanRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequiredNullable"))); + } + if (jsonObj.get("stringStandard") != null && !jsonObj.get("stringStandard").isJsonNull()) { if (!jsonObj.get("stringStandard").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java index 05c1285d..f838ca2b 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java @@ -45,6 +45,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -72,6 +76,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -101,7 +109,11 @@ public record RecordWithAllConstraints( /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("stringStandard", + Set.of("booleanStandard", + "booleanDefault", + "booleanNullable", + "booleanRequiredNullable", + "stringStandard", "stringDefault", "stringNullable", "stringRequired", @@ -130,12 +142,17 @@ public record RecordWithAllConstraints( /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("stringRequired", + Set.of("booleanRequiredNullable", + "stringRequired", "stringRequiredNullable", "stringRequiredPattern", "arrayRequiredNullable")); public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -161,6 +178,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; @@ -227,6 +248,44 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); + if (jsonObj.get("booleanStandard") != null && !jsonObj.get("booleanStandard").isJsonNull()) { + if (!jsonObj.get("booleanStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanStandard"))); + } + } + + if (jsonObj.get("booleanDefault") != null && !jsonObj.get("booleanDefault").isJsonNull()) { + if (!jsonObj.get("booleanDefault").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanDefault` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanDefault"))); + } + } + + if (jsonObj.get("booleanNullable") != null && !jsonObj.get("booleanNullable").isJsonNull()) { + if (!jsonObj.get("booleanNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanNullable"))); + } + } + + if (!jsonObj.get("booleanRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequiredNullable"))); + } + if (jsonObj.get("stringStandard") != null && !jsonObj.get("stringStandard").isJsonNull()) { if (!jsonObj.get("stringStandard").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java index 4e06ae4d..6381ae90 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -43,6 +43,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -70,6 +74,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -99,7 +107,11 @@ public record RecordWithAllConstraints( /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("stringStandard", + Set.of("booleanStandard", + "booleanDefault", + "booleanNullable", + "booleanRequiredNullable", + "stringStandard", "stringDefault", "stringNullable", "stringRequired", @@ -128,12 +140,17 @@ public record RecordWithAllConstraints( /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("stringRequired", + Set.of("booleanRequiredNullable", + "stringRequired", "stringRequiredNullable", "stringRequiredPattern", "arrayRequiredNullable")); public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -159,6 +176,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; @@ -225,6 +246,44 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); + if (jsonObj.get("booleanStandard") != null && !jsonObj.get("booleanStandard").isJsonNull()) { + if (!jsonObj.get("booleanStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanStandard"))); + } + } + + if (jsonObj.get("booleanDefault") != null && !jsonObj.get("booleanDefault").isJsonNull()) { + if (!jsonObj.get("booleanDefault").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanDefault` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanDefault"))); + } + } + + if (jsonObj.get("booleanNullable") != null && !jsonObj.get("booleanNullable").isJsonNull()) { + if (!jsonObj.get("booleanNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanNullable"))); + } + } + + if (!jsonObj.get("booleanRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequiredNullable"))); + } + if (jsonObj.get("stringStandard") != null && !jsonObj.get("stringStandard").isJsonNull()) { if (!jsonObj.get("stringStandard").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index 527c6c25..c0d88a2a 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -40,6 +40,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -67,6 +71,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -95,6 +103,10 @@ public record RecordWithAllConstraints( @JsonCreator public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -120,6 +132,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java index 01b9e73c..85bee5ce 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -40,6 +40,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -70,6 +74,10 @@ @io.github.chrimle.o2jrm.test.annotations.TestAnnotationTwo @io.github.chrimle.o2jrm.test.annotations.TestAnnotationThree public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -98,6 +106,10 @@ public record RecordWithAllConstraints( @JsonCreator public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -123,6 +135,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index 5ac287ea..dab88cc2 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -40,6 +40,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -67,6 +71,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -95,6 +103,10 @@ public record RecordWithAllConstraints( @JsonCreator public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -120,6 +132,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java index 03bcaf5f..b4210fa8 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -40,6 +40,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -67,6 +71,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -95,6 +103,10 @@ public record RecordWithAllConstraints( @JsonCreator public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -120,6 +132,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java index 5173285e..1ccff615 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java @@ -40,6 +40,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -67,6 +71,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -95,6 +103,10 @@ public record RecordWithAllConstraints( @JsonCreator public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -120,6 +132,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; @@ -150,6 +166,10 @@ public RecordWithAllConstraints( /** Builder class for {@link RecordWithAllConstraints }. */ public static class Builder { + private Boolean booleanStandard; + private Boolean booleanDefault; + private Boolean booleanNullable; + private Boolean booleanRequiredNullable; private String stringStandard; private String stringDefault; private String stringNullable; @@ -176,6 +196,58 @@ public static class Builder { private BigDecimal bigDecimalMaximum; private BigDecimal bigDecimalMinimumAndMaximum; + /** + * Sets the value of {@link RecordWithAllConstraints#booleanStandard }. + * + *

NOTE: Pass-by-reference is used! + * + * @param booleanStandard Non-required, non-nullable Boolean field.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder booleanStandard(final Boolean booleanStandard) { + this.booleanStandard = booleanStandard; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#booleanDefault }. + * + *

NOTE: Pass-by-reference is used! + * + * @param booleanDefault Non-required, non-nullable Boolean with a default value.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder booleanDefault(final Boolean booleanDefault) { + this.booleanDefault = booleanDefault; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#booleanNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param booleanNullable Non-required, nullable Boolean field.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder booleanNullable(final Boolean booleanNullable) { + this.booleanNullable = booleanNullable; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#booleanRequiredNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param booleanRequiredNullable Required, nullable Boolean field.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder booleanRequiredNullable(final Boolean booleanRequiredNullable) { + this.booleanRequiredNullable = booleanRequiredNullable; + return this; + } + /** * Sets the value of {@link RecordWithAllConstraints#stringStandard }. * @@ -511,6 +583,10 @@ public Builder bigDecimalMinimumAndMaximum(final BigDecimal bigDecimalMinimumAnd */ public RecordWithAllConstraints build() { return new RecordWithAllConstraints( + booleanStandard, + booleanDefault, + booleanNullable, + booleanRequiredNullable, stringStandard, stringDefault, stringNullable, diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java index 84e20191..d83bd200 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java @@ -41,6 +41,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -68,6 +72,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -97,6 +105,10 @@ public record RecordWithAllConstraints( @JsonCreator public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -122,6 +134,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java index 828c48a5..4b12a1ed 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java @@ -40,6 +40,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -67,6 +71,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -95,6 +103,10 @@ public record RecordWithAllConstraints( @JsonCreator public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -120,6 +132,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java index 42cdb8b0..6d33a21e 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java @@ -42,6 +42,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -69,6 +73,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -97,6 +105,10 @@ public record RecordWithAllConstraints( @JsonCreator public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -122,6 +134,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java index 945b78e0..c8df3bef 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -40,6 +40,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -67,6 +71,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -95,6 +103,10 @@ public record RecordWithAllConstraints( @JsonCreator public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -120,6 +132,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; diff --git a/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java b/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java index ab2390e0..f3f15e65 100644 --- a/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java +++ b/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java @@ -118,6 +118,19 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { false, List.of(), List.of(), + GeneratedField.of("booleanStandard", Boolean.class).build(), + GeneratedField.of("booleanDefault", Boolean.class).defaultValue(Boolean.TRUE).build(), + GeneratedField.of("booleanNullable", Boolean.class).isNullable(true).build(), + // FIXME: BUG, gets annotated @NotNull + // GeneratedField.of("booleanRequired", Boolean.class).isRequired(true).build(), + // GeneratedField.of("booleanRequiredDefault", Boolean.class) + // .isRequired(true) + // .defaultValue(Boolean.TRUE) + // .build(), + GeneratedField.of("booleanRequiredNullable", Boolean.class) + .isRequired(true) + .isNullable(true) + .build(), GeneratedField.of("stringStandard", String.class).build(), GeneratedField.of("stringDefault", String.class).defaultValue("someDefaultValue").build(), GeneratedField.of("stringNullable", String.class).isNullable(true).build(), diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index 1cc3df82..5c60e5f0 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -26,6 +26,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -53,6 +57,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -81,6 +89,10 @@ public record RecordWithAllConstraints( @JsonCreator public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -106,6 +118,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java index d6ac8bcd..0851ef99 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -26,6 +26,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -56,6 +60,10 @@ @io.github.chrimle.o2jrm.test.annotations.TestAnnotationTwo @io.github.chrimle.o2jrm.test.annotations.TestAnnotationThree public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -84,6 +92,10 @@ public record RecordWithAllConstraints( @JsonCreator public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -109,6 +121,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index 982b4103..b8d37d13 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -26,6 +26,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -53,6 +57,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -81,6 +89,10 @@ public record RecordWithAllConstraints( @JsonCreator public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -106,6 +118,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java index e399bc9a..92746d94 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -26,6 +26,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -53,6 +57,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -81,6 +89,10 @@ public record RecordWithAllConstraints( @JsonCreator public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -106,6 +118,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java index 4d61b469..8497acc5 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java @@ -26,6 +26,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -53,6 +57,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -81,6 +89,10 @@ public record RecordWithAllConstraints( @JsonCreator public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -106,6 +118,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; @@ -136,6 +152,10 @@ public RecordWithAllConstraints( /** Builder class for {@link RecordWithAllConstraints }. */ public static class Builder { + private Boolean booleanStandard; + private Boolean booleanDefault; + private Boolean booleanNullable; + private Boolean booleanRequiredNullable; private String stringStandard; private String stringDefault; private String stringNullable; @@ -162,6 +182,58 @@ public static class Builder { private BigDecimal bigDecimalMaximum; private BigDecimal bigDecimalMinimumAndMaximum; + /** + * Sets the value of {@link RecordWithAllConstraints#booleanStandard }. + * + *

NOTE: Pass-by-reference is used! + * + * @param booleanStandard Non-required, non-nullable Boolean field.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder booleanStandard(final Boolean booleanStandard) { + this.booleanStandard = booleanStandard; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#booleanDefault }. + * + *

NOTE: Pass-by-reference is used! + * + * @param booleanDefault Non-required, non-nullable Boolean with a default value.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder booleanDefault(final Boolean booleanDefault) { + this.booleanDefault = booleanDefault; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#booleanNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param booleanNullable Non-required, nullable Boolean field.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder booleanNullable(final Boolean booleanNullable) { + this.booleanNullable = booleanNullable; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#booleanRequiredNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param booleanRequiredNullable Required, nullable Boolean field.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder booleanRequiredNullable(final Boolean booleanRequiredNullable) { + this.booleanRequiredNullable = booleanRequiredNullable; + return this; + } + /** * Sets the value of {@link RecordWithAllConstraints#stringStandard }. * @@ -497,6 +569,10 @@ public Builder bigDecimalMinimumAndMaximum(final BigDecimal bigDecimalMinimumAnd */ public RecordWithAllConstraints build() { return new RecordWithAllConstraints( + booleanStandard, + booleanDefault, + booleanNullable, + booleanRequiredNullable, stringStandard, stringDefault, stringNullable, diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java index 3eedeac4..0361d0ed 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java @@ -27,6 +27,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -54,6 +58,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -83,6 +91,10 @@ public record RecordWithAllConstraints( @JsonCreator public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -108,6 +120,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java index 68fd9cbf..df60428e 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java @@ -26,6 +26,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -53,6 +57,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -81,6 +89,10 @@ public record RecordWithAllConstraints( @JsonCreator public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -106,6 +118,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java index d65ba2d6..72344a41 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java @@ -26,6 +26,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -53,6 +57,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -81,6 +89,10 @@ public record RecordWithAllConstraints( @JsonCreator public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -106,6 +118,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java index 969afc50..61c79a25 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -26,6 +26,10 @@ /** * Example of a Record which has fields with constraints * + * @param booleanStandard Non-required, non-nullable Boolean field. + * @param booleanDefault Non-required, non-nullable Boolean with a default value. + * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. * @param stringNullable Non-required, nullable String field. @@ -53,6 +57,10 @@ * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. */ public record RecordWithAllConstraints( + Boolean booleanStandard, + Boolean booleanDefault, + Boolean booleanNullable, + Boolean booleanRequiredNullable, String stringStandard, String stringDefault, String stringNullable, @@ -81,6 +89,10 @@ public record RecordWithAllConstraints( @JsonCreator public RecordWithAllConstraints( + final Boolean booleanStandard, + final Boolean booleanDefault, + final Boolean booleanNullable, + final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, final String stringNullable, @@ -106,6 +118,10 @@ public RecordWithAllConstraints( final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { + this.booleanStandard = booleanStandard; + this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); + this.booleanNullable = booleanNullable; + this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); this.stringNullable = stringNullable; From 01a487b916c7a2b0afe7cd7db95f0c96dc1a2b7c Mon Sep 17 00:00:00 2001 From: Chrimle <28791817+Chrimle@users.noreply.github.com> Date: Mon, 27 Jul 2026 16:17:31 +0200 Subject: [PATCH 05/13] Update `RecordWithAllConstraints` test record --- test/common/src/main/resources/api.yaml | 29 +++++ .../o2jrm/models/GeneratedRecordImpl.java | 10 ++ .../RecordWithAllConstraints.java | 62 ++++++++- .../RecordWithAllConstraints.java | 62 ++++++++- .../RecordWithAllConstraints.java | 62 ++++++++- .../RecordWithAllConstraints.java | 62 ++++++++- .../RecordWithAllConstraints.java | 122 +++++++++++++++++- .../RecordWithAllConstraints.java | 62 ++++++++- .../standard/RecordWithAllConstraints.java | 62 ++++++++- .../RecordWithAllConstraints.java | 62 ++++++++- .../RecordWithAllConstraints.java | 62 ++++++++- .../RecordWithAllConstraints.java | 19 +++ .../RecordWithAllConstraints.java | 19 +++ .../RecordWithAllConstraints.java | 19 +++ .../RecordWithAllConstraints.java | 19 +++ .../RecordWithAllConstraints.java | 79 ++++++++++++ .../RecordWithAllConstraints.java | 19 +++ .../standard/RecordWithAllConstraints.java | 19 +++ .../RecordWithAllConstraints.java | 19 +++ .../RecordWithAllConstraints.java | 19 +++ .../o2jrm/models/GeneratedRecordImpl.java | 10 ++ .../RecordWithAllConstraints.java | 62 ++++++++- .../RecordWithAllConstraints.java | 62 ++++++++- .../RecordWithAllConstraints.java | 62 ++++++++- .../RecordWithAllConstraints.java | 62 ++++++++- .../RecordWithAllConstraints.java | 122 +++++++++++++++++- .../RecordWithAllConstraints.java | 62 ++++++++- .../standard/RecordWithAllConstraints.java | 62 ++++++++- .../RecordWithAllConstraints.java | 62 ++++++++- .../RecordWithAllConstraints.java | 62 ++++++++- .../RecordWithAllConstraints.java | 19 +++ .../RecordWithAllConstraints.java | 19 +++ .../RecordWithAllConstraints.java | 19 +++ .../RecordWithAllConstraints.java | 19 +++ .../RecordWithAllConstraints.java | 79 ++++++++++++ .../RecordWithAllConstraints.java | 19 +++ .../standard/RecordWithAllConstraints.java | 19 +++ .../RecordWithAllConstraints.java | 19 +++ .../RecordWithAllConstraints.java | 19 +++ .../o2jrm/models/GeneratedRecordImpl.java | 10 ++ .../RecordWithAllConstraints.java | 19 +++ .../RecordWithAllConstraints.java | 19 +++ .../RecordWithAllConstraints.java | 19 +++ .../RecordWithAllConstraints.java | 19 +++ .../RecordWithAllConstraints.java | 79 ++++++++++++ .../RecordWithAllConstraints.java | 19 +++ .../standard/RecordWithAllConstraints.java | 19 +++ .../RecordWithAllConstraints.java | 19 +++ .../RecordWithAllConstraints.java | 19 +++ 49 files changed, 1970 insertions(+), 18 deletions(-) diff --git a/test/common/src/main/resources/api.yaml b/test/common/src/main/resources/api.yaml index 85b29fd6..b835aa2a 100644 --- a/test/common/src/main/resources/api.yaml +++ b/test/common/src/main/resources/api.yaml @@ -360,6 +360,8 @@ components: - stringRequiredNullable - stringRequiredPattern - arrayRequiredNullable + - arrayUniqueRequired + - arrayUniqueRequiredNullable properties: ### BOOLEAN FIELDS ### booleanStandard: @@ -461,6 +463,33 @@ components: maxItems: 10 items: type: string + ### SET FIELDS ### + arrayUniqueStandard: + description: "Non-required, non-nullable Set." + type: array + uniqueItems: true + items: + type: string + arrayUniqueRequired: + description: "Required, non-nullable Set." + type: array + uniqueItems: true + items: + type: string + arrayUniqueNullable: + description: "Non-required, nullable Set." + type: array + nullable: true + uniqueItems: true + items: + type: string + arrayUniqueRequiredNullable: + description: "Required, nullable Set." + type: array + nullable: true + uniqueItems: true + items: + type: string ### INTEGER FIELDS ### intMinimum: description: "Non-required, non-nullable Integer with minimum: 18." diff --git a/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java b/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java index 2b45bc5b..82e324aa 100644 --- a/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java +++ b/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java @@ -163,6 +163,16 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { .minItems(1) .maxItems(10) .build(), + GeneratedField.of("arrayUniqueStandard", Set.class, String.class).build(), + GeneratedField.of("arrayUniqueRequired", Set.class, String.class) + .isRequired(true) + .isBeanValidationNullable(false) + .build(), + GeneratedField.of("arrayUniqueNullable", Set.class, String.class).isNullable(true).build(), + GeneratedField.of("arrayUniqueRequiredNullable", Set.class, String.class) + .isRequired(true) + .isNullable(true) + .build(), GeneratedField.of("intMinimum", Integer.class).minimum(18).build(), GeneratedField.of("intMaximum", Integer.class).maximum(100).build(), GeneratedField.of("intMinimumAndMaximum", Integer.class).minimum(0).maximum(100).build(), diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index 58a1958d..52f2c750 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -28,7 +28,9 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; @@ -63,6 +65,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -94,6 +100,10 @@ public record RecordWithAllConstraints( List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, + Set arrayUniqueStandard, + Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -127,6 +137,10 @@ public record RecordWithAllConstraints( "arrayMinItems", "arrayMaxItems", "arrayMinAndMaxItems", + "arrayUniqueStandard", + "arrayUniqueRequired", + "arrayUniqueNullable", + "arrayUniqueRequiredNullable", "intMinimum", "intMaximum", "intMinimumAndMaximum", @@ -144,7 +158,9 @@ public record RecordWithAllConstraints( "stringRequired", "stringRequiredNullable", "stringRequiredPattern", - "arrayRequiredNullable")); + "arrayRequiredNullable", + "arrayUniqueRequired", + "arrayUniqueRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -167,6 +183,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -196,6 +216,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -436,6 +460,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("arrayUniqueStandard") != null && !jsonObj.get("arrayUniqueStandard").isJsonNull()) { + if (!jsonObj.get("arrayUniqueStandard").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueStandard` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueStandard"))); + } + } + + if (!jsonObj.get("arrayUniqueRequired").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueRequired` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueRequired"))); + } + + if (jsonObj.get("arrayUniqueNullable") != null && !jsonObj.get("arrayUniqueNullable").isJsonNull()) { + if (!jsonObj.get("arrayUniqueNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueNullable"))); + } + } + + if (!jsonObj.get("arrayUniqueRequiredNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueRequiredNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueRequiredNullable"))); + } + if (jsonObj.get("intMinimum") != null && !jsonObj.get("intMinimum").isJsonNull()) { if (!jsonObj.get("intMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java index a3a1ddcc..c00ef2ab 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -28,7 +28,9 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; @@ -63,6 +65,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -97,6 +103,10 @@ public record RecordWithAllConstraints( List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, + Set arrayUniqueStandard, + Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -130,6 +140,10 @@ public record RecordWithAllConstraints( "arrayMinItems", "arrayMaxItems", "arrayMinAndMaxItems", + "arrayUniqueStandard", + "arrayUniqueRequired", + "arrayUniqueNullable", + "arrayUniqueRequiredNullable", "intMinimum", "intMaximum", "intMinimumAndMaximum", @@ -147,7 +161,9 @@ public record RecordWithAllConstraints( "stringRequired", "stringRequiredNullable", "stringRequiredPattern", - "arrayRequiredNullable")); + "arrayRequiredNullable", + "arrayUniqueRequired", + "arrayUniqueRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -170,6 +186,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -199,6 +219,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -439,6 +463,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("arrayUniqueStandard") != null && !jsonObj.get("arrayUniqueStandard").isJsonNull()) { + if (!jsonObj.get("arrayUniqueStandard").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueStandard` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueStandard"))); + } + } + + if (!jsonObj.get("arrayUniqueRequired").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueRequired` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueRequired"))); + } + + if (jsonObj.get("arrayUniqueNullable") != null && !jsonObj.get("arrayUniqueNullable").isJsonNull()) { + if (!jsonObj.get("arrayUniqueNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueNullable"))); + } + } + + if (!jsonObj.get("arrayUniqueRequiredNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueRequiredNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueRequiredNullable"))); + } + if (jsonObj.get("intMinimum") != null && !jsonObj.get("intMinimum").isJsonNull()) { if (!jsonObj.get("intMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index 2a0d9c8d..02d84cae 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -28,7 +28,9 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; @@ -63,6 +65,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -94,6 +100,10 @@ public record RecordWithAllConstraints( List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, + Set arrayUniqueStandard, + Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -127,6 +137,10 @@ public record RecordWithAllConstraints( "arrayMinItems", "arrayMaxItems", "arrayMinAndMaxItems", + "arrayUniqueStandard", + "arrayUniqueRequired", + "arrayUniqueNullable", + "arrayUniqueRequiredNullable", "intMinimum", "intMaximum", "intMinimumAndMaximum", @@ -144,7 +158,9 @@ public record RecordWithAllConstraints( "stringRequired", "stringRequiredNullable", "stringRequiredPattern", - "arrayRequiredNullable")); + "arrayRequiredNullable", + "arrayUniqueRequired", + "arrayUniqueRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -167,6 +183,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -196,6 +216,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -436,6 +460,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("arrayUniqueStandard") != null && !jsonObj.get("arrayUniqueStandard").isJsonNull()) { + if (!jsonObj.get("arrayUniqueStandard").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueStandard` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueStandard"))); + } + } + + if (!jsonObj.get("arrayUniqueRequired").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueRequired` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueRequired"))); + } + + if (jsonObj.get("arrayUniqueNullable") != null && !jsonObj.get("arrayUniqueNullable").isJsonNull()) { + if (!jsonObj.get("arrayUniqueNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueNullable"))); + } + } + + if (!jsonObj.get("arrayUniqueRequiredNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueRequiredNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueRequiredNullable"))); + } + if (jsonObj.get("intMinimum") != null && !jsonObj.get("intMinimum").isJsonNull()) { if (!jsonObj.get("intMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java index 19a11b92..7cf58b93 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -28,7 +28,9 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; @@ -63,6 +65,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -94,6 +100,10 @@ public record RecordWithAllConstraints( List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, + Set arrayUniqueStandard, + Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -127,6 +137,10 @@ public record RecordWithAllConstraints( "arrayMinItems", "arrayMaxItems", "arrayMinAndMaxItems", + "arrayUniqueStandard", + "arrayUniqueRequired", + "arrayUniqueNullable", + "arrayUniqueRequiredNullable", "intMinimum", "intMaximum", "intMinimumAndMaximum", @@ -144,7 +158,9 @@ public record RecordWithAllConstraints( "stringRequired", "stringRequiredNullable", "stringRequiredPattern", - "arrayRequiredNullable")); + "arrayRequiredNullable", + "arrayUniqueRequired", + "arrayUniqueRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -167,6 +183,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -196,6 +216,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -436,6 +460,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("arrayUniqueStandard") != null && !jsonObj.get("arrayUniqueStandard").isJsonNull()) { + if (!jsonObj.get("arrayUniqueStandard").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueStandard` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueStandard"))); + } + } + + if (!jsonObj.get("arrayUniqueRequired").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueRequired` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueRequired"))); + } + + if (jsonObj.get("arrayUniqueNullable") != null && !jsonObj.get("arrayUniqueNullable").isJsonNull()) { + if (!jsonObj.get("arrayUniqueNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueNullable"))); + } + } + + if (!jsonObj.get("arrayUniqueRequiredNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueRequiredNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueRequiredNullable"))); + } + if (jsonObj.get("intMinimum") != null && !jsonObj.get("intMinimum").isJsonNull()) { if (!jsonObj.get("intMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java index f4f5af15..f2efee13 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java @@ -28,7 +28,9 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; @@ -63,6 +65,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -94,6 +100,10 @@ public record RecordWithAllConstraints( List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, + Set arrayUniqueStandard, + Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -127,6 +137,10 @@ public record RecordWithAllConstraints( "arrayMinItems", "arrayMaxItems", "arrayMinAndMaxItems", + "arrayUniqueStandard", + "arrayUniqueRequired", + "arrayUniqueNullable", + "arrayUniqueRequiredNullable", "intMinimum", "intMaximum", "intMinimumAndMaximum", @@ -144,7 +158,9 @@ public record RecordWithAllConstraints( "stringRequired", "stringRequiredNullable", "stringRequiredPattern", - "arrayRequiredNullable")); + "arrayRequiredNullable", + "arrayUniqueRequired", + "arrayUniqueRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -167,6 +183,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -196,6 +216,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -230,6 +254,10 @@ public static class Builder { private List arrayMinItems; private List arrayMaxItems; private List arrayMinAndMaxItems; + private Set arrayUniqueStandard; + private Set arrayUniqueRequired; + private Set arrayUniqueNullable; + private Set arrayUniqueRequiredNullable; private Integer intMinimum; private Integer intMaximum; private Integer intMinimumAndMaximum; @@ -500,6 +528,58 @@ public Builder arrayMinAndMaxItems(final List arrayMinAndMaxItems) { return this; } + /** + * Sets the value of {@link RecordWithAllConstraints#arrayUniqueStandard }. + * + *

NOTE: Pass-by-reference is used! + * + * @param arrayUniqueStandard Non-required, non-nullable Set.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder arrayUniqueStandard(final Set arrayUniqueStandard) { + this.arrayUniqueStandard = arrayUniqueStandard; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#arrayUniqueRequired }. + * + *

NOTE: Pass-by-reference is used! + * + * @param arrayUniqueRequired Required, non-nullable Set.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder arrayUniqueRequired(final Set arrayUniqueRequired) { + this.arrayUniqueRequired = arrayUniqueRequired; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#arrayUniqueNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param arrayUniqueNullable Non-required, nullable Set.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder arrayUniqueNullable(final Set arrayUniqueNullable) { + this.arrayUniqueNullable = arrayUniqueNullable; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#arrayUniqueRequiredNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param arrayUniqueRequiredNullable Required, nullable Set.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder arrayUniqueRequiredNullable(final Set arrayUniqueRequiredNullable) { + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + return this; + } + /** * Sets the value of {@link RecordWithAllConstraints#intMinimum }. * @@ -647,6 +727,10 @@ public RecordWithAllConstraints build() { arrayMinItems, arrayMaxItems, arrayMinAndMaxItems, + arrayUniqueStandard, + arrayUniqueRequired, + arrayUniqueNullable, + arrayUniqueRequiredNullable, intMinimum, intMaximum, intMinimumAndMaximum, @@ -893,6 +977,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("arrayUniqueStandard") != null && !jsonObj.get("arrayUniqueStandard").isJsonNull()) { + if (!jsonObj.get("arrayUniqueStandard").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueStandard` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueStandard"))); + } + } + + if (!jsonObj.get("arrayUniqueRequired").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueRequired` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueRequired"))); + } + + if (jsonObj.get("arrayUniqueNullable") != null && !jsonObj.get("arrayUniqueNullable").isJsonNull()) { + if (!jsonObj.get("arrayUniqueNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueNullable"))); + } + } + + if (!jsonObj.get("arrayUniqueRequiredNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueRequiredNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueRequiredNullable"))); + } + if (jsonObj.get("intMinimum") != null && !jsonObj.get("intMinimum").isJsonNull()) { if (!jsonObj.get("intMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java index 2d7ded9d..68b836cb 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java @@ -28,7 +28,9 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; import java.io.Serializable; @@ -64,6 +66,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -95,6 +101,10 @@ public record RecordWithAllConstraints( List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, + Set arrayUniqueStandard, + Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -129,6 +139,10 @@ public record RecordWithAllConstraints( "arrayMinItems", "arrayMaxItems", "arrayMinAndMaxItems", + "arrayUniqueStandard", + "arrayUniqueRequired", + "arrayUniqueNullable", + "arrayUniqueRequiredNullable", "intMinimum", "intMaximum", "intMinimumAndMaximum", @@ -146,7 +160,9 @@ public record RecordWithAllConstraints( "stringRequired", "stringRequiredNullable", "stringRequiredPattern", - "arrayRequiredNullable")); + "arrayRequiredNullable", + "arrayUniqueRequired", + "arrayUniqueRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -169,6 +185,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -198,6 +218,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -438,6 +462,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("arrayUniqueStandard") != null && !jsonObj.get("arrayUniqueStandard").isJsonNull()) { + if (!jsonObj.get("arrayUniqueStandard").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueStandard` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueStandard"))); + } + } + + if (!jsonObj.get("arrayUniqueRequired").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueRequired` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueRequired"))); + } + + if (jsonObj.get("arrayUniqueNullable") != null && !jsonObj.get("arrayUniqueNullable").isJsonNull()) { + if (!jsonObj.get("arrayUniqueNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueNullable"))); + } + } + + if (!jsonObj.get("arrayUniqueRequiredNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueRequiredNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueRequiredNullable"))); + } + if (jsonObj.get("intMinimum") != null && !jsonObj.get("intMinimum").isJsonNull()) { if (!jsonObj.get("intMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java index 41f5493b..2fbc7321 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java @@ -28,7 +28,9 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; @@ -63,6 +65,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -94,6 +100,10 @@ public record RecordWithAllConstraints( List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, + Set arrayUniqueStandard, + Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -127,6 +137,10 @@ public record RecordWithAllConstraints( "arrayMinItems", "arrayMaxItems", "arrayMinAndMaxItems", + "arrayUniqueStandard", + "arrayUniqueRequired", + "arrayUniqueNullable", + "arrayUniqueRequiredNullable", "intMinimum", "intMaximum", "intMinimumAndMaximum", @@ -144,7 +158,9 @@ public record RecordWithAllConstraints( "stringRequired", "stringRequiredNullable", "stringRequiredPattern", - "arrayRequiredNullable")); + "arrayRequiredNullable", + "arrayUniqueRequired", + "arrayUniqueRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -167,6 +183,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -196,6 +216,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -436,6 +460,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("arrayUniqueStandard") != null && !jsonObj.get("arrayUniqueStandard").isJsonNull()) { + if (!jsonObj.get("arrayUniqueStandard").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueStandard` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueStandard"))); + } + } + + if (!jsonObj.get("arrayUniqueRequired").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueRequired` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueRequired"))); + } + + if (jsonObj.get("arrayUniqueNullable") != null && !jsonObj.get("arrayUniqueNullable").isJsonNull()) { + if (!jsonObj.get("arrayUniqueNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueNullable"))); + } + } + + if (!jsonObj.get("arrayUniqueRequiredNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueRequiredNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueRequiredNullable"))); + } + if (jsonObj.get("intMinimum") != null && !jsonObj.get("intMinimum").isJsonNull()) { if (!jsonObj.get("intMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java index b59d8617..7c0a6570 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java @@ -28,7 +28,9 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; import jakarta.validation.constraints.*; @@ -65,6 +67,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -96,6 +102,10 @@ public record RecordWithAllConstraints( @Size(min = 1) List arrayMinItems, @Size(max = 10) List arrayMaxItems, @Size(min = 1, max = 10) List arrayMinAndMaxItems, + Set arrayUniqueStandard, + @NotNull Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, @@ -129,6 +139,10 @@ public record RecordWithAllConstraints( "arrayMinItems", "arrayMaxItems", "arrayMinAndMaxItems", + "arrayUniqueStandard", + "arrayUniqueRequired", + "arrayUniqueNullable", + "arrayUniqueRequiredNullable", "intMinimum", "intMaximum", "intMinimumAndMaximum", @@ -146,7 +160,9 @@ public record RecordWithAllConstraints( "stringRequired", "stringRequiredNullable", "stringRequiredPattern", - "arrayRequiredNullable")); + "arrayRequiredNullable", + "arrayUniqueRequired", + "arrayUniqueRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -169,6 +185,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -198,6 +218,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -438,6 +462,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("arrayUniqueStandard") != null && !jsonObj.get("arrayUniqueStandard").isJsonNull()) { + if (!jsonObj.get("arrayUniqueStandard").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueStandard` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueStandard"))); + } + } + + if (!jsonObj.get("arrayUniqueRequired").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueRequired` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueRequired"))); + } + + if (jsonObj.get("arrayUniqueNullable") != null && !jsonObj.get("arrayUniqueNullable").isJsonNull()) { + if (!jsonObj.get("arrayUniqueNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueNullable"))); + } + } + + if (!jsonObj.get("arrayUniqueRequiredNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueRequiredNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueRequiredNullable"))); + } + if (jsonObj.get("intMinimum") != null && !jsonObj.get("intMinimum").isJsonNull()) { if (!jsonObj.get("intMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java index 6381ae90..015a2e2b 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -28,7 +28,9 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; @@ -63,6 +65,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -94,6 +100,10 @@ public record RecordWithAllConstraints( List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, + Set arrayUniqueStandard, + Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -127,6 +137,10 @@ public record RecordWithAllConstraints( "arrayMinItems", "arrayMaxItems", "arrayMinAndMaxItems", + "arrayUniqueStandard", + "arrayUniqueRequired", + "arrayUniqueNullable", + "arrayUniqueRequiredNullable", "intMinimum", "intMaximum", "intMinimumAndMaximum", @@ -144,7 +158,9 @@ public record RecordWithAllConstraints( "stringRequired", "stringRequiredNullable", "stringRequiredPattern", - "arrayRequiredNullable")); + "arrayRequiredNullable", + "arrayUniqueRequired", + "arrayUniqueRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -167,6 +183,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -196,6 +216,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -436,6 +460,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("arrayUniqueStandard") != null && !jsonObj.get("arrayUniqueStandard").isJsonNull()) { + if (!jsonObj.get("arrayUniqueStandard").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueStandard` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueStandard"))); + } + } + + if (!jsonObj.get("arrayUniqueRequired").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueRequired` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueRequired"))); + } + + if (jsonObj.get("arrayUniqueNullable") != null && !jsonObj.get("arrayUniqueNullable").isJsonNull()) { + if (!jsonObj.get("arrayUniqueNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueNullable"))); + } + } + + if (!jsonObj.get("arrayUniqueRequiredNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueRequiredNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueRequiredNullable"))); + } + if (jsonObj.get("intMinimum") != null && !jsonObj.get("intMinimum").isJsonNull()) { if (!jsonObj.get("intMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index c0d88a2a..567b9610 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -25,10 +25,13 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -60,6 +63,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -91,6 +98,10 @@ public record RecordWithAllConstraints( List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, + Set arrayUniqueStandard, + Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -123,6 +134,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -152,6 +167,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java index 85bee5ce..f13df74c 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -25,10 +25,13 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -60,6 +63,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -94,6 +101,10 @@ public record RecordWithAllConstraints( List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, + Set arrayUniqueStandard, + Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -126,6 +137,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -155,6 +170,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index dab88cc2..8d482bf8 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -25,10 +25,13 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -60,6 +63,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -91,6 +98,10 @@ public record RecordWithAllConstraints( List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, + Set arrayUniqueStandard, + Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -123,6 +134,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -152,6 +167,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java index b4210fa8..588b174f 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -25,10 +25,13 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -60,6 +63,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -91,6 +98,10 @@ public record RecordWithAllConstraints( List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, + Set arrayUniqueStandard, + Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -123,6 +134,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -152,6 +167,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java index 1ccff615..609ef92d 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java @@ -25,10 +25,13 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -60,6 +63,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -91,6 +98,10 @@ public record RecordWithAllConstraints( List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, + Set arrayUniqueStandard, + Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -123,6 +134,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -152,6 +167,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -186,6 +205,10 @@ public static class Builder { private List arrayMinItems; private List arrayMaxItems; private List arrayMinAndMaxItems; + private Set arrayUniqueStandard; + private Set arrayUniqueRequired; + private Set arrayUniqueNullable; + private Set arrayUniqueRequiredNullable; private Integer intMinimum; private Integer intMaximum; private Integer intMinimumAndMaximum; @@ -456,6 +479,58 @@ public Builder arrayMinAndMaxItems(final List arrayMinAndMaxItems) { return this; } + /** + * Sets the value of {@link RecordWithAllConstraints#arrayUniqueStandard }. + * + *

NOTE: Pass-by-reference is used! + * + * @param arrayUniqueStandard Non-required, non-nullable Set.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder arrayUniqueStandard(final Set arrayUniqueStandard) { + this.arrayUniqueStandard = arrayUniqueStandard; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#arrayUniqueRequired }. + * + *

NOTE: Pass-by-reference is used! + * + * @param arrayUniqueRequired Required, non-nullable Set.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder arrayUniqueRequired(final Set arrayUniqueRequired) { + this.arrayUniqueRequired = arrayUniqueRequired; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#arrayUniqueNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param arrayUniqueNullable Non-required, nullable Set.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder arrayUniqueNullable(final Set arrayUniqueNullable) { + this.arrayUniqueNullable = arrayUniqueNullable; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#arrayUniqueRequiredNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param arrayUniqueRequiredNullable Required, nullable Set.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder arrayUniqueRequiredNullable(final Set arrayUniqueRequiredNullable) { + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + return this; + } + /** * Sets the value of {@link RecordWithAllConstraints#intMinimum }. * @@ -603,6 +678,10 @@ public RecordWithAllConstraints build() { arrayMinItems, arrayMaxItems, arrayMinAndMaxItems, + arrayUniqueStandard, + arrayUniqueRequired, + arrayUniqueNullable, + arrayUniqueRequiredNullable, intMinimum, intMaximum, intMinimumAndMaximum, diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java index d83bd200..f1e15df2 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java @@ -25,10 +25,13 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -61,6 +64,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -92,6 +99,10 @@ public record RecordWithAllConstraints( List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, + Set arrayUniqueStandard, + Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -125,6 +136,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -154,6 +169,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java index 4b12a1ed..df03528f 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java @@ -25,10 +25,13 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -60,6 +63,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -91,6 +98,10 @@ public record RecordWithAllConstraints( List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, + Set arrayUniqueStandard, + Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -123,6 +134,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -152,6 +167,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java index 782a9506..387c5a95 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java @@ -25,10 +25,13 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -62,6 +65,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -93,6 +100,10 @@ public record RecordWithAllConstraints( @Size(min = 1) List arrayMinItems, @Size(max = 10) List arrayMaxItems, @Size(min = 1, max = 10) List arrayMinAndMaxItems, + Set arrayUniqueStandard, + @NotNull Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, @@ -125,6 +136,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -154,6 +169,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java index c8df3bef..697c4df1 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -25,10 +25,13 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -60,6 +63,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -91,6 +98,10 @@ public record RecordWithAllConstraints( List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, + Set arrayUniqueStandard, + Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -123,6 +134,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -152,6 +167,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java b/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java index f3f15e65..ef47c3fb 100644 --- a/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java +++ b/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java @@ -163,6 +163,16 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { .minItems(1) .maxItems(10) .build(), + GeneratedField.of("arrayUniqueStandard", Set.class, String.class).build(), + GeneratedField.of("arrayUniqueRequired", Set.class, String.class) + .isRequired(true) + .isBeanValidationNullable(false) + .build(), + GeneratedField.of("arrayUniqueNullable", Set.class, String.class).isNullable(true).build(), + GeneratedField.of("arrayUniqueRequiredNullable", Set.class, String.class) + .isRequired(true) + .isNullable(true) + .build(), GeneratedField.of("intMinimum", Integer.class).minimum(18).build(), GeneratedField.of("intMaximum", Integer.class).maximum(100).build(), GeneratedField.of("intMinimumAndMaximum", Integer.class).minimum(0).maximum(100).build(), diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index 58a1958d..52f2c750 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -28,7 +28,9 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; @@ -63,6 +65,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -94,6 +100,10 @@ public record RecordWithAllConstraints( List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, + Set arrayUniqueStandard, + Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -127,6 +137,10 @@ public record RecordWithAllConstraints( "arrayMinItems", "arrayMaxItems", "arrayMinAndMaxItems", + "arrayUniqueStandard", + "arrayUniqueRequired", + "arrayUniqueNullable", + "arrayUniqueRequiredNullable", "intMinimum", "intMaximum", "intMinimumAndMaximum", @@ -144,7 +158,9 @@ public record RecordWithAllConstraints( "stringRequired", "stringRequiredNullable", "stringRequiredPattern", - "arrayRequiredNullable")); + "arrayRequiredNullable", + "arrayUniqueRequired", + "arrayUniqueRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -167,6 +183,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -196,6 +216,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -436,6 +460,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("arrayUniqueStandard") != null && !jsonObj.get("arrayUniqueStandard").isJsonNull()) { + if (!jsonObj.get("arrayUniqueStandard").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueStandard` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueStandard"))); + } + } + + if (!jsonObj.get("arrayUniqueRequired").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueRequired` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueRequired"))); + } + + if (jsonObj.get("arrayUniqueNullable") != null && !jsonObj.get("arrayUniqueNullable").isJsonNull()) { + if (!jsonObj.get("arrayUniqueNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueNullable"))); + } + } + + if (!jsonObj.get("arrayUniqueRequiredNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueRequiredNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueRequiredNullable"))); + } + if (jsonObj.get("intMinimum") != null && !jsonObj.get("intMinimum").isJsonNull()) { if (!jsonObj.get("intMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java index a3a1ddcc..c00ef2ab 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -28,7 +28,9 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; @@ -63,6 +65,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -97,6 +103,10 @@ public record RecordWithAllConstraints( List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, + Set arrayUniqueStandard, + Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -130,6 +140,10 @@ public record RecordWithAllConstraints( "arrayMinItems", "arrayMaxItems", "arrayMinAndMaxItems", + "arrayUniqueStandard", + "arrayUniqueRequired", + "arrayUniqueNullable", + "arrayUniqueRequiredNullable", "intMinimum", "intMaximum", "intMinimumAndMaximum", @@ -147,7 +161,9 @@ public record RecordWithAllConstraints( "stringRequired", "stringRequiredNullable", "stringRequiredPattern", - "arrayRequiredNullable")); + "arrayRequiredNullable", + "arrayUniqueRequired", + "arrayUniqueRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -170,6 +186,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -199,6 +219,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -439,6 +463,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("arrayUniqueStandard") != null && !jsonObj.get("arrayUniqueStandard").isJsonNull()) { + if (!jsonObj.get("arrayUniqueStandard").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueStandard` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueStandard"))); + } + } + + if (!jsonObj.get("arrayUniqueRequired").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueRequired` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueRequired"))); + } + + if (jsonObj.get("arrayUniqueNullable") != null && !jsonObj.get("arrayUniqueNullable").isJsonNull()) { + if (!jsonObj.get("arrayUniqueNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueNullable"))); + } + } + + if (!jsonObj.get("arrayUniqueRequiredNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueRequiredNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueRequiredNullable"))); + } + if (jsonObj.get("intMinimum") != null && !jsonObj.get("intMinimum").isJsonNull()) { if (!jsonObj.get("intMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index 2a0d9c8d..02d84cae 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -28,7 +28,9 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; @@ -63,6 +65,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -94,6 +100,10 @@ public record RecordWithAllConstraints( List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, + Set arrayUniqueStandard, + Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -127,6 +137,10 @@ public record RecordWithAllConstraints( "arrayMinItems", "arrayMaxItems", "arrayMinAndMaxItems", + "arrayUniqueStandard", + "arrayUniqueRequired", + "arrayUniqueNullable", + "arrayUniqueRequiredNullable", "intMinimum", "intMaximum", "intMinimumAndMaximum", @@ -144,7 +158,9 @@ public record RecordWithAllConstraints( "stringRequired", "stringRequiredNullable", "stringRequiredPattern", - "arrayRequiredNullable")); + "arrayRequiredNullable", + "arrayUniqueRequired", + "arrayUniqueRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -167,6 +183,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -196,6 +216,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -436,6 +460,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("arrayUniqueStandard") != null && !jsonObj.get("arrayUniqueStandard").isJsonNull()) { + if (!jsonObj.get("arrayUniqueStandard").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueStandard` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueStandard"))); + } + } + + if (!jsonObj.get("arrayUniqueRequired").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueRequired` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueRequired"))); + } + + if (jsonObj.get("arrayUniqueNullable") != null && !jsonObj.get("arrayUniqueNullable").isJsonNull()) { + if (!jsonObj.get("arrayUniqueNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueNullable"))); + } + } + + if (!jsonObj.get("arrayUniqueRequiredNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueRequiredNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueRequiredNullable"))); + } + if (jsonObj.get("intMinimum") != null && !jsonObj.get("intMinimum").isJsonNull()) { if (!jsonObj.get("intMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java index 19a11b92..7cf58b93 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -28,7 +28,9 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; @@ -63,6 +65,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -94,6 +100,10 @@ public record RecordWithAllConstraints( List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, + Set arrayUniqueStandard, + Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -127,6 +137,10 @@ public record RecordWithAllConstraints( "arrayMinItems", "arrayMaxItems", "arrayMinAndMaxItems", + "arrayUniqueStandard", + "arrayUniqueRequired", + "arrayUniqueNullable", + "arrayUniqueRequiredNullable", "intMinimum", "intMaximum", "intMinimumAndMaximum", @@ -144,7 +158,9 @@ public record RecordWithAllConstraints( "stringRequired", "stringRequiredNullable", "stringRequiredPattern", - "arrayRequiredNullable")); + "arrayRequiredNullable", + "arrayUniqueRequired", + "arrayUniqueRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -167,6 +183,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -196,6 +216,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -436,6 +460,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("arrayUniqueStandard") != null && !jsonObj.get("arrayUniqueStandard").isJsonNull()) { + if (!jsonObj.get("arrayUniqueStandard").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueStandard` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueStandard"))); + } + } + + if (!jsonObj.get("arrayUniqueRequired").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueRequired` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueRequired"))); + } + + if (jsonObj.get("arrayUniqueNullable") != null && !jsonObj.get("arrayUniqueNullable").isJsonNull()) { + if (!jsonObj.get("arrayUniqueNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueNullable"))); + } + } + + if (!jsonObj.get("arrayUniqueRequiredNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueRequiredNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueRequiredNullable"))); + } + if (jsonObj.get("intMinimum") != null && !jsonObj.get("intMinimum").isJsonNull()) { if (!jsonObj.get("intMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java index f4f5af15..f2efee13 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java @@ -28,7 +28,9 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; @@ -63,6 +65,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -94,6 +100,10 @@ public record RecordWithAllConstraints( List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, + Set arrayUniqueStandard, + Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -127,6 +137,10 @@ public record RecordWithAllConstraints( "arrayMinItems", "arrayMaxItems", "arrayMinAndMaxItems", + "arrayUniqueStandard", + "arrayUniqueRequired", + "arrayUniqueNullable", + "arrayUniqueRequiredNullable", "intMinimum", "intMaximum", "intMinimumAndMaximum", @@ -144,7 +158,9 @@ public record RecordWithAllConstraints( "stringRequired", "stringRequiredNullable", "stringRequiredPattern", - "arrayRequiredNullable")); + "arrayRequiredNullable", + "arrayUniqueRequired", + "arrayUniqueRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -167,6 +183,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -196,6 +216,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -230,6 +254,10 @@ public static class Builder { private List arrayMinItems; private List arrayMaxItems; private List arrayMinAndMaxItems; + private Set arrayUniqueStandard; + private Set arrayUniqueRequired; + private Set arrayUniqueNullable; + private Set arrayUniqueRequiredNullable; private Integer intMinimum; private Integer intMaximum; private Integer intMinimumAndMaximum; @@ -500,6 +528,58 @@ public Builder arrayMinAndMaxItems(final List arrayMinAndMaxItems) { return this; } + /** + * Sets the value of {@link RecordWithAllConstraints#arrayUniqueStandard }. + * + *

NOTE: Pass-by-reference is used! + * + * @param arrayUniqueStandard Non-required, non-nullable Set.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder arrayUniqueStandard(final Set arrayUniqueStandard) { + this.arrayUniqueStandard = arrayUniqueStandard; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#arrayUniqueRequired }. + * + *

NOTE: Pass-by-reference is used! + * + * @param arrayUniqueRequired Required, non-nullable Set.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder arrayUniqueRequired(final Set arrayUniqueRequired) { + this.arrayUniqueRequired = arrayUniqueRequired; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#arrayUniqueNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param arrayUniqueNullable Non-required, nullable Set.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder arrayUniqueNullable(final Set arrayUniqueNullable) { + this.arrayUniqueNullable = arrayUniqueNullable; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#arrayUniqueRequiredNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param arrayUniqueRequiredNullable Required, nullable Set.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder arrayUniqueRequiredNullable(final Set arrayUniqueRequiredNullable) { + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + return this; + } + /** * Sets the value of {@link RecordWithAllConstraints#intMinimum }. * @@ -647,6 +727,10 @@ public RecordWithAllConstraints build() { arrayMinItems, arrayMaxItems, arrayMinAndMaxItems, + arrayUniqueStandard, + arrayUniqueRequired, + arrayUniqueNullable, + arrayUniqueRequiredNullable, intMinimum, intMaximum, intMinimumAndMaximum, @@ -893,6 +977,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("arrayUniqueStandard") != null && !jsonObj.get("arrayUniqueStandard").isJsonNull()) { + if (!jsonObj.get("arrayUniqueStandard").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueStandard` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueStandard"))); + } + } + + if (!jsonObj.get("arrayUniqueRequired").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueRequired` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueRequired"))); + } + + if (jsonObj.get("arrayUniqueNullable") != null && !jsonObj.get("arrayUniqueNullable").isJsonNull()) { + if (!jsonObj.get("arrayUniqueNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueNullable"))); + } + } + + if (!jsonObj.get("arrayUniqueRequiredNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueRequiredNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueRequiredNullable"))); + } + if (jsonObj.get("intMinimum") != null && !jsonObj.get("intMinimum").isJsonNull()) { if (!jsonObj.get("intMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java index 2d7ded9d..68b836cb 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java @@ -28,7 +28,9 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; import java.io.Serializable; @@ -64,6 +66,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -95,6 +101,10 @@ public record RecordWithAllConstraints( List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, + Set arrayUniqueStandard, + Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -129,6 +139,10 @@ public record RecordWithAllConstraints( "arrayMinItems", "arrayMaxItems", "arrayMinAndMaxItems", + "arrayUniqueStandard", + "arrayUniqueRequired", + "arrayUniqueNullable", + "arrayUniqueRequiredNullable", "intMinimum", "intMaximum", "intMinimumAndMaximum", @@ -146,7 +160,9 @@ public record RecordWithAllConstraints( "stringRequired", "stringRequiredNullable", "stringRequiredPattern", - "arrayRequiredNullable")); + "arrayRequiredNullable", + "arrayUniqueRequired", + "arrayUniqueRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -169,6 +185,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -198,6 +218,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -438,6 +462,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("arrayUniqueStandard") != null && !jsonObj.get("arrayUniqueStandard").isJsonNull()) { + if (!jsonObj.get("arrayUniqueStandard").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueStandard` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueStandard"))); + } + } + + if (!jsonObj.get("arrayUniqueRequired").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueRequired` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueRequired"))); + } + + if (jsonObj.get("arrayUniqueNullable") != null && !jsonObj.get("arrayUniqueNullable").isJsonNull()) { + if (!jsonObj.get("arrayUniqueNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueNullable"))); + } + } + + if (!jsonObj.get("arrayUniqueRequiredNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueRequiredNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueRequiredNullable"))); + } + if (jsonObj.get("intMinimum") != null && !jsonObj.get("intMinimum").isJsonNull()) { if (!jsonObj.get("intMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java index 41f5493b..2fbc7321 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java @@ -28,7 +28,9 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; @@ -63,6 +65,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -94,6 +100,10 @@ public record RecordWithAllConstraints( List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, + Set arrayUniqueStandard, + Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -127,6 +137,10 @@ public record RecordWithAllConstraints( "arrayMinItems", "arrayMaxItems", "arrayMinAndMaxItems", + "arrayUniqueStandard", + "arrayUniqueRequired", + "arrayUniqueNullable", + "arrayUniqueRequiredNullable", "intMinimum", "intMaximum", "intMinimumAndMaximum", @@ -144,7 +158,9 @@ public record RecordWithAllConstraints( "stringRequired", "stringRequiredNullable", "stringRequiredPattern", - "arrayRequiredNullable")); + "arrayRequiredNullable", + "arrayUniqueRequired", + "arrayUniqueRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -167,6 +183,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -196,6 +216,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -436,6 +460,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("arrayUniqueStandard") != null && !jsonObj.get("arrayUniqueStandard").isJsonNull()) { + if (!jsonObj.get("arrayUniqueStandard").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueStandard` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueStandard"))); + } + } + + if (!jsonObj.get("arrayUniqueRequired").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueRequired` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueRequired"))); + } + + if (jsonObj.get("arrayUniqueNullable") != null && !jsonObj.get("arrayUniqueNullable").isJsonNull()) { + if (!jsonObj.get("arrayUniqueNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueNullable"))); + } + } + + if (!jsonObj.get("arrayUniqueRequiredNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueRequiredNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueRequiredNullable"))); + } + if (jsonObj.get("intMinimum") != null && !jsonObj.get("intMinimum").isJsonNull()) { if (!jsonObj.get("intMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java index f838ca2b..9075d016 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java @@ -28,7 +28,9 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; import javax.validation.constraints.*; @@ -65,6 +67,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -96,6 +102,10 @@ public record RecordWithAllConstraints( @Size(min = 1) List arrayMinItems, @Size(max = 10) List arrayMaxItems, @Size(min = 1, max = 10) List arrayMinAndMaxItems, + Set arrayUniqueStandard, + @NotNull Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, @@ -129,6 +139,10 @@ public record RecordWithAllConstraints( "arrayMinItems", "arrayMaxItems", "arrayMinAndMaxItems", + "arrayUniqueStandard", + "arrayUniqueRequired", + "arrayUniqueNullable", + "arrayUniqueRequiredNullable", "intMinimum", "intMaximum", "intMinimumAndMaximum", @@ -146,7 +160,9 @@ public record RecordWithAllConstraints( "stringRequired", "stringRequiredNullable", "stringRequiredPattern", - "arrayRequiredNullable")); + "arrayRequiredNullable", + "arrayUniqueRequired", + "arrayUniqueRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -169,6 +185,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -198,6 +218,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -438,6 +462,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("arrayUniqueStandard") != null && !jsonObj.get("arrayUniqueStandard").isJsonNull()) { + if (!jsonObj.get("arrayUniqueStandard").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueStandard` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueStandard"))); + } + } + + if (!jsonObj.get("arrayUniqueRequired").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueRequired` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueRequired"))); + } + + if (jsonObj.get("arrayUniqueNullable") != null && !jsonObj.get("arrayUniqueNullable").isJsonNull()) { + if (!jsonObj.get("arrayUniqueNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueNullable"))); + } + } + + if (!jsonObj.get("arrayUniqueRequiredNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueRequiredNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueRequiredNullable"))); + } + if (jsonObj.get("intMinimum") != null && !jsonObj.get("intMinimum").isJsonNull()) { if (!jsonObj.get("intMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java index 6381ae90..015a2e2b 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -28,7 +28,9 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; @@ -63,6 +65,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -94,6 +100,10 @@ public record RecordWithAllConstraints( List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, + Set arrayUniqueStandard, + Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -127,6 +137,10 @@ public record RecordWithAllConstraints( "arrayMinItems", "arrayMaxItems", "arrayMinAndMaxItems", + "arrayUniqueStandard", + "arrayUniqueRequired", + "arrayUniqueNullable", + "arrayUniqueRequiredNullable", "intMinimum", "intMaximum", "intMinimumAndMaximum", @@ -144,7 +158,9 @@ public record RecordWithAllConstraints( "stringRequired", "stringRequiredNullable", "stringRequiredPattern", - "arrayRequiredNullable")); + "arrayRequiredNullable", + "arrayUniqueRequired", + "arrayUniqueRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -167,6 +183,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -196,6 +216,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -436,6 +460,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("arrayUniqueStandard") != null && !jsonObj.get("arrayUniqueStandard").isJsonNull()) { + if (!jsonObj.get("arrayUniqueStandard").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueStandard` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueStandard"))); + } + } + + if (!jsonObj.get("arrayUniqueRequired").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueRequired` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueRequired"))); + } + + if (jsonObj.get("arrayUniqueNullable") != null && !jsonObj.get("arrayUniqueNullable").isJsonNull()) { + if (!jsonObj.get("arrayUniqueNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueNullable"))); + } + } + + if (!jsonObj.get("arrayUniqueRequiredNullable").isJsonArray()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `arrayUniqueRequiredNullable` to be an array in the JSON string but got `%s`", + jsonObj.get("arrayUniqueRequiredNullable"))); + } + if (jsonObj.get("intMinimum") != null && !jsonObj.get("intMinimum").isJsonNull()) { if (!jsonObj.get("intMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index c0d88a2a..567b9610 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -25,10 +25,13 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -60,6 +63,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -91,6 +98,10 @@ public record RecordWithAllConstraints( List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, + Set arrayUniqueStandard, + Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -123,6 +134,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -152,6 +167,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java index 85bee5ce..f13df74c 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -25,10 +25,13 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -60,6 +63,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -94,6 +101,10 @@ public record RecordWithAllConstraints( List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, + Set arrayUniqueStandard, + Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -126,6 +137,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -155,6 +170,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index dab88cc2..8d482bf8 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -25,10 +25,13 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -60,6 +63,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -91,6 +98,10 @@ public record RecordWithAllConstraints( List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, + Set arrayUniqueStandard, + Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -123,6 +134,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -152,6 +167,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java index b4210fa8..588b174f 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -25,10 +25,13 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -60,6 +63,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -91,6 +98,10 @@ public record RecordWithAllConstraints( List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, + Set arrayUniqueStandard, + Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -123,6 +134,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -152,6 +167,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java index 1ccff615..609ef92d 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java @@ -25,10 +25,13 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -60,6 +63,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -91,6 +98,10 @@ public record RecordWithAllConstraints( List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, + Set arrayUniqueStandard, + Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -123,6 +134,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -152,6 +167,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -186,6 +205,10 @@ public static class Builder { private List arrayMinItems; private List arrayMaxItems; private List arrayMinAndMaxItems; + private Set arrayUniqueStandard; + private Set arrayUniqueRequired; + private Set arrayUniqueNullable; + private Set arrayUniqueRequiredNullable; private Integer intMinimum; private Integer intMaximum; private Integer intMinimumAndMaximum; @@ -456,6 +479,58 @@ public Builder arrayMinAndMaxItems(final List arrayMinAndMaxItems) { return this; } + /** + * Sets the value of {@link RecordWithAllConstraints#arrayUniqueStandard }. + * + *

NOTE: Pass-by-reference is used! + * + * @param arrayUniqueStandard Non-required, non-nullable Set.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder arrayUniqueStandard(final Set arrayUniqueStandard) { + this.arrayUniqueStandard = arrayUniqueStandard; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#arrayUniqueRequired }. + * + *

NOTE: Pass-by-reference is used! + * + * @param arrayUniqueRequired Required, non-nullable Set.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder arrayUniqueRequired(final Set arrayUniqueRequired) { + this.arrayUniqueRequired = arrayUniqueRequired; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#arrayUniqueNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param arrayUniqueNullable Non-required, nullable Set.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder arrayUniqueNullable(final Set arrayUniqueNullable) { + this.arrayUniqueNullable = arrayUniqueNullable; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#arrayUniqueRequiredNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param arrayUniqueRequiredNullable Required, nullable Set.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder arrayUniqueRequiredNullable(final Set arrayUniqueRequiredNullable) { + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + return this; + } + /** * Sets the value of {@link RecordWithAllConstraints#intMinimum }. * @@ -603,6 +678,10 @@ public RecordWithAllConstraints build() { arrayMinItems, arrayMaxItems, arrayMinAndMaxItems, + arrayUniqueStandard, + arrayUniqueRequired, + arrayUniqueNullable, + arrayUniqueRequiredNullable, intMinimum, intMaximum, intMinimumAndMaximum, diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java index d83bd200..f1e15df2 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java @@ -25,10 +25,13 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -61,6 +64,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -92,6 +99,10 @@ public record RecordWithAllConstraints( List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, + Set arrayUniqueStandard, + Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -125,6 +136,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -154,6 +169,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java index 4b12a1ed..df03528f 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java @@ -25,10 +25,13 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -60,6 +63,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -91,6 +98,10 @@ public record RecordWithAllConstraints( List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, + Set arrayUniqueStandard, + Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -123,6 +134,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -152,6 +167,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java index 6d33a21e..c738ae9d 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java @@ -25,10 +25,13 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -62,6 +65,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -93,6 +100,10 @@ public record RecordWithAllConstraints( @Size(min = 1) List arrayMinItems, @Size(max = 10) List arrayMaxItems, @Size(min = 1, max = 10) List arrayMinAndMaxItems, + Set arrayUniqueStandard, + @NotNull Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, @@ -125,6 +136,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -154,6 +169,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java index c8df3bef..697c4df1 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -25,10 +25,13 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -60,6 +63,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -91,6 +98,10 @@ public record RecordWithAllConstraints( List arrayMinItems, List arrayMaxItems, List arrayMinAndMaxItems, + Set arrayUniqueStandard, + Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -123,6 +134,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -152,6 +167,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java b/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java index f3f15e65..ef47c3fb 100644 --- a/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java +++ b/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java @@ -163,6 +163,16 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { .minItems(1) .maxItems(10) .build(), + GeneratedField.of("arrayUniqueStandard", Set.class, String.class).build(), + GeneratedField.of("arrayUniqueRequired", Set.class, String.class) + .isRequired(true) + .isBeanValidationNullable(false) + .build(), + GeneratedField.of("arrayUniqueNullable", Set.class, String.class).isNullable(true).build(), + GeneratedField.of("arrayUniqueRequiredNullable", Set.class, String.class) + .isRequired(true) + .isNullable(true) + .build(), GeneratedField.of("intMinimum", Integer.class).minimum(18).build(), GeneratedField.of("intMaximum", Integer.class).maximum(100).build(), GeneratedField.of("intMinimumAndMaximum", Integer.class).minimum(0).maximum(100).build(), diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index 5c60e5f0..77977e2b 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -5,10 +5,13 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; import org.springframework.lang.Nullable; @@ -46,6 +49,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -77,6 +84,10 @@ public record RecordWithAllConstraints( @Size(min = 1) List arrayMinItems, @Size(max = 10) List arrayMaxItems, @Size(min = 1, max = 10) List arrayMinAndMaxItems, + Set arrayUniqueStandard, + @NotNull Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, @@ -109,6 +120,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -138,6 +153,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java index 0851ef99..31aac50d 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -5,10 +5,13 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; import org.springframework.lang.Nullable; @@ -46,6 +49,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -80,6 +87,10 @@ public record RecordWithAllConstraints( @Size(min = 1) List arrayMinItems, @Size(max = 10) List arrayMaxItems, @Size(min = 1, max = 10) List arrayMinAndMaxItems, + Set arrayUniqueStandard, + @NotNull Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, @@ -112,6 +123,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -141,6 +156,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index b8d37d13..69035569 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -5,10 +5,13 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; import org.springframework.lang.Nullable; @@ -46,6 +49,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -77,6 +84,10 @@ public record RecordWithAllConstraints( @Size(min = 1) List arrayMinItems, @Size(max = 10) List arrayMaxItems, @Size(min = 1, max = 10) List arrayMinAndMaxItems, + Set arrayUniqueStandard, + @NotNull Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, @@ -109,6 +120,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -138,6 +153,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java index 92746d94..7ced34b5 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -5,10 +5,13 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; import org.springframework.lang.Nullable; @@ -46,6 +49,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -77,6 +84,10 @@ public record RecordWithAllConstraints( @Size(min = 1) List arrayMinItems, @Size(max = 10) List arrayMaxItems, @Size(min = 1, max = 10) List arrayMinAndMaxItems, + Set arrayUniqueStandard, + @NotNull Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, @@ -109,6 +120,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -138,6 +153,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java index 8497acc5..059276a0 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java @@ -5,10 +5,13 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; import org.springframework.lang.Nullable; @@ -46,6 +49,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -77,6 +84,10 @@ public record RecordWithAllConstraints( @Size(min = 1) List arrayMinItems, @Size(max = 10) List arrayMaxItems, @Size(min = 1, max = 10) List arrayMinAndMaxItems, + Set arrayUniqueStandard, + @NotNull Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, @@ -109,6 +120,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -138,6 +153,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -172,6 +191,10 @@ public static class Builder { private List arrayMinItems; private List arrayMaxItems; private List arrayMinAndMaxItems; + private Set arrayUniqueStandard; + private Set arrayUniqueRequired; + private Set arrayUniqueNullable; + private Set arrayUniqueRequiredNullable; private Integer intMinimum; private Integer intMaximum; private Integer intMinimumAndMaximum; @@ -442,6 +465,58 @@ public Builder arrayMinAndMaxItems(final List arrayMinAndMaxItems) { return this; } + /** + * Sets the value of {@link RecordWithAllConstraints#arrayUniqueStandard }. + * + *

NOTE: Pass-by-reference is used! + * + * @param arrayUniqueStandard Non-required, non-nullable Set.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder arrayUniqueStandard(final Set arrayUniqueStandard) { + this.arrayUniqueStandard = arrayUniqueStandard; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#arrayUniqueRequired }. + * + *

NOTE: Pass-by-reference is used! + * + * @param arrayUniqueRequired Required, non-nullable Set.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder arrayUniqueRequired(final Set arrayUniqueRequired) { + this.arrayUniqueRequired = arrayUniqueRequired; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#arrayUniqueNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param arrayUniqueNullable Non-required, nullable Set.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder arrayUniqueNullable(final Set arrayUniqueNullable) { + this.arrayUniqueNullable = arrayUniqueNullable; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#arrayUniqueRequiredNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param arrayUniqueRequiredNullable Required, nullable Set.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder arrayUniqueRequiredNullable(final Set arrayUniqueRequiredNullable) { + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + return this; + } + /** * Sets the value of {@link RecordWithAllConstraints#intMinimum }. * @@ -589,6 +664,10 @@ public RecordWithAllConstraints build() { arrayMinItems, arrayMaxItems, arrayMinAndMaxItems, + arrayUniqueStandard, + arrayUniqueRequired, + arrayUniqueNullable, + arrayUniqueRequiredNullable, intMinimum, intMaximum, intMinimumAndMaximum, diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java index 0361d0ed..1442029b 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java @@ -5,10 +5,13 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; import org.springframework.lang.Nullable; @@ -47,6 +50,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -78,6 +85,10 @@ public record RecordWithAllConstraints( @Size(min = 1) List arrayMinItems, @Size(max = 10) List arrayMaxItems, @Size(min = 1, max = 10) List arrayMinAndMaxItems, + Set arrayUniqueStandard, + @NotNull Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, @@ -111,6 +122,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -140,6 +155,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java index df60428e..16646a3d 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java @@ -5,10 +5,13 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; import org.springframework.lang.Nullable; @@ -46,6 +49,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -77,6 +84,10 @@ public record RecordWithAllConstraints( @Size(min = 1) List arrayMinItems, @Size(max = 10) List arrayMaxItems, @Size(min = 1, max = 10) List arrayMinAndMaxItems, + Set arrayUniqueStandard, + @NotNull Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, @@ -109,6 +120,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -138,6 +153,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java index 72344a41..d42fc541 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java @@ -5,10 +5,13 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; import org.springframework.lang.Nullable; @@ -46,6 +49,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -77,6 +84,10 @@ public record RecordWithAllConstraints( @Size(min = 1) List arrayMinItems, @Size(max = 10) List arrayMaxItems, @Size(min = 1, max = 10) List arrayMinAndMaxItems, + Set arrayUniqueStandard, + @NotNull Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, @@ -109,6 +120,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -138,6 +153,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java index 61c79a25..25347730 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -5,10 +5,13 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import org.openapitools.jackson.nullable.JsonNullable; import org.springframework.lang.Nullable; @@ -46,6 +49,10 @@ * @param arrayMinItems Non-required, non-nullable List with minItems: 1. * @param arrayMaxItems Non-required, non-nullable List with maxItems: 10. * @param arrayMinAndMaxItems Non-required, non-nullable List with minItems: 1 and maxItems: 10. + * @param arrayUniqueStandard Non-required, non-nullable Set. + * @param arrayUniqueRequired Required, non-nullable Set. + * @param arrayUniqueNullable Non-required, nullable Set. + * @param arrayUniqueRequiredNullable Required, nullable Set. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -77,6 +84,10 @@ public record RecordWithAllConstraints( @Size(min = 1) List arrayMinItems, @Size(max = 10) List arrayMaxItems, @Size(min = 1, max = 10) List arrayMinAndMaxItems, + Set arrayUniqueStandard, + @NotNull Set arrayUniqueRequired, + Set arrayUniqueNullable, + Set arrayUniqueRequiredNullable, @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, @@ -109,6 +120,10 @@ public RecordWithAllConstraints( final List arrayMinItems, final List arrayMaxItems, final List arrayMinAndMaxItems, + final Set arrayUniqueStandard, + final Set arrayUniqueRequired, + final Set arrayUniqueNullable, + final Set arrayUniqueRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -138,6 +153,10 @@ public RecordWithAllConstraints( this.arrayMinItems = Objects.requireNonNullElseGet(arrayMinItems, () -> new ArrayList<>()); this.arrayMaxItems = Objects.requireNonNullElseGet(arrayMaxItems, () -> new ArrayList<>()); this.arrayMinAndMaxItems = Objects.requireNonNullElseGet(arrayMinAndMaxItems, () -> new ArrayList<>()); + this.arrayUniqueStandard = Objects.requireNonNullElseGet(arrayUniqueStandard, () -> new LinkedHashSet<>()); + this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); + this.arrayUniqueNullable = arrayUniqueNullable; + this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; From 15f202de819b19ee95aad881486d84870bf77f47 Mon Sep 17 00:00:00 2001 From: Chrimle <28791817+Chrimle@users.noreply.github.com> Date: Mon, 27 Jul 2026 17:24:21 +0200 Subject: [PATCH 06/13] Simplify `isBeanValidationNullable`-validation --- .../o2jrm/models/GeneratedRecordImpl.java | 45 ++++--------------- .../o2jrm/models/GeneratedRecordImpl.java | 45 ++++--------------- .../o2jrm/models/GeneratedRecordImpl.java | 45 ++++--------------- .../test/meta/models/GeneratedField.java | 8 +--- 4 files changed, 25 insertions(+), 118 deletions(-) diff --git a/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java b/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java index 82e324aa..43969e5c 100644 --- a/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java +++ b/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java @@ -134,17 +134,13 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { GeneratedField.of("stringStandard", String.class).build(), GeneratedField.of("stringDefault", String.class).defaultValue("someDefaultValue").build(), GeneratedField.of("stringNullable", String.class).isNullable(true).build(), - GeneratedField.of("stringRequired", String.class) - .isBeanValidationNullable(false) - .isRequired(true) - .build(), + GeneratedField.of("stringRequired", String.class).isRequired(true).build(), GeneratedField.of("stringRequiredNullable", String.class) .isNullable(true) .isRequired(true) .build(), GeneratedField.of("stringRequiredPattern", String.class) .isRequired(true) - .isBeanValidationNullable(false) .pattern("^\\d{3}-\\d{2}-\\d{4}$") .build(), GeneratedField.of("stringEmailFormat", String.class).isEmail(true).build(), @@ -164,10 +160,7 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { .maxItems(10) .build(), GeneratedField.of("arrayUniqueStandard", Set.class, String.class).build(), - GeneratedField.of("arrayUniqueRequired", Set.class, String.class) - .isRequired(true) - .isBeanValidationNullable(false) - .build(), + GeneratedField.of("arrayUniqueRequired", Set.class, String.class).isRequired(true).build(), GeneratedField.of("arrayUniqueNullable", Set.class, String.class).isNullable(true).build(), GeneratedField.of("arrayUniqueRequiredNullable", Set.class, String.class) .isRequired(true) @@ -314,40 +307,20 @@ public static GeneratedField[] getGeneratedFields( .toArray(new GeneratedField[] {}); case RECORD_WITH_REQUIRED_FIELDS_OF_EACH_TYPE -> List.of( - GeneratedField.of("field1", Boolean.class) - .isRequired(true) - .isBeanValidationNullable(false) - .build(), - GeneratedField.of("field2", String.class) - .isRequired(true) - .isBeanValidationNullable(false) - .build(), - GeneratedField.of("field3", Integer.class) - .isRequired(true) - .isBeanValidationNullable(false) - .build(), - GeneratedField.of("field4", BigDecimal.class) - .isRequired(true) - .isBeanValidationNullable(false) - .build(), - GeneratedField.of("field5", List.class, Boolean.class) - .isRequired(true) - .isBeanValidationNullable(false) - .build(), - GeneratedField.of("field6", Set.class, Boolean.class) - .isRequired(true) - .isBeanValidationNullable(false) - .build(), + GeneratedField.of("field1", Boolean.class).isRequired(true).build(), + GeneratedField.of("field2", String.class).isRequired(true).build(), + GeneratedField.of("field3", Integer.class).isRequired(true).build(), + GeneratedField.of("field4", BigDecimal.class).isRequired(true).build(), + GeneratedField.of("field5", List.class, Boolean.class).isRequired(true).build(), + GeneratedField.of("field6", Set.class, Boolean.class).isRequired(true).build(), GeneratedField.of( "field7", GeneratedRecordImpl.EXAMPLE_RECORD.getClass(pluginExecution)) .isRequired(true) - .isBeanValidationNullable(false) .isCustomClass(true) .build(), GeneratedField.of( "field8", GeneratedEnumImpl.EXAMPLE_ENUM.getClass(pluginExecution)) .isRequired(true) - .isBeanValidationNullable(false) .build()) .toArray(new GeneratedField[] {}); case RECORD_WITH_NULLABLE_FIELDS_OF_EACH_TYPE -> @@ -401,7 +374,6 @@ public static GeneratedField[] getGeneratedFields( "requiredRecordList", List.class, GeneratedRecordImpl.EXAMPLE_RECORD.getClass(pluginExecution)) - .isBeanValidationNullable(false) .isRequired(true) .build(), GeneratedField.of( @@ -413,7 +385,6 @@ public static GeneratedField[] getGeneratedFields( "requiredRecordSet", Set.class, GeneratedRecordImpl.EXAMPLE_RECORD.getClass(pluginExecution)) - .isBeanValidationNullable(false) .isRequired(true) .build()) .toArray(new GeneratedField[] {}); diff --git a/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java b/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java index ef47c3fb..238eee2f 100644 --- a/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java +++ b/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java @@ -134,17 +134,13 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { GeneratedField.of("stringStandard", String.class).build(), GeneratedField.of("stringDefault", String.class).defaultValue("someDefaultValue").build(), GeneratedField.of("stringNullable", String.class).isNullable(true).build(), - GeneratedField.of("stringRequired", String.class) - .isBeanValidationNullable(false) - .isRequired(true) - .build(), + GeneratedField.of("stringRequired", String.class).isRequired(true).build(), GeneratedField.of("stringRequiredNullable", String.class) .isNullable(true) .isRequired(true) .build(), GeneratedField.of("stringRequiredPattern", String.class) .isRequired(true) - .isBeanValidationNullable(false) .pattern("^\\d{3}-\\d{2}-\\d{4}$") .build(), GeneratedField.of("stringEmailFormat", String.class).isEmail(true).build(), @@ -164,10 +160,7 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { .maxItems(10) .build(), GeneratedField.of("arrayUniqueStandard", Set.class, String.class).build(), - GeneratedField.of("arrayUniqueRequired", Set.class, String.class) - .isRequired(true) - .isBeanValidationNullable(false) - .build(), + GeneratedField.of("arrayUniqueRequired", Set.class, String.class).isRequired(true).build(), GeneratedField.of("arrayUniqueNullable", Set.class, String.class).isNullable(true).build(), GeneratedField.of("arrayUniqueRequiredNullable", Set.class, String.class) .isRequired(true) @@ -313,40 +306,20 @@ public static GeneratedField[] getGeneratedFields( .toArray(new GeneratedField[] {}); case RECORD_WITH_REQUIRED_FIELDS_OF_EACH_TYPE -> List.of( - GeneratedField.of("field1", Boolean.class) - .isRequired(true) - .isBeanValidationNullable(false) - .build(), - GeneratedField.of("field2", String.class) - .isRequired(true) - .isBeanValidationNullable(false) - .build(), - GeneratedField.of("field3", Integer.class) - .isRequired(true) - .isBeanValidationNullable(false) - .build(), - GeneratedField.of("field4", BigDecimal.class) - .isRequired(true) - .isBeanValidationNullable(false) - .build(), - GeneratedField.of("field5", List.class, Boolean.class) - .isRequired(true) - .isBeanValidationNullable(false) - .build(), - GeneratedField.of("field6", Set.class, Boolean.class) - .isRequired(true) - .isBeanValidationNullable(false) - .build(), + GeneratedField.of("field1", Boolean.class).isRequired(true).build(), + GeneratedField.of("field2", String.class).isRequired(true).build(), + GeneratedField.of("field3", Integer.class).isRequired(true).build(), + GeneratedField.of("field4", BigDecimal.class).isRequired(true).build(), + GeneratedField.of("field5", List.class, Boolean.class).isRequired(true).build(), + GeneratedField.of("field6", Set.class, Boolean.class).isRequired(true).build(), GeneratedField.of( "field7", GeneratedRecordImpl.EXAMPLE_RECORD.getClass(pluginExecution)) .isRequired(true) - .isBeanValidationNullable(false) .isCustomClass(true) .build(), GeneratedField.of( "field8", GeneratedEnumImpl.EXAMPLE_ENUM.getClass(pluginExecution)) .isRequired(true) - .isBeanValidationNullable(false) .build()) .toArray(new GeneratedField[] {}); case RECORD_WITH_NULLABLE_FIELDS_OF_EACH_TYPE -> @@ -400,7 +373,6 @@ public static GeneratedField[] getGeneratedFields( "requiredRecordList", List.class, GeneratedRecordImpl.EXAMPLE_RECORD.getClass(pluginExecution)) - .isBeanValidationNullable(false) .isRequired(true) .build(), GeneratedField.of( @@ -412,7 +384,6 @@ public static GeneratedField[] getGeneratedFields( "requiredRecordSet", Set.class, GeneratedRecordImpl.EXAMPLE_RECORD.getClass(pluginExecution)) - .isBeanValidationNullable(false) .isRequired(true) .build()) .toArray(new GeneratedField[] {}); diff --git a/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java b/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java index ef47c3fb..238eee2f 100644 --- a/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java +++ b/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java @@ -134,17 +134,13 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { GeneratedField.of("stringStandard", String.class).build(), GeneratedField.of("stringDefault", String.class).defaultValue("someDefaultValue").build(), GeneratedField.of("stringNullable", String.class).isNullable(true).build(), - GeneratedField.of("stringRequired", String.class) - .isBeanValidationNullable(false) - .isRequired(true) - .build(), + GeneratedField.of("stringRequired", String.class).isRequired(true).build(), GeneratedField.of("stringRequiredNullable", String.class) .isNullable(true) .isRequired(true) .build(), GeneratedField.of("stringRequiredPattern", String.class) .isRequired(true) - .isBeanValidationNullable(false) .pattern("^\\d{3}-\\d{2}-\\d{4}$") .build(), GeneratedField.of("stringEmailFormat", String.class).isEmail(true).build(), @@ -164,10 +160,7 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { .maxItems(10) .build(), GeneratedField.of("arrayUniqueStandard", Set.class, String.class).build(), - GeneratedField.of("arrayUniqueRequired", Set.class, String.class) - .isRequired(true) - .isBeanValidationNullable(false) - .build(), + GeneratedField.of("arrayUniqueRequired", Set.class, String.class).isRequired(true).build(), GeneratedField.of("arrayUniqueNullable", Set.class, String.class).isNullable(true).build(), GeneratedField.of("arrayUniqueRequiredNullable", Set.class, String.class) .isRequired(true) @@ -313,40 +306,20 @@ public static GeneratedField[] getGeneratedFields( .toArray(new GeneratedField[] {}); case RECORD_WITH_REQUIRED_FIELDS_OF_EACH_TYPE -> List.of( - GeneratedField.of("field1", Boolean.class) - .isRequired(true) - .isBeanValidationNullable(false) - .build(), - GeneratedField.of("field2", String.class) - .isRequired(true) - .isBeanValidationNullable(false) - .build(), - GeneratedField.of("field3", Integer.class) - .isRequired(true) - .isBeanValidationNullable(false) - .build(), - GeneratedField.of("field4", BigDecimal.class) - .isRequired(true) - .isBeanValidationNullable(false) - .build(), - GeneratedField.of("field5", List.class, Boolean.class) - .isRequired(true) - .isBeanValidationNullable(false) - .build(), - GeneratedField.of("field6", Set.class, Boolean.class) - .isRequired(true) - .isBeanValidationNullable(false) - .build(), + GeneratedField.of("field1", Boolean.class).isRequired(true).build(), + GeneratedField.of("field2", String.class).isRequired(true).build(), + GeneratedField.of("field3", Integer.class).isRequired(true).build(), + GeneratedField.of("field4", BigDecimal.class).isRequired(true).build(), + GeneratedField.of("field5", List.class, Boolean.class).isRequired(true).build(), + GeneratedField.of("field6", Set.class, Boolean.class).isRequired(true).build(), GeneratedField.of( "field7", GeneratedRecordImpl.EXAMPLE_RECORD.getClass(pluginExecution)) .isRequired(true) - .isBeanValidationNullable(false) .isCustomClass(true) .build(), GeneratedField.of( "field8", GeneratedEnumImpl.EXAMPLE_ENUM.getClass(pluginExecution)) .isRequired(true) - .isBeanValidationNullable(false) .build()) .toArray(new GeneratedField[] {}); case RECORD_WITH_NULLABLE_FIELDS_OF_EACH_TYPE -> @@ -400,7 +373,6 @@ public static GeneratedField[] getGeneratedFields( "requiredRecordList", List.class, GeneratedRecordImpl.EXAMPLE_RECORD.getClass(pluginExecution)) - .isBeanValidationNullable(false) .isRequired(true) .build(), GeneratedField.of( @@ -412,7 +384,6 @@ public static GeneratedField[] getGeneratedFields( "requiredRecordSet", Set.class, GeneratedRecordImpl.EXAMPLE_RECORD.getClass(pluginExecution)) - .isBeanValidationNullable(false) .isRequired(true) .build()) .toArray(new GeneratedField[] {}); diff --git a/test/utils/src/main/java/io/github/chrimle/o2jrm/test/meta/models/GeneratedField.java b/test/utils/src/main/java/io/github/chrimle/o2jrm/test/meta/models/GeneratedField.java index ef4f9982..0fe0f751 100644 --- a/test/utils/src/main/java/io/github/chrimle/o2jrm/test/meta/models/GeneratedField.java +++ b/test/utils/src/main/java/io/github/chrimle/o2jrm/test/meta/models/GeneratedField.java @@ -181,7 +181,6 @@ public static class Builder { private final Optional> compositeType; private boolean isRequired = false; private boolean isNullable = false; - private boolean isBeanValidationNullable = true; private boolean isCustomClass = false; private boolean isEmail = false; private @Nullable T enumValue; @@ -218,11 +217,6 @@ public Builder isNullable(final boolean isNullable) { return this; } - public Builder isBeanValidationNullable(final boolean isBeanValidationNullable) { - this.isBeanValidationNullable = isBeanValidationNullable; - return this; - } - public Builder isCustomClass(final boolean isCustomClass) { this.isCustomClass = isCustomClass; return this; @@ -302,7 +296,7 @@ public GeneratedField build() { compositeType, isRequired, isNullable, - isBeanValidationNullable, + isNullable || !isRequired, isCustomClass, isEmail, enumValue, From b4f7cad3e52938cd2115907b21342437171bb835 Mon Sep 17 00:00:00 2001 From: Chrimle <28791817+Chrimle@users.noreply.github.com> Date: Mon, 27 Jul 2026 17:31:01 +0200 Subject: [PATCH 07/13] Update `RecordWithAllConstraints` test record --- test/common/src/main/resources/api.yaml | 20 +++---- .../o2jrm/models/GeneratedRecordImpl.java | 11 ++-- .../RecordWithAllConstraints.java | 30 +++++++++- .../RecordWithAllConstraints.java | 30 +++++++++- .../RecordWithAllConstraints.java | 30 +++++++++- .../RecordWithAllConstraints.java | 30 +++++++++- .../RecordWithAllConstraints.java | 60 ++++++++++++++++++- .../RecordWithAllConstraints.java | 30 +++++++++- .../standard/RecordWithAllConstraints.java | 30 +++++++++- .../RecordWithAllConstraints.java | 30 +++++++++- .../RecordWithAllConstraints.java | 30 +++++++++- .../RecordWithAllConstraints.java | 8 +++ .../RecordWithAllConstraints.java | 8 +++ .../RecordWithAllConstraints.java | 8 +++ .../RecordWithAllConstraints.java | 8 +++ .../RecordWithAllConstraints.java | 38 ++++++++++++ .../RecordWithAllConstraints.java | 8 +++ .../standard/RecordWithAllConstraints.java | 8 +++ .../RecordWithAllConstraints.java | 8 +++ .../RecordWithAllConstraints.java | 8 +++ .../o2jrm/models/GeneratedRecordImpl.java | 11 ++-- .../RecordWithAllConstraints.java | 30 +++++++++- .../RecordWithAllConstraints.java | 30 +++++++++- .../RecordWithAllConstraints.java | 30 +++++++++- .../RecordWithAllConstraints.java | 30 +++++++++- .../RecordWithAllConstraints.java | 60 ++++++++++++++++++- .../RecordWithAllConstraints.java | 30 +++++++++- .../standard/RecordWithAllConstraints.java | 30 +++++++++- .../RecordWithAllConstraints.java | 30 +++++++++- .../RecordWithAllConstraints.java | 30 +++++++++- .../RecordWithAllConstraints.java | 8 +++ .../RecordWithAllConstraints.java | 8 +++ .../RecordWithAllConstraints.java | 8 +++ .../RecordWithAllConstraints.java | 8 +++ .../RecordWithAllConstraints.java | 38 ++++++++++++ .../RecordWithAllConstraints.java | 8 +++ .../standard/RecordWithAllConstraints.java | 8 +++ .../RecordWithAllConstraints.java | 8 +++ .../RecordWithAllConstraints.java | 8 +++ .../o2jrm/models/GeneratedRecordImpl.java | 11 ++-- .../RecordWithAllConstraints.java | 8 +++ .../RecordWithAllConstraints.java | 8 +++ .../RecordWithAllConstraints.java | 8 +++ .../RecordWithAllConstraints.java | 8 +++ .../RecordWithAllConstraints.java | 38 ++++++++++++ .../RecordWithAllConstraints.java | 8 +++ .../standard/RecordWithAllConstraints.java | 8 +++ .../RecordWithAllConstraints.java | 8 +++ .../RecordWithAllConstraints.java | 8 +++ 49 files changed, 912 insertions(+), 47 deletions(-) diff --git a/test/common/src/main/resources/api.yaml b/test/common/src/main/resources/api.yaml index b835aa2a..7376a6a9 100644 --- a/test/common/src/main/resources/api.yaml +++ b/test/common/src/main/resources/api.yaml @@ -352,9 +352,8 @@ components: type: object description: Example of a Record which has fields with constraints required: - # FIXME: BUG, gets annotated @NotNull - #- booleanRequired - #- booleanRequiredDefault + - booleanRequired + - booleanRequiredDefault - booleanRequiredNullable - stringRequired - stringRequiredNullable @@ -375,14 +374,13 @@ components: description: "Non-required, nullable Boolean field." type: boolean nullable: true - # FIXME: BUG, gets annotated @NotNull - # booleanRequired: - # description: "Required, non-nullable Boolean field." - # type: boolean - # booleanRequiredDefault: - # description: "Required, non-nullable Boolean field with a default value." - # type: boolean - # default: true + booleanRequired: + description: "Required, non-nullable Boolean field." + type: boolean + booleanRequiredDefault: + description: "Required, non-nullable Boolean field with a default value." + type: boolean + default: true booleanRequiredNullable: description: "Required, nullable Boolean field." type: boolean diff --git a/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java b/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java index 43969e5c..7ee65377 100644 --- a/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java +++ b/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java @@ -121,12 +121,11 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { GeneratedField.of("booleanStandard", Boolean.class).build(), GeneratedField.of("booleanDefault", Boolean.class).defaultValue(Boolean.TRUE).build(), GeneratedField.of("booleanNullable", Boolean.class).isNullable(true).build(), - // FIXME: BUG, gets annotated @NotNull - // GeneratedField.of("booleanRequired", Boolean.class).isRequired(true).build(), - // GeneratedField.of("booleanRequiredDefault", Boolean.class) - // .isRequired(true) - // .defaultValue(Boolean.TRUE) - // .build(), + GeneratedField.of("booleanRequired", Boolean.class).isRequired(true).build(), + GeneratedField.of("booleanRequiredDefault", Boolean.class) + .isRequired(true) + .defaultValue(Boolean.TRUE) + .build(), GeneratedField.of("booleanRequiredNullable", Boolean.class) .isRequired(true) .isNullable(true) diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index 52f2c750..32638c98 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -48,6 +48,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -83,6 +85,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + Boolean booleanRequired, + Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -120,6 +124,8 @@ public record RecordWithAllConstraints( Set.of("booleanStandard", "booleanDefault", "booleanNullable", + "booleanRequired", + "booleanRequiredDefault", "booleanRequiredNullable", "stringStandard", "stringDefault", @@ -154,7 +160,9 @@ public record RecordWithAllConstraints( /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("booleanRequiredNullable", + Set.of("booleanRequired", + "booleanRequiredDefault", + "booleanRequiredNullable", "stringRequired", "stringRequiredNullable", "stringRequiredPattern", @@ -166,6 +174,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -199,6 +209,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); @@ -300,6 +312,22 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (!jsonObj.get("booleanRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequired"))); + } + + if (!jsonObj.get("booleanRequiredDefault").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequiredDefault` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequiredDefault"))); + } + if (!jsonObj.get("booleanRequiredNullable").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java index c00ef2ab..4be8dc34 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -48,6 +48,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -86,6 +88,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + Boolean booleanRequired, + Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -123,6 +127,8 @@ public record RecordWithAllConstraints( Set.of("booleanStandard", "booleanDefault", "booleanNullable", + "booleanRequired", + "booleanRequiredDefault", "booleanRequiredNullable", "stringStandard", "stringDefault", @@ -157,7 +163,9 @@ public record RecordWithAllConstraints( /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("booleanRequiredNullable", + Set.of("booleanRequired", + "booleanRequiredDefault", + "booleanRequiredNullable", "stringRequired", "stringRequiredNullable", "stringRequiredPattern", @@ -169,6 +177,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -202,6 +212,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); @@ -303,6 +315,22 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (!jsonObj.get("booleanRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequired"))); + } + + if (!jsonObj.get("booleanRequiredDefault").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequiredDefault` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequiredDefault"))); + } + if (!jsonObj.get("booleanRequiredNullable").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index 02d84cae..8f1f6c6d 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -48,6 +48,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -83,6 +85,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + Boolean booleanRequired, + Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -120,6 +124,8 @@ public record RecordWithAllConstraints( Set.of("booleanStandard", "booleanDefault", "booleanNullable", + "booleanRequired", + "booleanRequiredDefault", "booleanRequiredNullable", "stringStandard", "stringDefault", @@ -154,7 +160,9 @@ public record RecordWithAllConstraints( /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("booleanRequiredNullable", + Set.of("booleanRequired", + "booleanRequiredDefault", + "booleanRequiredNullable", "stringRequired", "stringRequiredNullable", "stringRequiredPattern", @@ -166,6 +174,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -199,6 +209,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); @@ -300,6 +312,22 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (!jsonObj.get("booleanRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequired"))); + } + + if (!jsonObj.get("booleanRequiredDefault").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequiredDefault` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequiredDefault"))); + } + if (!jsonObj.get("booleanRequiredNullable").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java index 7cf58b93..7842491f 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -48,6 +48,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -83,6 +85,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + Boolean booleanRequired, + Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -120,6 +124,8 @@ public record RecordWithAllConstraints( Set.of("booleanStandard", "booleanDefault", "booleanNullable", + "booleanRequired", + "booleanRequiredDefault", "booleanRequiredNullable", "stringStandard", "stringDefault", @@ -154,7 +160,9 @@ public record RecordWithAllConstraints( /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("booleanRequiredNullable", + Set.of("booleanRequired", + "booleanRequiredDefault", + "booleanRequiredNullable", "stringRequired", "stringRequiredNullable", "stringRequiredPattern", @@ -166,6 +174,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -199,6 +209,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); @@ -300,6 +312,22 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (!jsonObj.get("booleanRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequired"))); + } + + if (!jsonObj.get("booleanRequiredDefault").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequiredDefault` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequiredDefault"))); + } + if (!jsonObj.get("booleanRequiredNullable").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java index f2efee13..e55da5f6 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java @@ -48,6 +48,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -83,6 +85,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + Boolean booleanRequired, + Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -120,6 +124,8 @@ public record RecordWithAllConstraints( Set.of("booleanStandard", "booleanDefault", "booleanNullable", + "booleanRequired", + "booleanRequiredDefault", "booleanRequiredNullable", "stringStandard", "stringDefault", @@ -154,7 +160,9 @@ public record RecordWithAllConstraints( /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("booleanRequiredNullable", + Set.of("booleanRequired", + "booleanRequiredDefault", + "booleanRequiredNullable", "stringRequired", "stringRequiredNullable", "stringRequiredPattern", @@ -166,6 +174,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -199,6 +209,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); @@ -237,6 +249,8 @@ public static class Builder { private Boolean booleanStandard; private Boolean booleanDefault; private Boolean booleanNullable; + private Boolean booleanRequired; + private Boolean booleanRequiredDefault; private Boolean booleanRequiredNullable; private String stringStandard; private String stringDefault; @@ -307,6 +321,32 @@ public Builder booleanNullable(final Boolean booleanNullable) { return this; } + /** + * Sets the value of {@link RecordWithAllConstraints#booleanRequired }. + * + *

NOTE: Pass-by-reference is used! + * + * @param booleanRequired Required, non-nullable Boolean field.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder booleanRequired(final Boolean booleanRequired) { + this.booleanRequired = booleanRequired; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#booleanRequiredDefault }. + * + *

NOTE: Pass-by-reference is used! + * + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder booleanRequiredDefault(final Boolean booleanRequiredDefault) { + this.booleanRequiredDefault = booleanRequiredDefault; + return this; + } + /** * Sets the value of {@link RecordWithAllConstraints#booleanRequiredNullable }. * @@ -710,6 +750,8 @@ public RecordWithAllConstraints build() { booleanStandard, booleanDefault, booleanNullable, + booleanRequired, + booleanRequiredDefault, booleanRequiredNullable, stringStandard, stringDefault, @@ -817,6 +859,22 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (!jsonObj.get("booleanRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequired"))); + } + + if (!jsonObj.get("booleanRequiredDefault").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequiredDefault` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequiredDefault"))); + } + if (!jsonObj.get("booleanRequiredNullable").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java index 68b836cb..598090c8 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java @@ -49,6 +49,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -84,6 +86,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + Boolean booleanRequired, + Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -122,6 +126,8 @@ public record RecordWithAllConstraints( Set.of("booleanStandard", "booleanDefault", "booleanNullable", + "booleanRequired", + "booleanRequiredDefault", "booleanRequiredNullable", "stringStandard", "stringDefault", @@ -156,7 +162,9 @@ public record RecordWithAllConstraints( /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("booleanRequiredNullable", + Set.of("booleanRequired", + "booleanRequiredDefault", + "booleanRequiredNullable", "stringRequired", "stringRequiredNullable", "stringRequiredPattern", @@ -168,6 +176,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -201,6 +211,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); @@ -302,6 +314,22 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (!jsonObj.get("booleanRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequired"))); + } + + if (!jsonObj.get("booleanRequiredDefault").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequiredDefault` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequiredDefault"))); + } + if (!jsonObj.get("booleanRequiredNullable").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java index 2fbc7321..cefb029a 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java @@ -48,6 +48,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -83,6 +85,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + Boolean booleanRequired, + Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -120,6 +124,8 @@ public record RecordWithAllConstraints( Set.of("booleanStandard", "booleanDefault", "booleanNullable", + "booleanRequired", + "booleanRequiredDefault", "booleanRequiredNullable", "stringStandard", "stringDefault", @@ -154,7 +160,9 @@ public record RecordWithAllConstraints( /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("booleanRequiredNullable", + Set.of("booleanRequired", + "booleanRequiredDefault", + "booleanRequiredNullable", "stringRequired", "stringRequiredNullable", "stringRequiredPattern", @@ -166,6 +174,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -199,6 +209,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); @@ -300,6 +312,22 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (!jsonObj.get("booleanRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequired"))); + } + + if (!jsonObj.get("booleanRequiredDefault").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequiredDefault` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequiredDefault"))); + } + if (!jsonObj.get("booleanRequiredNullable").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java index 7c0a6570..8144725d 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java @@ -50,6 +50,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -85,6 +87,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + @NotNull Boolean booleanRequired, + @NotNull Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -122,6 +126,8 @@ public record RecordWithAllConstraints( Set.of("booleanStandard", "booleanDefault", "booleanNullable", + "booleanRequired", + "booleanRequiredDefault", "booleanRequiredNullable", "stringStandard", "stringDefault", @@ -156,7 +162,9 @@ public record RecordWithAllConstraints( /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("booleanRequiredNullable", + Set.of("booleanRequired", + "booleanRequiredDefault", + "booleanRequiredNullable", "stringRequired", "stringRequiredNullable", "stringRequiredPattern", @@ -168,6 +176,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -201,6 +211,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); @@ -302,6 +314,22 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (!jsonObj.get("booleanRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequired"))); + } + + if (!jsonObj.get("booleanRequiredDefault").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequiredDefault` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequiredDefault"))); + } + if (!jsonObj.get("booleanRequiredNullable").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java index 015a2e2b..2ef714ff 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -48,6 +48,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -83,6 +85,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + Boolean booleanRequired, + Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -120,6 +124,8 @@ public record RecordWithAllConstraints( Set.of("booleanStandard", "booleanDefault", "booleanNullable", + "booleanRequired", + "booleanRequiredDefault", "booleanRequiredNullable", "stringStandard", "stringDefault", @@ -154,7 +160,9 @@ public record RecordWithAllConstraints( /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("booleanRequiredNullable", + Set.of("booleanRequired", + "booleanRequiredDefault", + "booleanRequiredNullable", "stringRequired", "stringRequiredNullable", "stringRequiredPattern", @@ -166,6 +174,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -199,6 +209,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); @@ -300,6 +312,22 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (!jsonObj.get("booleanRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequired"))); + } + + if (!jsonObj.get("booleanRequiredDefault").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequiredDefault` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequiredDefault"))); + } + if (!jsonObj.get("booleanRequiredNullable").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index 567b9610..74b569ea 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -46,6 +46,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -81,6 +83,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + Boolean booleanRequired, + Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -117,6 +121,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -150,6 +156,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java index f13df74c..a563d5df 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -46,6 +46,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -84,6 +86,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + Boolean booleanRequired, + Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -120,6 +124,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -153,6 +159,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index 8d482bf8..0d92df18 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -46,6 +46,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -81,6 +83,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + Boolean booleanRequired, + Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -117,6 +121,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -150,6 +156,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java index 588b174f..1de6c196 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -46,6 +46,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -81,6 +83,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + Boolean booleanRequired, + Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -117,6 +121,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -150,6 +156,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java index 609ef92d..915f643d 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java @@ -46,6 +46,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -81,6 +83,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + Boolean booleanRequired, + Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -117,6 +121,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -150,6 +156,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); @@ -188,6 +196,8 @@ public static class Builder { private Boolean booleanStandard; private Boolean booleanDefault; private Boolean booleanNullable; + private Boolean booleanRequired; + private Boolean booleanRequiredDefault; private Boolean booleanRequiredNullable; private String stringStandard; private String stringDefault; @@ -258,6 +268,32 @@ public Builder booleanNullable(final Boolean booleanNullable) { return this; } + /** + * Sets the value of {@link RecordWithAllConstraints#booleanRequired }. + * + *

NOTE: Pass-by-reference is used! + * + * @param booleanRequired Required, non-nullable Boolean field.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder booleanRequired(final Boolean booleanRequired) { + this.booleanRequired = booleanRequired; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#booleanRequiredDefault }. + * + *

NOTE: Pass-by-reference is used! + * + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder booleanRequiredDefault(final Boolean booleanRequiredDefault) { + this.booleanRequiredDefault = booleanRequiredDefault; + return this; + } + /** * Sets the value of {@link RecordWithAllConstraints#booleanRequiredNullable }. * @@ -661,6 +697,8 @@ public RecordWithAllConstraints build() { booleanStandard, booleanDefault, booleanNullable, + booleanRequired, + booleanRequiredDefault, booleanRequiredNullable, stringStandard, stringDefault, diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java index f1e15df2..c0814f44 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java @@ -47,6 +47,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -82,6 +84,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + Boolean booleanRequired, + Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -119,6 +123,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -152,6 +158,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java index df03528f..29b9a24a 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java @@ -46,6 +46,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -81,6 +83,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + Boolean booleanRequired, + Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -117,6 +121,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -150,6 +156,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java index 387c5a95..89250e6a 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java @@ -48,6 +48,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -83,6 +85,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + @NotNull Boolean booleanRequired, + @NotNull Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -119,6 +123,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -152,6 +158,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java index 697c4df1..65373f3f 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -46,6 +46,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -81,6 +83,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + Boolean booleanRequired, + Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -117,6 +121,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -150,6 +156,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); diff --git a/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java b/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java index 238eee2f..7f7385e5 100644 --- a/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java +++ b/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java @@ -121,12 +121,11 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { GeneratedField.of("booleanStandard", Boolean.class).build(), GeneratedField.of("booleanDefault", Boolean.class).defaultValue(Boolean.TRUE).build(), GeneratedField.of("booleanNullable", Boolean.class).isNullable(true).build(), - // FIXME: BUG, gets annotated @NotNull - // GeneratedField.of("booleanRequired", Boolean.class).isRequired(true).build(), - // GeneratedField.of("booleanRequiredDefault", Boolean.class) - // .isRequired(true) - // .defaultValue(Boolean.TRUE) - // .build(), + GeneratedField.of("booleanRequired", Boolean.class).isRequired(true).build(), + GeneratedField.of("booleanRequiredDefault", Boolean.class) + .isRequired(true) + .defaultValue(Boolean.TRUE) + .build(), GeneratedField.of("booleanRequiredNullable", Boolean.class) .isRequired(true) .isNullable(true) diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index 52f2c750..32638c98 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -48,6 +48,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -83,6 +85,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + Boolean booleanRequired, + Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -120,6 +124,8 @@ public record RecordWithAllConstraints( Set.of("booleanStandard", "booleanDefault", "booleanNullable", + "booleanRequired", + "booleanRequiredDefault", "booleanRequiredNullable", "stringStandard", "stringDefault", @@ -154,7 +160,9 @@ public record RecordWithAllConstraints( /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("booleanRequiredNullable", + Set.of("booleanRequired", + "booleanRequiredDefault", + "booleanRequiredNullable", "stringRequired", "stringRequiredNullable", "stringRequiredPattern", @@ -166,6 +174,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -199,6 +209,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); @@ -300,6 +312,22 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (!jsonObj.get("booleanRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequired"))); + } + + if (!jsonObj.get("booleanRequiredDefault").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequiredDefault` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequiredDefault"))); + } + if (!jsonObj.get("booleanRequiredNullable").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java index c00ef2ab..4be8dc34 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -48,6 +48,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -86,6 +88,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + Boolean booleanRequired, + Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -123,6 +127,8 @@ public record RecordWithAllConstraints( Set.of("booleanStandard", "booleanDefault", "booleanNullable", + "booleanRequired", + "booleanRequiredDefault", "booleanRequiredNullable", "stringStandard", "stringDefault", @@ -157,7 +163,9 @@ public record RecordWithAllConstraints( /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("booleanRequiredNullable", + Set.of("booleanRequired", + "booleanRequiredDefault", + "booleanRequiredNullable", "stringRequired", "stringRequiredNullable", "stringRequiredPattern", @@ -169,6 +177,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -202,6 +212,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); @@ -303,6 +315,22 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (!jsonObj.get("booleanRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequired"))); + } + + if (!jsonObj.get("booleanRequiredDefault").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequiredDefault` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequiredDefault"))); + } + if (!jsonObj.get("booleanRequiredNullable").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index 02d84cae..8f1f6c6d 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -48,6 +48,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -83,6 +85,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + Boolean booleanRequired, + Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -120,6 +124,8 @@ public record RecordWithAllConstraints( Set.of("booleanStandard", "booleanDefault", "booleanNullable", + "booleanRequired", + "booleanRequiredDefault", "booleanRequiredNullable", "stringStandard", "stringDefault", @@ -154,7 +160,9 @@ public record RecordWithAllConstraints( /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("booleanRequiredNullable", + Set.of("booleanRequired", + "booleanRequiredDefault", + "booleanRequiredNullable", "stringRequired", "stringRequiredNullable", "stringRequiredPattern", @@ -166,6 +174,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -199,6 +209,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); @@ -300,6 +312,22 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (!jsonObj.get("booleanRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequired"))); + } + + if (!jsonObj.get("booleanRequiredDefault").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequiredDefault` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequiredDefault"))); + } + if (!jsonObj.get("booleanRequiredNullable").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java index 7cf58b93..7842491f 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -48,6 +48,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -83,6 +85,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + Boolean booleanRequired, + Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -120,6 +124,8 @@ public record RecordWithAllConstraints( Set.of("booleanStandard", "booleanDefault", "booleanNullable", + "booleanRequired", + "booleanRequiredDefault", "booleanRequiredNullable", "stringStandard", "stringDefault", @@ -154,7 +160,9 @@ public record RecordWithAllConstraints( /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("booleanRequiredNullable", + Set.of("booleanRequired", + "booleanRequiredDefault", + "booleanRequiredNullable", "stringRequired", "stringRequiredNullable", "stringRequiredPattern", @@ -166,6 +174,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -199,6 +209,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); @@ -300,6 +312,22 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (!jsonObj.get("booleanRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequired"))); + } + + if (!jsonObj.get("booleanRequiredDefault").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequiredDefault` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequiredDefault"))); + } + if (!jsonObj.get("booleanRequiredNullable").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java index f2efee13..e55da5f6 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java @@ -48,6 +48,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -83,6 +85,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + Boolean booleanRequired, + Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -120,6 +124,8 @@ public record RecordWithAllConstraints( Set.of("booleanStandard", "booleanDefault", "booleanNullable", + "booleanRequired", + "booleanRequiredDefault", "booleanRequiredNullable", "stringStandard", "stringDefault", @@ -154,7 +160,9 @@ public record RecordWithAllConstraints( /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("booleanRequiredNullable", + Set.of("booleanRequired", + "booleanRequiredDefault", + "booleanRequiredNullable", "stringRequired", "stringRequiredNullable", "stringRequiredPattern", @@ -166,6 +174,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -199,6 +209,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); @@ -237,6 +249,8 @@ public static class Builder { private Boolean booleanStandard; private Boolean booleanDefault; private Boolean booleanNullable; + private Boolean booleanRequired; + private Boolean booleanRequiredDefault; private Boolean booleanRequiredNullable; private String stringStandard; private String stringDefault; @@ -307,6 +321,32 @@ public Builder booleanNullable(final Boolean booleanNullable) { return this; } + /** + * Sets the value of {@link RecordWithAllConstraints#booleanRequired }. + * + *

NOTE: Pass-by-reference is used! + * + * @param booleanRequired Required, non-nullable Boolean field.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder booleanRequired(final Boolean booleanRequired) { + this.booleanRequired = booleanRequired; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#booleanRequiredDefault }. + * + *

NOTE: Pass-by-reference is used! + * + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder booleanRequiredDefault(final Boolean booleanRequiredDefault) { + this.booleanRequiredDefault = booleanRequiredDefault; + return this; + } + /** * Sets the value of {@link RecordWithAllConstraints#booleanRequiredNullable }. * @@ -710,6 +750,8 @@ public RecordWithAllConstraints build() { booleanStandard, booleanDefault, booleanNullable, + booleanRequired, + booleanRequiredDefault, booleanRequiredNullable, stringStandard, stringDefault, @@ -817,6 +859,22 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (!jsonObj.get("booleanRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequired"))); + } + + if (!jsonObj.get("booleanRequiredDefault").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequiredDefault` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequiredDefault"))); + } + if (!jsonObj.get("booleanRequiredNullable").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java index 68b836cb..598090c8 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java @@ -49,6 +49,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -84,6 +86,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + Boolean booleanRequired, + Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -122,6 +126,8 @@ public record RecordWithAllConstraints( Set.of("booleanStandard", "booleanDefault", "booleanNullable", + "booleanRequired", + "booleanRequiredDefault", "booleanRequiredNullable", "stringStandard", "stringDefault", @@ -156,7 +162,9 @@ public record RecordWithAllConstraints( /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("booleanRequiredNullable", + Set.of("booleanRequired", + "booleanRequiredDefault", + "booleanRequiredNullable", "stringRequired", "stringRequiredNullable", "stringRequiredPattern", @@ -168,6 +176,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -201,6 +211,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); @@ -302,6 +314,22 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (!jsonObj.get("booleanRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequired"))); + } + + if (!jsonObj.get("booleanRequiredDefault").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequiredDefault` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequiredDefault"))); + } + if (!jsonObj.get("booleanRequiredNullable").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java index 2fbc7321..cefb029a 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java @@ -48,6 +48,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -83,6 +85,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + Boolean booleanRequired, + Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -120,6 +124,8 @@ public record RecordWithAllConstraints( Set.of("booleanStandard", "booleanDefault", "booleanNullable", + "booleanRequired", + "booleanRequiredDefault", "booleanRequiredNullable", "stringStandard", "stringDefault", @@ -154,7 +160,9 @@ public record RecordWithAllConstraints( /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("booleanRequiredNullable", + Set.of("booleanRequired", + "booleanRequiredDefault", + "booleanRequiredNullable", "stringRequired", "stringRequiredNullable", "stringRequiredPattern", @@ -166,6 +174,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -199,6 +209,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); @@ -300,6 +312,22 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (!jsonObj.get("booleanRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequired"))); + } + + if (!jsonObj.get("booleanRequiredDefault").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequiredDefault` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequiredDefault"))); + } + if (!jsonObj.get("booleanRequiredNullable").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java index 9075d016..20d86c26 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java @@ -50,6 +50,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -85,6 +87,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + @NotNull Boolean booleanRequired, + @NotNull Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -122,6 +126,8 @@ public record RecordWithAllConstraints( Set.of("booleanStandard", "booleanDefault", "booleanNullable", + "booleanRequired", + "booleanRequiredDefault", "booleanRequiredNullable", "stringStandard", "stringDefault", @@ -156,7 +162,9 @@ public record RecordWithAllConstraints( /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("booleanRequiredNullable", + Set.of("booleanRequired", + "booleanRequiredDefault", + "booleanRequiredNullable", "stringRequired", "stringRequiredNullable", "stringRequiredPattern", @@ -168,6 +176,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -201,6 +211,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); @@ -302,6 +314,22 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (!jsonObj.get("booleanRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequired"))); + } + + if (!jsonObj.get("booleanRequiredDefault").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequiredDefault` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequiredDefault"))); + } + if (!jsonObj.get("booleanRequiredNullable").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java index 015a2e2b..2ef714ff 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -48,6 +48,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -83,6 +85,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + Boolean booleanRequired, + Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -120,6 +124,8 @@ public record RecordWithAllConstraints( Set.of("booleanStandard", "booleanDefault", "booleanNullable", + "booleanRequired", + "booleanRequiredDefault", "booleanRequiredNullable", "stringStandard", "stringDefault", @@ -154,7 +160,9 @@ public record RecordWithAllConstraints( /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("booleanRequiredNullable", + Set.of("booleanRequired", + "booleanRequiredDefault", + "booleanRequiredNullable", "stringRequired", "stringRequiredNullable", "stringRequiredPattern", @@ -166,6 +174,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -199,6 +209,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); @@ -300,6 +312,22 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (!jsonObj.get("booleanRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequired"))); + } + + if (!jsonObj.get("booleanRequiredDefault").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `booleanRequiredDefault` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("booleanRequiredDefault"))); + } + if (!jsonObj.get("booleanRequiredNullable").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index 567b9610..74b569ea 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -46,6 +46,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -81,6 +83,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + Boolean booleanRequired, + Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -117,6 +121,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -150,6 +156,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java index f13df74c..a563d5df 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -46,6 +46,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -84,6 +86,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + Boolean booleanRequired, + Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -120,6 +124,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -153,6 +159,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index 8d482bf8..0d92df18 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -46,6 +46,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -81,6 +83,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + Boolean booleanRequired, + Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -117,6 +121,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -150,6 +156,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java index 588b174f..1de6c196 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -46,6 +46,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -81,6 +83,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + Boolean booleanRequired, + Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -117,6 +121,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -150,6 +156,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java index 609ef92d..915f643d 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java @@ -46,6 +46,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -81,6 +83,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + Boolean booleanRequired, + Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -117,6 +121,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -150,6 +156,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); @@ -188,6 +196,8 @@ public static class Builder { private Boolean booleanStandard; private Boolean booleanDefault; private Boolean booleanNullable; + private Boolean booleanRequired; + private Boolean booleanRequiredDefault; private Boolean booleanRequiredNullable; private String stringStandard; private String stringDefault; @@ -258,6 +268,32 @@ public Builder booleanNullable(final Boolean booleanNullable) { return this; } + /** + * Sets the value of {@link RecordWithAllConstraints#booleanRequired }. + * + *

NOTE: Pass-by-reference is used! + * + * @param booleanRequired Required, non-nullable Boolean field.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder booleanRequired(final Boolean booleanRequired) { + this.booleanRequired = booleanRequired; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#booleanRequiredDefault }. + * + *

NOTE: Pass-by-reference is used! + * + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder booleanRequiredDefault(final Boolean booleanRequiredDefault) { + this.booleanRequiredDefault = booleanRequiredDefault; + return this; + } + /** * Sets the value of {@link RecordWithAllConstraints#booleanRequiredNullable }. * @@ -661,6 +697,8 @@ public RecordWithAllConstraints build() { booleanStandard, booleanDefault, booleanNullable, + booleanRequired, + booleanRequiredDefault, booleanRequiredNullable, stringStandard, stringDefault, diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java index f1e15df2..c0814f44 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java @@ -47,6 +47,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -82,6 +84,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + Boolean booleanRequired, + Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -119,6 +123,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -152,6 +158,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java index df03528f..29b9a24a 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java @@ -46,6 +46,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -81,6 +83,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + Boolean booleanRequired, + Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -117,6 +121,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -150,6 +156,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java index c738ae9d..ac3746d9 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java @@ -48,6 +48,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -83,6 +85,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + @NotNull Boolean booleanRequired, + @NotNull Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -119,6 +123,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -152,6 +158,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java index 697c4df1..65373f3f 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -46,6 +46,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -81,6 +83,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + Boolean booleanRequired, + Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -117,6 +121,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -150,6 +156,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); diff --git a/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java b/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java index 238eee2f..7f7385e5 100644 --- a/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java +++ b/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java @@ -121,12 +121,11 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { GeneratedField.of("booleanStandard", Boolean.class).build(), GeneratedField.of("booleanDefault", Boolean.class).defaultValue(Boolean.TRUE).build(), GeneratedField.of("booleanNullable", Boolean.class).isNullable(true).build(), - // FIXME: BUG, gets annotated @NotNull - // GeneratedField.of("booleanRequired", Boolean.class).isRequired(true).build(), - // GeneratedField.of("booleanRequiredDefault", Boolean.class) - // .isRequired(true) - // .defaultValue(Boolean.TRUE) - // .build(), + GeneratedField.of("booleanRequired", Boolean.class).isRequired(true).build(), + GeneratedField.of("booleanRequiredDefault", Boolean.class) + .isRequired(true) + .defaultValue(Boolean.TRUE) + .build(), GeneratedField.of("booleanRequiredNullable", Boolean.class) .isRequired(true) .isNullable(true) diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index 77977e2b..86b928e2 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -32,6 +32,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -67,6 +69,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + @NotNull Boolean booleanRequired, + @NotNull Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -103,6 +107,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -136,6 +142,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java index 31aac50d..07494bbd 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -32,6 +32,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -70,6 +72,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + @NotNull Boolean booleanRequired, + @NotNull Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -106,6 +110,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -139,6 +145,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index 69035569..436005ad 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -32,6 +32,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -67,6 +69,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + @NotNull Boolean booleanRequired, + @NotNull Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -103,6 +107,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -136,6 +142,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java index 7ced34b5..123af6bf 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -32,6 +32,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -67,6 +69,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + @NotNull Boolean booleanRequired, + @NotNull Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -103,6 +107,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -136,6 +142,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java index 059276a0..9b832b56 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java @@ -32,6 +32,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -67,6 +69,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + @NotNull Boolean booleanRequired, + @NotNull Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -103,6 +107,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -136,6 +142,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); @@ -174,6 +182,8 @@ public static class Builder { private Boolean booleanStandard; private Boolean booleanDefault; private Boolean booleanNullable; + private Boolean booleanRequired; + private Boolean booleanRequiredDefault; private Boolean booleanRequiredNullable; private String stringStandard; private String stringDefault; @@ -244,6 +254,32 @@ public Builder booleanNullable(final Boolean booleanNullable) { return this; } + /** + * Sets the value of {@link RecordWithAllConstraints#booleanRequired }. + * + *

NOTE: Pass-by-reference is used! + * + * @param booleanRequired Required, non-nullable Boolean field.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder booleanRequired(final Boolean booleanRequired) { + this.booleanRequired = booleanRequired; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#booleanRequiredDefault }. + * + *

NOTE: Pass-by-reference is used! + * + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder booleanRequiredDefault(final Boolean booleanRequiredDefault) { + this.booleanRequiredDefault = booleanRequiredDefault; + return this; + } + /** * Sets the value of {@link RecordWithAllConstraints#booleanRequiredNullable }. * @@ -647,6 +683,8 @@ public RecordWithAllConstraints build() { booleanStandard, booleanDefault, booleanNullable, + booleanRequired, + booleanRequiredDefault, booleanRequiredNullable, stringStandard, stringDefault, diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java index 1442029b..4292fdc9 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java @@ -33,6 +33,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -68,6 +70,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + @NotNull Boolean booleanRequired, + @NotNull Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -105,6 +109,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -138,6 +144,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java index 16646a3d..ab9e3227 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java @@ -32,6 +32,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -67,6 +69,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + @NotNull Boolean booleanRequired, + @NotNull Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -103,6 +107,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -136,6 +142,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java index d42fc541..0b9d150c 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java @@ -32,6 +32,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -67,6 +69,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + @NotNull Boolean booleanRequired, + @NotNull Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -103,6 +107,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -136,6 +142,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java index 25347730..3603ea23 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -32,6 +32,8 @@ * @param booleanStandard Non-required, non-nullable Boolean field. * @param booleanDefault Non-required, non-nullable Boolean with a default value. * @param booleanNullable Non-required, nullable Boolean field. + * @param booleanRequired Required, non-nullable Boolean field. + * @param booleanRequiredDefault Required, non-nullable Boolean field with a default value. * @param booleanRequiredNullable Required, nullable Boolean field. * @param stringStandard Non-required, non-nullable String field. * @param stringDefault Non-required, non-nullable String field with a default value. @@ -67,6 +69,8 @@ public record RecordWithAllConstraints( Boolean booleanStandard, Boolean booleanDefault, Boolean booleanNullable, + @NotNull Boolean booleanRequired, + @NotNull Boolean booleanRequiredDefault, Boolean booleanRequiredNullable, String stringStandard, String stringDefault, @@ -103,6 +107,8 @@ public RecordWithAllConstraints( final Boolean booleanStandard, final Boolean booleanDefault, final Boolean booleanNullable, + final Boolean booleanRequired, + final Boolean booleanRequiredDefault, final Boolean booleanRequiredNullable, final String stringStandard, final String stringDefault, @@ -136,6 +142,8 @@ public RecordWithAllConstraints( this.booleanStandard = booleanStandard; this.booleanDefault = Objects.requireNonNullElse(booleanDefault, true); this.booleanNullable = booleanNullable; + this.booleanRequired = booleanRequired; + this.booleanRequiredDefault = Objects.requireNonNullElse(booleanRequiredDefault, true); this.booleanRequiredNullable = booleanRequiredNullable; this.stringStandard = stringStandard; this.stringDefault = Objects.requireNonNullElse(stringDefault, "someDefaultValue"); From 357040a8e99844d22f4d0a0e65073d6d6c4f5b96 Mon Sep 17 00:00:00 2001 From: Chrimle <28791817+Chrimle@users.noreply.github.com> Date: Mon, 27 Jul 2026 18:58:47 +0200 Subject: [PATCH 08/13] Update `RecordWithAllConstraints` test record --- test/common/src/main/resources/api.yaml | 21 +++ .../o2jrm/models/GeneratedRecordImpl.java | 7 + .../RecordWithAllConstraints.java | 60 ++++++++- .../RecordWithAllConstraints.java | 60 ++++++++- .../RecordWithAllConstraints.java | 60 ++++++++- .../RecordWithAllConstraints.java | 60 ++++++++- .../RecordWithAllConstraints.java | 120 +++++++++++++++++- .../RecordWithAllConstraints.java | 60 ++++++++- .../standard/RecordWithAllConstraints.java | 60 ++++++++- .../RecordWithAllConstraints.java | 60 ++++++++- .../RecordWithAllConstraints.java | 60 ++++++++- .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 76 +++++++++++ .../RecordWithAllConstraints.java | 16 +++ .../standard/RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../o2jrm/models/GeneratedRecordImpl.java | 7 + .../RecordWithAllConstraints.java | 60 ++++++++- .../RecordWithAllConstraints.java | 60 ++++++++- .../RecordWithAllConstraints.java | 60 ++++++++- .../RecordWithAllConstraints.java | 60 ++++++++- .../RecordWithAllConstraints.java | 120 +++++++++++++++++- .../RecordWithAllConstraints.java | 60 ++++++++- .../standard/RecordWithAllConstraints.java | 60 ++++++++- .../RecordWithAllConstraints.java | 60 ++++++++- .../RecordWithAllConstraints.java | 60 ++++++++- .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 76 +++++++++++ .../RecordWithAllConstraints.java | 16 +++ .../standard/RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../o2jrm/models/GeneratedRecordImpl.java | 7 + .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 76 +++++++++++ .../RecordWithAllConstraints.java | 16 +++ .../standard/RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ 49 files changed, 1836 insertions(+), 18 deletions(-) diff --git a/test/common/src/main/resources/api.yaml b/test/common/src/main/resources/api.yaml index 7376a6a9..2274a14b 100644 --- a/test/common/src/main/resources/api.yaml +++ b/test/common/src/main/resources/api.yaml @@ -361,6 +361,8 @@ components: - arrayRequiredNullable - arrayUniqueRequired - arrayUniqueRequiredNullable + - longRequired + - longRequiredNullable properties: ### BOOLEAN FIELDS ### booleanStandard: @@ -502,6 +504,25 @@ components: type: integer minimum: 0 maximum: 100 + ### int64 / LONG FIELDS ### + longStandard: + description: "Non-required, non-nullable Long." + type: integer + format: int64 + longNullable: + description: "Non-required, nullable Long." + type: integer + format: int64 + nullable: true + longRequired: + description: "Required, non-nullable Long." + type: integer + format: int64 + longRequiredNullable: + description: "Required, nullable Long." + type: integer + format: int64 + nullable: true longMinimum: description: "Non-required, non-nullable Long with minimum: 18." type: integer diff --git a/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java b/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java index 7ee65377..c7353410 100644 --- a/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java +++ b/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java @@ -168,6 +168,13 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { GeneratedField.of("intMinimum", Integer.class).minimum(18).build(), GeneratedField.of("intMaximum", Integer.class).maximum(100).build(), GeneratedField.of("intMinimumAndMaximum", Integer.class).minimum(0).maximum(100).build(), + GeneratedField.of("longStandard", Long.class).build(), + GeneratedField.of("longNullable", Long.class).isNullable(true).build(), + GeneratedField.of("longRequired", Long.class).isRequired(true).build(), + GeneratedField.of("longRequiredNullable", Long.class) + .isRequired(true) + .isNullable(true) + .build(), GeneratedField.of("longMinimum", Long.class).minimum(18).build(), GeneratedField.of("longMaximum", Long.class).maximum(100).build(), GeneratedField.of("longMinimumAndMaximum", Long.class).minimum(0).maximum(100).build(), diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index 32638c98..44d84a8c 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -74,6 +74,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -111,6 +115,10 @@ public record RecordWithAllConstraints( Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + Long longRequired, + Long longRequiredNullable, Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, @@ -150,6 +158,10 @@ public record RecordWithAllConstraints( "intMinimum", "intMaximum", "intMinimumAndMaximum", + "longStandard", + "longNullable", + "longRequired", + "longRequiredNullable", "longMinimum", "longMaximum", "longMinimumAndMaximum", @@ -168,7 +180,9 @@ public record RecordWithAllConstraints( "stringRequiredPattern", "arrayRequiredNullable", "arrayUniqueRequired", - "arrayUniqueRequiredNullable")); + "arrayUniqueRequiredNullable", + "longRequired", + "longRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -200,6 +214,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -235,6 +253,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; @@ -554,6 +576,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("longStandard") != null && !jsonObj.get("longStandard").isJsonNull()) { + if (!jsonObj.get("longStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longStandard"))); + } + } + + if (jsonObj.get("longNullable") != null && !jsonObj.get("longNullable").isJsonNull()) { + if (!jsonObj.get("longNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longNullable"))); + } + } + + if (!jsonObj.get("longRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longRequired"))); + } + + if (!jsonObj.get("longRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longRequiredNullable"))); + } + if (jsonObj.get("longMinimum") != null && !jsonObj.get("longMinimum").isJsonNull()) { if (!jsonObj.get("longMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java index 4be8dc34..89da722b 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -74,6 +74,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -114,6 +118,10 @@ public record RecordWithAllConstraints( Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + Long longRequired, + Long longRequiredNullable, Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, @@ -153,6 +161,10 @@ public record RecordWithAllConstraints( "intMinimum", "intMaximum", "intMinimumAndMaximum", + "longStandard", + "longNullable", + "longRequired", + "longRequiredNullable", "longMinimum", "longMaximum", "longMinimumAndMaximum", @@ -171,7 +183,9 @@ public record RecordWithAllConstraints( "stringRequiredPattern", "arrayRequiredNullable", "arrayUniqueRequired", - "arrayUniqueRequiredNullable")); + "arrayUniqueRequiredNullable", + "longRequired", + "longRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -203,6 +217,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -238,6 +256,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; @@ -557,6 +579,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("longStandard") != null && !jsonObj.get("longStandard").isJsonNull()) { + if (!jsonObj.get("longStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longStandard"))); + } + } + + if (jsonObj.get("longNullable") != null && !jsonObj.get("longNullable").isJsonNull()) { + if (!jsonObj.get("longNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longNullable"))); + } + } + + if (!jsonObj.get("longRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longRequired"))); + } + + if (!jsonObj.get("longRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longRequiredNullable"))); + } + if (jsonObj.get("longMinimum") != null && !jsonObj.get("longMinimum").isJsonNull()) { if (!jsonObj.get("longMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index 8f1f6c6d..c65a9454 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -74,6 +74,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -111,6 +115,10 @@ public record RecordWithAllConstraints( Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + Long longRequired, + Long longRequiredNullable, Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, @@ -150,6 +158,10 @@ public record RecordWithAllConstraints( "intMinimum", "intMaximum", "intMinimumAndMaximum", + "longStandard", + "longNullable", + "longRequired", + "longRequiredNullable", "longMinimum", "longMaximum", "longMinimumAndMaximum", @@ -168,7 +180,9 @@ public record RecordWithAllConstraints( "stringRequiredPattern", "arrayRequiredNullable", "arrayUniqueRequired", - "arrayUniqueRequiredNullable")); + "arrayUniqueRequiredNullable", + "longRequired", + "longRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -200,6 +214,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -235,6 +253,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; @@ -554,6 +576,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("longStandard") != null && !jsonObj.get("longStandard").isJsonNull()) { + if (!jsonObj.get("longStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longStandard"))); + } + } + + if (jsonObj.get("longNullable") != null && !jsonObj.get("longNullable").isJsonNull()) { + if (!jsonObj.get("longNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longNullable"))); + } + } + + if (!jsonObj.get("longRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longRequired"))); + } + + if (!jsonObj.get("longRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longRequiredNullable"))); + } + if (jsonObj.get("longMinimum") != null && !jsonObj.get("longMinimum").isJsonNull()) { if (!jsonObj.get("longMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java index 7842491f..bdbef776 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -74,6 +74,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -111,6 +115,10 @@ public record RecordWithAllConstraints( Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + Long longRequired, + Long longRequiredNullable, Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, @@ -150,6 +158,10 @@ public record RecordWithAllConstraints( "intMinimum", "intMaximum", "intMinimumAndMaximum", + "longStandard", + "longNullable", + "longRequired", + "longRequiredNullable", "longMinimum", "longMaximum", "longMinimumAndMaximum", @@ -168,7 +180,9 @@ public record RecordWithAllConstraints( "stringRequiredPattern", "arrayRequiredNullable", "arrayUniqueRequired", - "arrayUniqueRequiredNullable")); + "arrayUniqueRequiredNullable", + "longRequired", + "longRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -200,6 +214,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -235,6 +253,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; @@ -554,6 +576,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("longStandard") != null && !jsonObj.get("longStandard").isJsonNull()) { + if (!jsonObj.get("longStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longStandard"))); + } + } + + if (jsonObj.get("longNullable") != null && !jsonObj.get("longNullable").isJsonNull()) { + if (!jsonObj.get("longNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longNullable"))); + } + } + + if (!jsonObj.get("longRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longRequired"))); + } + + if (!jsonObj.get("longRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longRequiredNullable"))); + } + if (jsonObj.get("longMinimum") != null && !jsonObj.get("longMinimum").isJsonNull()) { if (!jsonObj.get("longMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java index e55da5f6..b63e3e45 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java @@ -74,6 +74,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -111,6 +115,10 @@ public record RecordWithAllConstraints( Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + Long longRequired, + Long longRequiredNullable, Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, @@ -150,6 +158,10 @@ public record RecordWithAllConstraints( "intMinimum", "intMaximum", "intMinimumAndMaximum", + "longStandard", + "longNullable", + "longRequired", + "longRequiredNullable", "longMinimum", "longMaximum", "longMinimumAndMaximum", @@ -168,7 +180,9 @@ public record RecordWithAllConstraints( "stringRequiredPattern", "arrayRequiredNullable", "arrayUniqueRequired", - "arrayUniqueRequiredNullable")); + "arrayUniqueRequiredNullable", + "longRequired", + "longRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -200,6 +214,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -235,6 +253,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; @@ -275,6 +297,10 @@ public static class Builder { private Integer intMinimum; private Integer intMaximum; private Integer intMinimumAndMaximum; + private Long longStandard; + private Long longNullable; + private Long longRequired; + private Long longRequiredNullable; private Long longMinimum; private Long longMaximum; private Long longMinimumAndMaximum; @@ -659,6 +685,58 @@ public Builder intMinimumAndMaximum(final Integer intMinimumAndMaximum) { return this; } + /** + * Sets the value of {@link RecordWithAllConstraints#longStandard }. + * + *

NOTE: Pass-by-reference is used! + * + * @param longStandard Non-required, non-nullable Long.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder longStandard(final Long longStandard) { + this.longStandard = longStandard; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#longNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param longNullable Non-required, nullable Long.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder longNullable(final Long longNullable) { + this.longNullable = longNullable; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#longRequired }. + * + *

NOTE: Pass-by-reference is used! + * + * @param longRequired Required, non-nullable Long.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder longRequired(final Long longRequired) { + this.longRequired = longRequired; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#longRequiredNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param longRequiredNullable Required, nullable Long.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder longRequiredNullable(final Long longRequiredNullable) { + this.longRequiredNullable = longRequiredNullable; + return this; + } + /** * Sets the value of {@link RecordWithAllConstraints#longMinimum }. * @@ -776,6 +854,10 @@ public RecordWithAllConstraints build() { intMinimum, intMaximum, intMinimumAndMaximum, + longStandard, + longNullable, + longRequired, + longRequiredNullable, longMinimum, longMaximum, longMinimumAndMaximum, @@ -1101,6 +1183,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("longStandard") != null && !jsonObj.get("longStandard").isJsonNull()) { + if (!jsonObj.get("longStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longStandard"))); + } + } + + if (jsonObj.get("longNullable") != null && !jsonObj.get("longNullable").isJsonNull()) { + if (!jsonObj.get("longNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longNullable"))); + } + } + + if (!jsonObj.get("longRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longRequired"))); + } + + if (!jsonObj.get("longRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longRequiredNullable"))); + } + if (jsonObj.get("longMinimum") != null && !jsonObj.get("longMinimum").isJsonNull()) { if (!jsonObj.get("longMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java index 598090c8..bf568a8a 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java @@ -75,6 +75,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -112,6 +116,10 @@ public record RecordWithAllConstraints( Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + Long longRequired, + Long longRequiredNullable, Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, @@ -152,6 +160,10 @@ public record RecordWithAllConstraints( "intMinimum", "intMaximum", "intMinimumAndMaximum", + "longStandard", + "longNullable", + "longRequired", + "longRequiredNullable", "longMinimum", "longMaximum", "longMinimumAndMaximum", @@ -170,7 +182,9 @@ public record RecordWithAllConstraints( "stringRequiredPattern", "arrayRequiredNullable", "arrayUniqueRequired", - "arrayUniqueRequiredNullable")); + "arrayUniqueRequiredNullable", + "longRequired", + "longRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -202,6 +216,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -237,6 +255,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; @@ -556,6 +578,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("longStandard") != null && !jsonObj.get("longStandard").isJsonNull()) { + if (!jsonObj.get("longStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longStandard"))); + } + } + + if (jsonObj.get("longNullable") != null && !jsonObj.get("longNullable").isJsonNull()) { + if (!jsonObj.get("longNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longNullable"))); + } + } + + if (!jsonObj.get("longRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longRequired"))); + } + + if (!jsonObj.get("longRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longRequiredNullable"))); + } + if (jsonObj.get("longMinimum") != null && !jsonObj.get("longMinimum").isJsonNull()) { if (!jsonObj.get("longMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java index cefb029a..3d0a2744 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java @@ -74,6 +74,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -111,6 +115,10 @@ public record RecordWithAllConstraints( Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + Long longRequired, + Long longRequiredNullable, Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, @@ -150,6 +158,10 @@ public record RecordWithAllConstraints( "intMinimum", "intMaximum", "intMinimumAndMaximum", + "longStandard", + "longNullable", + "longRequired", + "longRequiredNullable", "longMinimum", "longMaximum", "longMinimumAndMaximum", @@ -168,7 +180,9 @@ public record RecordWithAllConstraints( "stringRequiredPattern", "arrayRequiredNullable", "arrayUniqueRequired", - "arrayUniqueRequiredNullable")); + "arrayUniqueRequiredNullable", + "longRequired", + "longRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -200,6 +214,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -235,6 +253,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; @@ -554,6 +576,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("longStandard") != null && !jsonObj.get("longStandard").isJsonNull()) { + if (!jsonObj.get("longStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longStandard"))); + } + } + + if (jsonObj.get("longNullable") != null && !jsonObj.get("longNullable").isJsonNull()) { + if (!jsonObj.get("longNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longNullable"))); + } + } + + if (!jsonObj.get("longRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longRequired"))); + } + + if (!jsonObj.get("longRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longRequiredNullable"))); + } + if (jsonObj.get("longMinimum") != null && !jsonObj.get("longMinimum").isJsonNull()) { if (!jsonObj.get("longMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java index 8144725d..7110b802 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java @@ -76,6 +76,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -113,6 +117,10 @@ public record RecordWithAllConstraints( @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + @NotNull Long longRequired, + Long longRequiredNullable, @Min(18L) Long longMinimum, @Max(100L) Long longMaximum, @Min(0L) @Max(100L) Long longMinimumAndMaximum, @@ -152,6 +160,10 @@ public record RecordWithAllConstraints( "intMinimum", "intMaximum", "intMinimumAndMaximum", + "longStandard", + "longNullable", + "longRequired", + "longRequiredNullable", "longMinimum", "longMaximum", "longMinimumAndMaximum", @@ -170,7 +182,9 @@ public record RecordWithAllConstraints( "stringRequiredPattern", "arrayRequiredNullable", "arrayUniqueRequired", - "arrayUniqueRequiredNullable")); + "arrayUniqueRequiredNullable", + "longRequired", + "longRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -202,6 +216,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -237,6 +255,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; @@ -556,6 +578,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("longStandard") != null && !jsonObj.get("longStandard").isJsonNull()) { + if (!jsonObj.get("longStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longStandard"))); + } + } + + if (jsonObj.get("longNullable") != null && !jsonObj.get("longNullable").isJsonNull()) { + if (!jsonObj.get("longNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longNullable"))); + } + } + + if (!jsonObj.get("longRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longRequired"))); + } + + if (!jsonObj.get("longRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longRequiredNullable"))); + } + if (jsonObj.get("longMinimum") != null && !jsonObj.get("longMinimum").isJsonNull()) { if (!jsonObj.get("longMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java index 2ef714ff..534272fc 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -74,6 +74,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -111,6 +115,10 @@ public record RecordWithAllConstraints( Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + Long longRequired, + Long longRequiredNullable, Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, @@ -150,6 +158,10 @@ public record RecordWithAllConstraints( "intMinimum", "intMaximum", "intMinimumAndMaximum", + "longStandard", + "longNullable", + "longRequired", + "longRequiredNullable", "longMinimum", "longMaximum", "longMinimumAndMaximum", @@ -168,7 +180,9 @@ public record RecordWithAllConstraints( "stringRequiredPattern", "arrayRequiredNullable", "arrayUniqueRequired", - "arrayUniqueRequiredNullable")); + "arrayUniqueRequiredNullable", + "longRequired", + "longRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -200,6 +214,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -235,6 +253,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; @@ -554,6 +576,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("longStandard") != null && !jsonObj.get("longStandard").isJsonNull()) { + if (!jsonObj.get("longStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longStandard"))); + } + } + + if (jsonObj.get("longNullable") != null && !jsonObj.get("longNullable").isJsonNull()) { + if (!jsonObj.get("longNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longNullable"))); + } + } + + if (!jsonObj.get("longRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longRequired"))); + } + + if (!jsonObj.get("longRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longRequiredNullable"))); + } + if (jsonObj.get("longMinimum") != null && !jsonObj.get("longMinimum").isJsonNull()) { if (!jsonObj.get("longMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index 74b569ea..66f185ac 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -72,6 +72,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -109,6 +113,10 @@ public record RecordWithAllConstraints( Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + Long longRequired, + Long longRequiredNullable, Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, @@ -147,6 +155,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -182,6 +194,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java index a563d5df..4f9ae840 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -72,6 +72,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -112,6 +116,10 @@ public record RecordWithAllConstraints( Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + Long longRequired, + Long longRequiredNullable, Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, @@ -150,6 +158,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -185,6 +197,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index 0d92df18..ccc745f7 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -72,6 +72,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -109,6 +113,10 @@ public record RecordWithAllConstraints( Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + Long longRequired, + Long longRequiredNullable, Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, @@ -147,6 +155,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -182,6 +194,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java index 1de6c196..5b28ccb2 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -72,6 +72,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -109,6 +113,10 @@ public record RecordWithAllConstraints( Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + Long longRequired, + Long longRequiredNullable, Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, @@ -147,6 +155,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -182,6 +194,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java index 915f643d..af093b18 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java @@ -72,6 +72,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -109,6 +113,10 @@ public record RecordWithAllConstraints( Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + Long longRequired, + Long longRequiredNullable, Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, @@ -147,6 +155,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -182,6 +194,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; @@ -222,6 +238,10 @@ public static class Builder { private Integer intMinimum; private Integer intMaximum; private Integer intMinimumAndMaximum; + private Long longStandard; + private Long longNullable; + private Long longRequired; + private Long longRequiredNullable; private Long longMinimum; private Long longMaximum; private Long longMinimumAndMaximum; @@ -606,6 +626,58 @@ public Builder intMinimumAndMaximum(final Integer intMinimumAndMaximum) { return this; } + /** + * Sets the value of {@link RecordWithAllConstraints#longStandard }. + * + *

NOTE: Pass-by-reference is used! + * + * @param longStandard Non-required, non-nullable Long.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder longStandard(final Long longStandard) { + this.longStandard = longStandard; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#longNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param longNullable Non-required, nullable Long.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder longNullable(final Long longNullable) { + this.longNullable = longNullable; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#longRequired }. + * + *

NOTE: Pass-by-reference is used! + * + * @param longRequired Required, non-nullable Long.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder longRequired(final Long longRequired) { + this.longRequired = longRequired; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#longRequiredNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param longRequiredNullable Required, nullable Long.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder longRequiredNullable(final Long longRequiredNullable) { + this.longRequiredNullable = longRequiredNullable; + return this; + } + /** * Sets the value of {@link RecordWithAllConstraints#longMinimum }. * @@ -723,6 +795,10 @@ public RecordWithAllConstraints build() { intMinimum, intMaximum, intMinimumAndMaximum, + longStandard, + longNullable, + longRequired, + longRequiredNullable, longMinimum, longMaximum, longMinimumAndMaximum, diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java index c0814f44..bb6a694f 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java @@ -73,6 +73,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -110,6 +114,10 @@ public record RecordWithAllConstraints( Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + Long longRequired, + Long longRequiredNullable, Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, @@ -149,6 +157,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -184,6 +196,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java index 29b9a24a..b17adaef 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java @@ -72,6 +72,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -109,6 +113,10 @@ public record RecordWithAllConstraints( Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + Long longRequired, + Long longRequiredNullable, Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, @@ -147,6 +155,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -182,6 +194,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java index 89250e6a..eab38ccb 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java @@ -74,6 +74,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -111,6 +115,10 @@ public record RecordWithAllConstraints( @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + @NotNull Long longRequired, + Long longRequiredNullable, @Min(18L) Long longMinimum, @Max(100L) Long longMaximum, @Min(0L) @Max(100L) Long longMinimumAndMaximum, @@ -149,6 +157,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -184,6 +196,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java index 65373f3f..522f8bb7 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -72,6 +72,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -109,6 +113,10 @@ public record RecordWithAllConstraints( Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + Long longRequired, + Long longRequiredNullable, Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, @@ -147,6 +155,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -182,6 +194,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; diff --git a/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java b/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java index 7f7385e5..811966dc 100644 --- a/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java +++ b/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java @@ -168,6 +168,13 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { GeneratedField.of("intMinimum", Integer.class).minimum(18).build(), GeneratedField.of("intMaximum", Integer.class).maximum(100).build(), GeneratedField.of("intMinimumAndMaximum", Integer.class).minimum(0).maximum(100).build(), + GeneratedField.of("longStandard", Long.class).build(), + GeneratedField.of("longNullable", Long.class).isNullable(true).build(), + GeneratedField.of("longRequired", Long.class).isRequired(true).build(), + GeneratedField.of("longRequiredNullable", Long.class) + .isRequired(true) + .isNullable(true) + .build(), GeneratedField.of("longMinimum", Long.class).minimum(18).build(), GeneratedField.of("longMaximum", Long.class).maximum(100).build(), GeneratedField.of("longMinimumAndMaximum", Long.class).minimum(0).maximum(100).build(), diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index 32638c98..44d84a8c 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -74,6 +74,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -111,6 +115,10 @@ public record RecordWithAllConstraints( Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + Long longRequired, + Long longRequiredNullable, Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, @@ -150,6 +158,10 @@ public record RecordWithAllConstraints( "intMinimum", "intMaximum", "intMinimumAndMaximum", + "longStandard", + "longNullable", + "longRequired", + "longRequiredNullable", "longMinimum", "longMaximum", "longMinimumAndMaximum", @@ -168,7 +180,9 @@ public record RecordWithAllConstraints( "stringRequiredPattern", "arrayRequiredNullable", "arrayUniqueRequired", - "arrayUniqueRequiredNullable")); + "arrayUniqueRequiredNullable", + "longRequired", + "longRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -200,6 +214,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -235,6 +253,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; @@ -554,6 +576,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("longStandard") != null && !jsonObj.get("longStandard").isJsonNull()) { + if (!jsonObj.get("longStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longStandard"))); + } + } + + if (jsonObj.get("longNullable") != null && !jsonObj.get("longNullable").isJsonNull()) { + if (!jsonObj.get("longNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longNullable"))); + } + } + + if (!jsonObj.get("longRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longRequired"))); + } + + if (!jsonObj.get("longRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longRequiredNullable"))); + } + if (jsonObj.get("longMinimum") != null && !jsonObj.get("longMinimum").isJsonNull()) { if (!jsonObj.get("longMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java index 4be8dc34..89da722b 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -74,6 +74,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -114,6 +118,10 @@ public record RecordWithAllConstraints( Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + Long longRequired, + Long longRequiredNullable, Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, @@ -153,6 +161,10 @@ public record RecordWithAllConstraints( "intMinimum", "intMaximum", "intMinimumAndMaximum", + "longStandard", + "longNullable", + "longRequired", + "longRequiredNullable", "longMinimum", "longMaximum", "longMinimumAndMaximum", @@ -171,7 +183,9 @@ public record RecordWithAllConstraints( "stringRequiredPattern", "arrayRequiredNullable", "arrayUniqueRequired", - "arrayUniqueRequiredNullable")); + "arrayUniqueRequiredNullable", + "longRequired", + "longRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -203,6 +217,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -238,6 +256,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; @@ -557,6 +579,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("longStandard") != null && !jsonObj.get("longStandard").isJsonNull()) { + if (!jsonObj.get("longStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longStandard"))); + } + } + + if (jsonObj.get("longNullable") != null && !jsonObj.get("longNullable").isJsonNull()) { + if (!jsonObj.get("longNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longNullable"))); + } + } + + if (!jsonObj.get("longRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longRequired"))); + } + + if (!jsonObj.get("longRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longRequiredNullable"))); + } + if (jsonObj.get("longMinimum") != null && !jsonObj.get("longMinimum").isJsonNull()) { if (!jsonObj.get("longMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index 8f1f6c6d..c65a9454 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -74,6 +74,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -111,6 +115,10 @@ public record RecordWithAllConstraints( Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + Long longRequired, + Long longRequiredNullable, Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, @@ -150,6 +158,10 @@ public record RecordWithAllConstraints( "intMinimum", "intMaximum", "intMinimumAndMaximum", + "longStandard", + "longNullable", + "longRequired", + "longRequiredNullable", "longMinimum", "longMaximum", "longMinimumAndMaximum", @@ -168,7 +180,9 @@ public record RecordWithAllConstraints( "stringRequiredPattern", "arrayRequiredNullable", "arrayUniqueRequired", - "arrayUniqueRequiredNullable")); + "arrayUniqueRequiredNullable", + "longRequired", + "longRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -200,6 +214,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -235,6 +253,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; @@ -554,6 +576,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("longStandard") != null && !jsonObj.get("longStandard").isJsonNull()) { + if (!jsonObj.get("longStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longStandard"))); + } + } + + if (jsonObj.get("longNullable") != null && !jsonObj.get("longNullable").isJsonNull()) { + if (!jsonObj.get("longNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longNullable"))); + } + } + + if (!jsonObj.get("longRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longRequired"))); + } + + if (!jsonObj.get("longRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longRequiredNullable"))); + } + if (jsonObj.get("longMinimum") != null && !jsonObj.get("longMinimum").isJsonNull()) { if (!jsonObj.get("longMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java index 7842491f..bdbef776 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -74,6 +74,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -111,6 +115,10 @@ public record RecordWithAllConstraints( Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + Long longRequired, + Long longRequiredNullable, Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, @@ -150,6 +158,10 @@ public record RecordWithAllConstraints( "intMinimum", "intMaximum", "intMinimumAndMaximum", + "longStandard", + "longNullable", + "longRequired", + "longRequiredNullable", "longMinimum", "longMaximum", "longMinimumAndMaximum", @@ -168,7 +180,9 @@ public record RecordWithAllConstraints( "stringRequiredPattern", "arrayRequiredNullable", "arrayUniqueRequired", - "arrayUniqueRequiredNullable")); + "arrayUniqueRequiredNullable", + "longRequired", + "longRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -200,6 +214,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -235,6 +253,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; @@ -554,6 +576,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("longStandard") != null && !jsonObj.get("longStandard").isJsonNull()) { + if (!jsonObj.get("longStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longStandard"))); + } + } + + if (jsonObj.get("longNullable") != null && !jsonObj.get("longNullable").isJsonNull()) { + if (!jsonObj.get("longNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longNullable"))); + } + } + + if (!jsonObj.get("longRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longRequired"))); + } + + if (!jsonObj.get("longRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longRequiredNullable"))); + } + if (jsonObj.get("longMinimum") != null && !jsonObj.get("longMinimum").isJsonNull()) { if (!jsonObj.get("longMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java index e55da5f6..b63e3e45 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java @@ -74,6 +74,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -111,6 +115,10 @@ public record RecordWithAllConstraints( Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + Long longRequired, + Long longRequiredNullable, Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, @@ -150,6 +158,10 @@ public record RecordWithAllConstraints( "intMinimum", "intMaximum", "intMinimumAndMaximum", + "longStandard", + "longNullable", + "longRequired", + "longRequiredNullable", "longMinimum", "longMaximum", "longMinimumAndMaximum", @@ -168,7 +180,9 @@ public record RecordWithAllConstraints( "stringRequiredPattern", "arrayRequiredNullable", "arrayUniqueRequired", - "arrayUniqueRequiredNullable")); + "arrayUniqueRequiredNullable", + "longRequired", + "longRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -200,6 +214,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -235,6 +253,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; @@ -275,6 +297,10 @@ public static class Builder { private Integer intMinimum; private Integer intMaximum; private Integer intMinimumAndMaximum; + private Long longStandard; + private Long longNullable; + private Long longRequired; + private Long longRequiredNullable; private Long longMinimum; private Long longMaximum; private Long longMinimumAndMaximum; @@ -659,6 +685,58 @@ public Builder intMinimumAndMaximum(final Integer intMinimumAndMaximum) { return this; } + /** + * Sets the value of {@link RecordWithAllConstraints#longStandard }. + * + *

NOTE: Pass-by-reference is used! + * + * @param longStandard Non-required, non-nullable Long.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder longStandard(final Long longStandard) { + this.longStandard = longStandard; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#longNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param longNullable Non-required, nullable Long.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder longNullable(final Long longNullable) { + this.longNullable = longNullable; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#longRequired }. + * + *

NOTE: Pass-by-reference is used! + * + * @param longRequired Required, non-nullable Long.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder longRequired(final Long longRequired) { + this.longRequired = longRequired; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#longRequiredNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param longRequiredNullable Required, nullable Long.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder longRequiredNullable(final Long longRequiredNullable) { + this.longRequiredNullable = longRequiredNullable; + return this; + } + /** * Sets the value of {@link RecordWithAllConstraints#longMinimum }. * @@ -776,6 +854,10 @@ public RecordWithAllConstraints build() { intMinimum, intMaximum, intMinimumAndMaximum, + longStandard, + longNullable, + longRequired, + longRequiredNullable, longMinimum, longMaximum, longMinimumAndMaximum, @@ -1101,6 +1183,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("longStandard") != null && !jsonObj.get("longStandard").isJsonNull()) { + if (!jsonObj.get("longStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longStandard"))); + } + } + + if (jsonObj.get("longNullable") != null && !jsonObj.get("longNullable").isJsonNull()) { + if (!jsonObj.get("longNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longNullable"))); + } + } + + if (!jsonObj.get("longRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longRequired"))); + } + + if (!jsonObj.get("longRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longRequiredNullable"))); + } + if (jsonObj.get("longMinimum") != null && !jsonObj.get("longMinimum").isJsonNull()) { if (!jsonObj.get("longMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java index 598090c8..bf568a8a 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java @@ -75,6 +75,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -112,6 +116,10 @@ public record RecordWithAllConstraints( Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + Long longRequired, + Long longRequiredNullable, Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, @@ -152,6 +160,10 @@ public record RecordWithAllConstraints( "intMinimum", "intMaximum", "intMinimumAndMaximum", + "longStandard", + "longNullable", + "longRequired", + "longRequiredNullable", "longMinimum", "longMaximum", "longMinimumAndMaximum", @@ -170,7 +182,9 @@ public record RecordWithAllConstraints( "stringRequiredPattern", "arrayRequiredNullable", "arrayUniqueRequired", - "arrayUniqueRequiredNullable")); + "arrayUniqueRequiredNullable", + "longRequired", + "longRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -202,6 +216,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -237,6 +255,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; @@ -556,6 +578,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("longStandard") != null && !jsonObj.get("longStandard").isJsonNull()) { + if (!jsonObj.get("longStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longStandard"))); + } + } + + if (jsonObj.get("longNullable") != null && !jsonObj.get("longNullable").isJsonNull()) { + if (!jsonObj.get("longNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longNullable"))); + } + } + + if (!jsonObj.get("longRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longRequired"))); + } + + if (!jsonObj.get("longRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longRequiredNullable"))); + } + if (jsonObj.get("longMinimum") != null && !jsonObj.get("longMinimum").isJsonNull()) { if (!jsonObj.get("longMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java index cefb029a..3d0a2744 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java @@ -74,6 +74,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -111,6 +115,10 @@ public record RecordWithAllConstraints( Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + Long longRequired, + Long longRequiredNullable, Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, @@ -150,6 +158,10 @@ public record RecordWithAllConstraints( "intMinimum", "intMaximum", "intMinimumAndMaximum", + "longStandard", + "longNullable", + "longRequired", + "longRequiredNullable", "longMinimum", "longMaximum", "longMinimumAndMaximum", @@ -168,7 +180,9 @@ public record RecordWithAllConstraints( "stringRequiredPattern", "arrayRequiredNullable", "arrayUniqueRequired", - "arrayUniqueRequiredNullable")); + "arrayUniqueRequiredNullable", + "longRequired", + "longRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -200,6 +214,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -235,6 +253,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; @@ -554,6 +576,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("longStandard") != null && !jsonObj.get("longStandard").isJsonNull()) { + if (!jsonObj.get("longStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longStandard"))); + } + } + + if (jsonObj.get("longNullable") != null && !jsonObj.get("longNullable").isJsonNull()) { + if (!jsonObj.get("longNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longNullable"))); + } + } + + if (!jsonObj.get("longRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longRequired"))); + } + + if (!jsonObj.get("longRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longRequiredNullable"))); + } + if (jsonObj.get("longMinimum") != null && !jsonObj.get("longMinimum").isJsonNull()) { if (!jsonObj.get("longMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java index 20d86c26..d50df201 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java @@ -76,6 +76,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -113,6 +117,10 @@ public record RecordWithAllConstraints( @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + @NotNull Long longRequired, + Long longRequiredNullable, @Min(18L) Long longMinimum, @Max(100L) Long longMaximum, @Min(0L) @Max(100L) Long longMinimumAndMaximum, @@ -152,6 +160,10 @@ public record RecordWithAllConstraints( "intMinimum", "intMaximum", "intMinimumAndMaximum", + "longStandard", + "longNullable", + "longRequired", + "longRequiredNullable", "longMinimum", "longMaximum", "longMinimumAndMaximum", @@ -170,7 +182,9 @@ public record RecordWithAllConstraints( "stringRequiredPattern", "arrayRequiredNullable", "arrayUniqueRequired", - "arrayUniqueRequiredNullable")); + "arrayUniqueRequiredNullable", + "longRequired", + "longRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -202,6 +216,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -237,6 +255,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; @@ -556,6 +578,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("longStandard") != null && !jsonObj.get("longStandard").isJsonNull()) { + if (!jsonObj.get("longStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longStandard"))); + } + } + + if (jsonObj.get("longNullable") != null && !jsonObj.get("longNullable").isJsonNull()) { + if (!jsonObj.get("longNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longNullable"))); + } + } + + if (!jsonObj.get("longRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longRequired"))); + } + + if (!jsonObj.get("longRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longRequiredNullable"))); + } + if (jsonObj.get("longMinimum") != null && !jsonObj.get("longMinimum").isJsonNull()) { if (!jsonObj.get("longMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java index 2ef714ff..534272fc 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -74,6 +74,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -111,6 +115,10 @@ public record RecordWithAllConstraints( Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + Long longRequired, + Long longRequiredNullable, Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, @@ -150,6 +158,10 @@ public record RecordWithAllConstraints( "intMinimum", "intMaximum", "intMinimumAndMaximum", + "longStandard", + "longNullable", + "longRequired", + "longRequiredNullable", "longMinimum", "longMaximum", "longMinimumAndMaximum", @@ -168,7 +180,9 @@ public record RecordWithAllConstraints( "stringRequiredPattern", "arrayRequiredNullable", "arrayUniqueRequired", - "arrayUniqueRequiredNullable")); + "arrayUniqueRequiredNullable", + "longRequired", + "longRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -200,6 +214,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -235,6 +253,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; @@ -554,6 +576,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("longStandard") != null && !jsonObj.get("longStandard").isJsonNull()) { + if (!jsonObj.get("longStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longStandard"))); + } + } + + if (jsonObj.get("longNullable") != null && !jsonObj.get("longNullable").isJsonNull()) { + if (!jsonObj.get("longNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longNullable"))); + } + } + + if (!jsonObj.get("longRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longRequired"))); + } + + if (!jsonObj.get("longRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `longRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("longRequiredNullable"))); + } + if (jsonObj.get("longMinimum") != null && !jsonObj.get("longMinimum").isJsonNull()) { if (!jsonObj.get("longMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index 74b569ea..66f185ac 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -72,6 +72,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -109,6 +113,10 @@ public record RecordWithAllConstraints( Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + Long longRequired, + Long longRequiredNullable, Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, @@ -147,6 +155,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -182,6 +194,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java index a563d5df..4f9ae840 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -72,6 +72,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -112,6 +116,10 @@ public record RecordWithAllConstraints( Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + Long longRequired, + Long longRequiredNullable, Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, @@ -150,6 +158,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -185,6 +197,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index 0d92df18..ccc745f7 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -72,6 +72,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -109,6 +113,10 @@ public record RecordWithAllConstraints( Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + Long longRequired, + Long longRequiredNullable, Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, @@ -147,6 +155,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -182,6 +194,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java index 1de6c196..5b28ccb2 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -72,6 +72,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -109,6 +113,10 @@ public record RecordWithAllConstraints( Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + Long longRequired, + Long longRequiredNullable, Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, @@ -147,6 +155,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -182,6 +194,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java index 915f643d..af093b18 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java @@ -72,6 +72,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -109,6 +113,10 @@ public record RecordWithAllConstraints( Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + Long longRequired, + Long longRequiredNullable, Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, @@ -147,6 +155,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -182,6 +194,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; @@ -222,6 +238,10 @@ public static class Builder { private Integer intMinimum; private Integer intMaximum; private Integer intMinimumAndMaximum; + private Long longStandard; + private Long longNullable; + private Long longRequired; + private Long longRequiredNullable; private Long longMinimum; private Long longMaximum; private Long longMinimumAndMaximum; @@ -606,6 +626,58 @@ public Builder intMinimumAndMaximum(final Integer intMinimumAndMaximum) { return this; } + /** + * Sets the value of {@link RecordWithAllConstraints#longStandard }. + * + *

NOTE: Pass-by-reference is used! + * + * @param longStandard Non-required, non-nullable Long.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder longStandard(final Long longStandard) { + this.longStandard = longStandard; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#longNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param longNullable Non-required, nullable Long.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder longNullable(final Long longNullable) { + this.longNullable = longNullable; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#longRequired }. + * + *

NOTE: Pass-by-reference is used! + * + * @param longRequired Required, non-nullable Long.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder longRequired(final Long longRequired) { + this.longRequired = longRequired; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#longRequiredNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param longRequiredNullable Required, nullable Long.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder longRequiredNullable(final Long longRequiredNullable) { + this.longRequiredNullable = longRequiredNullable; + return this; + } + /** * Sets the value of {@link RecordWithAllConstraints#longMinimum }. * @@ -723,6 +795,10 @@ public RecordWithAllConstraints build() { intMinimum, intMaximum, intMinimumAndMaximum, + longStandard, + longNullable, + longRequired, + longRequiredNullable, longMinimum, longMaximum, longMinimumAndMaximum, diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java index c0814f44..bb6a694f 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java @@ -73,6 +73,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -110,6 +114,10 @@ public record RecordWithAllConstraints( Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + Long longRequired, + Long longRequiredNullable, Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, @@ -149,6 +157,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -184,6 +196,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java index 29b9a24a..b17adaef 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java @@ -72,6 +72,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -109,6 +113,10 @@ public record RecordWithAllConstraints( Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + Long longRequired, + Long longRequiredNullable, Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, @@ -147,6 +155,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -182,6 +194,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java index ac3746d9..d601fbea 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java @@ -74,6 +74,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -111,6 +115,10 @@ public record RecordWithAllConstraints( @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + @NotNull Long longRequired, + Long longRequiredNullable, @Min(18L) Long longMinimum, @Max(100L) Long longMaximum, @Min(0L) @Max(100L) Long longMinimumAndMaximum, @@ -149,6 +157,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -184,6 +196,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java index 65373f3f..522f8bb7 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -72,6 +72,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -109,6 +113,10 @@ public record RecordWithAllConstraints( Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + Long longRequired, + Long longRequiredNullable, Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, @@ -147,6 +155,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -182,6 +194,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; diff --git a/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java b/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java index 7f7385e5..811966dc 100644 --- a/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java +++ b/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java @@ -168,6 +168,13 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { GeneratedField.of("intMinimum", Integer.class).minimum(18).build(), GeneratedField.of("intMaximum", Integer.class).maximum(100).build(), GeneratedField.of("intMinimumAndMaximum", Integer.class).minimum(0).maximum(100).build(), + GeneratedField.of("longStandard", Long.class).build(), + GeneratedField.of("longNullable", Long.class).isNullable(true).build(), + GeneratedField.of("longRequired", Long.class).isRequired(true).build(), + GeneratedField.of("longRequiredNullable", Long.class) + .isRequired(true) + .isNullable(true) + .build(), GeneratedField.of("longMinimum", Long.class).minimum(18).build(), GeneratedField.of("longMaximum", Long.class).maximum(100).build(), GeneratedField.of("longMinimumAndMaximum", Long.class).minimum(0).maximum(100).build(), diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index 86b928e2..016c9d04 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -58,6 +58,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -95,6 +99,10 @@ public record RecordWithAllConstraints( @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + @NotNull Long longRequired, + Long longRequiredNullable, @Min(18L) Long longMinimum, @Max(100L) Long longMaximum, @Min(0L) @Max(100L) Long longMinimumAndMaximum, @@ -133,6 +141,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -168,6 +180,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java index 07494bbd..c04fe907 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -58,6 +58,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -98,6 +102,10 @@ public record RecordWithAllConstraints( @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + @NotNull Long longRequired, + Long longRequiredNullable, @Min(18L) Long longMinimum, @Max(100L) Long longMaximum, @Min(0L) @Max(100L) Long longMinimumAndMaximum, @@ -136,6 +144,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -171,6 +183,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index 436005ad..1c090c84 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -58,6 +58,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -95,6 +99,10 @@ public record RecordWithAllConstraints( @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + @NotNull Long longRequired, + Long longRequiredNullable, @Min(18L) Long longMinimum, @Max(100L) Long longMaximum, @Min(0L) @Max(100L) Long longMinimumAndMaximum, @@ -133,6 +141,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -168,6 +180,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java index 123af6bf..4a2442f7 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -58,6 +58,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -95,6 +99,10 @@ public record RecordWithAllConstraints( @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + @NotNull Long longRequired, + Long longRequiredNullable, @Min(18L) Long longMinimum, @Max(100L) Long longMaximum, @Min(0L) @Max(100L) Long longMinimumAndMaximum, @@ -133,6 +141,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -168,6 +180,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java index 9b832b56..0b0d3484 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java @@ -58,6 +58,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -95,6 +99,10 @@ public record RecordWithAllConstraints( @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + @NotNull Long longRequired, + Long longRequiredNullable, @Min(18L) Long longMinimum, @Max(100L) Long longMaximum, @Min(0L) @Max(100L) Long longMinimumAndMaximum, @@ -133,6 +141,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -168,6 +180,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; @@ -208,6 +224,10 @@ public static class Builder { private Integer intMinimum; private Integer intMaximum; private Integer intMinimumAndMaximum; + private Long longStandard; + private Long longNullable; + private Long longRequired; + private Long longRequiredNullable; private Long longMinimum; private Long longMaximum; private Long longMinimumAndMaximum; @@ -592,6 +612,58 @@ public Builder intMinimumAndMaximum(final Integer intMinimumAndMaximum) { return this; } + /** + * Sets the value of {@link RecordWithAllConstraints#longStandard }. + * + *

NOTE: Pass-by-reference is used! + * + * @param longStandard Non-required, non-nullable Long.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder longStandard(final Long longStandard) { + this.longStandard = longStandard; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#longNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param longNullable Non-required, nullable Long.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder longNullable(final Long longNullable) { + this.longNullable = longNullable; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#longRequired }. + * + *

NOTE: Pass-by-reference is used! + * + * @param longRequired Required, non-nullable Long.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder longRequired(final Long longRequired) { + this.longRequired = longRequired; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#longRequiredNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param longRequiredNullable Required, nullable Long.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder longRequiredNullable(final Long longRequiredNullable) { + this.longRequiredNullable = longRequiredNullable; + return this; + } + /** * Sets the value of {@link RecordWithAllConstraints#longMinimum }. * @@ -709,6 +781,10 @@ public RecordWithAllConstraints build() { intMinimum, intMaximum, intMinimumAndMaximum, + longStandard, + longNullable, + longRequired, + longRequiredNullable, longMinimum, longMaximum, longMinimumAndMaximum, diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java index 4292fdc9..b3a5d819 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java @@ -59,6 +59,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -96,6 +100,10 @@ public record RecordWithAllConstraints( @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + @NotNull Long longRequired, + Long longRequiredNullable, @Min(18L) Long longMinimum, @Max(100L) Long longMaximum, @Min(0L) @Max(100L) Long longMinimumAndMaximum, @@ -135,6 +143,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -170,6 +182,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java index ab9e3227..c63b3cfe 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java @@ -58,6 +58,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -95,6 +99,10 @@ public record RecordWithAllConstraints( @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + @NotNull Long longRequired, + Long longRequiredNullable, @Min(18L) Long longMinimum, @Max(100L) Long longMaximum, @Min(0L) @Max(100L) Long longMinimumAndMaximum, @@ -133,6 +141,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -168,6 +180,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java index 0b9d150c..0b170c1b 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java @@ -58,6 +58,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -95,6 +99,10 @@ public record RecordWithAllConstraints( @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + @NotNull Long longRequired, + Long longRequiredNullable, @Min(18L) Long longMinimum, @Max(100L) Long longMaximum, @Min(0L) @Max(100L) Long longMinimumAndMaximum, @@ -133,6 +141,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -168,6 +180,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java index 3603ea23..95a09f30 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -58,6 +58,10 @@ * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. + * @param longStandard Non-required, non-nullable Long. + * @param longNullable Non-required, nullable Long. + * @param longRequired Required, non-nullable Long. + * @param longRequiredNullable Required, nullable Long. * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. @@ -95,6 +99,10 @@ public record RecordWithAllConstraints( @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, + Long longStandard, + Long longNullable, + @NotNull Long longRequired, + Long longRequiredNullable, @Min(18L) Long longMinimum, @Max(100L) Long longMaximum, @Min(0L) @Max(100L) Long longMinimumAndMaximum, @@ -133,6 +141,10 @@ public RecordWithAllConstraints( final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, + final Long longStandard, + final Long longNullable, + final Long longRequired, + final Long longRequiredNullable, final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, @@ -168,6 +180,10 @@ public RecordWithAllConstraints( this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; + this.longStandard = longStandard; + this.longNullable = longNullable; + this.longRequired = longRequired; + this.longRequiredNullable = longRequiredNullable; this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; From fadfc82d5801ce9ef41cb82e292441fc5f24547c Mon Sep 17 00:00:00 2001 From: Chrimle <28791817+Chrimle@users.noreply.github.com> Date: Mon, 27 Jul 2026 19:01:28 +0200 Subject: [PATCH 09/13] Simplify `isNullable`-setup --- .../o2jrm/models/GeneratedRecordImpl.java | 48 +++++++------------ .../o2jrm/models/GeneratedRecordImpl.java | 48 +++++++------------ .../o2jrm/models/GeneratedRecordImpl.java | 48 +++++++------------ .../test/meta/models/GeneratedField.java | 4 +- 4 files changed, 56 insertions(+), 92 deletions(-) diff --git a/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java b/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java index c7353410..16ffa648 100644 --- a/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java +++ b/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java @@ -120,7 +120,7 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { List.of(), GeneratedField.of("booleanStandard", Boolean.class).build(), GeneratedField.of("booleanDefault", Boolean.class).defaultValue(Boolean.TRUE).build(), - GeneratedField.of("booleanNullable", Boolean.class).isNullable(true).build(), + GeneratedField.of("booleanNullable", Boolean.class).isNullable().build(), GeneratedField.of("booleanRequired", Boolean.class).isRequired(true).build(), GeneratedField.of("booleanRequiredDefault", Boolean.class) .isRequired(true) @@ -128,14 +128,14 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { .build(), GeneratedField.of("booleanRequiredNullable", Boolean.class) .isRequired(true) - .isNullable(true) + .isNullable() .build(), GeneratedField.of("stringStandard", String.class).build(), GeneratedField.of("stringDefault", String.class).defaultValue("someDefaultValue").build(), - GeneratedField.of("stringNullable", String.class).isNullable(true).build(), + GeneratedField.of("stringNullable", String.class).isNullable().build(), GeneratedField.of("stringRequired", String.class).isRequired(true).build(), GeneratedField.of("stringRequiredNullable", String.class) - .isNullable(true) + .isNullable() .isRequired(true) .build(), GeneratedField.of("stringRequiredPattern", String.class) @@ -147,10 +147,10 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { GeneratedField.of("stringMinLength", String.class).minLength(3).build(), GeneratedField.of("stringMaxLength", String.class).maxLength(7).build(), GeneratedField.of("stringMinAndMaxLength", String.class).minLength(3).maxLength(7).build(), - GeneratedField.of("arrayNullable", List.class, String.class).isNullable(true).build(), + GeneratedField.of("arrayNullable", List.class, String.class).isNullable().build(), GeneratedField.of("arrayRequiredNullable", List.class, String.class) .isRequired(true) - .isNullable(true) + .isNullable() .build(), GeneratedField.of("arrayMinItems", List.class, String.class).minItems(1).build(), GeneratedField.of("arrayMaxItems", List.class, String.class).maxItems(10).build(), @@ -160,21 +160,18 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { .build(), GeneratedField.of("arrayUniqueStandard", Set.class, String.class).build(), GeneratedField.of("arrayUniqueRequired", Set.class, String.class).isRequired(true).build(), - GeneratedField.of("arrayUniqueNullable", Set.class, String.class).isNullable(true).build(), + GeneratedField.of("arrayUniqueNullable", Set.class, String.class).isNullable().build(), GeneratedField.of("arrayUniqueRequiredNullable", Set.class, String.class) .isRequired(true) - .isNullable(true) + .isNullable() .build(), GeneratedField.of("intMinimum", Integer.class).minimum(18).build(), GeneratedField.of("intMaximum", Integer.class).maximum(100).build(), GeneratedField.of("intMinimumAndMaximum", Integer.class).minimum(0).maximum(100).build(), GeneratedField.of("longStandard", Long.class).build(), - GeneratedField.of("longNullable", Long.class).isNullable(true).build(), + GeneratedField.of("longNullable", Long.class).isNullable().build(), GeneratedField.of("longRequired", Long.class).isRequired(true).build(), - GeneratedField.of("longRequiredNullable", Long.class) - .isRequired(true) - .isNullable(true) - .build(), + GeneratedField.of("longRequiredNullable", Long.class).isRequired(true).isNullable().build(), GeneratedField.of("longMinimum", Long.class).minimum(18).build(), GeneratedField.of("longMaximum", Long.class).maximum(100).build(), GeneratedField.of("longMinimumAndMaximum", Long.class).minimum(0).maximum(100).build(), @@ -331,42 +328,33 @@ public static GeneratedField[] getGeneratedFields( .toArray(new GeneratedField[] {}); case RECORD_WITH_NULLABLE_FIELDS_OF_EACH_TYPE -> List.of( - GeneratedField.of("field1", Boolean.class) - .isNullable(true) - .isRequired(true) - .build(), - GeneratedField.of("field2", String.class) - .isNullable(true) - .isRequired(true) - .build(), - GeneratedField.of("field3", Integer.class) - .isNullable(true) - .isRequired(true) - .build(), + GeneratedField.of("field1", Boolean.class).isNullable().isRequired(true).build(), + GeneratedField.of("field2", String.class).isNullable().isRequired(true).build(), + GeneratedField.of("field3", Integer.class).isNullable().isRequired(true).build(), GeneratedField.of("field4", BigDecimal.class) - .isNullable(true) + .isNullable() .isRequired(true) .build(), GeneratedField.of("field5", List.class, Boolean.class) - .isNullable(true) + .isNullable() .isRequired(true) .build(), GeneratedField.of("field6", Set.class, Boolean.class) - .isNullable(true) + .isNullable() .isRequired(true) .build(), GeneratedField.of( "field7", GeneratedRecordImpl.EXAMPLE_NULLABLE_RECORD.getClass(pluginExecution)) .isRequired(false) - .isNullable(true) + .isNullable() .isCustomClass(true) .build(), GeneratedField.of( "field8", GeneratedEnumImpl.EXAMPLE_NULLABLE_ENUM.getClass(pluginExecution)) .isRequired(false) - .isNullable(true) + .isNullable() .build()) .toArray(new GeneratedField[] {}); case RECORD_WITH_COLLECTIONS_OF_RECORDS -> diff --git a/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java b/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java index 811966dc..499ce18e 100644 --- a/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java +++ b/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java @@ -120,7 +120,7 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { List.of(), GeneratedField.of("booleanStandard", Boolean.class).build(), GeneratedField.of("booleanDefault", Boolean.class).defaultValue(Boolean.TRUE).build(), - GeneratedField.of("booleanNullable", Boolean.class).isNullable(true).build(), + GeneratedField.of("booleanNullable", Boolean.class).isNullable().build(), GeneratedField.of("booleanRequired", Boolean.class).isRequired(true).build(), GeneratedField.of("booleanRequiredDefault", Boolean.class) .isRequired(true) @@ -128,14 +128,14 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { .build(), GeneratedField.of("booleanRequiredNullable", Boolean.class) .isRequired(true) - .isNullable(true) + .isNullable() .build(), GeneratedField.of("stringStandard", String.class).build(), GeneratedField.of("stringDefault", String.class).defaultValue("someDefaultValue").build(), - GeneratedField.of("stringNullable", String.class).isNullable(true).build(), + GeneratedField.of("stringNullable", String.class).isNullable().build(), GeneratedField.of("stringRequired", String.class).isRequired(true).build(), GeneratedField.of("stringRequiredNullable", String.class) - .isNullable(true) + .isNullable() .isRequired(true) .build(), GeneratedField.of("stringRequiredPattern", String.class) @@ -147,10 +147,10 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { GeneratedField.of("stringMinLength", String.class).minLength(3).build(), GeneratedField.of("stringMaxLength", String.class).maxLength(7).build(), GeneratedField.of("stringMinAndMaxLength", String.class).minLength(3).maxLength(7).build(), - GeneratedField.of("arrayNullable", List.class, String.class).isNullable(true).build(), + GeneratedField.of("arrayNullable", List.class, String.class).isNullable().build(), GeneratedField.of("arrayRequiredNullable", List.class, String.class) .isRequired(true) - .isNullable(true) + .isNullable() .build(), GeneratedField.of("arrayMinItems", List.class, String.class).minItems(1).build(), GeneratedField.of("arrayMaxItems", List.class, String.class).maxItems(10).build(), @@ -160,21 +160,18 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { .build(), GeneratedField.of("arrayUniqueStandard", Set.class, String.class).build(), GeneratedField.of("arrayUniqueRequired", Set.class, String.class).isRequired(true).build(), - GeneratedField.of("arrayUniqueNullable", Set.class, String.class).isNullable(true).build(), + GeneratedField.of("arrayUniqueNullable", Set.class, String.class).isNullable().build(), GeneratedField.of("arrayUniqueRequiredNullable", Set.class, String.class) .isRequired(true) - .isNullable(true) + .isNullable() .build(), GeneratedField.of("intMinimum", Integer.class).minimum(18).build(), GeneratedField.of("intMaximum", Integer.class).maximum(100).build(), GeneratedField.of("intMinimumAndMaximum", Integer.class).minimum(0).maximum(100).build(), GeneratedField.of("longStandard", Long.class).build(), - GeneratedField.of("longNullable", Long.class).isNullable(true).build(), + GeneratedField.of("longNullable", Long.class).isNullable().build(), GeneratedField.of("longRequired", Long.class).isRequired(true).build(), - GeneratedField.of("longRequiredNullable", Long.class) - .isRequired(true) - .isNullable(true) - .build(), + GeneratedField.of("longRequiredNullable", Long.class).isRequired(true).isNullable().build(), GeneratedField.of("longMinimum", Long.class).minimum(18).build(), GeneratedField.of("longMaximum", Long.class).maximum(100).build(), GeneratedField.of("longMinimumAndMaximum", Long.class).minimum(0).maximum(100).build(), @@ -330,42 +327,33 @@ public static GeneratedField[] getGeneratedFields( .toArray(new GeneratedField[] {}); case RECORD_WITH_NULLABLE_FIELDS_OF_EACH_TYPE -> List.of( - GeneratedField.of("field1", Boolean.class) - .isNullable(true) - .isRequired(true) - .build(), - GeneratedField.of("field2", String.class) - .isNullable(true) - .isRequired(true) - .build(), - GeneratedField.of("field3", Integer.class) - .isNullable(true) - .isRequired(true) - .build(), + GeneratedField.of("field1", Boolean.class).isNullable().isRequired(true).build(), + GeneratedField.of("field2", String.class).isNullable().isRequired(true).build(), + GeneratedField.of("field3", Integer.class).isNullable().isRequired(true).build(), GeneratedField.of("field4", BigDecimal.class) - .isNullable(true) + .isNullable() .isRequired(true) .build(), GeneratedField.of("field5", List.class, Boolean.class) - .isNullable(true) + .isNullable() .isRequired(true) .build(), GeneratedField.of("field6", Set.class, Boolean.class) - .isNullable(true) + .isNullable() .isRequired(true) .build(), GeneratedField.of( "field7", GeneratedRecordImpl.EXAMPLE_NULLABLE_RECORD.getClass(pluginExecution)) .isRequired(false) - .isNullable(true) + .isNullable() .isCustomClass(true) .build(), GeneratedField.of( "field8", GeneratedEnumImpl.EXAMPLE_NULLABLE_ENUM.getClass(pluginExecution)) .isRequired(false) - .isNullable(true) + .isNullable() .build()) .toArray(new GeneratedField[] {}); case RECORD_WITH_COLLECTIONS_OF_RECORDS -> diff --git a/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java b/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java index 811966dc..499ce18e 100644 --- a/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java +++ b/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java @@ -120,7 +120,7 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { List.of(), GeneratedField.of("booleanStandard", Boolean.class).build(), GeneratedField.of("booleanDefault", Boolean.class).defaultValue(Boolean.TRUE).build(), - GeneratedField.of("booleanNullable", Boolean.class).isNullable(true).build(), + GeneratedField.of("booleanNullable", Boolean.class).isNullable().build(), GeneratedField.of("booleanRequired", Boolean.class).isRequired(true).build(), GeneratedField.of("booleanRequiredDefault", Boolean.class) .isRequired(true) @@ -128,14 +128,14 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { .build(), GeneratedField.of("booleanRequiredNullable", Boolean.class) .isRequired(true) - .isNullable(true) + .isNullable() .build(), GeneratedField.of("stringStandard", String.class).build(), GeneratedField.of("stringDefault", String.class).defaultValue("someDefaultValue").build(), - GeneratedField.of("stringNullable", String.class).isNullable(true).build(), + GeneratedField.of("stringNullable", String.class).isNullable().build(), GeneratedField.of("stringRequired", String.class).isRequired(true).build(), GeneratedField.of("stringRequiredNullable", String.class) - .isNullable(true) + .isNullable() .isRequired(true) .build(), GeneratedField.of("stringRequiredPattern", String.class) @@ -147,10 +147,10 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { GeneratedField.of("stringMinLength", String.class).minLength(3).build(), GeneratedField.of("stringMaxLength", String.class).maxLength(7).build(), GeneratedField.of("stringMinAndMaxLength", String.class).minLength(3).maxLength(7).build(), - GeneratedField.of("arrayNullable", List.class, String.class).isNullable(true).build(), + GeneratedField.of("arrayNullable", List.class, String.class).isNullable().build(), GeneratedField.of("arrayRequiredNullable", List.class, String.class) .isRequired(true) - .isNullable(true) + .isNullable() .build(), GeneratedField.of("arrayMinItems", List.class, String.class).minItems(1).build(), GeneratedField.of("arrayMaxItems", List.class, String.class).maxItems(10).build(), @@ -160,21 +160,18 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { .build(), GeneratedField.of("arrayUniqueStandard", Set.class, String.class).build(), GeneratedField.of("arrayUniqueRequired", Set.class, String.class).isRequired(true).build(), - GeneratedField.of("arrayUniqueNullable", Set.class, String.class).isNullable(true).build(), + GeneratedField.of("arrayUniqueNullable", Set.class, String.class).isNullable().build(), GeneratedField.of("arrayUniqueRequiredNullable", Set.class, String.class) .isRequired(true) - .isNullable(true) + .isNullable() .build(), GeneratedField.of("intMinimum", Integer.class).minimum(18).build(), GeneratedField.of("intMaximum", Integer.class).maximum(100).build(), GeneratedField.of("intMinimumAndMaximum", Integer.class).minimum(0).maximum(100).build(), GeneratedField.of("longStandard", Long.class).build(), - GeneratedField.of("longNullable", Long.class).isNullable(true).build(), + GeneratedField.of("longNullable", Long.class).isNullable().build(), GeneratedField.of("longRequired", Long.class).isRequired(true).build(), - GeneratedField.of("longRequiredNullable", Long.class) - .isRequired(true) - .isNullable(true) - .build(), + GeneratedField.of("longRequiredNullable", Long.class).isRequired(true).isNullable().build(), GeneratedField.of("longMinimum", Long.class).minimum(18).build(), GeneratedField.of("longMaximum", Long.class).maximum(100).build(), GeneratedField.of("longMinimumAndMaximum", Long.class).minimum(0).maximum(100).build(), @@ -330,42 +327,33 @@ public static GeneratedField[] getGeneratedFields( .toArray(new GeneratedField[] {}); case RECORD_WITH_NULLABLE_FIELDS_OF_EACH_TYPE -> List.of( - GeneratedField.of("field1", Boolean.class) - .isNullable(true) - .isRequired(true) - .build(), - GeneratedField.of("field2", String.class) - .isNullable(true) - .isRequired(true) - .build(), - GeneratedField.of("field3", Integer.class) - .isNullable(true) - .isRequired(true) - .build(), + GeneratedField.of("field1", Boolean.class).isNullable().isRequired(true).build(), + GeneratedField.of("field2", String.class).isNullable().isRequired(true).build(), + GeneratedField.of("field3", Integer.class).isNullable().isRequired(true).build(), GeneratedField.of("field4", BigDecimal.class) - .isNullable(true) + .isNullable() .isRequired(true) .build(), GeneratedField.of("field5", List.class, Boolean.class) - .isNullable(true) + .isNullable() .isRequired(true) .build(), GeneratedField.of("field6", Set.class, Boolean.class) - .isNullable(true) + .isNullable() .isRequired(true) .build(), GeneratedField.of( "field7", GeneratedRecordImpl.EXAMPLE_NULLABLE_RECORD.getClass(pluginExecution)) .isRequired(false) - .isNullable(true) + .isNullable() .isCustomClass(true) .build(), GeneratedField.of( "field8", GeneratedEnumImpl.EXAMPLE_NULLABLE_ENUM.getClass(pluginExecution)) .isRequired(false) - .isNullable(true) + .isNullable() .build()) .toArray(new GeneratedField[] {}); case RECORD_WITH_COLLECTIONS_OF_RECORDS -> diff --git a/test/utils/src/main/java/io/github/chrimle/o2jrm/test/meta/models/GeneratedField.java b/test/utils/src/main/java/io/github/chrimle/o2jrm/test/meta/models/GeneratedField.java index 0fe0f751..aa07ffb9 100644 --- a/test/utils/src/main/java/io/github/chrimle/o2jrm/test/meta/models/GeneratedField.java +++ b/test/utils/src/main/java/io/github/chrimle/o2jrm/test/meta/models/GeneratedField.java @@ -212,8 +212,8 @@ public Builder isRequired(final boolean isRequired) { return this; } - public Builder isNullable(final boolean isNullable) { - this.isNullable = isNullable; + public Builder isNullable() { + this.isNullable = true; return this; } From 50c581d8fedd94d54375634e0c28e2b8e9031d62 Mon Sep 17 00:00:00 2001 From: Chrimle <28791817+Chrimle@users.noreply.github.com> Date: Mon, 27 Jul 2026 19:05:22 +0200 Subject: [PATCH 10/13] Simplify `isRequired`-setup --- .../o2jrm/models/GeneratedRecordImpl.java | 65 ++++++++----------- .../o2jrm/models/GeneratedRecordImpl.java | 65 ++++++++----------- .../o2jrm/models/GeneratedRecordImpl.java | 65 ++++++++----------- .../test/meta/models/GeneratedField.java | 4 +- 4 files changed, 83 insertions(+), 116 deletions(-) diff --git a/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java b/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java index 16ffa648..34c0b604 100644 --- a/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java +++ b/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java @@ -121,25 +121,19 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { GeneratedField.of("booleanStandard", Boolean.class).build(), GeneratedField.of("booleanDefault", Boolean.class).defaultValue(Boolean.TRUE).build(), GeneratedField.of("booleanNullable", Boolean.class).isNullable().build(), - GeneratedField.of("booleanRequired", Boolean.class).isRequired(true).build(), + GeneratedField.of("booleanRequired", Boolean.class).isRequired().build(), GeneratedField.of("booleanRequiredDefault", Boolean.class) - .isRequired(true) + .isRequired() .defaultValue(Boolean.TRUE) .build(), - GeneratedField.of("booleanRequiredNullable", Boolean.class) - .isRequired(true) - .isNullable() - .build(), + GeneratedField.of("booleanRequiredNullable", Boolean.class).isRequired().isNullable().build(), GeneratedField.of("stringStandard", String.class).build(), GeneratedField.of("stringDefault", String.class).defaultValue("someDefaultValue").build(), GeneratedField.of("stringNullable", String.class).isNullable().build(), - GeneratedField.of("stringRequired", String.class).isRequired(true).build(), - GeneratedField.of("stringRequiredNullable", String.class) - .isNullable() - .isRequired(true) - .build(), + GeneratedField.of("stringRequired", String.class).isRequired().build(), + GeneratedField.of("stringRequiredNullable", String.class).isNullable().isRequired().build(), GeneratedField.of("stringRequiredPattern", String.class) - .isRequired(true) + .isRequired() .pattern("^\\d{3}-\\d{2}-\\d{4}$") .build(), GeneratedField.of("stringEmailFormat", String.class).isEmail(true).build(), @@ -149,7 +143,7 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { GeneratedField.of("stringMinAndMaxLength", String.class).minLength(3).maxLength(7).build(), GeneratedField.of("arrayNullable", List.class, String.class).isNullable().build(), GeneratedField.of("arrayRequiredNullable", List.class, String.class) - .isRequired(true) + .isRequired() .isNullable() .build(), GeneratedField.of("arrayMinItems", List.class, String.class).minItems(1).build(), @@ -159,10 +153,10 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { .maxItems(10) .build(), GeneratedField.of("arrayUniqueStandard", Set.class, String.class).build(), - GeneratedField.of("arrayUniqueRequired", Set.class, String.class).isRequired(true).build(), + GeneratedField.of("arrayUniqueRequired", Set.class, String.class).isRequired().build(), GeneratedField.of("arrayUniqueNullable", Set.class, String.class).isNullable().build(), GeneratedField.of("arrayUniqueRequiredNullable", Set.class, String.class) - .isRequired(true) + .isRequired() .isNullable() .build(), GeneratedField.of("intMinimum", Integer.class).minimum(18).build(), @@ -170,8 +164,8 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { GeneratedField.of("intMinimumAndMaximum", Integer.class).minimum(0).maximum(100).build(), GeneratedField.of("longStandard", Long.class).build(), GeneratedField.of("longNullable", Long.class).isNullable().build(), - GeneratedField.of("longRequired", Long.class).isRequired(true).build(), - GeneratedField.of("longRequiredNullable", Long.class).isRequired(true).isNullable().build(), + GeneratedField.of("longRequired", Long.class).isRequired().build(), + GeneratedField.of("longRequiredNullable", Long.class).isRequired().isNullable().build(), GeneratedField.of("longMinimum", Long.class).minimum(18).build(), GeneratedField.of("longMaximum", Long.class).maximum(100).build(), GeneratedField.of("longMinimumAndMaximum", Long.class).minimum(0).maximum(100).build(), @@ -310,50 +304,45 @@ public static GeneratedField[] getGeneratedFields( .toArray(new GeneratedField[] {}); case RECORD_WITH_REQUIRED_FIELDS_OF_EACH_TYPE -> List.of( - GeneratedField.of("field1", Boolean.class).isRequired(true).build(), - GeneratedField.of("field2", String.class).isRequired(true).build(), - GeneratedField.of("field3", Integer.class).isRequired(true).build(), - GeneratedField.of("field4", BigDecimal.class).isRequired(true).build(), - GeneratedField.of("field5", List.class, Boolean.class).isRequired(true).build(), - GeneratedField.of("field6", Set.class, Boolean.class).isRequired(true).build(), + GeneratedField.of("field1", Boolean.class).isRequired().build(), + GeneratedField.of("field2", String.class).isRequired().build(), + GeneratedField.of("field3", Integer.class).isRequired().build(), + GeneratedField.of("field4", BigDecimal.class).isRequired().build(), + GeneratedField.of("field5", List.class, Boolean.class).isRequired().build(), + GeneratedField.of("field6", Set.class, Boolean.class).isRequired().build(), GeneratedField.of( "field7", GeneratedRecordImpl.EXAMPLE_RECORD.getClass(pluginExecution)) - .isRequired(true) + .isRequired() .isCustomClass(true) .build(), GeneratedField.of( "field8", GeneratedEnumImpl.EXAMPLE_ENUM.getClass(pluginExecution)) - .isRequired(true) + .isRequired() .build()) .toArray(new GeneratedField[] {}); case RECORD_WITH_NULLABLE_FIELDS_OF_EACH_TYPE -> List.of( - GeneratedField.of("field1", Boolean.class).isNullable().isRequired(true).build(), - GeneratedField.of("field2", String.class).isNullable().isRequired(true).build(), - GeneratedField.of("field3", Integer.class).isNullable().isRequired(true).build(), - GeneratedField.of("field4", BigDecimal.class) - .isNullable() - .isRequired(true) - .build(), + GeneratedField.of("field1", Boolean.class).isNullable().isRequired().build(), + GeneratedField.of("field2", String.class).isNullable().isRequired().build(), + GeneratedField.of("field3", Integer.class).isNullable().isRequired().build(), + GeneratedField.of("field4", BigDecimal.class).isNullable().isRequired().build(), GeneratedField.of("field5", List.class, Boolean.class) .isNullable() - .isRequired(true) + .isRequired() .build(), GeneratedField.of("field6", Set.class, Boolean.class) .isNullable() - .isRequired(true) + .isRequired() .build(), GeneratedField.of( "field7", GeneratedRecordImpl.EXAMPLE_NULLABLE_RECORD.getClass(pluginExecution)) - .isRequired(false) .isNullable() .isCustomClass(true) .build(), GeneratedField.of( "field8", GeneratedEnumImpl.EXAMPLE_NULLABLE_ENUM.getClass(pluginExecution)) - .isRequired(false) .isNullable() .build()) .toArray(new GeneratedField[] {}); @@ -368,7 +357,7 @@ public static GeneratedField[] getGeneratedFields( "requiredRecordList", List.class, GeneratedRecordImpl.EXAMPLE_RECORD.getClass(pluginExecution)) - .isRequired(true) + .isRequired() .build(), GeneratedField.of( "optionalRecordSet", @@ -379,7 +368,7 @@ public static GeneratedField[] getGeneratedFields( "requiredRecordSet", Set.class, GeneratedRecordImpl.EXAMPLE_RECORD.getClass(pluginExecution)) - .isRequired(true) + .isRequired() .build()) .toArray(new GeneratedField[] {}); default -> generatedRecord.getGeneratedFields(); diff --git a/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java b/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java index 499ce18e..1677e3b1 100644 --- a/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java +++ b/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java @@ -121,25 +121,19 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { GeneratedField.of("booleanStandard", Boolean.class).build(), GeneratedField.of("booleanDefault", Boolean.class).defaultValue(Boolean.TRUE).build(), GeneratedField.of("booleanNullable", Boolean.class).isNullable().build(), - GeneratedField.of("booleanRequired", Boolean.class).isRequired(true).build(), + GeneratedField.of("booleanRequired", Boolean.class).isRequired().build(), GeneratedField.of("booleanRequiredDefault", Boolean.class) - .isRequired(true) + .isRequired() .defaultValue(Boolean.TRUE) .build(), - GeneratedField.of("booleanRequiredNullable", Boolean.class) - .isRequired(true) - .isNullable() - .build(), + GeneratedField.of("booleanRequiredNullable", Boolean.class).isRequired().isNullable().build(), GeneratedField.of("stringStandard", String.class).build(), GeneratedField.of("stringDefault", String.class).defaultValue("someDefaultValue").build(), GeneratedField.of("stringNullable", String.class).isNullable().build(), - GeneratedField.of("stringRequired", String.class).isRequired(true).build(), - GeneratedField.of("stringRequiredNullable", String.class) - .isNullable() - .isRequired(true) - .build(), + GeneratedField.of("stringRequired", String.class).isRequired().build(), + GeneratedField.of("stringRequiredNullable", String.class).isNullable().isRequired().build(), GeneratedField.of("stringRequiredPattern", String.class) - .isRequired(true) + .isRequired() .pattern("^\\d{3}-\\d{2}-\\d{4}$") .build(), GeneratedField.of("stringEmailFormat", String.class).isEmail(true).build(), @@ -149,7 +143,7 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { GeneratedField.of("stringMinAndMaxLength", String.class).minLength(3).maxLength(7).build(), GeneratedField.of("arrayNullable", List.class, String.class).isNullable().build(), GeneratedField.of("arrayRequiredNullable", List.class, String.class) - .isRequired(true) + .isRequired() .isNullable() .build(), GeneratedField.of("arrayMinItems", List.class, String.class).minItems(1).build(), @@ -159,10 +153,10 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { .maxItems(10) .build(), GeneratedField.of("arrayUniqueStandard", Set.class, String.class).build(), - GeneratedField.of("arrayUniqueRequired", Set.class, String.class).isRequired(true).build(), + GeneratedField.of("arrayUniqueRequired", Set.class, String.class).isRequired().build(), GeneratedField.of("arrayUniqueNullable", Set.class, String.class).isNullable().build(), GeneratedField.of("arrayUniqueRequiredNullable", Set.class, String.class) - .isRequired(true) + .isRequired() .isNullable() .build(), GeneratedField.of("intMinimum", Integer.class).minimum(18).build(), @@ -170,8 +164,8 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { GeneratedField.of("intMinimumAndMaximum", Integer.class).minimum(0).maximum(100).build(), GeneratedField.of("longStandard", Long.class).build(), GeneratedField.of("longNullable", Long.class).isNullable().build(), - GeneratedField.of("longRequired", Long.class).isRequired(true).build(), - GeneratedField.of("longRequiredNullable", Long.class).isRequired(true).isNullable().build(), + GeneratedField.of("longRequired", Long.class).isRequired().build(), + GeneratedField.of("longRequiredNullable", Long.class).isRequired().isNullable().build(), GeneratedField.of("longMinimum", Long.class).minimum(18).build(), GeneratedField.of("longMaximum", Long.class).maximum(100).build(), GeneratedField.of("longMinimumAndMaximum", Long.class).minimum(0).maximum(100).build(), @@ -309,50 +303,45 @@ public static GeneratedField[] getGeneratedFields( .toArray(new GeneratedField[] {}); case RECORD_WITH_REQUIRED_FIELDS_OF_EACH_TYPE -> List.of( - GeneratedField.of("field1", Boolean.class).isRequired(true).build(), - GeneratedField.of("field2", String.class).isRequired(true).build(), - GeneratedField.of("field3", Integer.class).isRequired(true).build(), - GeneratedField.of("field4", BigDecimal.class).isRequired(true).build(), - GeneratedField.of("field5", List.class, Boolean.class).isRequired(true).build(), - GeneratedField.of("field6", Set.class, Boolean.class).isRequired(true).build(), + GeneratedField.of("field1", Boolean.class).isRequired().build(), + GeneratedField.of("field2", String.class).isRequired().build(), + GeneratedField.of("field3", Integer.class).isRequired().build(), + GeneratedField.of("field4", BigDecimal.class).isRequired().build(), + GeneratedField.of("field5", List.class, Boolean.class).isRequired().build(), + GeneratedField.of("field6", Set.class, Boolean.class).isRequired().build(), GeneratedField.of( "field7", GeneratedRecordImpl.EXAMPLE_RECORD.getClass(pluginExecution)) - .isRequired(true) + .isRequired() .isCustomClass(true) .build(), GeneratedField.of( "field8", GeneratedEnumImpl.EXAMPLE_ENUM.getClass(pluginExecution)) - .isRequired(true) + .isRequired() .build()) .toArray(new GeneratedField[] {}); case RECORD_WITH_NULLABLE_FIELDS_OF_EACH_TYPE -> List.of( - GeneratedField.of("field1", Boolean.class).isNullable().isRequired(true).build(), - GeneratedField.of("field2", String.class).isNullable().isRequired(true).build(), - GeneratedField.of("field3", Integer.class).isNullable().isRequired(true).build(), - GeneratedField.of("field4", BigDecimal.class) - .isNullable() - .isRequired(true) - .build(), + GeneratedField.of("field1", Boolean.class).isNullable().isRequired().build(), + GeneratedField.of("field2", String.class).isNullable().isRequired().build(), + GeneratedField.of("field3", Integer.class).isNullable().isRequired().build(), + GeneratedField.of("field4", BigDecimal.class).isNullable().isRequired().build(), GeneratedField.of("field5", List.class, Boolean.class) .isNullable() - .isRequired(true) + .isRequired() .build(), GeneratedField.of("field6", Set.class, Boolean.class) .isNullable() - .isRequired(true) + .isRequired() .build(), GeneratedField.of( "field7", GeneratedRecordImpl.EXAMPLE_NULLABLE_RECORD.getClass(pluginExecution)) - .isRequired(false) .isNullable() .isCustomClass(true) .build(), GeneratedField.of( "field8", GeneratedEnumImpl.EXAMPLE_NULLABLE_ENUM.getClass(pluginExecution)) - .isRequired(false) .isNullable() .build()) .toArray(new GeneratedField[] {}); @@ -367,7 +356,7 @@ public static GeneratedField[] getGeneratedFields( "requiredRecordList", List.class, GeneratedRecordImpl.EXAMPLE_RECORD.getClass(pluginExecution)) - .isRequired(true) + .isRequired() .build(), GeneratedField.of( "optionalRecordSet", @@ -378,7 +367,7 @@ public static GeneratedField[] getGeneratedFields( "requiredRecordSet", Set.class, GeneratedRecordImpl.EXAMPLE_RECORD.getClass(pluginExecution)) - .isRequired(true) + .isRequired() .build()) .toArray(new GeneratedField[] {}); default -> generatedRecord.getGeneratedFields(); diff --git a/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java b/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java index 499ce18e..1677e3b1 100644 --- a/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java +++ b/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java @@ -121,25 +121,19 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { GeneratedField.of("booleanStandard", Boolean.class).build(), GeneratedField.of("booleanDefault", Boolean.class).defaultValue(Boolean.TRUE).build(), GeneratedField.of("booleanNullable", Boolean.class).isNullable().build(), - GeneratedField.of("booleanRequired", Boolean.class).isRequired(true).build(), + GeneratedField.of("booleanRequired", Boolean.class).isRequired().build(), GeneratedField.of("booleanRequiredDefault", Boolean.class) - .isRequired(true) + .isRequired() .defaultValue(Boolean.TRUE) .build(), - GeneratedField.of("booleanRequiredNullable", Boolean.class) - .isRequired(true) - .isNullable() - .build(), + GeneratedField.of("booleanRequiredNullable", Boolean.class).isRequired().isNullable().build(), GeneratedField.of("stringStandard", String.class).build(), GeneratedField.of("stringDefault", String.class).defaultValue("someDefaultValue").build(), GeneratedField.of("stringNullable", String.class).isNullable().build(), - GeneratedField.of("stringRequired", String.class).isRequired(true).build(), - GeneratedField.of("stringRequiredNullable", String.class) - .isNullable() - .isRequired(true) - .build(), + GeneratedField.of("stringRequired", String.class).isRequired().build(), + GeneratedField.of("stringRequiredNullable", String.class).isNullable().isRequired().build(), GeneratedField.of("stringRequiredPattern", String.class) - .isRequired(true) + .isRequired() .pattern("^\\d{3}-\\d{2}-\\d{4}$") .build(), GeneratedField.of("stringEmailFormat", String.class).isEmail(true).build(), @@ -149,7 +143,7 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { GeneratedField.of("stringMinAndMaxLength", String.class).minLength(3).maxLength(7).build(), GeneratedField.of("arrayNullable", List.class, String.class).isNullable().build(), GeneratedField.of("arrayRequiredNullable", List.class, String.class) - .isRequired(true) + .isRequired() .isNullable() .build(), GeneratedField.of("arrayMinItems", List.class, String.class).minItems(1).build(), @@ -159,10 +153,10 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { .maxItems(10) .build(), GeneratedField.of("arrayUniqueStandard", Set.class, String.class).build(), - GeneratedField.of("arrayUniqueRequired", Set.class, String.class).isRequired(true).build(), + GeneratedField.of("arrayUniqueRequired", Set.class, String.class).isRequired().build(), GeneratedField.of("arrayUniqueNullable", Set.class, String.class).isNullable().build(), GeneratedField.of("arrayUniqueRequiredNullable", Set.class, String.class) - .isRequired(true) + .isRequired() .isNullable() .build(), GeneratedField.of("intMinimum", Integer.class).minimum(18).build(), @@ -170,8 +164,8 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { GeneratedField.of("intMinimumAndMaximum", Integer.class).minimum(0).maximum(100).build(), GeneratedField.of("longStandard", Long.class).build(), GeneratedField.of("longNullable", Long.class).isNullable().build(), - GeneratedField.of("longRequired", Long.class).isRequired(true).build(), - GeneratedField.of("longRequiredNullable", Long.class).isRequired(true).isNullable().build(), + GeneratedField.of("longRequired", Long.class).isRequired().build(), + GeneratedField.of("longRequiredNullable", Long.class).isRequired().isNullable().build(), GeneratedField.of("longMinimum", Long.class).minimum(18).build(), GeneratedField.of("longMaximum", Long.class).maximum(100).build(), GeneratedField.of("longMinimumAndMaximum", Long.class).minimum(0).maximum(100).build(), @@ -309,50 +303,45 @@ public static GeneratedField[] getGeneratedFields( .toArray(new GeneratedField[] {}); case RECORD_WITH_REQUIRED_FIELDS_OF_EACH_TYPE -> List.of( - GeneratedField.of("field1", Boolean.class).isRequired(true).build(), - GeneratedField.of("field2", String.class).isRequired(true).build(), - GeneratedField.of("field3", Integer.class).isRequired(true).build(), - GeneratedField.of("field4", BigDecimal.class).isRequired(true).build(), - GeneratedField.of("field5", List.class, Boolean.class).isRequired(true).build(), - GeneratedField.of("field6", Set.class, Boolean.class).isRequired(true).build(), + GeneratedField.of("field1", Boolean.class).isRequired().build(), + GeneratedField.of("field2", String.class).isRequired().build(), + GeneratedField.of("field3", Integer.class).isRequired().build(), + GeneratedField.of("field4", BigDecimal.class).isRequired().build(), + GeneratedField.of("field5", List.class, Boolean.class).isRequired().build(), + GeneratedField.of("field6", Set.class, Boolean.class).isRequired().build(), GeneratedField.of( "field7", GeneratedRecordImpl.EXAMPLE_RECORD.getClass(pluginExecution)) - .isRequired(true) + .isRequired() .isCustomClass(true) .build(), GeneratedField.of( "field8", GeneratedEnumImpl.EXAMPLE_ENUM.getClass(pluginExecution)) - .isRequired(true) + .isRequired() .build()) .toArray(new GeneratedField[] {}); case RECORD_WITH_NULLABLE_FIELDS_OF_EACH_TYPE -> List.of( - GeneratedField.of("field1", Boolean.class).isNullable().isRequired(true).build(), - GeneratedField.of("field2", String.class).isNullable().isRequired(true).build(), - GeneratedField.of("field3", Integer.class).isNullable().isRequired(true).build(), - GeneratedField.of("field4", BigDecimal.class) - .isNullable() - .isRequired(true) - .build(), + GeneratedField.of("field1", Boolean.class).isNullable().isRequired().build(), + GeneratedField.of("field2", String.class).isNullable().isRequired().build(), + GeneratedField.of("field3", Integer.class).isNullable().isRequired().build(), + GeneratedField.of("field4", BigDecimal.class).isNullable().isRequired().build(), GeneratedField.of("field5", List.class, Boolean.class) .isNullable() - .isRequired(true) + .isRequired() .build(), GeneratedField.of("field6", Set.class, Boolean.class) .isNullable() - .isRequired(true) + .isRequired() .build(), GeneratedField.of( "field7", GeneratedRecordImpl.EXAMPLE_NULLABLE_RECORD.getClass(pluginExecution)) - .isRequired(false) .isNullable() .isCustomClass(true) .build(), GeneratedField.of( "field8", GeneratedEnumImpl.EXAMPLE_NULLABLE_ENUM.getClass(pluginExecution)) - .isRequired(false) .isNullable() .build()) .toArray(new GeneratedField[] {}); @@ -367,7 +356,7 @@ public static GeneratedField[] getGeneratedFields( "requiredRecordList", List.class, GeneratedRecordImpl.EXAMPLE_RECORD.getClass(pluginExecution)) - .isRequired(true) + .isRequired() .build(), GeneratedField.of( "optionalRecordSet", @@ -378,7 +367,7 @@ public static GeneratedField[] getGeneratedFields( "requiredRecordSet", Set.class, GeneratedRecordImpl.EXAMPLE_RECORD.getClass(pluginExecution)) - .isRequired(true) + .isRequired() .build()) .toArray(new GeneratedField[] {}); default -> generatedRecord.getGeneratedFields(); diff --git a/test/utils/src/main/java/io/github/chrimle/o2jrm/test/meta/models/GeneratedField.java b/test/utils/src/main/java/io/github/chrimle/o2jrm/test/meta/models/GeneratedField.java index aa07ffb9..567895c7 100644 --- a/test/utils/src/main/java/io/github/chrimle/o2jrm/test/meta/models/GeneratedField.java +++ b/test/utils/src/main/java/io/github/chrimle/o2jrm/test/meta/models/GeneratedField.java @@ -207,8 +207,8 @@ public Builder( this.enumValue = enumValue; } - public Builder isRequired(final boolean isRequired) { - this.isRequired = isRequired; + public Builder isRequired() { + this.isRequired = true; return this; } From e40071a41c84210299c0c85abac62edf591b473b Mon Sep 17 00:00:00 2001 From: Chrimle <28791817+Chrimle@users.noreply.github.com> Date: Mon, 27 Jul 2026 19:24:02 +0200 Subject: [PATCH 11/13] Update `RecordWithAllConstraints` test record --- test/common/src/main/resources/api.yaml | 16 +++ .../o2jrm/models/GeneratedRecordImpl.java | 7 + .../RecordWithAllConstraints.java | 60 ++++++++- .../RecordWithAllConstraints.java | 60 ++++++++- .../RecordWithAllConstraints.java | 60 ++++++++- .../RecordWithAllConstraints.java | 60 ++++++++- .../RecordWithAllConstraints.java | 120 +++++++++++++++++- .../RecordWithAllConstraints.java | 60 ++++++++- .../standard/RecordWithAllConstraints.java | 60 ++++++++- .../RecordWithAllConstraints.java | 60 ++++++++- .../RecordWithAllConstraints.java | 60 ++++++++- .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 76 +++++++++++ .../RecordWithAllConstraints.java | 16 +++ .../standard/RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../o2jrm/models/GeneratedRecordImpl.java | 7 + .../RecordWithAllConstraints.java | 60 ++++++++- .../RecordWithAllConstraints.java | 60 ++++++++- .../RecordWithAllConstraints.java | 60 ++++++++- .../RecordWithAllConstraints.java | 60 ++++++++- .../RecordWithAllConstraints.java | 120 +++++++++++++++++- .../RecordWithAllConstraints.java | 60 ++++++++- .../standard/RecordWithAllConstraints.java | 60 ++++++++- .../RecordWithAllConstraints.java | 60 ++++++++- .../RecordWithAllConstraints.java | 60 ++++++++- .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 76 +++++++++++ .../RecordWithAllConstraints.java | 16 +++ .../standard/RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../o2jrm/models/GeneratedRecordImpl.java | 7 + .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 76 +++++++++++ .../RecordWithAllConstraints.java | 16 +++ .../standard/RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../test/meta/models/GeneratedField.java | 1 + 50 files changed, 1832 insertions(+), 18 deletions(-) diff --git a/test/common/src/main/resources/api.yaml b/test/common/src/main/resources/api.yaml index 2274a14b..a25ebbf8 100644 --- a/test/common/src/main/resources/api.yaml +++ b/test/common/src/main/resources/api.yaml @@ -363,6 +363,8 @@ components: - arrayUniqueRequiredNullable - longRequired - longRequiredNullable + - bigDecimalRequired + - bigDecimalRequiredNullable properties: ### BOOLEAN FIELDS ### booleanStandard: @@ -540,6 +542,20 @@ components: minimum: 0 maximum: 100 ### NUMBER FIELDS ### + bigDecimalStandard: + description: "Non-required, non-nullable BigDecimal." + type: number + bigDecimalNullable: + description: "Non-required, nullable BigDecimal." + type: number + nullable: true + bigDecimalRequired: + description: "Required, non-nullable BigDecimal." + type: number + bigDecimalRequiredNullable: + description: "Required, nullable BigDecimal." + type: number + nullable: true bigDecimalMinimum: description: "Non-required, non-nullable BigDecimal with minimum: 0." type: number diff --git a/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java b/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java index 34c0b604..63dc6c09 100644 --- a/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java +++ b/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java @@ -169,6 +169,13 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { GeneratedField.of("longMinimum", Long.class).minimum(18).build(), GeneratedField.of("longMaximum", Long.class).maximum(100).build(), GeneratedField.of("longMinimumAndMaximum", Long.class).minimum(0).maximum(100).build(), + GeneratedField.of("bigDecimalStandard", BigDecimal.class).build(), + GeneratedField.of("bigDecimalNullable", BigDecimal.class).isNullable().build(), + GeneratedField.of("bigDecimalRequired", BigDecimal.class).isRequired().build(), + GeneratedField.of("bigDecimalRequiredNullable", BigDecimal.class) + .isRequired() + .isNullable() + .build(), GeneratedField.of("bigDecimalMinimum", BigDecimal.class).decimalMin("0").build(), GeneratedField.of("bigDecimalMaximum", BigDecimal.class).decimalMax("100").build(), GeneratedField.of("bigDecimalMinimumAndMaximum", BigDecimal.class) diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index 44d84a8c..bf3482bc 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -81,6 +81,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -122,6 +126,10 @@ public record RecordWithAllConstraints( Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, BigDecimal bigDecimalMinimum, BigDecimal bigDecimalMaximum, BigDecimal bigDecimalMinimumAndMaximum) { @@ -165,6 +173,10 @@ public record RecordWithAllConstraints( "longMinimum", "longMaximum", "longMinimumAndMaximum", + "bigDecimalStandard", + "bigDecimalNullable", + "bigDecimalRequired", + "bigDecimalRequiredNullable", "bigDecimalMinimum", "bigDecimalMaximum", "bigDecimalMinimumAndMaximum")); @@ -182,7 +194,9 @@ public record RecordWithAllConstraints( "arrayUniqueRequired", "arrayUniqueRequiredNullable", "longRequired", - "longRequiredNullable")); + "longRequiredNullable", + "bigDecimalRequired", + "bigDecimalRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -221,6 +235,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -260,6 +278,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; @@ -642,6 +664,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("bigDecimalStandard") != null && !jsonObj.get("bigDecimalStandard").isJsonNull()) { + if (!jsonObj.get("bigDecimalStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalStandard"))); + } + } + + if (jsonObj.get("bigDecimalNullable") != null && !jsonObj.get("bigDecimalNullable").isJsonNull()) { + if (!jsonObj.get("bigDecimalNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalNullable"))); + } + } + + if (!jsonObj.get("bigDecimalRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalRequired"))); + } + + if (!jsonObj.get("bigDecimalRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalRequiredNullable"))); + } + if (jsonObj.get("bigDecimalMinimum") != null && !jsonObj.get("bigDecimalMinimum").isJsonNull()) { if (!jsonObj.get("bigDecimalMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java index 89da722b..1abad713 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -81,6 +81,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -125,6 +129,10 @@ public record RecordWithAllConstraints( Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, BigDecimal bigDecimalMinimum, BigDecimal bigDecimalMaximum, BigDecimal bigDecimalMinimumAndMaximum) { @@ -168,6 +176,10 @@ public record RecordWithAllConstraints( "longMinimum", "longMaximum", "longMinimumAndMaximum", + "bigDecimalStandard", + "bigDecimalNullable", + "bigDecimalRequired", + "bigDecimalRequiredNullable", "bigDecimalMinimum", "bigDecimalMaximum", "bigDecimalMinimumAndMaximum")); @@ -185,7 +197,9 @@ public record RecordWithAllConstraints( "arrayUniqueRequired", "arrayUniqueRequiredNullable", "longRequired", - "longRequiredNullable")); + "longRequiredNullable", + "bigDecimalRequired", + "bigDecimalRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -224,6 +238,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -263,6 +281,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; @@ -645,6 +667,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("bigDecimalStandard") != null && !jsonObj.get("bigDecimalStandard").isJsonNull()) { + if (!jsonObj.get("bigDecimalStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalStandard"))); + } + } + + if (jsonObj.get("bigDecimalNullable") != null && !jsonObj.get("bigDecimalNullable").isJsonNull()) { + if (!jsonObj.get("bigDecimalNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalNullable"))); + } + } + + if (!jsonObj.get("bigDecimalRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalRequired"))); + } + + if (!jsonObj.get("bigDecimalRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalRequiredNullable"))); + } + if (jsonObj.get("bigDecimalMinimum") != null && !jsonObj.get("bigDecimalMinimum").isJsonNull()) { if (!jsonObj.get("bigDecimalMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index c65a9454..da323034 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -81,6 +81,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -122,6 +126,10 @@ public record RecordWithAllConstraints( Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, BigDecimal bigDecimalMinimum, BigDecimal bigDecimalMaximum, BigDecimal bigDecimalMinimumAndMaximum) { @@ -165,6 +173,10 @@ public record RecordWithAllConstraints( "longMinimum", "longMaximum", "longMinimumAndMaximum", + "bigDecimalStandard", + "bigDecimalNullable", + "bigDecimalRequired", + "bigDecimalRequiredNullable", "bigDecimalMinimum", "bigDecimalMaximum", "bigDecimalMinimumAndMaximum")); @@ -182,7 +194,9 @@ public record RecordWithAllConstraints( "arrayUniqueRequired", "arrayUniqueRequiredNullable", "longRequired", - "longRequiredNullable")); + "longRequiredNullable", + "bigDecimalRequired", + "bigDecimalRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -221,6 +235,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -260,6 +278,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; @@ -642,6 +664,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("bigDecimalStandard") != null && !jsonObj.get("bigDecimalStandard").isJsonNull()) { + if (!jsonObj.get("bigDecimalStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalStandard"))); + } + } + + if (jsonObj.get("bigDecimalNullable") != null && !jsonObj.get("bigDecimalNullable").isJsonNull()) { + if (!jsonObj.get("bigDecimalNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalNullable"))); + } + } + + if (!jsonObj.get("bigDecimalRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalRequired"))); + } + + if (!jsonObj.get("bigDecimalRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalRequiredNullable"))); + } + if (jsonObj.get("bigDecimalMinimum") != null && !jsonObj.get("bigDecimalMinimum").isJsonNull()) { if (!jsonObj.get("bigDecimalMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java index bdbef776..50c4a8d6 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -81,6 +81,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -122,6 +126,10 @@ public record RecordWithAllConstraints( Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, BigDecimal bigDecimalMinimum, BigDecimal bigDecimalMaximum, BigDecimal bigDecimalMinimumAndMaximum) { @@ -165,6 +173,10 @@ public record RecordWithAllConstraints( "longMinimum", "longMaximum", "longMinimumAndMaximum", + "bigDecimalStandard", + "bigDecimalNullable", + "bigDecimalRequired", + "bigDecimalRequiredNullable", "bigDecimalMinimum", "bigDecimalMaximum", "bigDecimalMinimumAndMaximum")); @@ -182,7 +194,9 @@ public record RecordWithAllConstraints( "arrayUniqueRequired", "arrayUniqueRequiredNullable", "longRequired", - "longRequiredNullable")); + "longRequiredNullable", + "bigDecimalRequired", + "bigDecimalRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -221,6 +235,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -260,6 +278,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; @@ -642,6 +664,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("bigDecimalStandard") != null && !jsonObj.get("bigDecimalStandard").isJsonNull()) { + if (!jsonObj.get("bigDecimalStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalStandard"))); + } + } + + if (jsonObj.get("bigDecimalNullable") != null && !jsonObj.get("bigDecimalNullable").isJsonNull()) { + if (!jsonObj.get("bigDecimalNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalNullable"))); + } + } + + if (!jsonObj.get("bigDecimalRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalRequired"))); + } + + if (!jsonObj.get("bigDecimalRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalRequiredNullable"))); + } + if (jsonObj.get("bigDecimalMinimum") != null && !jsonObj.get("bigDecimalMinimum").isJsonNull()) { if (!jsonObj.get("bigDecimalMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java index b63e3e45..b35b0066 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java @@ -81,6 +81,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -122,6 +126,10 @@ public record RecordWithAllConstraints( Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, BigDecimal bigDecimalMinimum, BigDecimal bigDecimalMaximum, BigDecimal bigDecimalMinimumAndMaximum) { @@ -165,6 +173,10 @@ public record RecordWithAllConstraints( "longMinimum", "longMaximum", "longMinimumAndMaximum", + "bigDecimalStandard", + "bigDecimalNullable", + "bigDecimalRequired", + "bigDecimalRequiredNullable", "bigDecimalMinimum", "bigDecimalMaximum", "bigDecimalMinimumAndMaximum")); @@ -182,7 +194,9 @@ public record RecordWithAllConstraints( "arrayUniqueRequired", "arrayUniqueRequiredNullable", "longRequired", - "longRequiredNullable")); + "longRequiredNullable", + "bigDecimalRequired", + "bigDecimalRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -221,6 +235,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -260,6 +278,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; @@ -304,6 +326,10 @@ public static class Builder { private Long longMinimum; private Long longMaximum; private Long longMinimumAndMaximum; + private BigDecimal bigDecimalStandard; + private BigDecimal bigDecimalNullable; + private BigDecimal bigDecimalRequired; + private BigDecimal bigDecimalRequiredNullable; private BigDecimal bigDecimalMinimum; private BigDecimal bigDecimalMaximum; private BigDecimal bigDecimalMinimumAndMaximum; @@ -776,6 +802,58 @@ public Builder longMinimumAndMaximum(final Long longMinimumAndMaximum) { return this; } + /** + * Sets the value of {@link RecordWithAllConstraints#bigDecimalStandard }. + * + *

NOTE: Pass-by-reference is used! + * + * @param bigDecimalStandard Non-required, non-nullable BigDecimal.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder bigDecimalStandard(final BigDecimal bigDecimalStandard) { + this.bigDecimalStandard = bigDecimalStandard; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#bigDecimalNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param bigDecimalNullable Non-required, nullable BigDecimal.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder bigDecimalNullable(final BigDecimal bigDecimalNullable) { + this.bigDecimalNullable = bigDecimalNullable; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#bigDecimalRequired }. + * + *

NOTE: Pass-by-reference is used! + * + * @param bigDecimalRequired Required, non-nullable BigDecimal.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder bigDecimalRequired(final BigDecimal bigDecimalRequired) { + this.bigDecimalRequired = bigDecimalRequired; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#bigDecimalRequiredNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param bigDecimalRequiredNullable Required, nullable BigDecimal.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder bigDecimalRequiredNullable(final BigDecimal bigDecimalRequiredNullable) { + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; + return this; + } + /** * Sets the value of {@link RecordWithAllConstraints#bigDecimalMinimum }. * @@ -861,6 +939,10 @@ public RecordWithAllConstraints build() { longMinimum, longMaximum, longMinimumAndMaximum, + bigDecimalStandard, + bigDecimalNullable, + bigDecimalRequired, + bigDecimalRequiredNullable, bigDecimalMinimum, bigDecimalMaximum, bigDecimalMinimumAndMaximum); @@ -1249,6 +1331,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("bigDecimalStandard") != null && !jsonObj.get("bigDecimalStandard").isJsonNull()) { + if (!jsonObj.get("bigDecimalStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalStandard"))); + } + } + + if (jsonObj.get("bigDecimalNullable") != null && !jsonObj.get("bigDecimalNullable").isJsonNull()) { + if (!jsonObj.get("bigDecimalNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalNullable"))); + } + } + + if (!jsonObj.get("bigDecimalRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalRequired"))); + } + + if (!jsonObj.get("bigDecimalRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalRequiredNullable"))); + } + if (jsonObj.get("bigDecimalMinimum") != null && !jsonObj.get("bigDecimalMinimum").isJsonNull()) { if (!jsonObj.get("bigDecimalMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java index bf568a8a..fbade165 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java @@ -82,6 +82,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -123,6 +127,10 @@ public record RecordWithAllConstraints( Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, BigDecimal bigDecimalMinimum, BigDecimal bigDecimalMaximum, BigDecimal bigDecimalMinimumAndMaximum) @@ -167,6 +175,10 @@ public record RecordWithAllConstraints( "longMinimum", "longMaximum", "longMinimumAndMaximum", + "bigDecimalStandard", + "bigDecimalNullable", + "bigDecimalRequired", + "bigDecimalRequiredNullable", "bigDecimalMinimum", "bigDecimalMaximum", "bigDecimalMinimumAndMaximum")); @@ -184,7 +196,9 @@ public record RecordWithAllConstraints( "arrayUniqueRequired", "arrayUniqueRequiredNullable", "longRequired", - "longRequiredNullable")); + "longRequiredNullable", + "bigDecimalRequired", + "bigDecimalRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -223,6 +237,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -262,6 +280,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; @@ -644,6 +666,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("bigDecimalStandard") != null && !jsonObj.get("bigDecimalStandard").isJsonNull()) { + if (!jsonObj.get("bigDecimalStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalStandard"))); + } + } + + if (jsonObj.get("bigDecimalNullable") != null && !jsonObj.get("bigDecimalNullable").isJsonNull()) { + if (!jsonObj.get("bigDecimalNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalNullable"))); + } + } + + if (!jsonObj.get("bigDecimalRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalRequired"))); + } + + if (!jsonObj.get("bigDecimalRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalRequiredNullable"))); + } + if (jsonObj.get("bigDecimalMinimum") != null && !jsonObj.get("bigDecimalMinimum").isJsonNull()) { if (!jsonObj.get("bigDecimalMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java index 3d0a2744..462e9309 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java @@ -81,6 +81,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -122,6 +126,10 @@ public record RecordWithAllConstraints( Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, BigDecimal bigDecimalMinimum, BigDecimal bigDecimalMaximum, BigDecimal bigDecimalMinimumAndMaximum) { @@ -165,6 +173,10 @@ public record RecordWithAllConstraints( "longMinimum", "longMaximum", "longMinimumAndMaximum", + "bigDecimalStandard", + "bigDecimalNullable", + "bigDecimalRequired", + "bigDecimalRequiredNullable", "bigDecimalMinimum", "bigDecimalMaximum", "bigDecimalMinimumAndMaximum")); @@ -182,7 +194,9 @@ public record RecordWithAllConstraints( "arrayUniqueRequired", "arrayUniqueRequiredNullable", "longRequired", - "longRequiredNullable")); + "longRequiredNullable", + "bigDecimalRequired", + "bigDecimalRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -221,6 +235,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -260,6 +278,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; @@ -642,6 +664,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("bigDecimalStandard") != null && !jsonObj.get("bigDecimalStandard").isJsonNull()) { + if (!jsonObj.get("bigDecimalStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalStandard"))); + } + } + + if (jsonObj.get("bigDecimalNullable") != null && !jsonObj.get("bigDecimalNullable").isJsonNull()) { + if (!jsonObj.get("bigDecimalNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalNullable"))); + } + } + + if (!jsonObj.get("bigDecimalRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalRequired"))); + } + + if (!jsonObj.get("bigDecimalRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalRequiredNullable"))); + } + if (jsonObj.get("bigDecimalMinimum") != null && !jsonObj.get("bigDecimalMinimum").isJsonNull()) { if (!jsonObj.get("bigDecimalMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java index 7110b802..8f7b4900 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java @@ -83,6 +83,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -124,6 +128,10 @@ public record RecordWithAllConstraints( @Min(18L) Long longMinimum, @Max(100L) Long longMaximum, @Min(0L) @Max(100L) Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + @NotNull BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, @DecimalMin("0") BigDecimal bigDecimalMinimum, @DecimalMax("100") BigDecimal bigDecimalMaximum, @DecimalMin("0") @DecimalMax("100") BigDecimal bigDecimalMinimumAndMaximum) { @@ -167,6 +175,10 @@ public record RecordWithAllConstraints( "longMinimum", "longMaximum", "longMinimumAndMaximum", + "bigDecimalStandard", + "bigDecimalNullable", + "bigDecimalRequired", + "bigDecimalRequiredNullable", "bigDecimalMinimum", "bigDecimalMaximum", "bigDecimalMinimumAndMaximum")); @@ -184,7 +196,9 @@ public record RecordWithAllConstraints( "arrayUniqueRequired", "arrayUniqueRequiredNullable", "longRequired", - "longRequiredNullable")); + "longRequiredNullable", + "bigDecimalRequired", + "bigDecimalRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -223,6 +237,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -262,6 +280,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; @@ -644,6 +666,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("bigDecimalStandard") != null && !jsonObj.get("bigDecimalStandard").isJsonNull()) { + if (!jsonObj.get("bigDecimalStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalStandard"))); + } + } + + if (jsonObj.get("bigDecimalNullable") != null && !jsonObj.get("bigDecimalNullable").isJsonNull()) { + if (!jsonObj.get("bigDecimalNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalNullable"))); + } + } + + if (!jsonObj.get("bigDecimalRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalRequired"))); + } + + if (!jsonObj.get("bigDecimalRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalRequiredNullable"))); + } + if (jsonObj.get("bigDecimalMinimum") != null && !jsonObj.get("bigDecimalMinimum").isJsonNull()) { if (!jsonObj.get("bigDecimalMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java index 534272fc..5110e584 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -81,6 +81,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -122,6 +126,10 @@ public record RecordWithAllConstraints( Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, BigDecimal bigDecimalMinimum, BigDecimal bigDecimalMaximum, BigDecimal bigDecimalMinimumAndMaximum) { @@ -165,6 +173,10 @@ public record RecordWithAllConstraints( "longMinimum", "longMaximum", "longMinimumAndMaximum", + "bigDecimalStandard", + "bigDecimalNullable", + "bigDecimalRequired", + "bigDecimalRequiredNullable", "bigDecimalMinimum", "bigDecimalMaximum", "bigDecimalMinimumAndMaximum")); @@ -182,7 +194,9 @@ public record RecordWithAllConstraints( "arrayUniqueRequired", "arrayUniqueRequiredNullable", "longRequired", - "longRequiredNullable")); + "longRequiredNullable", + "bigDecimalRequired", + "bigDecimalRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -221,6 +235,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -260,6 +278,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; @@ -642,6 +664,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("bigDecimalStandard") != null && !jsonObj.get("bigDecimalStandard").isJsonNull()) { + if (!jsonObj.get("bigDecimalStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalStandard"))); + } + } + + if (jsonObj.get("bigDecimalNullable") != null && !jsonObj.get("bigDecimalNullable").isJsonNull()) { + if (!jsonObj.get("bigDecimalNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalNullable"))); + } + } + + if (!jsonObj.get("bigDecimalRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalRequired"))); + } + + if (!jsonObj.get("bigDecimalRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalRequiredNullable"))); + } + if (jsonObj.get("bigDecimalMinimum") != null && !jsonObj.get("bigDecimalMinimum").isJsonNull()) { if (!jsonObj.get("bigDecimalMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index 66f185ac..146f6293 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -79,6 +79,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -120,6 +124,10 @@ public record RecordWithAllConstraints( Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, BigDecimal bigDecimalMinimum, BigDecimal bigDecimalMaximum, BigDecimal bigDecimalMinimumAndMaximum) { @@ -162,6 +170,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -201,6 +213,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java index 4f9ae840..4d4f271f 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -79,6 +79,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -123,6 +127,10 @@ public record RecordWithAllConstraints( Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, BigDecimal bigDecimalMinimum, BigDecimal bigDecimalMaximum, BigDecimal bigDecimalMinimumAndMaximum) { @@ -165,6 +173,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -204,6 +216,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index ccc745f7..346112e6 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -79,6 +79,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -120,6 +124,10 @@ public record RecordWithAllConstraints( Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, BigDecimal bigDecimalMinimum, BigDecimal bigDecimalMaximum, BigDecimal bigDecimalMinimumAndMaximum) { @@ -162,6 +170,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -201,6 +213,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java index 5b28ccb2..799e69b2 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -79,6 +79,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -120,6 +124,10 @@ public record RecordWithAllConstraints( Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, BigDecimal bigDecimalMinimum, BigDecimal bigDecimalMaximum, BigDecimal bigDecimalMinimumAndMaximum) { @@ -162,6 +170,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -201,6 +213,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java index af093b18..a1785615 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java @@ -79,6 +79,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -120,6 +124,10 @@ public record RecordWithAllConstraints( Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, BigDecimal bigDecimalMinimum, BigDecimal bigDecimalMaximum, BigDecimal bigDecimalMinimumAndMaximum) { @@ -162,6 +170,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -201,6 +213,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; @@ -245,6 +261,10 @@ public static class Builder { private Long longMinimum; private Long longMaximum; private Long longMinimumAndMaximum; + private BigDecimal bigDecimalStandard; + private BigDecimal bigDecimalNullable; + private BigDecimal bigDecimalRequired; + private BigDecimal bigDecimalRequiredNullable; private BigDecimal bigDecimalMinimum; private BigDecimal bigDecimalMaximum; private BigDecimal bigDecimalMinimumAndMaximum; @@ -717,6 +737,58 @@ public Builder longMinimumAndMaximum(final Long longMinimumAndMaximum) { return this; } + /** + * Sets the value of {@link RecordWithAllConstraints#bigDecimalStandard }. + * + *

NOTE: Pass-by-reference is used! + * + * @param bigDecimalStandard Non-required, non-nullable BigDecimal.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder bigDecimalStandard(final BigDecimal bigDecimalStandard) { + this.bigDecimalStandard = bigDecimalStandard; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#bigDecimalNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param bigDecimalNullable Non-required, nullable BigDecimal.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder bigDecimalNullable(final BigDecimal bigDecimalNullable) { + this.bigDecimalNullable = bigDecimalNullable; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#bigDecimalRequired }. + * + *

NOTE: Pass-by-reference is used! + * + * @param bigDecimalRequired Required, non-nullable BigDecimal.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder bigDecimalRequired(final BigDecimal bigDecimalRequired) { + this.bigDecimalRequired = bigDecimalRequired; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#bigDecimalRequiredNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param bigDecimalRequiredNullable Required, nullable BigDecimal.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder bigDecimalRequiredNullable(final BigDecimal bigDecimalRequiredNullable) { + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; + return this; + } + /** * Sets the value of {@link RecordWithAllConstraints#bigDecimalMinimum }. * @@ -802,6 +874,10 @@ public RecordWithAllConstraints build() { longMinimum, longMaximum, longMinimumAndMaximum, + bigDecimalStandard, + bigDecimalNullable, + bigDecimalRequired, + bigDecimalRequiredNullable, bigDecimalMinimum, bigDecimalMaximum, bigDecimalMinimumAndMaximum); diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java index bb6a694f..86238dbb 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java @@ -80,6 +80,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -121,6 +125,10 @@ public record RecordWithAllConstraints( Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, BigDecimal bigDecimalMinimum, BigDecimal bigDecimalMaximum, BigDecimal bigDecimalMinimumAndMaximum) @@ -164,6 +172,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -203,6 +215,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java index b17adaef..1032dba8 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java @@ -79,6 +79,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -120,6 +124,10 @@ public record RecordWithAllConstraints( Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, BigDecimal bigDecimalMinimum, BigDecimal bigDecimalMaximum, BigDecimal bigDecimalMinimumAndMaximum) { @@ -162,6 +170,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -201,6 +213,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java index eab38ccb..2894adc7 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java @@ -81,6 +81,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -122,6 +126,10 @@ public record RecordWithAllConstraints( @Min(18L) Long longMinimum, @Max(100L) Long longMaximum, @Min(0L) @Max(100L) Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + @NotNull BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, @DecimalMin("0") BigDecimal bigDecimalMinimum, @DecimalMax("100") BigDecimal bigDecimalMaximum, @DecimalMin("0") @DecimalMax("100") BigDecimal bigDecimalMinimumAndMaximum) { @@ -164,6 +172,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -203,6 +215,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java index 522f8bb7..45eeb7f7 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -79,6 +79,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -120,6 +124,10 @@ public record RecordWithAllConstraints( Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, BigDecimal bigDecimalMinimum, BigDecimal bigDecimalMaximum, BigDecimal bigDecimalMinimumAndMaximum) { @@ -162,6 +170,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -201,6 +213,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; diff --git a/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java b/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java index 1677e3b1..035afb22 100644 --- a/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java +++ b/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java @@ -169,6 +169,13 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { GeneratedField.of("longMinimum", Long.class).minimum(18).build(), GeneratedField.of("longMaximum", Long.class).maximum(100).build(), GeneratedField.of("longMinimumAndMaximum", Long.class).minimum(0).maximum(100).build(), + GeneratedField.of("bigDecimalStandard", BigDecimal.class).build(), + GeneratedField.of("bigDecimalNullable", BigDecimal.class).isNullable().build(), + GeneratedField.of("bigDecimalRequired", BigDecimal.class).isRequired().build(), + GeneratedField.of("bigDecimalRequiredNullable", BigDecimal.class) + .isRequired() + .isNullable() + .build(), GeneratedField.of("bigDecimalMinimum", BigDecimal.class).decimalMin("0").build(), GeneratedField.of("bigDecimalMaximum", BigDecimal.class).decimalMax("100").build(), GeneratedField.of("bigDecimalMinimumAndMaximum", BigDecimal.class) diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index 44d84a8c..bf3482bc 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -81,6 +81,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -122,6 +126,10 @@ public record RecordWithAllConstraints( Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, BigDecimal bigDecimalMinimum, BigDecimal bigDecimalMaximum, BigDecimal bigDecimalMinimumAndMaximum) { @@ -165,6 +173,10 @@ public record RecordWithAllConstraints( "longMinimum", "longMaximum", "longMinimumAndMaximum", + "bigDecimalStandard", + "bigDecimalNullable", + "bigDecimalRequired", + "bigDecimalRequiredNullable", "bigDecimalMinimum", "bigDecimalMaximum", "bigDecimalMinimumAndMaximum")); @@ -182,7 +194,9 @@ public record RecordWithAllConstraints( "arrayUniqueRequired", "arrayUniqueRequiredNullable", "longRequired", - "longRequiredNullable")); + "longRequiredNullable", + "bigDecimalRequired", + "bigDecimalRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -221,6 +235,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -260,6 +278,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; @@ -642,6 +664,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("bigDecimalStandard") != null && !jsonObj.get("bigDecimalStandard").isJsonNull()) { + if (!jsonObj.get("bigDecimalStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalStandard"))); + } + } + + if (jsonObj.get("bigDecimalNullable") != null && !jsonObj.get("bigDecimalNullable").isJsonNull()) { + if (!jsonObj.get("bigDecimalNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalNullable"))); + } + } + + if (!jsonObj.get("bigDecimalRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalRequired"))); + } + + if (!jsonObj.get("bigDecimalRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalRequiredNullable"))); + } + if (jsonObj.get("bigDecimalMinimum") != null && !jsonObj.get("bigDecimalMinimum").isJsonNull()) { if (!jsonObj.get("bigDecimalMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java index 89da722b..1abad713 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -81,6 +81,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -125,6 +129,10 @@ public record RecordWithAllConstraints( Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, BigDecimal bigDecimalMinimum, BigDecimal bigDecimalMaximum, BigDecimal bigDecimalMinimumAndMaximum) { @@ -168,6 +176,10 @@ public record RecordWithAllConstraints( "longMinimum", "longMaximum", "longMinimumAndMaximum", + "bigDecimalStandard", + "bigDecimalNullable", + "bigDecimalRequired", + "bigDecimalRequiredNullable", "bigDecimalMinimum", "bigDecimalMaximum", "bigDecimalMinimumAndMaximum")); @@ -185,7 +197,9 @@ public record RecordWithAllConstraints( "arrayUniqueRequired", "arrayUniqueRequiredNullable", "longRequired", - "longRequiredNullable")); + "longRequiredNullable", + "bigDecimalRequired", + "bigDecimalRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -224,6 +238,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -263,6 +281,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; @@ -645,6 +667,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("bigDecimalStandard") != null && !jsonObj.get("bigDecimalStandard").isJsonNull()) { + if (!jsonObj.get("bigDecimalStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalStandard"))); + } + } + + if (jsonObj.get("bigDecimalNullable") != null && !jsonObj.get("bigDecimalNullable").isJsonNull()) { + if (!jsonObj.get("bigDecimalNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalNullable"))); + } + } + + if (!jsonObj.get("bigDecimalRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalRequired"))); + } + + if (!jsonObj.get("bigDecimalRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalRequiredNullable"))); + } + if (jsonObj.get("bigDecimalMinimum") != null && !jsonObj.get("bigDecimalMinimum").isJsonNull()) { if (!jsonObj.get("bigDecimalMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index c65a9454..da323034 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -81,6 +81,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -122,6 +126,10 @@ public record RecordWithAllConstraints( Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, BigDecimal bigDecimalMinimum, BigDecimal bigDecimalMaximum, BigDecimal bigDecimalMinimumAndMaximum) { @@ -165,6 +173,10 @@ public record RecordWithAllConstraints( "longMinimum", "longMaximum", "longMinimumAndMaximum", + "bigDecimalStandard", + "bigDecimalNullable", + "bigDecimalRequired", + "bigDecimalRequiredNullable", "bigDecimalMinimum", "bigDecimalMaximum", "bigDecimalMinimumAndMaximum")); @@ -182,7 +194,9 @@ public record RecordWithAllConstraints( "arrayUniqueRequired", "arrayUniqueRequiredNullable", "longRequired", - "longRequiredNullable")); + "longRequiredNullable", + "bigDecimalRequired", + "bigDecimalRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -221,6 +235,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -260,6 +278,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; @@ -642,6 +664,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("bigDecimalStandard") != null && !jsonObj.get("bigDecimalStandard").isJsonNull()) { + if (!jsonObj.get("bigDecimalStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalStandard"))); + } + } + + if (jsonObj.get("bigDecimalNullable") != null && !jsonObj.get("bigDecimalNullable").isJsonNull()) { + if (!jsonObj.get("bigDecimalNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalNullable"))); + } + } + + if (!jsonObj.get("bigDecimalRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalRequired"))); + } + + if (!jsonObj.get("bigDecimalRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalRequiredNullable"))); + } + if (jsonObj.get("bigDecimalMinimum") != null && !jsonObj.get("bigDecimalMinimum").isJsonNull()) { if (!jsonObj.get("bigDecimalMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java index bdbef776..50c4a8d6 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -81,6 +81,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -122,6 +126,10 @@ public record RecordWithAllConstraints( Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, BigDecimal bigDecimalMinimum, BigDecimal bigDecimalMaximum, BigDecimal bigDecimalMinimumAndMaximum) { @@ -165,6 +173,10 @@ public record RecordWithAllConstraints( "longMinimum", "longMaximum", "longMinimumAndMaximum", + "bigDecimalStandard", + "bigDecimalNullable", + "bigDecimalRequired", + "bigDecimalRequiredNullable", "bigDecimalMinimum", "bigDecimalMaximum", "bigDecimalMinimumAndMaximum")); @@ -182,7 +194,9 @@ public record RecordWithAllConstraints( "arrayUniqueRequired", "arrayUniqueRequiredNullable", "longRequired", - "longRequiredNullable")); + "longRequiredNullable", + "bigDecimalRequired", + "bigDecimalRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -221,6 +235,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -260,6 +278,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; @@ -642,6 +664,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("bigDecimalStandard") != null && !jsonObj.get("bigDecimalStandard").isJsonNull()) { + if (!jsonObj.get("bigDecimalStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalStandard"))); + } + } + + if (jsonObj.get("bigDecimalNullable") != null && !jsonObj.get("bigDecimalNullable").isJsonNull()) { + if (!jsonObj.get("bigDecimalNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalNullable"))); + } + } + + if (!jsonObj.get("bigDecimalRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalRequired"))); + } + + if (!jsonObj.get("bigDecimalRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalRequiredNullable"))); + } + if (jsonObj.get("bigDecimalMinimum") != null && !jsonObj.get("bigDecimalMinimum").isJsonNull()) { if (!jsonObj.get("bigDecimalMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java index b63e3e45..b35b0066 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java @@ -81,6 +81,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -122,6 +126,10 @@ public record RecordWithAllConstraints( Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, BigDecimal bigDecimalMinimum, BigDecimal bigDecimalMaximum, BigDecimal bigDecimalMinimumAndMaximum) { @@ -165,6 +173,10 @@ public record RecordWithAllConstraints( "longMinimum", "longMaximum", "longMinimumAndMaximum", + "bigDecimalStandard", + "bigDecimalNullable", + "bigDecimalRequired", + "bigDecimalRequiredNullable", "bigDecimalMinimum", "bigDecimalMaximum", "bigDecimalMinimumAndMaximum")); @@ -182,7 +194,9 @@ public record RecordWithAllConstraints( "arrayUniqueRequired", "arrayUniqueRequiredNullable", "longRequired", - "longRequiredNullable")); + "longRequiredNullable", + "bigDecimalRequired", + "bigDecimalRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -221,6 +235,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -260,6 +278,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; @@ -304,6 +326,10 @@ public static class Builder { private Long longMinimum; private Long longMaximum; private Long longMinimumAndMaximum; + private BigDecimal bigDecimalStandard; + private BigDecimal bigDecimalNullable; + private BigDecimal bigDecimalRequired; + private BigDecimal bigDecimalRequiredNullable; private BigDecimal bigDecimalMinimum; private BigDecimal bigDecimalMaximum; private BigDecimal bigDecimalMinimumAndMaximum; @@ -776,6 +802,58 @@ public Builder longMinimumAndMaximum(final Long longMinimumAndMaximum) { return this; } + /** + * Sets the value of {@link RecordWithAllConstraints#bigDecimalStandard }. + * + *

NOTE: Pass-by-reference is used! + * + * @param bigDecimalStandard Non-required, non-nullable BigDecimal.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder bigDecimalStandard(final BigDecimal bigDecimalStandard) { + this.bigDecimalStandard = bigDecimalStandard; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#bigDecimalNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param bigDecimalNullable Non-required, nullable BigDecimal.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder bigDecimalNullable(final BigDecimal bigDecimalNullable) { + this.bigDecimalNullable = bigDecimalNullable; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#bigDecimalRequired }. + * + *

NOTE: Pass-by-reference is used! + * + * @param bigDecimalRequired Required, non-nullable BigDecimal.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder bigDecimalRequired(final BigDecimal bigDecimalRequired) { + this.bigDecimalRequired = bigDecimalRequired; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#bigDecimalRequiredNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param bigDecimalRequiredNullable Required, nullable BigDecimal.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder bigDecimalRequiredNullable(final BigDecimal bigDecimalRequiredNullable) { + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; + return this; + } + /** * Sets the value of {@link RecordWithAllConstraints#bigDecimalMinimum }. * @@ -861,6 +939,10 @@ public RecordWithAllConstraints build() { longMinimum, longMaximum, longMinimumAndMaximum, + bigDecimalStandard, + bigDecimalNullable, + bigDecimalRequired, + bigDecimalRequiredNullable, bigDecimalMinimum, bigDecimalMaximum, bigDecimalMinimumAndMaximum); @@ -1249,6 +1331,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("bigDecimalStandard") != null && !jsonObj.get("bigDecimalStandard").isJsonNull()) { + if (!jsonObj.get("bigDecimalStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalStandard"))); + } + } + + if (jsonObj.get("bigDecimalNullable") != null && !jsonObj.get("bigDecimalNullable").isJsonNull()) { + if (!jsonObj.get("bigDecimalNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalNullable"))); + } + } + + if (!jsonObj.get("bigDecimalRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalRequired"))); + } + + if (!jsonObj.get("bigDecimalRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalRequiredNullable"))); + } + if (jsonObj.get("bigDecimalMinimum") != null && !jsonObj.get("bigDecimalMinimum").isJsonNull()) { if (!jsonObj.get("bigDecimalMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java index bf568a8a..fbade165 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java @@ -82,6 +82,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -123,6 +127,10 @@ public record RecordWithAllConstraints( Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, BigDecimal bigDecimalMinimum, BigDecimal bigDecimalMaximum, BigDecimal bigDecimalMinimumAndMaximum) @@ -167,6 +175,10 @@ public record RecordWithAllConstraints( "longMinimum", "longMaximum", "longMinimumAndMaximum", + "bigDecimalStandard", + "bigDecimalNullable", + "bigDecimalRequired", + "bigDecimalRequiredNullable", "bigDecimalMinimum", "bigDecimalMaximum", "bigDecimalMinimumAndMaximum")); @@ -184,7 +196,9 @@ public record RecordWithAllConstraints( "arrayUniqueRequired", "arrayUniqueRequiredNullable", "longRequired", - "longRequiredNullable")); + "longRequiredNullable", + "bigDecimalRequired", + "bigDecimalRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -223,6 +237,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -262,6 +280,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; @@ -644,6 +666,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("bigDecimalStandard") != null && !jsonObj.get("bigDecimalStandard").isJsonNull()) { + if (!jsonObj.get("bigDecimalStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalStandard"))); + } + } + + if (jsonObj.get("bigDecimalNullable") != null && !jsonObj.get("bigDecimalNullable").isJsonNull()) { + if (!jsonObj.get("bigDecimalNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalNullable"))); + } + } + + if (!jsonObj.get("bigDecimalRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalRequired"))); + } + + if (!jsonObj.get("bigDecimalRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalRequiredNullable"))); + } + if (jsonObj.get("bigDecimalMinimum") != null && !jsonObj.get("bigDecimalMinimum").isJsonNull()) { if (!jsonObj.get("bigDecimalMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java index 3d0a2744..462e9309 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java @@ -81,6 +81,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -122,6 +126,10 @@ public record RecordWithAllConstraints( Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, BigDecimal bigDecimalMinimum, BigDecimal bigDecimalMaximum, BigDecimal bigDecimalMinimumAndMaximum) { @@ -165,6 +173,10 @@ public record RecordWithAllConstraints( "longMinimum", "longMaximum", "longMinimumAndMaximum", + "bigDecimalStandard", + "bigDecimalNullable", + "bigDecimalRequired", + "bigDecimalRequiredNullable", "bigDecimalMinimum", "bigDecimalMaximum", "bigDecimalMinimumAndMaximum")); @@ -182,7 +194,9 @@ public record RecordWithAllConstraints( "arrayUniqueRequired", "arrayUniqueRequiredNullable", "longRequired", - "longRequiredNullable")); + "longRequiredNullable", + "bigDecimalRequired", + "bigDecimalRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -221,6 +235,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -260,6 +278,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; @@ -642,6 +664,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("bigDecimalStandard") != null && !jsonObj.get("bigDecimalStandard").isJsonNull()) { + if (!jsonObj.get("bigDecimalStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalStandard"))); + } + } + + if (jsonObj.get("bigDecimalNullable") != null && !jsonObj.get("bigDecimalNullable").isJsonNull()) { + if (!jsonObj.get("bigDecimalNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalNullable"))); + } + } + + if (!jsonObj.get("bigDecimalRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalRequired"))); + } + + if (!jsonObj.get("bigDecimalRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalRequiredNullable"))); + } + if (jsonObj.get("bigDecimalMinimum") != null && !jsonObj.get("bigDecimalMinimum").isJsonNull()) { if (!jsonObj.get("bigDecimalMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java index d50df201..8fb6d8b4 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java @@ -83,6 +83,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -124,6 +128,10 @@ public record RecordWithAllConstraints( @Min(18L) Long longMinimum, @Max(100L) Long longMaximum, @Min(0L) @Max(100L) Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + @NotNull BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, @DecimalMin("0") BigDecimal bigDecimalMinimum, @DecimalMax("100") BigDecimal bigDecimalMaximum, @DecimalMin("0") @DecimalMax("100") BigDecimal bigDecimalMinimumAndMaximum) { @@ -167,6 +175,10 @@ public record RecordWithAllConstraints( "longMinimum", "longMaximum", "longMinimumAndMaximum", + "bigDecimalStandard", + "bigDecimalNullable", + "bigDecimalRequired", + "bigDecimalRequiredNullable", "bigDecimalMinimum", "bigDecimalMaximum", "bigDecimalMinimumAndMaximum")); @@ -184,7 +196,9 @@ public record RecordWithAllConstraints( "arrayUniqueRequired", "arrayUniqueRequiredNullable", "longRequired", - "longRequiredNullable")); + "longRequiredNullable", + "bigDecimalRequired", + "bigDecimalRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -223,6 +237,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -262,6 +280,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; @@ -644,6 +666,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("bigDecimalStandard") != null && !jsonObj.get("bigDecimalStandard").isJsonNull()) { + if (!jsonObj.get("bigDecimalStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalStandard"))); + } + } + + if (jsonObj.get("bigDecimalNullable") != null && !jsonObj.get("bigDecimalNullable").isJsonNull()) { + if (!jsonObj.get("bigDecimalNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalNullable"))); + } + } + + if (!jsonObj.get("bigDecimalRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalRequired"))); + } + + if (!jsonObj.get("bigDecimalRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalRequiredNullable"))); + } + if (jsonObj.get("bigDecimalMinimum") != null && !jsonObj.get("bigDecimalMinimum").isJsonNull()) { if (!jsonObj.get("bigDecimalMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java index 534272fc..5110e584 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -81,6 +81,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -122,6 +126,10 @@ public record RecordWithAllConstraints( Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, BigDecimal bigDecimalMinimum, BigDecimal bigDecimalMaximum, BigDecimal bigDecimalMinimumAndMaximum) { @@ -165,6 +173,10 @@ public record RecordWithAllConstraints( "longMinimum", "longMaximum", "longMinimumAndMaximum", + "bigDecimalStandard", + "bigDecimalNullable", + "bigDecimalRequired", + "bigDecimalRequiredNullable", "bigDecimalMinimum", "bigDecimalMaximum", "bigDecimalMinimumAndMaximum")); @@ -182,7 +194,9 @@ public record RecordWithAllConstraints( "arrayUniqueRequired", "arrayUniqueRequiredNullable", "longRequired", - "longRequiredNullable")); + "longRequiredNullable", + "bigDecimalRequired", + "bigDecimalRequiredNullable")); public RecordWithAllConstraints( final Boolean booleanStandard, @@ -221,6 +235,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -260,6 +278,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; @@ -642,6 +664,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE } } + if (jsonObj.get("bigDecimalStandard") != null && !jsonObj.get("bigDecimalStandard").isJsonNull()) { + if (!jsonObj.get("bigDecimalStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalStandard"))); + } + } + + if (jsonObj.get("bigDecimalNullable") != null && !jsonObj.get("bigDecimalNullable").isJsonNull()) { + if (!jsonObj.get("bigDecimalNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalNullable"))); + } + } + + if (!jsonObj.get("bigDecimalRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalRequired"))); + } + + if (!jsonObj.get("bigDecimalRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `bigDecimalRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("bigDecimalRequiredNullable"))); + } + if (jsonObj.get("bigDecimalMinimum") != null && !jsonObj.get("bigDecimalMinimum").isJsonNull()) { if (!jsonObj.get("bigDecimalMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index 66f185ac..146f6293 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -79,6 +79,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -120,6 +124,10 @@ public record RecordWithAllConstraints( Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, BigDecimal bigDecimalMinimum, BigDecimal bigDecimalMaximum, BigDecimal bigDecimalMinimumAndMaximum) { @@ -162,6 +170,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -201,6 +213,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java index 4f9ae840..4d4f271f 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -79,6 +79,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -123,6 +127,10 @@ public record RecordWithAllConstraints( Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, BigDecimal bigDecimalMinimum, BigDecimal bigDecimalMaximum, BigDecimal bigDecimalMinimumAndMaximum) { @@ -165,6 +173,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -204,6 +216,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index ccc745f7..346112e6 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -79,6 +79,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -120,6 +124,10 @@ public record RecordWithAllConstraints( Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, BigDecimal bigDecimalMinimum, BigDecimal bigDecimalMaximum, BigDecimal bigDecimalMinimumAndMaximum) { @@ -162,6 +170,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -201,6 +213,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java index 5b28ccb2..799e69b2 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -79,6 +79,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -120,6 +124,10 @@ public record RecordWithAllConstraints( Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, BigDecimal bigDecimalMinimum, BigDecimal bigDecimalMaximum, BigDecimal bigDecimalMinimumAndMaximum) { @@ -162,6 +170,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -201,6 +213,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java index af093b18..a1785615 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java @@ -79,6 +79,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -120,6 +124,10 @@ public record RecordWithAllConstraints( Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, BigDecimal bigDecimalMinimum, BigDecimal bigDecimalMaximum, BigDecimal bigDecimalMinimumAndMaximum) { @@ -162,6 +170,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -201,6 +213,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; @@ -245,6 +261,10 @@ public static class Builder { private Long longMinimum; private Long longMaximum; private Long longMinimumAndMaximum; + private BigDecimal bigDecimalStandard; + private BigDecimal bigDecimalNullable; + private BigDecimal bigDecimalRequired; + private BigDecimal bigDecimalRequiredNullable; private BigDecimal bigDecimalMinimum; private BigDecimal bigDecimalMaximum; private BigDecimal bigDecimalMinimumAndMaximum; @@ -717,6 +737,58 @@ public Builder longMinimumAndMaximum(final Long longMinimumAndMaximum) { return this; } + /** + * Sets the value of {@link RecordWithAllConstraints#bigDecimalStandard }. + * + *

NOTE: Pass-by-reference is used! + * + * @param bigDecimalStandard Non-required, non-nullable BigDecimal.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder bigDecimalStandard(final BigDecimal bigDecimalStandard) { + this.bigDecimalStandard = bigDecimalStandard; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#bigDecimalNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param bigDecimalNullable Non-required, nullable BigDecimal.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder bigDecimalNullable(final BigDecimal bigDecimalNullable) { + this.bigDecimalNullable = bigDecimalNullable; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#bigDecimalRequired }. + * + *

NOTE: Pass-by-reference is used! + * + * @param bigDecimalRequired Required, non-nullable BigDecimal.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder bigDecimalRequired(final BigDecimal bigDecimalRequired) { + this.bigDecimalRequired = bigDecimalRequired; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#bigDecimalRequiredNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param bigDecimalRequiredNullable Required, nullable BigDecimal.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder bigDecimalRequiredNullable(final BigDecimal bigDecimalRequiredNullable) { + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; + return this; + } + /** * Sets the value of {@link RecordWithAllConstraints#bigDecimalMinimum }. * @@ -802,6 +874,10 @@ public RecordWithAllConstraints build() { longMinimum, longMaximum, longMinimumAndMaximum, + bigDecimalStandard, + bigDecimalNullable, + bigDecimalRequired, + bigDecimalRequiredNullable, bigDecimalMinimum, bigDecimalMaximum, bigDecimalMinimumAndMaximum); diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java index bb6a694f..86238dbb 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java @@ -80,6 +80,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -121,6 +125,10 @@ public record RecordWithAllConstraints( Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, BigDecimal bigDecimalMinimum, BigDecimal bigDecimalMaximum, BigDecimal bigDecimalMinimumAndMaximum) @@ -164,6 +172,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -203,6 +215,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java index b17adaef..1032dba8 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java @@ -79,6 +79,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -120,6 +124,10 @@ public record RecordWithAllConstraints( Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, BigDecimal bigDecimalMinimum, BigDecimal bigDecimalMaximum, BigDecimal bigDecimalMinimumAndMaximum) { @@ -162,6 +170,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -201,6 +213,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java index d601fbea..2ca29ca0 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java @@ -81,6 +81,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -122,6 +126,10 @@ public record RecordWithAllConstraints( @Min(18L) Long longMinimum, @Max(100L) Long longMaximum, @Min(0L) @Max(100L) Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + @NotNull BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, @DecimalMin("0") BigDecimal bigDecimalMinimum, @DecimalMax("100") BigDecimal bigDecimalMaximum, @DecimalMin("0") @DecimalMax("100") BigDecimal bigDecimalMinimumAndMaximum) { @@ -164,6 +172,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -203,6 +215,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java index 522f8bb7..45eeb7f7 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -79,6 +79,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -120,6 +124,10 @@ public record RecordWithAllConstraints( Long longMinimum, Long longMaximum, Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, BigDecimal bigDecimalMinimum, BigDecimal bigDecimalMaximum, BigDecimal bigDecimalMinimumAndMaximum) { @@ -162,6 +170,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -201,6 +213,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; diff --git a/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java b/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java index 1677e3b1..035afb22 100644 --- a/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java +++ b/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java @@ -169,6 +169,13 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { GeneratedField.of("longMinimum", Long.class).minimum(18).build(), GeneratedField.of("longMaximum", Long.class).maximum(100).build(), GeneratedField.of("longMinimumAndMaximum", Long.class).minimum(0).maximum(100).build(), + GeneratedField.of("bigDecimalStandard", BigDecimal.class).build(), + GeneratedField.of("bigDecimalNullable", BigDecimal.class).isNullable().build(), + GeneratedField.of("bigDecimalRequired", BigDecimal.class).isRequired().build(), + GeneratedField.of("bigDecimalRequiredNullable", BigDecimal.class) + .isRequired() + .isNullable() + .build(), GeneratedField.of("bigDecimalMinimum", BigDecimal.class).decimalMin("0").build(), GeneratedField.of("bigDecimalMaximum", BigDecimal.class).decimalMax("100").build(), GeneratedField.of("bigDecimalMinimumAndMaximum", BigDecimal.class) diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index 016c9d04..c6963a10 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -65,6 +65,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -106,6 +110,10 @@ public record RecordWithAllConstraints( @Min(18L) Long longMinimum, @Max(100L) Long longMaximum, @Min(0L) @Max(100L) Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + @NotNull BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, @DecimalMin("0") BigDecimal bigDecimalMinimum, @DecimalMax("100") BigDecimal bigDecimalMaximum, @DecimalMin("0") @DecimalMax("100") BigDecimal bigDecimalMinimumAndMaximum) { @@ -148,6 +156,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -187,6 +199,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java index c04fe907..e761e687 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -65,6 +65,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -109,6 +113,10 @@ public record RecordWithAllConstraints( @Min(18L) Long longMinimum, @Max(100L) Long longMaximum, @Min(0L) @Max(100L) Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + @NotNull BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, @DecimalMin("0") BigDecimal bigDecimalMinimum, @DecimalMax("100") BigDecimal bigDecimalMaximum, @DecimalMin("0") @DecimalMax("100") BigDecimal bigDecimalMinimumAndMaximum) { @@ -151,6 +159,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -190,6 +202,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index 1c090c84..233d564e 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -65,6 +65,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -106,6 +110,10 @@ public record RecordWithAllConstraints( @Min(18L) Long longMinimum, @Max(100L) Long longMaximum, @Min(0L) @Max(100L) Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + @NotNull BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, @DecimalMin("0") BigDecimal bigDecimalMinimum, @DecimalMax("100") BigDecimal bigDecimalMaximum, @DecimalMin("0") @DecimalMax("100") BigDecimal bigDecimalMinimumAndMaximum) { @@ -148,6 +156,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -187,6 +199,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java index 4a2442f7..ebb69d87 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -65,6 +65,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -106,6 +110,10 @@ public record RecordWithAllConstraints( @Min(18L) Long longMinimum, @Max(100L) Long longMaximum, @Min(0L) @Max(100L) Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + @NotNull BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, @DecimalMin("0") BigDecimal bigDecimalMinimum, @DecimalMax("100") BigDecimal bigDecimalMaximum, @DecimalMin("0") @DecimalMax("100") BigDecimal bigDecimalMinimumAndMaximum) { @@ -148,6 +156,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -187,6 +199,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java index 0b0d3484..cda67672 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java @@ -65,6 +65,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -106,6 +110,10 @@ public record RecordWithAllConstraints( @Min(18L) Long longMinimum, @Max(100L) Long longMaximum, @Min(0L) @Max(100L) Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + @NotNull BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, @DecimalMin("0") BigDecimal bigDecimalMinimum, @DecimalMax("100") BigDecimal bigDecimalMaximum, @DecimalMin("0") @DecimalMax("100") BigDecimal bigDecimalMinimumAndMaximum) { @@ -148,6 +156,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -187,6 +199,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; @@ -231,6 +247,10 @@ public static class Builder { private Long longMinimum; private Long longMaximum; private Long longMinimumAndMaximum; + private BigDecimal bigDecimalStandard; + private BigDecimal bigDecimalNullable; + private BigDecimal bigDecimalRequired; + private BigDecimal bigDecimalRequiredNullable; private BigDecimal bigDecimalMinimum; private BigDecimal bigDecimalMaximum; private BigDecimal bigDecimalMinimumAndMaximum; @@ -703,6 +723,58 @@ public Builder longMinimumAndMaximum(final Long longMinimumAndMaximum) { return this; } + /** + * Sets the value of {@link RecordWithAllConstraints#bigDecimalStandard }. + * + *

NOTE: Pass-by-reference is used! + * + * @param bigDecimalStandard Non-required, non-nullable BigDecimal.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder bigDecimalStandard(final BigDecimal bigDecimalStandard) { + this.bigDecimalStandard = bigDecimalStandard; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#bigDecimalNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param bigDecimalNullable Non-required, nullable BigDecimal.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder bigDecimalNullable(final BigDecimal bigDecimalNullable) { + this.bigDecimalNullable = bigDecimalNullable; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#bigDecimalRequired }. + * + *

NOTE: Pass-by-reference is used! + * + * @param bigDecimalRequired Required, non-nullable BigDecimal.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder bigDecimalRequired(final BigDecimal bigDecimalRequired) { + this.bigDecimalRequired = bigDecimalRequired; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#bigDecimalRequiredNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param bigDecimalRequiredNullable Required, nullable BigDecimal.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder bigDecimalRequiredNullable(final BigDecimal bigDecimalRequiredNullable) { + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; + return this; + } + /** * Sets the value of {@link RecordWithAllConstraints#bigDecimalMinimum }. * @@ -788,6 +860,10 @@ public RecordWithAllConstraints build() { longMinimum, longMaximum, longMinimumAndMaximum, + bigDecimalStandard, + bigDecimalNullable, + bigDecimalRequired, + bigDecimalRequiredNullable, bigDecimalMinimum, bigDecimalMaximum, bigDecimalMinimumAndMaximum); diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java index b3a5d819..71bcec25 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java @@ -66,6 +66,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -107,6 +111,10 @@ public record RecordWithAllConstraints( @Min(18L) Long longMinimum, @Max(100L) Long longMaximum, @Min(0L) @Max(100L) Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + @NotNull BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, @DecimalMin("0") BigDecimal bigDecimalMinimum, @DecimalMax("100") BigDecimal bigDecimalMaximum, @DecimalMin("0") @DecimalMax("100") BigDecimal bigDecimalMinimumAndMaximum) @@ -150,6 +158,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -189,6 +201,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java index c63b3cfe..f6f66145 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java @@ -65,6 +65,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -106,6 +110,10 @@ public record RecordWithAllConstraints( @Min(18L) Long longMinimum, @Max(100L) Long longMaximum, @Min(0L) @Max(100L) Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + @NotNull BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, @DecimalMin("0") BigDecimal bigDecimalMinimum, @DecimalMax("100") BigDecimal bigDecimalMaximum, @DecimalMin("0") @DecimalMax("100") BigDecimal bigDecimalMinimumAndMaximum) { @@ -148,6 +156,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -187,6 +199,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java index 0b170c1b..446e4842 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java @@ -65,6 +65,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -106,6 +110,10 @@ public record RecordWithAllConstraints( @Min(18L) Long longMinimum, @Max(100L) Long longMaximum, @Min(0L) @Max(100L) Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + @NotNull BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, @DecimalMin("0") BigDecimal bigDecimalMinimum, @DecimalMax("100") BigDecimal bigDecimalMaximum, @DecimalMin("0") @DecimalMax("100") BigDecimal bigDecimalMinimumAndMaximum) { @@ -148,6 +156,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -187,6 +199,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java index 95a09f30..53fe1b16 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -65,6 +65,10 @@ * @param longMinimum Non-required, non-nullable Long with minimum: 18. * @param longMaximum Non-required, non-nullable Long with maximum: 100. * @param longMinimumAndMaximum Non-required, non-nullable Long with minimum: 0 and maximum: 100. + * @param bigDecimalStandard Non-required, non-nullable BigDecimal. + * @param bigDecimalNullable Non-required, nullable BigDecimal. + * @param bigDecimalRequired Required, non-nullable BigDecimal. + * @param bigDecimalRequiredNullable Required, nullable BigDecimal. * @param bigDecimalMinimum Non-required, non-nullable BigDecimal with minimum: 0. * @param bigDecimalMaximum Non-required, non-nullable BigDecimal with maximum: 100. * @param bigDecimalMinimumAndMaximum Non-required, non-nullable BigDecimal with minimum: 0 and maximum: 100. @@ -106,6 +110,10 @@ public record RecordWithAllConstraints( @Min(18L) Long longMinimum, @Max(100L) Long longMaximum, @Min(0L) @Max(100L) Long longMinimumAndMaximum, + BigDecimal bigDecimalStandard, + BigDecimal bigDecimalNullable, + @NotNull BigDecimal bigDecimalRequired, + BigDecimal bigDecimalRequiredNullable, @DecimalMin("0") BigDecimal bigDecimalMinimum, @DecimalMax("100") BigDecimal bigDecimalMaximum, @DecimalMin("0") @DecimalMax("100") BigDecimal bigDecimalMinimumAndMaximum) { @@ -148,6 +156,10 @@ public RecordWithAllConstraints( final Long longMinimum, final Long longMaximum, final Long longMinimumAndMaximum, + final BigDecimal bigDecimalStandard, + final BigDecimal bigDecimalNullable, + final BigDecimal bigDecimalRequired, + final BigDecimal bigDecimalRequiredNullable, final BigDecimal bigDecimalMinimum, final BigDecimal bigDecimalMaximum, final BigDecimal bigDecimalMinimumAndMaximum) { @@ -187,6 +199,10 @@ public RecordWithAllConstraints( this.longMinimum = longMinimum; this.longMaximum = longMaximum; this.longMinimumAndMaximum = longMinimumAndMaximum; + this.bigDecimalStandard = bigDecimalStandard; + this.bigDecimalNullable = bigDecimalNullable; + this.bigDecimalRequired = bigDecimalRequired; + this.bigDecimalRequiredNullable = bigDecimalRequiredNullable; this.bigDecimalMinimum = bigDecimalMinimum; this.bigDecimalMaximum = bigDecimalMaximum; this.bigDecimalMinimumAndMaximum = bigDecimalMinimumAndMaximum; diff --git a/test/utils/src/main/java/io/github/chrimle/o2jrm/test/meta/models/GeneratedField.java b/test/utils/src/main/java/io/github/chrimle/o2jrm/test/meta/models/GeneratedField.java index 567895c7..54fe6d47 100644 --- a/test/utils/src/main/java/io/github/chrimle/o2jrm/test/meta/models/GeneratedField.java +++ b/test/utils/src/main/java/io/github/chrimle/o2jrm/test/meta/models/GeneratedField.java @@ -175,6 +175,7 @@ public static Builder of(final String name, final Class type, final T return new Builder<>(name, type, enumValue, null); } + @SuppressWarnings("OptionalUsedAsFieldOrParameterType") public static class Builder { private final String name; private final Class type; From 8d5d2dbaaf7cc63e9a140e7603417f9796a8abb2 Mon Sep 17 00:00:00 2001 From: Chrimle <28791817+Chrimle@users.noreply.github.com> Date: Mon, 27 Jul 2026 20:12:14 +0200 Subject: [PATCH 12/13] Clean Up `RecordWithRequiredFieldsOfEachType` & `RecordWithNullableFieldsOfEachType` --- test/common/src/main/resources/api.yaml | 55 ------- .../o2jrm/models/GeneratedRecordImpl.java | 16 -- .../RecordWithNullableFieldsOfEachType.java | 79 +-------- .../RecordWithRequiredFieldsOfEachType.java | 79 +-------- .../RecordWithNullableFieldsOfEachType.java | 79 +-------- .../RecordWithRequiredFieldsOfEachType.java | 79 +-------- .../RecordWithNullableFieldsOfEachType.java | 79 +-------- .../RecordWithRequiredFieldsOfEachType.java | 79 +-------- .../RecordWithNullableFieldsOfEachType.java | 79 +-------- .../RecordWithRequiredFieldsOfEachType.java | 79 +-------- .../RecordWithNullableFieldsOfEachType.java | 154 +----------------- .../RecordWithRequiredFieldsOfEachType.java | 154 +----------------- .../RecordWithNullableFieldsOfEachType.java | 79 +-------- .../RecordWithRequiredFieldsOfEachType.java | 79 +-------- .../RecordWithNullableFieldsOfEachType.java | 79 +-------- .../RecordWithRequiredFieldsOfEachType.java | 79 +-------- .../RecordWithNullableFieldsOfEachType.java | 79 +-------- .../RecordWithRequiredFieldsOfEachType.java | 79 +-------- .../RecordWithNullableFieldsOfEachType.java | 79 +-------- .../RecordWithRequiredFieldsOfEachType.java | 79 +-------- .../RecordWithNullableFieldsOfEachType.java | 26 --- .../RecordWithRequiredFieldsOfEachType.java | 27 --- .../RecordWithNullableFieldsOfEachType.java | 26 --- .../RecordWithRequiredFieldsOfEachType.java | 27 --- .../RecordWithNullableFieldsOfEachType.java | 26 --- .../RecordWithRequiredFieldsOfEachType.java | 27 --- .../RecordWithNullableFieldsOfEachType.java | 26 --- .../RecordWithRequiredFieldsOfEachType.java | 27 --- .../RecordWithNullableFieldsOfEachType.java | 101 ------------ .../RecordWithRequiredFieldsOfEachType.java | 102 ------------ .../RecordWithNullableFieldsOfEachType.java | 26 --- .../RecordWithRequiredFieldsOfEachType.java | 27 --- .../RecordWithNullableFieldsOfEachType.java | 26 --- .../RecordWithRequiredFieldsOfEachType.java | 27 --- .../RecordWithNullableFieldsOfEachType.java | 26 --- .../RecordWithRequiredFieldsOfEachType.java | 27 --- .../RecordWithNullableFieldsOfEachType.java | 26 --- .../RecordWithRequiredFieldsOfEachType.java | 27 --- .../o2jrm/models/GeneratedRecordImpl.java | 16 -- .../RecordWithNullableFieldsOfEachType.java | 79 +-------- .../RecordWithRequiredFieldsOfEachType.java | 79 +-------- .../RecordWithNullableFieldsOfEachType.java | 79 +-------- .../RecordWithRequiredFieldsOfEachType.java | 79 +-------- .../RecordWithNullableFieldsOfEachType.java | 79 +-------- .../RecordWithRequiredFieldsOfEachType.java | 79 +-------- .../RecordWithNullableFieldsOfEachType.java | 79 +-------- .../RecordWithRequiredFieldsOfEachType.java | 79 +-------- .../RecordWithNullableFieldsOfEachType.java | 154 +----------------- .../RecordWithRequiredFieldsOfEachType.java | 154 +----------------- .../RecordWithNullableFieldsOfEachType.java | 79 +-------- .../RecordWithRequiredFieldsOfEachType.java | 79 +-------- .../RecordWithNullableFieldsOfEachType.java | 79 +-------- .../RecordWithRequiredFieldsOfEachType.java | 79 +-------- .../RecordWithNullableFieldsOfEachType.java | 79 +-------- .../RecordWithRequiredFieldsOfEachType.java | 79 +-------- .../RecordWithNullableFieldsOfEachType.java | 79 +-------- .../RecordWithRequiredFieldsOfEachType.java | 79 +-------- .../RecordWithNullableFieldsOfEachType.java | 26 --- .../RecordWithRequiredFieldsOfEachType.java | 27 --- .../RecordWithNullableFieldsOfEachType.java | 26 --- .../RecordWithRequiredFieldsOfEachType.java | 27 --- .../RecordWithNullableFieldsOfEachType.java | 26 --- .../RecordWithRequiredFieldsOfEachType.java | 27 --- .../RecordWithNullableFieldsOfEachType.java | 26 --- .../RecordWithRequiredFieldsOfEachType.java | 27 --- .../RecordWithNullableFieldsOfEachType.java | 101 ------------ .../RecordWithRequiredFieldsOfEachType.java | 102 ------------ .../RecordWithNullableFieldsOfEachType.java | 26 --- .../RecordWithRequiredFieldsOfEachType.java | 27 --- .../RecordWithNullableFieldsOfEachType.java | 26 --- .../RecordWithRequiredFieldsOfEachType.java | 27 --- .../RecordWithNullableFieldsOfEachType.java | 26 --- .../RecordWithRequiredFieldsOfEachType.java | 27 --- .../RecordWithNullableFieldsOfEachType.java | 26 --- .../RecordWithRequiredFieldsOfEachType.java | 27 --- .../o2jrm/models/GeneratedRecordImpl.java | 16 -- .../RecordWithNullableFieldsOfEachType.java | 25 --- .../RecordWithRequiredFieldsOfEachType.java | 27 --- .../RecordWithNullableFieldsOfEachType.java | 25 --- .../RecordWithRequiredFieldsOfEachType.java | 27 --- .../RecordWithNullableFieldsOfEachType.java | 25 --- .../RecordWithRequiredFieldsOfEachType.java | 27 --- .../RecordWithNullableFieldsOfEachType.java | 25 --- .../RecordWithRequiredFieldsOfEachType.java | 27 --- .../RecordWithNullableFieldsOfEachType.java | 100 ------------ .../RecordWithRequiredFieldsOfEachType.java | 102 ------------ .../RecordWithNullableFieldsOfEachType.java | 25 --- .../RecordWithRequiredFieldsOfEachType.java | 27 --- .../RecordWithNullableFieldsOfEachType.java | 25 --- .../RecordWithRequiredFieldsOfEachType.java | 27 --- .../RecordWithNullableFieldsOfEachType.java | 25 --- .../RecordWithRequiredFieldsOfEachType.java | 27 --- .../RecordWithNullableFieldsOfEachType.java | 25 --- .../RecordWithRequiredFieldsOfEachType.java | 27 --- 94 files changed, 72 insertions(+), 5047 deletions(-) diff --git a/test/common/src/main/resources/api.yaml b/test/common/src/main/resources/api.yaml index a25ebbf8..a95bfaba 100644 --- a/test/common/src/main/resources/api.yaml +++ b/test/common/src/main/resources/api.yaml @@ -23,38 +23,13 @@ components: type: object description: Example of a Record with fields of each type required: - - field1 - - field2 - field3 - - field4 - - field5 - - field6 - field7 - field8 properties: - field1: - type: boolean - description: a Boolean field - field2: - type: string - description: a String field field3: type: integer description: an Integer field - field4: - type: number - description: a Number field - field5: - type: array - description: an Array of Boolean field - items: - type: boolean - field6: - type: array - description: a Set field - uniqueItems: true - items: - type: boolean field7: description: an ExampleRecord field $ref: '#/components/schemas/ExampleRecord' @@ -65,42 +40,12 @@ components: type: object description: Example of a Record with fields of each type required: - - field1 - - field2 - field3 - - field4 - - field5 - - field6 properties: - field1: - type: boolean - description: a Boolean field - nullable: true - field2: - type: string - description: a String field - nullable: true field3: type: integer description: an Integer field nullable: true - field4: - type: number - description: a Number field - nullable: true - field5: - type: array - description: an Array of Boolean field - nullable: true - items: - type: boolean - field6: - type: array - description: a Set field - uniqueItems: true - nullable: true - items: - type: boolean field7: description: an ExampleNullableRecord field $ref: '#/components/schemas/ExampleNullableRecord' diff --git a/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java b/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java index 63dc6c09..f71b1c62 100644 --- a/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java +++ b/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java @@ -311,12 +311,7 @@ public static GeneratedField[] getGeneratedFields( .toArray(new GeneratedField[] {}); case RECORD_WITH_REQUIRED_FIELDS_OF_EACH_TYPE -> List.of( - GeneratedField.of("field1", Boolean.class).isRequired().build(), - GeneratedField.of("field2", String.class).isRequired().build(), GeneratedField.of("field3", Integer.class).isRequired().build(), - GeneratedField.of("field4", BigDecimal.class).isRequired().build(), - GeneratedField.of("field5", List.class, Boolean.class).isRequired().build(), - GeneratedField.of("field6", Set.class, Boolean.class).isRequired().build(), GeneratedField.of( "field7", GeneratedRecordImpl.EXAMPLE_RECORD.getClass(pluginExecution)) .isRequired() @@ -329,18 +324,7 @@ public static GeneratedField[] getGeneratedFields( .toArray(new GeneratedField[] {}); case RECORD_WITH_NULLABLE_FIELDS_OF_EACH_TYPE -> List.of( - GeneratedField.of("field1", Boolean.class).isNullable().isRequired().build(), - GeneratedField.of("field2", String.class).isNullable().isRequired().build(), GeneratedField.of("field3", Integer.class).isNullable().isRequired().build(), - GeneratedField.of("field4", BigDecimal.class).isNullable().isRequired().build(), - GeneratedField.of("field5", List.class, Boolean.class) - .isNullable() - .isRequired() - .build(), - GeneratedField.of("field6", Set.class, Boolean.class) - .isNullable() - .isRequired() - .build(), GeneratedField.of( "field7", GeneratedRecordImpl.EXAMPLE_NULLABLE_RECORD.getClass(pluginExecution)) diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithNullableFieldsOfEachType.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithNullableFieldsOfEachType.java index ff393512..e12541a5 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithNullableFieldsOfEachType.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithNullableFieldsOfEachType.java @@ -27,12 +27,7 @@ import io.github.chrimle.o2jrm.additionalEnumTypeAnnotations.ExampleNullableEnum; import io.github.chrimle.o2jrm.additionalEnumTypeAnnotations.ExampleNullableRecord; import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import com.google.gson.Gson; @@ -46,62 +41,32 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleNullableRecord field7, ExampleNullableEnum field8) { /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6")); + Set.of("field3")); public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } @@ -145,22 +110,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - - if (!jsonObj.get("field2").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field2` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field2"))); - } - if (!jsonObj.get("field3").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( @@ -169,30 +118,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("field3"))); } - if (!jsonObj.get("field4").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field4` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field4"))); - } - - if (!jsonObj.get("field5").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field5` to be an array in the JSON string but got `%s`", - jsonObj.get("field5"))); - } - - if (!jsonObj.get("field6").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field6` to be an array in the JSON string but got `%s`", - jsonObj.get("field6"))); - } - if (jsonObj.get("field7") != null && !jsonObj.get("field7").isJsonNull()) { ExampleNullableRecord.validateJsonElement(jsonObj.get("field7")); } diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithRequiredFieldsOfEachType.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithRequiredFieldsOfEachType.java index c11f457f..d1f8311b 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithRequiredFieldsOfEachType.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithRequiredFieldsOfEachType.java @@ -27,12 +27,7 @@ import io.github.chrimle.o2jrm.additionalEnumTypeAnnotations.ExampleEnum; import io.github.chrimle.o2jrm.additionalEnumTypeAnnotations.ExampleRecord; import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import com.google.gson.Gson; import com.google.gson.JsonElement; @@ -45,64 +40,34 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleRecord field7, ExampleEnum field8) { /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } @@ -146,22 +111,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - - if (!jsonObj.get("field2").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field2` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field2"))); - } - if (!jsonObj.get("field3").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( @@ -170,30 +119,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("field3"))); } - if (!jsonObj.get("field4").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field4` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field4"))); - } - - if (!jsonObj.get("field5").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field5` to be an array in the JSON string but got `%s`", - jsonObj.get("field5"))); - } - - if (!jsonObj.get("field6").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field6` to be an array in the JSON string but got `%s`", - jsonObj.get("field6"))); - } - ExampleRecord.validateJsonElement(jsonObj.get("field7")); ExampleEnum.validateJsonElement(jsonObj.get("field8")); diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithNullableFieldsOfEachType.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithNullableFieldsOfEachType.java index 32fb1a0f..0cc44e1b 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithNullableFieldsOfEachType.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithNullableFieldsOfEachType.java @@ -27,12 +27,7 @@ import io.github.chrimle.o2jrm.additionalModelTypeAnnotations.ExampleNullableEnum; import io.github.chrimle.o2jrm.additionalModelTypeAnnotations.ExampleNullableRecord; import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import com.google.gson.Gson; @@ -46,12 +41,7 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ @@ -59,52 +49,27 @@ @io.github.chrimle.o2jrm.test.annotations.TestAnnotationTwo @io.github.chrimle.o2jrm.test.annotations.TestAnnotationThree public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleNullableRecord field7, ExampleNullableEnum field8) { /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6")); + Set.of("field3")); public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } @@ -148,22 +113,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - - if (!jsonObj.get("field2").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field2` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field2"))); - } - if (!jsonObj.get("field3").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( @@ -172,30 +121,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("field3"))); } - if (!jsonObj.get("field4").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field4` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field4"))); - } - - if (!jsonObj.get("field5").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field5` to be an array in the JSON string but got `%s`", - jsonObj.get("field5"))); - } - - if (!jsonObj.get("field6").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field6` to be an array in the JSON string but got `%s`", - jsonObj.get("field6"))); - } - if (jsonObj.get("field7") != null && !jsonObj.get("field7").isJsonNull()) { ExampleNullableRecord.validateJsonElement(jsonObj.get("field7")); } diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithRequiredFieldsOfEachType.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithRequiredFieldsOfEachType.java index b6fb7587..1f5a48cd 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithRequiredFieldsOfEachType.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithRequiredFieldsOfEachType.java @@ -27,12 +27,7 @@ import io.github.chrimle.o2jrm.additionalModelTypeAnnotations.ExampleEnum; import io.github.chrimle.o2jrm.additionalModelTypeAnnotations.ExampleRecord; import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import com.google.gson.Gson; import com.google.gson.JsonElement; @@ -45,12 +40,7 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ @@ -58,54 +48,29 @@ @io.github.chrimle.o2jrm.test.annotations.TestAnnotationTwo @io.github.chrimle.o2jrm.test.annotations.TestAnnotationThree public record RecordWithRequiredFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleRecord field7, ExampleEnum field8) { /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } @@ -149,22 +114,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - - if (!jsonObj.get("field2").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field2` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field2"))); - } - if (!jsonObj.get("field3").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( @@ -173,30 +122,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("field3"))); } - if (!jsonObj.get("field4").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field4` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field4"))); - } - - if (!jsonObj.get("field5").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field5` to be an array in the JSON string but got `%s`", - jsonObj.get("field5"))); - } - - if (!jsonObj.get("field6").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field6` to be an array in the JSON string but got `%s`", - jsonObj.get("field6"))); - } - ExampleRecord.validateJsonElement(jsonObj.get("field7")); ExampleEnum.validateJsonElement(jsonObj.get("field8")); diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithNullableFieldsOfEachType.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithNullableFieldsOfEachType.java index 88ec78bb..198f28db 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithNullableFieldsOfEachType.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithNullableFieldsOfEachType.java @@ -27,12 +27,7 @@ import io.github.chrimle.o2jrm.enumDefaultCaseAndCaseInsensitive.ExampleNullableEnum; import io.github.chrimle.o2jrm.enumDefaultCaseAndCaseInsensitive.ExampleNullableRecord; import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import com.google.gson.Gson; @@ -46,62 +41,32 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleNullableRecord field7, ExampleNullableEnum field8) { /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6")); + Set.of("field3")); public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } @@ -145,22 +110,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - - if (!jsonObj.get("field2").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field2` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field2"))); - } - if (!jsonObj.get("field3").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( @@ -169,30 +118,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("field3"))); } - if (!jsonObj.get("field4").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field4` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field4"))); - } - - if (!jsonObj.get("field5").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field5` to be an array in the JSON string but got `%s`", - jsonObj.get("field5"))); - } - - if (!jsonObj.get("field6").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field6` to be an array in the JSON string but got `%s`", - jsonObj.get("field6"))); - } - if (jsonObj.get("field7") != null && !jsonObj.get("field7").isJsonNull()) { ExampleNullableRecord.validateJsonElement(jsonObj.get("field7")); } diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithRequiredFieldsOfEachType.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithRequiredFieldsOfEachType.java index 595b126c..03c178aa 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithRequiredFieldsOfEachType.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithRequiredFieldsOfEachType.java @@ -27,12 +27,7 @@ import io.github.chrimle.o2jrm.enumDefaultCaseAndCaseInsensitive.ExampleEnum; import io.github.chrimle.o2jrm.enumDefaultCaseAndCaseInsensitive.ExampleRecord; import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import com.google.gson.Gson; import com.google.gson.JsonElement; @@ -45,64 +40,34 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleRecord field7, ExampleEnum field8) { /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } @@ -146,22 +111,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - - if (!jsonObj.get("field2").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field2` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field2"))); - } - if (!jsonObj.get("field3").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( @@ -170,30 +119,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("field3"))); } - if (!jsonObj.get("field4").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field4` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field4"))); - } - - if (!jsonObj.get("field5").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field5` to be an array in the JSON string but got `%s`", - jsonObj.get("field5"))); - } - - if (!jsonObj.get("field6").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field6` to be an array in the JSON string but got `%s`", - jsonObj.get("field6"))); - } - ExampleRecord.validateJsonElement(jsonObj.get("field7")); ExampleEnum.validateJsonElement(jsonObj.get("field8")); diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithNullableFieldsOfEachType.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithNullableFieldsOfEachType.java index 885914c3..0a3cc91e 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithNullableFieldsOfEachType.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithNullableFieldsOfEachType.java @@ -27,12 +27,7 @@ import io.github.chrimle.o2jrm.enumUnknownDefaultCase.ExampleNullableEnum; import io.github.chrimle.o2jrm.enumUnknownDefaultCase.ExampleNullableRecord; import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import com.google.gson.Gson; @@ -46,62 +41,32 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleNullableRecord field7, ExampleNullableEnum field8) { /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6")); + Set.of("field3")); public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } @@ -145,22 +110,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - - if (!jsonObj.get("field2").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field2` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field2"))); - } - if (!jsonObj.get("field3").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( @@ -169,30 +118,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("field3"))); } - if (!jsonObj.get("field4").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field4` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field4"))); - } - - if (!jsonObj.get("field5").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field5` to be an array in the JSON string but got `%s`", - jsonObj.get("field5"))); - } - - if (!jsonObj.get("field6").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field6` to be an array in the JSON string but got `%s`", - jsonObj.get("field6"))); - } - if (jsonObj.get("field7") != null && !jsonObj.get("field7").isJsonNull()) { ExampleNullableRecord.validateJsonElement(jsonObj.get("field7")); } diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithRequiredFieldsOfEachType.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithRequiredFieldsOfEachType.java index 95f81cd4..43e1b121 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithRequiredFieldsOfEachType.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithRequiredFieldsOfEachType.java @@ -27,12 +27,7 @@ import io.github.chrimle.o2jrm.enumUnknownDefaultCase.ExampleEnum; import io.github.chrimle.o2jrm.enumUnknownDefaultCase.ExampleRecord; import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import com.google.gson.Gson; import com.google.gson.JsonElement; @@ -45,64 +40,34 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleRecord field7, ExampleEnum field8) { /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } @@ -146,22 +111,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - - if (!jsonObj.get("field2").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field2` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field2"))); - } - if (!jsonObj.get("field3").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( @@ -170,30 +119,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("field3"))); } - if (!jsonObj.get("field4").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field4` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field4"))); - } - - if (!jsonObj.get("field5").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field5` to be an array in the JSON string but got `%s`", - jsonObj.get("field5"))); - } - - if (!jsonObj.get("field6").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field6` to be an array in the JSON string but got `%s`", - jsonObj.get("field6"))); - } - ExampleRecord.validateJsonElement(jsonObj.get("field7")); ExampleEnum.validateJsonElement(jsonObj.get("field8")); diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithNullableFieldsOfEachType.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithNullableFieldsOfEachType.java index 4284726b..0c1f0ed4 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithNullableFieldsOfEachType.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithNullableFieldsOfEachType.java @@ -27,12 +27,7 @@ import io.github.chrimle.o2jrm.generateBuilders.ExampleNullableEnum; import io.github.chrimle.o2jrm.generateBuilders.ExampleNullableRecord; import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import com.google.gson.Gson; @@ -46,62 +41,32 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleNullableRecord field7, ExampleNullableEnum field8) { /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6")); + Set.of("field3")); public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } @@ -109,41 +74,10 @@ public RecordWithNullableFieldsOfEachType( /** Builder class for {@link RecordWithNullableFieldsOfEachType }. */ public static class Builder { - private Boolean field1; - private String field2; private Integer field3; - private BigDecimal field4; - private List field5; - private Set field6; private ExampleNullableRecord field7; private ExampleNullableEnum field8; - /** - * Sets the value of {@link RecordWithNullableFieldsOfEachType#field1 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field1 a Boolean field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field1(final Boolean field1) { - this.field1 = field1; - return this; - } - - /** - * Sets the value of {@link RecordWithNullableFieldsOfEachType#field2 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field2 a String field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field2(final String field2) { - this.field2 = field2; - return this; - } - /** * Sets the value of {@link RecordWithNullableFieldsOfEachType#field3 }. * @@ -157,45 +91,6 @@ public Builder field3(final Integer field3) { return this; } - /** - * Sets the value of {@link RecordWithNullableFieldsOfEachType#field4 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field4 a Number field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field4(final BigDecimal field4) { - this.field4 = field4; - return this; - } - - /** - * Sets the value of {@link RecordWithNullableFieldsOfEachType#field5 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field5 an Array of Boolean field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field5(final List field5) { - this.field5 = field5; - return this; - } - - /** - * Sets the value of {@link RecordWithNullableFieldsOfEachType#field6 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field6 a Set field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field6(final Set field6) { - this.field6 = field6; - return this; - } - /** * Sets the value of {@link RecordWithNullableFieldsOfEachType#field7 }. * @@ -232,12 +127,7 @@ public Builder field8(final ExampleNullableEnum field8) { */ public RecordWithNullableFieldsOfEachType build() { return new RecordWithNullableFieldsOfEachType( - field1, - field2, field3, - field4, - field5, - field6, field7, field8); } @@ -287,22 +177,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - - if (!jsonObj.get("field2").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field2` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field2"))); - } - if (!jsonObj.get("field3").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( @@ -311,30 +185,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("field3"))); } - if (!jsonObj.get("field4").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field4` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field4"))); - } - - if (!jsonObj.get("field5").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field5` to be an array in the JSON string but got `%s`", - jsonObj.get("field5"))); - } - - if (!jsonObj.get("field6").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field6` to be an array in the JSON string but got `%s`", - jsonObj.get("field6"))); - } - if (jsonObj.get("field7") != null && !jsonObj.get("field7").isJsonNull()) { ExampleNullableRecord.validateJsonElement(jsonObj.get("field7")); } diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithRequiredFieldsOfEachType.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithRequiredFieldsOfEachType.java index a598faa3..536d90e5 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithRequiredFieldsOfEachType.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithRequiredFieldsOfEachType.java @@ -27,12 +27,7 @@ import io.github.chrimle.o2jrm.generateBuilders.ExampleEnum; import io.github.chrimle.o2jrm.generateBuilders.ExampleRecord; import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import com.google.gson.Gson; import com.google.gson.JsonElement; @@ -45,64 +40,34 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleRecord field7, ExampleEnum field8) { /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } @@ -110,41 +75,10 @@ public RecordWithRequiredFieldsOfEachType( /** Builder class for {@link RecordWithRequiredFieldsOfEachType }. */ public static class Builder { - private Boolean field1; - private String field2; private Integer field3; - private BigDecimal field4; - private List field5; - private Set field6; private ExampleRecord field7; private ExampleEnum field8; - /** - * Sets the value of {@link RecordWithRequiredFieldsOfEachType#field1 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field1 a Boolean field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field1(final Boolean field1) { - this.field1 = field1; - return this; - } - - /** - * Sets the value of {@link RecordWithRequiredFieldsOfEachType#field2 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field2 a String field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field2(final String field2) { - this.field2 = field2; - return this; - } - /** * Sets the value of {@link RecordWithRequiredFieldsOfEachType#field3 }. * @@ -158,45 +92,6 @@ public Builder field3(final Integer field3) { return this; } - /** - * Sets the value of {@link RecordWithRequiredFieldsOfEachType#field4 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field4 a Number field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field4(final BigDecimal field4) { - this.field4 = field4; - return this; - } - - /** - * Sets the value of {@link RecordWithRequiredFieldsOfEachType#field5 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field5 an Array of Boolean field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field5(final List field5) { - this.field5 = field5; - return this; - } - - /** - * Sets the value of {@link RecordWithRequiredFieldsOfEachType#field6 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field6 a Set field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field6(final Set field6) { - this.field6 = field6; - return this; - } - /** * Sets the value of {@link RecordWithRequiredFieldsOfEachType#field7 }. * @@ -233,12 +128,7 @@ public Builder field8(final ExampleEnum field8) { */ public RecordWithRequiredFieldsOfEachType build() { return new RecordWithRequiredFieldsOfEachType( - field1, - field2, field3, - field4, - field5, - field6, field7, field8); } @@ -288,22 +178,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - - if (!jsonObj.get("field2").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field2` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field2"))); - } - if (!jsonObj.get("field3").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( @@ -312,30 +186,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("field3"))); } - if (!jsonObj.get("field4").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field4` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field4"))); - } - - if (!jsonObj.get("field5").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field5` to be an array in the JSON string but got `%s`", - jsonObj.get("field5"))); - } - - if (!jsonObj.get("field6").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field6` to be an array in the JSON string but got `%s`", - jsonObj.get("field6"))); - } - ExampleRecord.validateJsonElement(jsonObj.get("field7")); ExampleEnum.validateJsonElement(jsonObj.get("field8")); diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithNullableFieldsOfEachType.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithNullableFieldsOfEachType.java index 50fc1df2..c17812e1 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithNullableFieldsOfEachType.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithNullableFieldsOfEachType.java @@ -27,12 +27,7 @@ import io.github.chrimle.o2jrm.serializableModel.ExampleNullableEnum; import io.github.chrimle.o2jrm.serializableModel.ExampleNullableRecord; import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import java.io.Serializable; @@ -47,22 +42,12 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleNullableRecord field7, ExampleNullableEnum field8) implements Serializable { @@ -70,40 +55,20 @@ public record RecordWithNullableFieldsOfEachType( /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6")); + Set.of("field3")); public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } @@ -147,22 +112,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - - if (!jsonObj.get("field2").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field2` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field2"))); - } - if (!jsonObj.get("field3").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( @@ -171,30 +120,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("field3"))); } - if (!jsonObj.get("field4").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field4` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field4"))); - } - - if (!jsonObj.get("field5").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field5` to be an array in the JSON string but got `%s`", - jsonObj.get("field5"))); - } - - if (!jsonObj.get("field6").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field6` to be an array in the JSON string but got `%s`", - jsonObj.get("field6"))); - } - if (jsonObj.get("field7") != null && !jsonObj.get("field7").isJsonNull()) { ExampleNullableRecord.validateJsonElement(jsonObj.get("field7")); } diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithRequiredFieldsOfEachType.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithRequiredFieldsOfEachType.java index c408801e..e8aec62e 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithRequiredFieldsOfEachType.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithRequiredFieldsOfEachType.java @@ -27,12 +27,7 @@ import io.github.chrimle.o2jrm.serializableModel.ExampleEnum; import io.github.chrimle.o2jrm.serializableModel.ExampleRecord; import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import java.io.Serializable; import com.google.gson.Gson; @@ -46,22 +41,12 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleRecord field7, ExampleEnum field8) implements Serializable { @@ -69,42 +54,22 @@ public record RecordWithRequiredFieldsOfEachType( /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } @@ -148,22 +113,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - - if (!jsonObj.get("field2").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field2` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field2"))); - } - if (!jsonObj.get("field3").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( @@ -172,30 +121,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("field3"))); } - if (!jsonObj.get("field4").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field4` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field4"))); - } - - if (!jsonObj.get("field5").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field5` to be an array in the JSON string but got `%s`", - jsonObj.get("field5"))); - } - - if (!jsonObj.get("field6").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field6` to be an array in the JSON string but got `%s`", - jsonObj.get("field6"))); - } - ExampleRecord.validateJsonElement(jsonObj.get("field7")); ExampleEnum.validateJsonElement(jsonObj.get("field8")); diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithNullableFieldsOfEachType.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithNullableFieldsOfEachType.java index ac26e6fb..bb46785a 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithNullableFieldsOfEachType.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithNullableFieldsOfEachType.java @@ -27,12 +27,7 @@ import io.github.chrimle.o2jrm.standard.ExampleNullableEnum; import io.github.chrimle.o2jrm.standard.ExampleNullableRecord; import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import com.google.gson.Gson; @@ -46,62 +41,32 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleNullableRecord field7, ExampleNullableEnum field8) { /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6")); + Set.of("field3")); public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } @@ -145,22 +110,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - - if (!jsonObj.get("field2").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field2` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field2"))); - } - if (!jsonObj.get("field3").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( @@ -169,30 +118,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("field3"))); } - if (!jsonObj.get("field4").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field4` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field4"))); - } - - if (!jsonObj.get("field5").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field5` to be an array in the JSON string but got `%s`", - jsonObj.get("field5"))); - } - - if (!jsonObj.get("field6").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field6` to be an array in the JSON string but got `%s`", - jsonObj.get("field6"))); - } - if (jsonObj.get("field7") != null && !jsonObj.get("field7").isJsonNull()) { ExampleNullableRecord.validateJsonElement(jsonObj.get("field7")); } diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithRequiredFieldsOfEachType.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithRequiredFieldsOfEachType.java index 863bda51..ea1d96bd 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithRequiredFieldsOfEachType.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithRequiredFieldsOfEachType.java @@ -27,12 +27,7 @@ import io.github.chrimle.o2jrm.standard.ExampleEnum; import io.github.chrimle.o2jrm.standard.ExampleRecord; import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import com.google.gson.Gson; import com.google.gson.JsonElement; @@ -45,64 +40,34 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleRecord field7, ExampleEnum field8) { /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } @@ -146,22 +111,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - - if (!jsonObj.get("field2").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field2` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field2"))); - } - if (!jsonObj.get("field3").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( @@ -170,30 +119,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("field3"))); } - if (!jsonObj.get("field4").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field4` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field4"))); - } - - if (!jsonObj.get("field5").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field5` to be an array in the JSON string but got `%s`", - jsonObj.get("field5"))); - } - - if (!jsonObj.get("field6").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field6` to be an array in the JSON string but got `%s`", - jsonObj.get("field6"))); - } - ExampleRecord.validateJsonElement(jsonObj.get("field7")); ExampleEnum.validateJsonElement(jsonObj.get("field8")); diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithNullableFieldsOfEachType.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithNullableFieldsOfEachType.java index c6ce6a9a..d2119b3c 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithNullableFieldsOfEachType.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithNullableFieldsOfEachType.java @@ -27,12 +27,7 @@ import io.github.chrimle.o2jrm.useBeanValidation.ExampleNullableEnum; import io.github.chrimle.o2jrm.useBeanValidation.ExampleNullableRecord; import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; @@ -48,62 +43,32 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, @Valid ExampleNullableRecord field7, ExampleNullableEnum field8) { /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6")); + Set.of("field3")); public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } @@ -147,22 +112,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - - if (!jsonObj.get("field2").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field2` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field2"))); - } - if (!jsonObj.get("field3").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( @@ -171,30 +120,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("field3"))); } - if (!jsonObj.get("field4").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field4` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field4"))); - } - - if (!jsonObj.get("field5").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field5` to be an array in the JSON string but got `%s`", - jsonObj.get("field5"))); - } - - if (!jsonObj.get("field6").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field6` to be an array in the JSON string but got `%s`", - jsonObj.get("field6"))); - } - if (jsonObj.get("field7") != null && !jsonObj.get("field7").isJsonNull()) { ExampleNullableRecord.validateJsonElement(jsonObj.get("field7")); } diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithRequiredFieldsOfEachType.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithRequiredFieldsOfEachType.java index 0b28198f..bee71f6c 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithRequiredFieldsOfEachType.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithRequiredFieldsOfEachType.java @@ -27,12 +27,7 @@ import io.github.chrimle.o2jrm.useBeanValidation.ExampleEnum; import io.github.chrimle.o2jrm.useBeanValidation.ExampleRecord; import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import jakarta.validation.constraints.*; import jakarta.validation.Valid; @@ -47,64 +42,34 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - @NotNull Boolean field1, - @NotNull String field2, @NotNull Integer field3, - @NotNull BigDecimal field4, - @NotNull List field5, - @NotNull Set field6, @Valid @NotNull ExampleRecord field7, @NotNull ExampleEnum field8) { /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } @@ -148,22 +113,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - - if (!jsonObj.get("field2").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field2` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field2"))); - } - if (!jsonObj.get("field3").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( @@ -172,30 +121,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("field3"))); } - if (!jsonObj.get("field4").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field4` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field4"))); - } - - if (!jsonObj.get("field5").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field5` to be an array in the JSON string but got `%s`", - jsonObj.get("field5"))); - } - - if (!jsonObj.get("field6").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field6` to be an array in the JSON string but got `%s`", - jsonObj.get("field6"))); - } - ExampleRecord.validateJsonElement(jsonObj.get("field7")); ExampleEnum.validateJsonElement(jsonObj.get("field8")); diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithNullableFieldsOfEachType.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithNullableFieldsOfEachType.java index 810bca0f..237ea0b1 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithNullableFieldsOfEachType.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithNullableFieldsOfEachType.java @@ -27,12 +27,7 @@ import io.github.chrimle.o2jrm.useEnumCaseInsensitive.ExampleNullableEnum; import io.github.chrimle.o2jrm.useEnumCaseInsensitive.ExampleNullableRecord; import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import com.google.gson.Gson; @@ -46,62 +41,32 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleNullableRecord field7, ExampleNullableEnum field8) { /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6")); + Set.of("field3")); public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } @@ -145,22 +110,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - - if (!jsonObj.get("field2").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field2` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field2"))); - } - if (!jsonObj.get("field3").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( @@ -169,30 +118,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("field3"))); } - if (!jsonObj.get("field4").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field4` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field4"))); - } - - if (!jsonObj.get("field5").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field5` to be an array in the JSON string but got `%s`", - jsonObj.get("field5"))); - } - - if (!jsonObj.get("field6").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field6` to be an array in the JSON string but got `%s`", - jsonObj.get("field6"))); - } - if (jsonObj.get("field7") != null && !jsonObj.get("field7").isJsonNull()) { ExampleNullableRecord.validateJsonElement(jsonObj.get("field7")); } diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithRequiredFieldsOfEachType.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithRequiredFieldsOfEachType.java index 53625a2c..9a29114f 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithRequiredFieldsOfEachType.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithRequiredFieldsOfEachType.java @@ -27,12 +27,7 @@ import io.github.chrimle.o2jrm.useEnumCaseInsensitive.ExampleEnum; import io.github.chrimle.o2jrm.useEnumCaseInsensitive.ExampleRecord; import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import com.google.gson.Gson; import com.google.gson.JsonElement; @@ -45,64 +40,34 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleRecord field7, ExampleEnum field8) { /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } @@ -146,22 +111,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - - if (!jsonObj.get("field2").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field2` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field2"))); - } - if (!jsonObj.get("field3").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( @@ -170,30 +119,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("field3"))); } - if (!jsonObj.get("field4").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field4` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field4"))); - } - - if (!jsonObj.get("field5").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field5` to be an array in the JSON string but got `%s`", - jsonObj.get("field5"))); - } - - if (!jsonObj.get("field6").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field6` to be an array in the JSON string but got `%s`", - jsonObj.get("field6"))); - } - ExampleRecord.validateJsonElement(jsonObj.get("field7")); ExampleEnum.validateJsonElement(jsonObj.get("field8")); diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithNullableFieldsOfEachType.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithNullableFieldsOfEachType.java index 3572d311..4a56374c 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithNullableFieldsOfEachType.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithNullableFieldsOfEachType.java @@ -27,12 +27,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.github.chrimle.o2jrm.webclient.additionalEnumTypeAnnotations.ExampleNullableEnum; import io.github.chrimle.o2jrm.webclient.additionalEnumTypeAnnotations.ExampleNullableRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; @@ -43,41 +37,21 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleNullableRecord field7, ExampleNullableEnum field8) { @JsonCreator public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithRequiredFieldsOfEachType.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithRequiredFieldsOfEachType.java index e849a3b6..84d806bf 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithRequiredFieldsOfEachType.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithRequiredFieldsOfEachType.java @@ -25,56 +25,29 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.github.chrimle.o2jrm.webclient.additionalEnumTypeAnnotations.ExampleEnum; import io.github.chrimle.o2jrm.webclient.additionalEnumTypeAnnotations.ExampleRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleRecord field7, ExampleEnum field8) { @JsonCreator public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithNullableFieldsOfEachType.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithNullableFieldsOfEachType.java index dc69983b..58ab4c81 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithNullableFieldsOfEachType.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithNullableFieldsOfEachType.java @@ -27,12 +27,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.github.chrimle.o2jrm.webclient.additionalModelTypeAnnotations.ExampleNullableEnum; import io.github.chrimle.o2jrm.webclient.additionalModelTypeAnnotations.ExampleNullableRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; @@ -43,12 +37,7 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ @@ -56,31 +45,16 @@ @io.github.chrimle.o2jrm.test.annotations.TestAnnotationTwo @io.github.chrimle.o2jrm.test.annotations.TestAnnotationThree public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleNullableRecord field7, ExampleNullableEnum field8) { @JsonCreator public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithRequiredFieldsOfEachType.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithRequiredFieldsOfEachType.java index 7ba77cae..60a765db 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithRequiredFieldsOfEachType.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithRequiredFieldsOfEachType.java @@ -25,27 +25,15 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.github.chrimle.o2jrm.webclient.additionalModelTypeAnnotations.ExampleEnum; import io.github.chrimle.o2jrm.webclient.additionalModelTypeAnnotations.ExampleRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ @@ -53,31 +41,16 @@ @io.github.chrimle.o2jrm.test.annotations.TestAnnotationTwo @io.github.chrimle.o2jrm.test.annotations.TestAnnotationThree public record RecordWithRequiredFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleRecord field7, ExampleEnum field8) { @JsonCreator public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithNullableFieldsOfEachType.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithNullableFieldsOfEachType.java index b126f4df..e3ed53bb 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithNullableFieldsOfEachType.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithNullableFieldsOfEachType.java @@ -27,12 +27,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.github.chrimle.o2jrm.webclient.enumDefaultCaseAndCaseInsensitive.ExampleNullableEnum; import io.github.chrimle.o2jrm.webclient.enumDefaultCaseAndCaseInsensitive.ExampleNullableRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; @@ -43,41 +37,21 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleNullableRecord field7, ExampleNullableEnum field8) { @JsonCreator public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithRequiredFieldsOfEachType.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithRequiredFieldsOfEachType.java index 737dc2ef..1d0b3b80 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithRequiredFieldsOfEachType.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithRequiredFieldsOfEachType.java @@ -25,56 +25,29 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.github.chrimle.o2jrm.webclient.enumDefaultCaseAndCaseInsensitive.ExampleEnum; import io.github.chrimle.o2jrm.webclient.enumDefaultCaseAndCaseInsensitive.ExampleRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleRecord field7, ExampleEnum field8) { @JsonCreator public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithNullableFieldsOfEachType.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithNullableFieldsOfEachType.java index 07241c12..1f824ca1 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithNullableFieldsOfEachType.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithNullableFieldsOfEachType.java @@ -27,12 +27,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.github.chrimle.o2jrm.webclient.enumUnknownDefaultCase.ExampleNullableEnum; import io.github.chrimle.o2jrm.webclient.enumUnknownDefaultCase.ExampleNullableRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; @@ -43,41 +37,21 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleNullableRecord field7, ExampleNullableEnum field8) { @JsonCreator public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithRequiredFieldsOfEachType.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithRequiredFieldsOfEachType.java index d5f1e372..829b844c 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithRequiredFieldsOfEachType.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithRequiredFieldsOfEachType.java @@ -25,56 +25,29 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.github.chrimle.o2jrm.webclient.enumUnknownDefaultCase.ExampleEnum; import io.github.chrimle.o2jrm.webclient.enumUnknownDefaultCase.ExampleRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleRecord field7, ExampleEnum field8) { @JsonCreator public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithNullableFieldsOfEachType.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithNullableFieldsOfEachType.java index 579bb7d1..e166143d 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithNullableFieldsOfEachType.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithNullableFieldsOfEachType.java @@ -27,12 +27,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.github.chrimle.o2jrm.webclient.generateBuilders.ExampleNullableEnum; import io.github.chrimle.o2jrm.webclient.generateBuilders.ExampleNullableRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; @@ -43,41 +37,21 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleNullableRecord field7, ExampleNullableEnum field8) { @JsonCreator public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } @@ -85,41 +59,10 @@ public RecordWithNullableFieldsOfEachType( /** Builder class for {@link RecordWithNullableFieldsOfEachType }. */ public static class Builder { - private Boolean field1; - private String field2; private Integer field3; - private BigDecimal field4; - private List field5; - private Set field6; private ExampleNullableRecord field7; private ExampleNullableEnum field8; - /** - * Sets the value of {@link RecordWithNullableFieldsOfEachType#field1 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field1 a Boolean field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field1(final Boolean field1) { - this.field1 = field1; - return this; - } - - /** - * Sets the value of {@link RecordWithNullableFieldsOfEachType#field2 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field2 a String field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field2(final String field2) { - this.field2 = field2; - return this; - } - /** * Sets the value of {@link RecordWithNullableFieldsOfEachType#field3 }. * @@ -133,45 +76,6 @@ public Builder field3(final Integer field3) { return this; } - /** - * Sets the value of {@link RecordWithNullableFieldsOfEachType#field4 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field4 a Number field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field4(final BigDecimal field4) { - this.field4 = field4; - return this; - } - - /** - * Sets the value of {@link RecordWithNullableFieldsOfEachType#field5 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field5 an Array of Boolean field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field5(final List field5) { - this.field5 = field5; - return this; - } - - /** - * Sets the value of {@link RecordWithNullableFieldsOfEachType#field6 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field6 a Set field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field6(final Set field6) { - this.field6 = field6; - return this; - } - /** * Sets the value of {@link RecordWithNullableFieldsOfEachType#field7 }. * @@ -208,12 +112,7 @@ public Builder field8(final ExampleNullableEnum field8) { */ public RecordWithNullableFieldsOfEachType build() { return new RecordWithNullableFieldsOfEachType( - field1, - field2, field3, - field4, - field5, - field6, field7, field8); } diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithRequiredFieldsOfEachType.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithRequiredFieldsOfEachType.java index e1278efc..97c54b53 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithRequiredFieldsOfEachType.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithRequiredFieldsOfEachType.java @@ -25,56 +25,29 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.github.chrimle.o2jrm.webclient.generateBuilders.ExampleEnum; import io.github.chrimle.o2jrm.webclient.generateBuilders.ExampleRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleRecord field7, ExampleEnum field8) { @JsonCreator public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } @@ -82,41 +55,10 @@ public RecordWithRequiredFieldsOfEachType( /** Builder class for {@link RecordWithRequiredFieldsOfEachType }. */ public static class Builder { - private Boolean field1; - private String field2; private Integer field3; - private BigDecimal field4; - private List field5; - private Set field6; private ExampleRecord field7; private ExampleEnum field8; - /** - * Sets the value of {@link RecordWithRequiredFieldsOfEachType#field1 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field1 a Boolean field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field1(final Boolean field1) { - this.field1 = field1; - return this; - } - - /** - * Sets the value of {@link RecordWithRequiredFieldsOfEachType#field2 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field2 a String field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field2(final String field2) { - this.field2 = field2; - return this; - } - /** * Sets the value of {@link RecordWithRequiredFieldsOfEachType#field3 }. * @@ -130,45 +72,6 @@ public Builder field3(final Integer field3) { return this; } - /** - * Sets the value of {@link RecordWithRequiredFieldsOfEachType#field4 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field4 a Number field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field4(final BigDecimal field4) { - this.field4 = field4; - return this; - } - - /** - * Sets the value of {@link RecordWithRequiredFieldsOfEachType#field5 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field5 an Array of Boolean field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field5(final List field5) { - this.field5 = field5; - return this; - } - - /** - * Sets the value of {@link RecordWithRequiredFieldsOfEachType#field6 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field6 a Set field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field6(final Set field6) { - this.field6 = field6; - return this; - } - /** * Sets the value of {@link RecordWithRequiredFieldsOfEachType#field7 }. * @@ -205,12 +108,7 @@ public Builder field8(final ExampleEnum field8) { */ public RecordWithRequiredFieldsOfEachType build() { return new RecordWithRequiredFieldsOfEachType( - field1, - field2, field3, - field4, - field5, - field6, field7, field8); } diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithNullableFieldsOfEachType.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithNullableFieldsOfEachType.java index aeab5d10..13e25597 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithNullableFieldsOfEachType.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithNullableFieldsOfEachType.java @@ -27,12 +27,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.github.chrimle.o2jrm.webclient.serializableModel.ExampleNullableEnum; import io.github.chrimle.o2jrm.webclient.serializableModel.ExampleNullableRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; @@ -44,42 +38,22 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleNullableRecord field7, ExampleNullableEnum field8) implements Serializable { @JsonCreator public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithRequiredFieldsOfEachType.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithRequiredFieldsOfEachType.java index 9f1b724f..6cfe0904 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithRequiredFieldsOfEachType.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithRequiredFieldsOfEachType.java @@ -25,15 +25,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.github.chrimle.o2jrm.webclient.serializableModel.ExampleEnum; import io.github.chrimle.o2jrm.webclient.serializableModel.ExampleRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import java.io.Serializable; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -41,42 +34,22 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleRecord field7, ExampleEnum field8) implements Serializable { @JsonCreator public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithNullableFieldsOfEachType.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithNullableFieldsOfEachType.java index c0c151cb..f6e0bb69 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithNullableFieldsOfEachType.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithNullableFieldsOfEachType.java @@ -27,12 +27,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.github.chrimle.o2jrm.webclient.standard.ExampleNullableEnum; import io.github.chrimle.o2jrm.webclient.standard.ExampleNullableRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; @@ -43,41 +37,21 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleNullableRecord field7, ExampleNullableEnum field8) { @JsonCreator public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithRequiredFieldsOfEachType.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithRequiredFieldsOfEachType.java index 502c93da..cbb69fc7 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithRequiredFieldsOfEachType.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithRequiredFieldsOfEachType.java @@ -25,56 +25,29 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.github.chrimle.o2jrm.webclient.standard.ExampleEnum; import io.github.chrimle.o2jrm.webclient.standard.ExampleRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleRecord field7, ExampleEnum field8) { @JsonCreator public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithNullableFieldsOfEachType.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithNullableFieldsOfEachType.java index c6709684..1d16787f 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithNullableFieldsOfEachType.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithNullableFieldsOfEachType.java @@ -27,12 +27,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.github.chrimle.o2jrm.webclient.useBeanValidation.ExampleNullableEnum; import io.github.chrimle.o2jrm.webclient.useBeanValidation.ExampleNullableRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; @@ -45,41 +39,21 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, @Valid ExampleNullableRecord field7, ExampleNullableEnum field8) { @JsonCreator public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithRequiredFieldsOfEachType.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithRequiredFieldsOfEachType.java index 4b9e1fc9..4f3dab04 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithRequiredFieldsOfEachType.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithRequiredFieldsOfEachType.java @@ -25,15 +25,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.github.chrimle.o2jrm.webclient.useBeanValidation.ExampleEnum; import io.github.chrimle.o2jrm.webclient.useBeanValidation.ExampleRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; import jakarta.validation.constraints.*; @@ -42,41 +35,21 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - @NotNull Boolean field1, - @NotNull String field2, @NotNull Integer field3, - @NotNull BigDecimal field4, - @NotNull List field5, - @NotNull Set field6, @Valid @NotNull ExampleRecord field7, @NotNull ExampleEnum field8) { @JsonCreator public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithNullableFieldsOfEachType.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithNullableFieldsOfEachType.java index 074d7399..f803d97e 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithNullableFieldsOfEachType.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithNullableFieldsOfEachType.java @@ -27,12 +27,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.github.chrimle.o2jrm.webclient.useEnumCaseInsensitive.ExampleNullableEnum; import io.github.chrimle.o2jrm.webclient.useEnumCaseInsensitive.ExampleNullableRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; @@ -43,41 +37,21 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleNullableRecord field7, ExampleNullableEnum field8) { @JsonCreator public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithRequiredFieldsOfEachType.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithRequiredFieldsOfEachType.java index 98b4e8bb..054f713c 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithRequiredFieldsOfEachType.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithRequiredFieldsOfEachType.java @@ -25,56 +25,29 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.github.chrimle.o2jrm.webclient.useEnumCaseInsensitive.ExampleEnum; import io.github.chrimle.o2jrm.webclient.useEnumCaseInsensitive.ExampleRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleRecord field7, ExampleEnum field8) { @JsonCreator public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } diff --git a/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java b/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java index 035afb22..cbd7da17 100644 --- a/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java +++ b/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java @@ -310,12 +310,7 @@ public static GeneratedField[] getGeneratedFields( .toArray(new GeneratedField[] {}); case RECORD_WITH_REQUIRED_FIELDS_OF_EACH_TYPE -> List.of( - GeneratedField.of("field1", Boolean.class).isRequired().build(), - GeneratedField.of("field2", String.class).isRequired().build(), GeneratedField.of("field3", Integer.class).isRequired().build(), - GeneratedField.of("field4", BigDecimal.class).isRequired().build(), - GeneratedField.of("field5", List.class, Boolean.class).isRequired().build(), - GeneratedField.of("field6", Set.class, Boolean.class).isRequired().build(), GeneratedField.of( "field7", GeneratedRecordImpl.EXAMPLE_RECORD.getClass(pluginExecution)) .isRequired() @@ -328,18 +323,7 @@ public static GeneratedField[] getGeneratedFields( .toArray(new GeneratedField[] {}); case RECORD_WITH_NULLABLE_FIELDS_OF_EACH_TYPE -> List.of( - GeneratedField.of("field1", Boolean.class).isNullable().isRequired().build(), - GeneratedField.of("field2", String.class).isNullable().isRequired().build(), GeneratedField.of("field3", Integer.class).isNullable().isRequired().build(), - GeneratedField.of("field4", BigDecimal.class).isNullable().isRequired().build(), - GeneratedField.of("field5", List.class, Boolean.class) - .isNullable() - .isRequired() - .build(), - GeneratedField.of("field6", Set.class, Boolean.class) - .isNullable() - .isRequired() - .build(), GeneratedField.of( "field7", GeneratedRecordImpl.EXAMPLE_NULLABLE_RECORD.getClass(pluginExecution)) diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithNullableFieldsOfEachType.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithNullableFieldsOfEachType.java index ff393512..e12541a5 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithNullableFieldsOfEachType.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithNullableFieldsOfEachType.java @@ -27,12 +27,7 @@ import io.github.chrimle.o2jrm.additionalEnumTypeAnnotations.ExampleNullableEnum; import io.github.chrimle.o2jrm.additionalEnumTypeAnnotations.ExampleNullableRecord; import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import com.google.gson.Gson; @@ -46,62 +41,32 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleNullableRecord field7, ExampleNullableEnum field8) { /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6")); + Set.of("field3")); public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } @@ -145,22 +110,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - - if (!jsonObj.get("field2").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field2` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field2"))); - } - if (!jsonObj.get("field3").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( @@ -169,30 +118,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("field3"))); } - if (!jsonObj.get("field4").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field4` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field4"))); - } - - if (!jsonObj.get("field5").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field5` to be an array in the JSON string but got `%s`", - jsonObj.get("field5"))); - } - - if (!jsonObj.get("field6").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field6` to be an array in the JSON string but got `%s`", - jsonObj.get("field6"))); - } - if (jsonObj.get("field7") != null && !jsonObj.get("field7").isJsonNull()) { ExampleNullableRecord.validateJsonElement(jsonObj.get("field7")); } diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithRequiredFieldsOfEachType.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithRequiredFieldsOfEachType.java index c11f457f..d1f8311b 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithRequiredFieldsOfEachType.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithRequiredFieldsOfEachType.java @@ -27,12 +27,7 @@ import io.github.chrimle.o2jrm.additionalEnumTypeAnnotations.ExampleEnum; import io.github.chrimle.o2jrm.additionalEnumTypeAnnotations.ExampleRecord; import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import com.google.gson.Gson; import com.google.gson.JsonElement; @@ -45,64 +40,34 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleRecord field7, ExampleEnum field8) { /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } @@ -146,22 +111,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - - if (!jsonObj.get("field2").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field2` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field2"))); - } - if (!jsonObj.get("field3").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( @@ -170,30 +119,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("field3"))); } - if (!jsonObj.get("field4").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field4` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field4"))); - } - - if (!jsonObj.get("field5").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field5` to be an array in the JSON string but got `%s`", - jsonObj.get("field5"))); - } - - if (!jsonObj.get("field6").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field6` to be an array in the JSON string but got `%s`", - jsonObj.get("field6"))); - } - ExampleRecord.validateJsonElement(jsonObj.get("field7")); ExampleEnum.validateJsonElement(jsonObj.get("field8")); diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithNullableFieldsOfEachType.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithNullableFieldsOfEachType.java index 32fb1a0f..0cc44e1b 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithNullableFieldsOfEachType.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithNullableFieldsOfEachType.java @@ -27,12 +27,7 @@ import io.github.chrimle.o2jrm.additionalModelTypeAnnotations.ExampleNullableEnum; import io.github.chrimle.o2jrm.additionalModelTypeAnnotations.ExampleNullableRecord; import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import com.google.gson.Gson; @@ -46,12 +41,7 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ @@ -59,52 +49,27 @@ @io.github.chrimle.o2jrm.test.annotations.TestAnnotationTwo @io.github.chrimle.o2jrm.test.annotations.TestAnnotationThree public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleNullableRecord field7, ExampleNullableEnum field8) { /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6")); + Set.of("field3")); public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } @@ -148,22 +113,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - - if (!jsonObj.get("field2").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field2` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field2"))); - } - if (!jsonObj.get("field3").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( @@ -172,30 +121,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("field3"))); } - if (!jsonObj.get("field4").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field4` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field4"))); - } - - if (!jsonObj.get("field5").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field5` to be an array in the JSON string but got `%s`", - jsonObj.get("field5"))); - } - - if (!jsonObj.get("field6").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field6` to be an array in the JSON string but got `%s`", - jsonObj.get("field6"))); - } - if (jsonObj.get("field7") != null && !jsonObj.get("field7").isJsonNull()) { ExampleNullableRecord.validateJsonElement(jsonObj.get("field7")); } diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithRequiredFieldsOfEachType.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithRequiredFieldsOfEachType.java index b6fb7587..1f5a48cd 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithRequiredFieldsOfEachType.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithRequiredFieldsOfEachType.java @@ -27,12 +27,7 @@ import io.github.chrimle.o2jrm.additionalModelTypeAnnotations.ExampleEnum; import io.github.chrimle.o2jrm.additionalModelTypeAnnotations.ExampleRecord; import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import com.google.gson.Gson; import com.google.gson.JsonElement; @@ -45,12 +40,7 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ @@ -58,54 +48,29 @@ @io.github.chrimle.o2jrm.test.annotations.TestAnnotationTwo @io.github.chrimle.o2jrm.test.annotations.TestAnnotationThree public record RecordWithRequiredFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleRecord field7, ExampleEnum field8) { /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } @@ -149,22 +114,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - - if (!jsonObj.get("field2").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field2` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field2"))); - } - if (!jsonObj.get("field3").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( @@ -173,30 +122,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("field3"))); } - if (!jsonObj.get("field4").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field4` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field4"))); - } - - if (!jsonObj.get("field5").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field5` to be an array in the JSON string but got `%s`", - jsonObj.get("field5"))); - } - - if (!jsonObj.get("field6").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field6` to be an array in the JSON string but got `%s`", - jsonObj.get("field6"))); - } - ExampleRecord.validateJsonElement(jsonObj.get("field7")); ExampleEnum.validateJsonElement(jsonObj.get("field8")); diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithNullableFieldsOfEachType.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithNullableFieldsOfEachType.java index 88ec78bb..198f28db 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithNullableFieldsOfEachType.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithNullableFieldsOfEachType.java @@ -27,12 +27,7 @@ import io.github.chrimle.o2jrm.enumDefaultCaseAndCaseInsensitive.ExampleNullableEnum; import io.github.chrimle.o2jrm.enumDefaultCaseAndCaseInsensitive.ExampleNullableRecord; import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import com.google.gson.Gson; @@ -46,62 +41,32 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleNullableRecord field7, ExampleNullableEnum field8) { /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6")); + Set.of("field3")); public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } @@ -145,22 +110,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - - if (!jsonObj.get("field2").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field2` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field2"))); - } - if (!jsonObj.get("field3").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( @@ -169,30 +118,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("field3"))); } - if (!jsonObj.get("field4").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field4` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field4"))); - } - - if (!jsonObj.get("field5").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field5` to be an array in the JSON string but got `%s`", - jsonObj.get("field5"))); - } - - if (!jsonObj.get("field6").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field6` to be an array in the JSON string but got `%s`", - jsonObj.get("field6"))); - } - if (jsonObj.get("field7") != null && !jsonObj.get("field7").isJsonNull()) { ExampleNullableRecord.validateJsonElement(jsonObj.get("field7")); } diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithRequiredFieldsOfEachType.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithRequiredFieldsOfEachType.java index 595b126c..03c178aa 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithRequiredFieldsOfEachType.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithRequiredFieldsOfEachType.java @@ -27,12 +27,7 @@ import io.github.chrimle.o2jrm.enumDefaultCaseAndCaseInsensitive.ExampleEnum; import io.github.chrimle.o2jrm.enumDefaultCaseAndCaseInsensitive.ExampleRecord; import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import com.google.gson.Gson; import com.google.gson.JsonElement; @@ -45,64 +40,34 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleRecord field7, ExampleEnum field8) { /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } @@ -146,22 +111,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - - if (!jsonObj.get("field2").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field2` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field2"))); - } - if (!jsonObj.get("field3").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( @@ -170,30 +119,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("field3"))); } - if (!jsonObj.get("field4").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field4` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field4"))); - } - - if (!jsonObj.get("field5").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field5` to be an array in the JSON string but got `%s`", - jsonObj.get("field5"))); - } - - if (!jsonObj.get("field6").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field6` to be an array in the JSON string but got `%s`", - jsonObj.get("field6"))); - } - ExampleRecord.validateJsonElement(jsonObj.get("field7")); ExampleEnum.validateJsonElement(jsonObj.get("field8")); diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithNullableFieldsOfEachType.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithNullableFieldsOfEachType.java index 885914c3..0a3cc91e 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithNullableFieldsOfEachType.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithNullableFieldsOfEachType.java @@ -27,12 +27,7 @@ import io.github.chrimle.o2jrm.enumUnknownDefaultCase.ExampleNullableEnum; import io.github.chrimle.o2jrm.enumUnknownDefaultCase.ExampleNullableRecord; import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import com.google.gson.Gson; @@ -46,62 +41,32 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleNullableRecord field7, ExampleNullableEnum field8) { /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6")); + Set.of("field3")); public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } @@ -145,22 +110,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - - if (!jsonObj.get("field2").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field2` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field2"))); - } - if (!jsonObj.get("field3").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( @@ -169,30 +118,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("field3"))); } - if (!jsonObj.get("field4").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field4` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field4"))); - } - - if (!jsonObj.get("field5").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field5` to be an array in the JSON string but got `%s`", - jsonObj.get("field5"))); - } - - if (!jsonObj.get("field6").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field6` to be an array in the JSON string but got `%s`", - jsonObj.get("field6"))); - } - if (jsonObj.get("field7") != null && !jsonObj.get("field7").isJsonNull()) { ExampleNullableRecord.validateJsonElement(jsonObj.get("field7")); } diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithRequiredFieldsOfEachType.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithRequiredFieldsOfEachType.java index 95f81cd4..43e1b121 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithRequiredFieldsOfEachType.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithRequiredFieldsOfEachType.java @@ -27,12 +27,7 @@ import io.github.chrimle.o2jrm.enumUnknownDefaultCase.ExampleEnum; import io.github.chrimle.o2jrm.enumUnknownDefaultCase.ExampleRecord; import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import com.google.gson.Gson; import com.google.gson.JsonElement; @@ -45,64 +40,34 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleRecord field7, ExampleEnum field8) { /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } @@ -146,22 +111,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - - if (!jsonObj.get("field2").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field2` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field2"))); - } - if (!jsonObj.get("field3").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( @@ -170,30 +119,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("field3"))); } - if (!jsonObj.get("field4").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field4` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field4"))); - } - - if (!jsonObj.get("field5").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field5` to be an array in the JSON string but got `%s`", - jsonObj.get("field5"))); - } - - if (!jsonObj.get("field6").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field6` to be an array in the JSON string but got `%s`", - jsonObj.get("field6"))); - } - ExampleRecord.validateJsonElement(jsonObj.get("field7")); ExampleEnum.validateJsonElement(jsonObj.get("field8")); diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithNullableFieldsOfEachType.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithNullableFieldsOfEachType.java index 4284726b..0c1f0ed4 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithNullableFieldsOfEachType.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithNullableFieldsOfEachType.java @@ -27,12 +27,7 @@ import io.github.chrimle.o2jrm.generateBuilders.ExampleNullableEnum; import io.github.chrimle.o2jrm.generateBuilders.ExampleNullableRecord; import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import com.google.gson.Gson; @@ -46,62 +41,32 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleNullableRecord field7, ExampleNullableEnum field8) { /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6")); + Set.of("field3")); public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } @@ -109,41 +74,10 @@ public RecordWithNullableFieldsOfEachType( /** Builder class for {@link RecordWithNullableFieldsOfEachType }. */ public static class Builder { - private Boolean field1; - private String field2; private Integer field3; - private BigDecimal field4; - private List field5; - private Set field6; private ExampleNullableRecord field7; private ExampleNullableEnum field8; - /** - * Sets the value of {@link RecordWithNullableFieldsOfEachType#field1 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field1 a Boolean field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field1(final Boolean field1) { - this.field1 = field1; - return this; - } - - /** - * Sets the value of {@link RecordWithNullableFieldsOfEachType#field2 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field2 a String field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field2(final String field2) { - this.field2 = field2; - return this; - } - /** * Sets the value of {@link RecordWithNullableFieldsOfEachType#field3 }. * @@ -157,45 +91,6 @@ public Builder field3(final Integer field3) { return this; } - /** - * Sets the value of {@link RecordWithNullableFieldsOfEachType#field4 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field4 a Number field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field4(final BigDecimal field4) { - this.field4 = field4; - return this; - } - - /** - * Sets the value of {@link RecordWithNullableFieldsOfEachType#field5 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field5 an Array of Boolean field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field5(final List field5) { - this.field5 = field5; - return this; - } - - /** - * Sets the value of {@link RecordWithNullableFieldsOfEachType#field6 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field6 a Set field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field6(final Set field6) { - this.field6 = field6; - return this; - } - /** * Sets the value of {@link RecordWithNullableFieldsOfEachType#field7 }. * @@ -232,12 +127,7 @@ public Builder field8(final ExampleNullableEnum field8) { */ public RecordWithNullableFieldsOfEachType build() { return new RecordWithNullableFieldsOfEachType( - field1, - field2, field3, - field4, - field5, - field6, field7, field8); } @@ -287,22 +177,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - - if (!jsonObj.get("field2").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field2` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field2"))); - } - if (!jsonObj.get("field3").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( @@ -311,30 +185,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("field3"))); } - if (!jsonObj.get("field4").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field4` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field4"))); - } - - if (!jsonObj.get("field5").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field5` to be an array in the JSON string but got `%s`", - jsonObj.get("field5"))); - } - - if (!jsonObj.get("field6").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field6` to be an array in the JSON string but got `%s`", - jsonObj.get("field6"))); - } - if (jsonObj.get("field7") != null && !jsonObj.get("field7").isJsonNull()) { ExampleNullableRecord.validateJsonElement(jsonObj.get("field7")); } diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithRequiredFieldsOfEachType.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithRequiredFieldsOfEachType.java index a598faa3..536d90e5 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithRequiredFieldsOfEachType.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithRequiredFieldsOfEachType.java @@ -27,12 +27,7 @@ import io.github.chrimle.o2jrm.generateBuilders.ExampleEnum; import io.github.chrimle.o2jrm.generateBuilders.ExampleRecord; import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import com.google.gson.Gson; import com.google.gson.JsonElement; @@ -45,64 +40,34 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleRecord field7, ExampleEnum field8) { /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } @@ -110,41 +75,10 @@ public RecordWithRequiredFieldsOfEachType( /** Builder class for {@link RecordWithRequiredFieldsOfEachType }. */ public static class Builder { - private Boolean field1; - private String field2; private Integer field3; - private BigDecimal field4; - private List field5; - private Set field6; private ExampleRecord field7; private ExampleEnum field8; - /** - * Sets the value of {@link RecordWithRequiredFieldsOfEachType#field1 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field1 a Boolean field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field1(final Boolean field1) { - this.field1 = field1; - return this; - } - - /** - * Sets the value of {@link RecordWithRequiredFieldsOfEachType#field2 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field2 a String field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field2(final String field2) { - this.field2 = field2; - return this; - } - /** * Sets the value of {@link RecordWithRequiredFieldsOfEachType#field3 }. * @@ -158,45 +92,6 @@ public Builder field3(final Integer field3) { return this; } - /** - * Sets the value of {@link RecordWithRequiredFieldsOfEachType#field4 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field4 a Number field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field4(final BigDecimal field4) { - this.field4 = field4; - return this; - } - - /** - * Sets the value of {@link RecordWithRequiredFieldsOfEachType#field5 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field5 an Array of Boolean field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field5(final List field5) { - this.field5 = field5; - return this; - } - - /** - * Sets the value of {@link RecordWithRequiredFieldsOfEachType#field6 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field6 a Set field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field6(final Set field6) { - this.field6 = field6; - return this; - } - /** * Sets the value of {@link RecordWithRequiredFieldsOfEachType#field7 }. * @@ -233,12 +128,7 @@ public Builder field8(final ExampleEnum field8) { */ public RecordWithRequiredFieldsOfEachType build() { return new RecordWithRequiredFieldsOfEachType( - field1, - field2, field3, - field4, - field5, - field6, field7, field8); } @@ -288,22 +178,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - - if (!jsonObj.get("field2").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field2` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field2"))); - } - if (!jsonObj.get("field3").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( @@ -312,30 +186,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("field3"))); } - if (!jsonObj.get("field4").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field4` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field4"))); - } - - if (!jsonObj.get("field5").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field5` to be an array in the JSON string but got `%s`", - jsonObj.get("field5"))); - } - - if (!jsonObj.get("field6").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field6` to be an array in the JSON string but got `%s`", - jsonObj.get("field6"))); - } - ExampleRecord.validateJsonElement(jsonObj.get("field7")); ExampleEnum.validateJsonElement(jsonObj.get("field8")); diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithNullableFieldsOfEachType.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithNullableFieldsOfEachType.java index 50fc1df2..c17812e1 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithNullableFieldsOfEachType.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithNullableFieldsOfEachType.java @@ -27,12 +27,7 @@ import io.github.chrimle.o2jrm.serializableModel.ExampleNullableEnum; import io.github.chrimle.o2jrm.serializableModel.ExampleNullableRecord; import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import java.io.Serializable; @@ -47,22 +42,12 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleNullableRecord field7, ExampleNullableEnum field8) implements Serializable { @@ -70,40 +55,20 @@ public record RecordWithNullableFieldsOfEachType( /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6")); + Set.of("field3")); public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } @@ -147,22 +112,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - - if (!jsonObj.get("field2").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field2` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field2"))); - } - if (!jsonObj.get("field3").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( @@ -171,30 +120,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("field3"))); } - if (!jsonObj.get("field4").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field4` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field4"))); - } - - if (!jsonObj.get("field5").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field5` to be an array in the JSON string but got `%s`", - jsonObj.get("field5"))); - } - - if (!jsonObj.get("field6").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field6` to be an array in the JSON string but got `%s`", - jsonObj.get("field6"))); - } - if (jsonObj.get("field7") != null && !jsonObj.get("field7").isJsonNull()) { ExampleNullableRecord.validateJsonElement(jsonObj.get("field7")); } diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithRequiredFieldsOfEachType.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithRequiredFieldsOfEachType.java index c408801e..e8aec62e 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithRequiredFieldsOfEachType.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithRequiredFieldsOfEachType.java @@ -27,12 +27,7 @@ import io.github.chrimle.o2jrm.serializableModel.ExampleEnum; import io.github.chrimle.o2jrm.serializableModel.ExampleRecord; import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import java.io.Serializable; import com.google.gson.Gson; @@ -46,22 +41,12 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleRecord field7, ExampleEnum field8) implements Serializable { @@ -69,42 +54,22 @@ public record RecordWithRequiredFieldsOfEachType( /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } @@ -148,22 +113,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - - if (!jsonObj.get("field2").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field2` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field2"))); - } - if (!jsonObj.get("field3").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( @@ -172,30 +121,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("field3"))); } - if (!jsonObj.get("field4").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field4` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field4"))); - } - - if (!jsonObj.get("field5").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field5` to be an array in the JSON string but got `%s`", - jsonObj.get("field5"))); - } - - if (!jsonObj.get("field6").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field6` to be an array in the JSON string but got `%s`", - jsonObj.get("field6"))); - } - ExampleRecord.validateJsonElement(jsonObj.get("field7")); ExampleEnum.validateJsonElement(jsonObj.get("field8")); diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithNullableFieldsOfEachType.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithNullableFieldsOfEachType.java index ac26e6fb..bb46785a 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithNullableFieldsOfEachType.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithNullableFieldsOfEachType.java @@ -27,12 +27,7 @@ import io.github.chrimle.o2jrm.standard.ExampleNullableEnum; import io.github.chrimle.o2jrm.standard.ExampleNullableRecord; import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import com.google.gson.Gson; @@ -46,62 +41,32 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleNullableRecord field7, ExampleNullableEnum field8) { /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6")); + Set.of("field3")); public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } @@ -145,22 +110,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - - if (!jsonObj.get("field2").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field2` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field2"))); - } - if (!jsonObj.get("field3").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( @@ -169,30 +118,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("field3"))); } - if (!jsonObj.get("field4").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field4` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field4"))); - } - - if (!jsonObj.get("field5").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field5` to be an array in the JSON string but got `%s`", - jsonObj.get("field5"))); - } - - if (!jsonObj.get("field6").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field6` to be an array in the JSON string but got `%s`", - jsonObj.get("field6"))); - } - if (jsonObj.get("field7") != null && !jsonObj.get("field7").isJsonNull()) { ExampleNullableRecord.validateJsonElement(jsonObj.get("field7")); } diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithRequiredFieldsOfEachType.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithRequiredFieldsOfEachType.java index 863bda51..ea1d96bd 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithRequiredFieldsOfEachType.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithRequiredFieldsOfEachType.java @@ -27,12 +27,7 @@ import io.github.chrimle.o2jrm.standard.ExampleEnum; import io.github.chrimle.o2jrm.standard.ExampleRecord; import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import com.google.gson.Gson; import com.google.gson.JsonElement; @@ -45,64 +40,34 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleRecord field7, ExampleEnum field8) { /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } @@ -146,22 +111,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - - if (!jsonObj.get("field2").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field2` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field2"))); - } - if (!jsonObj.get("field3").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( @@ -170,30 +119,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("field3"))); } - if (!jsonObj.get("field4").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field4` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field4"))); - } - - if (!jsonObj.get("field5").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field5` to be an array in the JSON string but got `%s`", - jsonObj.get("field5"))); - } - - if (!jsonObj.get("field6").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field6` to be an array in the JSON string but got `%s`", - jsonObj.get("field6"))); - } - ExampleRecord.validateJsonElement(jsonObj.get("field7")); ExampleEnum.validateJsonElement(jsonObj.get("field8")); diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithNullableFieldsOfEachType.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithNullableFieldsOfEachType.java index 8273a2e9..1f09dbb5 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithNullableFieldsOfEachType.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithNullableFieldsOfEachType.java @@ -27,12 +27,7 @@ import io.github.chrimle.o2jrm.useBeanValidation.ExampleNullableEnum; import io.github.chrimle.o2jrm.useBeanValidation.ExampleNullableRecord; import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import javax.validation.constraints.*; import javax.validation.Valid; @@ -48,62 +43,32 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, @Valid ExampleNullableRecord field7, ExampleNullableEnum field8) { /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6")); + Set.of("field3")); public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } @@ -147,22 +112,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - - if (!jsonObj.get("field2").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field2` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field2"))); - } - if (!jsonObj.get("field3").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( @@ -171,30 +120,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("field3"))); } - if (!jsonObj.get("field4").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field4` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field4"))); - } - - if (!jsonObj.get("field5").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field5` to be an array in the JSON string but got `%s`", - jsonObj.get("field5"))); - } - - if (!jsonObj.get("field6").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field6` to be an array in the JSON string but got `%s`", - jsonObj.get("field6"))); - } - if (jsonObj.get("field7") != null && !jsonObj.get("field7").isJsonNull()) { ExampleNullableRecord.validateJsonElement(jsonObj.get("field7")); } diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithRequiredFieldsOfEachType.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithRequiredFieldsOfEachType.java index abdb61c5..c67b8640 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithRequiredFieldsOfEachType.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithRequiredFieldsOfEachType.java @@ -27,12 +27,7 @@ import io.github.chrimle.o2jrm.useBeanValidation.ExampleEnum; import io.github.chrimle.o2jrm.useBeanValidation.ExampleRecord; import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import javax.validation.constraints.*; import javax.validation.Valid; @@ -47,64 +42,34 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - @NotNull Boolean field1, - @NotNull String field2, @NotNull Integer field3, - @NotNull BigDecimal field4, - @NotNull List field5, - @NotNull Set field6, @Valid @NotNull ExampleRecord field7, @NotNull ExampleEnum field8) { /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } @@ -148,22 +113,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - - if (!jsonObj.get("field2").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field2` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field2"))); - } - if (!jsonObj.get("field3").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( @@ -172,30 +121,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("field3"))); } - if (!jsonObj.get("field4").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field4` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field4"))); - } - - if (!jsonObj.get("field5").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field5` to be an array in the JSON string but got `%s`", - jsonObj.get("field5"))); - } - - if (!jsonObj.get("field6").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field6` to be an array in the JSON string but got `%s`", - jsonObj.get("field6"))); - } - ExampleRecord.validateJsonElement(jsonObj.get("field7")); ExampleEnum.validateJsonElement(jsonObj.get("field8")); diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithNullableFieldsOfEachType.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithNullableFieldsOfEachType.java index 810bca0f..237ea0b1 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithNullableFieldsOfEachType.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithNullableFieldsOfEachType.java @@ -27,12 +27,7 @@ import io.github.chrimle.o2jrm.useEnumCaseInsensitive.ExampleNullableEnum; import io.github.chrimle.o2jrm.useEnumCaseInsensitive.ExampleNullableRecord; import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import com.google.gson.Gson; @@ -46,62 +41,32 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleNullableRecord field7, ExampleNullableEnum field8) { /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6")); + Set.of("field3")); public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } @@ -145,22 +110,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - - if (!jsonObj.get("field2").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field2` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field2"))); - } - if (!jsonObj.get("field3").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( @@ -169,30 +118,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("field3"))); } - if (!jsonObj.get("field4").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field4` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field4"))); - } - - if (!jsonObj.get("field5").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field5` to be an array in the JSON string but got `%s`", - jsonObj.get("field5"))); - } - - if (!jsonObj.get("field6").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field6` to be an array in the JSON string but got `%s`", - jsonObj.get("field6"))); - } - if (jsonObj.get("field7") != null && !jsonObj.get("field7").isJsonNull()) { ExampleNullableRecord.validateJsonElement(jsonObj.get("field7")); } diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithRequiredFieldsOfEachType.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithRequiredFieldsOfEachType.java index 53625a2c..9a29114f 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithRequiredFieldsOfEachType.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithRequiredFieldsOfEachType.java @@ -27,12 +27,7 @@ import io.github.chrimle.o2jrm.useEnumCaseInsensitive.ExampleEnum; import io.github.chrimle.o2jrm.useEnumCaseInsensitive.ExampleRecord; import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import com.google.gson.Gson; import com.google.gson.JsonElement; @@ -45,64 +40,34 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleRecord field7, ExampleEnum field8) { /** A set containing the names of all instance fields defined in this class. */ public static final HashSet openapiFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); /** A set containing the names of all required fields defined in this class. */ public static final HashSet openapiRequiredFields = new HashSet<>( - Set.of("field1", - "field2", - "field3", - "field4", - "field5", - "field6", + Set.of("field3", "field7", "field8")); public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } @@ -146,22 +111,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE final JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("field1").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field1` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field1"))); - } - - if (!jsonObj.get("field2").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field2` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field2"))); - } - if (!jsonObj.get("field3").isJsonPrimitive()) { throw new IllegalArgumentException( String.format( @@ -170,30 +119,6 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("field3"))); } - if (!jsonObj.get("field4").isJsonPrimitive()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field4` to be a primitive type in the JSON string but got `%s`", - jsonObj.get("field4"))); - } - - if (!jsonObj.get("field5").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field5` to be an array in the JSON string but got `%s`", - jsonObj.get("field5"))); - } - - if (!jsonObj.get("field6").isJsonArray()) { - throw new IllegalArgumentException( - String.format( - java.util.Locale.ROOT, - "Expected the field `field6` to be an array in the JSON string but got `%s`", - jsonObj.get("field6"))); - } - ExampleRecord.validateJsonElement(jsonObj.get("field7")); ExampleEnum.validateJsonElement(jsonObj.get("field8")); diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithNullableFieldsOfEachType.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithNullableFieldsOfEachType.java index 3572d311..4a56374c 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithNullableFieldsOfEachType.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithNullableFieldsOfEachType.java @@ -27,12 +27,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.github.chrimle.o2jrm.webclient.additionalEnumTypeAnnotations.ExampleNullableEnum; import io.github.chrimle.o2jrm.webclient.additionalEnumTypeAnnotations.ExampleNullableRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; @@ -43,41 +37,21 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleNullableRecord field7, ExampleNullableEnum field8) { @JsonCreator public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithRequiredFieldsOfEachType.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithRequiredFieldsOfEachType.java index e849a3b6..84d806bf 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithRequiredFieldsOfEachType.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithRequiredFieldsOfEachType.java @@ -25,56 +25,29 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.github.chrimle.o2jrm.webclient.additionalEnumTypeAnnotations.ExampleEnum; import io.github.chrimle.o2jrm.webclient.additionalEnumTypeAnnotations.ExampleRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleRecord field7, ExampleEnum field8) { @JsonCreator public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithNullableFieldsOfEachType.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithNullableFieldsOfEachType.java index dc69983b..58ab4c81 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithNullableFieldsOfEachType.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithNullableFieldsOfEachType.java @@ -27,12 +27,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.github.chrimle.o2jrm.webclient.additionalModelTypeAnnotations.ExampleNullableEnum; import io.github.chrimle.o2jrm.webclient.additionalModelTypeAnnotations.ExampleNullableRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; @@ -43,12 +37,7 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ @@ -56,31 +45,16 @@ @io.github.chrimle.o2jrm.test.annotations.TestAnnotationTwo @io.github.chrimle.o2jrm.test.annotations.TestAnnotationThree public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleNullableRecord field7, ExampleNullableEnum field8) { @JsonCreator public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithRequiredFieldsOfEachType.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithRequiredFieldsOfEachType.java index 7ba77cae..60a765db 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithRequiredFieldsOfEachType.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithRequiredFieldsOfEachType.java @@ -25,27 +25,15 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.github.chrimle.o2jrm.webclient.additionalModelTypeAnnotations.ExampleEnum; import io.github.chrimle.o2jrm.webclient.additionalModelTypeAnnotations.ExampleRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ @@ -53,31 +41,16 @@ @io.github.chrimle.o2jrm.test.annotations.TestAnnotationTwo @io.github.chrimle.o2jrm.test.annotations.TestAnnotationThree public record RecordWithRequiredFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleRecord field7, ExampleEnum field8) { @JsonCreator public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithNullableFieldsOfEachType.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithNullableFieldsOfEachType.java index b126f4df..e3ed53bb 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithNullableFieldsOfEachType.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithNullableFieldsOfEachType.java @@ -27,12 +27,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.github.chrimle.o2jrm.webclient.enumDefaultCaseAndCaseInsensitive.ExampleNullableEnum; import io.github.chrimle.o2jrm.webclient.enumDefaultCaseAndCaseInsensitive.ExampleNullableRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; @@ -43,41 +37,21 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleNullableRecord field7, ExampleNullableEnum field8) { @JsonCreator public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithRequiredFieldsOfEachType.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithRequiredFieldsOfEachType.java index 737dc2ef..1d0b3b80 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithRequiredFieldsOfEachType.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithRequiredFieldsOfEachType.java @@ -25,56 +25,29 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.github.chrimle.o2jrm.webclient.enumDefaultCaseAndCaseInsensitive.ExampleEnum; import io.github.chrimle.o2jrm.webclient.enumDefaultCaseAndCaseInsensitive.ExampleRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleRecord field7, ExampleEnum field8) { @JsonCreator public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithNullableFieldsOfEachType.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithNullableFieldsOfEachType.java index 07241c12..1f824ca1 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithNullableFieldsOfEachType.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithNullableFieldsOfEachType.java @@ -27,12 +27,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.github.chrimle.o2jrm.webclient.enumUnknownDefaultCase.ExampleNullableEnum; import io.github.chrimle.o2jrm.webclient.enumUnknownDefaultCase.ExampleNullableRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; @@ -43,41 +37,21 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleNullableRecord field7, ExampleNullableEnum field8) { @JsonCreator public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithRequiredFieldsOfEachType.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithRequiredFieldsOfEachType.java index d5f1e372..829b844c 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithRequiredFieldsOfEachType.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithRequiredFieldsOfEachType.java @@ -25,56 +25,29 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.github.chrimle.o2jrm.webclient.enumUnknownDefaultCase.ExampleEnum; import io.github.chrimle.o2jrm.webclient.enumUnknownDefaultCase.ExampleRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleRecord field7, ExampleEnum field8) { @JsonCreator public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithNullableFieldsOfEachType.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithNullableFieldsOfEachType.java index 579bb7d1..e166143d 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithNullableFieldsOfEachType.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithNullableFieldsOfEachType.java @@ -27,12 +27,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.github.chrimle.o2jrm.webclient.generateBuilders.ExampleNullableEnum; import io.github.chrimle.o2jrm.webclient.generateBuilders.ExampleNullableRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; @@ -43,41 +37,21 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleNullableRecord field7, ExampleNullableEnum field8) { @JsonCreator public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } @@ -85,41 +59,10 @@ public RecordWithNullableFieldsOfEachType( /** Builder class for {@link RecordWithNullableFieldsOfEachType }. */ public static class Builder { - private Boolean field1; - private String field2; private Integer field3; - private BigDecimal field4; - private List field5; - private Set field6; private ExampleNullableRecord field7; private ExampleNullableEnum field8; - /** - * Sets the value of {@link RecordWithNullableFieldsOfEachType#field1 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field1 a Boolean field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field1(final Boolean field1) { - this.field1 = field1; - return this; - } - - /** - * Sets the value of {@link RecordWithNullableFieldsOfEachType#field2 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field2 a String field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field2(final String field2) { - this.field2 = field2; - return this; - } - /** * Sets the value of {@link RecordWithNullableFieldsOfEachType#field3 }. * @@ -133,45 +76,6 @@ public Builder field3(final Integer field3) { return this; } - /** - * Sets the value of {@link RecordWithNullableFieldsOfEachType#field4 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field4 a Number field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field4(final BigDecimal field4) { - this.field4 = field4; - return this; - } - - /** - * Sets the value of {@link RecordWithNullableFieldsOfEachType#field5 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field5 an Array of Boolean field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field5(final List field5) { - this.field5 = field5; - return this; - } - - /** - * Sets the value of {@link RecordWithNullableFieldsOfEachType#field6 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field6 a Set field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field6(final Set field6) { - this.field6 = field6; - return this; - } - /** * Sets the value of {@link RecordWithNullableFieldsOfEachType#field7 }. * @@ -208,12 +112,7 @@ public Builder field8(final ExampleNullableEnum field8) { */ public RecordWithNullableFieldsOfEachType build() { return new RecordWithNullableFieldsOfEachType( - field1, - field2, field3, - field4, - field5, - field6, field7, field8); } diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithRequiredFieldsOfEachType.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithRequiredFieldsOfEachType.java index e1278efc..97c54b53 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithRequiredFieldsOfEachType.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithRequiredFieldsOfEachType.java @@ -25,56 +25,29 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.github.chrimle.o2jrm.webclient.generateBuilders.ExampleEnum; import io.github.chrimle.o2jrm.webclient.generateBuilders.ExampleRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleRecord field7, ExampleEnum field8) { @JsonCreator public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } @@ -82,41 +55,10 @@ public RecordWithRequiredFieldsOfEachType( /** Builder class for {@link RecordWithRequiredFieldsOfEachType }. */ public static class Builder { - private Boolean field1; - private String field2; private Integer field3; - private BigDecimal field4; - private List field5; - private Set field6; private ExampleRecord field7; private ExampleEnum field8; - /** - * Sets the value of {@link RecordWithRequiredFieldsOfEachType#field1 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field1 a Boolean field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field1(final Boolean field1) { - this.field1 = field1; - return this; - } - - /** - * Sets the value of {@link RecordWithRequiredFieldsOfEachType#field2 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field2 a String field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field2(final String field2) { - this.field2 = field2; - return this; - } - /** * Sets the value of {@link RecordWithRequiredFieldsOfEachType#field3 }. * @@ -130,45 +72,6 @@ public Builder field3(final Integer field3) { return this; } - /** - * Sets the value of {@link RecordWithRequiredFieldsOfEachType#field4 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field4 a Number field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field4(final BigDecimal field4) { - this.field4 = field4; - return this; - } - - /** - * Sets the value of {@link RecordWithRequiredFieldsOfEachType#field5 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field5 an Array of Boolean field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field5(final List field5) { - this.field5 = field5; - return this; - } - - /** - * Sets the value of {@link RecordWithRequiredFieldsOfEachType#field6 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field6 a Set field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field6(final Set field6) { - this.field6 = field6; - return this; - } - /** * Sets the value of {@link RecordWithRequiredFieldsOfEachType#field7 }. * @@ -205,12 +108,7 @@ public Builder field8(final ExampleEnum field8) { */ public RecordWithRequiredFieldsOfEachType build() { return new RecordWithRequiredFieldsOfEachType( - field1, - field2, field3, - field4, - field5, - field6, field7, field8); } diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithNullableFieldsOfEachType.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithNullableFieldsOfEachType.java index aeab5d10..13e25597 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithNullableFieldsOfEachType.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithNullableFieldsOfEachType.java @@ -27,12 +27,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.github.chrimle.o2jrm.webclient.serializableModel.ExampleNullableEnum; import io.github.chrimle.o2jrm.webclient.serializableModel.ExampleNullableRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; @@ -44,42 +38,22 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleNullableRecord field7, ExampleNullableEnum field8) implements Serializable { @JsonCreator public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithRequiredFieldsOfEachType.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithRequiredFieldsOfEachType.java index 9f1b724f..6cfe0904 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithRequiredFieldsOfEachType.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithRequiredFieldsOfEachType.java @@ -25,15 +25,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.github.chrimle.o2jrm.webclient.serializableModel.ExampleEnum; import io.github.chrimle.o2jrm.webclient.serializableModel.ExampleRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import java.io.Serializable; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -41,42 +34,22 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleRecord field7, ExampleEnum field8) implements Serializable { @JsonCreator public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithNullableFieldsOfEachType.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithNullableFieldsOfEachType.java index c0c151cb..f6e0bb69 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithNullableFieldsOfEachType.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithNullableFieldsOfEachType.java @@ -27,12 +27,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.github.chrimle.o2jrm.webclient.standard.ExampleNullableEnum; import io.github.chrimle.o2jrm.webclient.standard.ExampleNullableRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; @@ -43,41 +37,21 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleNullableRecord field7, ExampleNullableEnum field8) { @JsonCreator public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithRequiredFieldsOfEachType.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithRequiredFieldsOfEachType.java index 502c93da..cbb69fc7 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithRequiredFieldsOfEachType.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithRequiredFieldsOfEachType.java @@ -25,56 +25,29 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.github.chrimle.o2jrm.webclient.standard.ExampleEnum; import io.github.chrimle.o2jrm.webclient.standard.ExampleRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleRecord field7, ExampleEnum field8) { @JsonCreator public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithNullableFieldsOfEachType.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithNullableFieldsOfEachType.java index 75279a80..c9234c3c 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithNullableFieldsOfEachType.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithNullableFieldsOfEachType.java @@ -27,12 +27,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.github.chrimle.o2jrm.webclient.useBeanValidation.ExampleNullableEnum; import io.github.chrimle.o2jrm.webclient.useBeanValidation.ExampleNullableRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; @@ -45,41 +39,21 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, @Valid ExampleNullableRecord field7, ExampleNullableEnum field8) { @JsonCreator public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithRequiredFieldsOfEachType.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithRequiredFieldsOfEachType.java index 73fd2e5b..7e1f3f28 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithRequiredFieldsOfEachType.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithRequiredFieldsOfEachType.java @@ -25,15 +25,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.github.chrimle.o2jrm.webclient.useBeanValidation.ExampleEnum; import io.github.chrimle.o2jrm.webclient.useBeanValidation.ExampleRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; import javax.validation.constraints.*; @@ -42,41 +35,21 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - @NotNull Boolean field1, - @NotNull String field2, @NotNull Integer field3, - @NotNull BigDecimal field4, - @NotNull List field5, - @NotNull Set field6, @Valid @NotNull ExampleRecord field7, @NotNull ExampleEnum field8) { @JsonCreator public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithNullableFieldsOfEachType.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithNullableFieldsOfEachType.java index 074d7399..f803d97e 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithNullableFieldsOfEachType.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithNullableFieldsOfEachType.java @@ -27,12 +27,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.github.chrimle.o2jrm.webclient.useEnumCaseInsensitive.ExampleNullableEnum; import io.github.chrimle.o2jrm.webclient.useEnumCaseInsensitive.ExampleNullableRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; @@ -43,41 +37,21 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleNullableRecord field7, ExampleNullableEnum field8) { @JsonCreator public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithRequiredFieldsOfEachType.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithRequiredFieldsOfEachType.java index 98b4e8bb..054f713c 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithRequiredFieldsOfEachType.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithRequiredFieldsOfEachType.java @@ -25,56 +25,29 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.github.chrimle.o2jrm.webclient.useEnumCaseInsensitive.ExampleEnum; import io.github.chrimle.o2jrm.webclient.useEnumCaseInsensitive.ExampleRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, ExampleRecord field7, ExampleEnum field8) { @JsonCreator public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } diff --git a/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java b/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java index 035afb22..cbd7da17 100644 --- a/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java +++ b/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java @@ -310,12 +310,7 @@ public static GeneratedField[] getGeneratedFields( .toArray(new GeneratedField[] {}); case RECORD_WITH_REQUIRED_FIELDS_OF_EACH_TYPE -> List.of( - GeneratedField.of("field1", Boolean.class).isRequired().build(), - GeneratedField.of("field2", String.class).isRequired().build(), GeneratedField.of("field3", Integer.class).isRequired().build(), - GeneratedField.of("field4", BigDecimal.class).isRequired().build(), - GeneratedField.of("field5", List.class, Boolean.class).isRequired().build(), - GeneratedField.of("field6", Set.class, Boolean.class).isRequired().build(), GeneratedField.of( "field7", GeneratedRecordImpl.EXAMPLE_RECORD.getClass(pluginExecution)) .isRequired() @@ -328,18 +323,7 @@ public static GeneratedField[] getGeneratedFields( .toArray(new GeneratedField[] {}); case RECORD_WITH_NULLABLE_FIELDS_OF_EACH_TYPE -> List.of( - GeneratedField.of("field1", Boolean.class).isNullable().isRequired().build(), - GeneratedField.of("field2", String.class).isNullable().isRequired().build(), GeneratedField.of("field3", Integer.class).isNullable().isRequired().build(), - GeneratedField.of("field4", BigDecimal.class).isNullable().isRequired().build(), - GeneratedField.of("field5", List.class, Boolean.class) - .isNullable() - .isRequired() - .build(), - GeneratedField.of("field6", Set.class, Boolean.class) - .isNullable() - .isRequired() - .build(), GeneratedField.of( "field7", GeneratedRecordImpl.EXAMPLE_NULLABLE_RECORD.getClass(pluginExecution)) diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithNullableFieldsOfEachType.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithNullableFieldsOfEachType.java index e5f4c687..20315528 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithNullableFieldsOfEachType.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithNullableFieldsOfEachType.java @@ -8,12 +8,7 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.github.chrimle.o2jrm.additionalEnumTypeAnnotations.ExampleNullableEnum; import io.github.chrimle.o2jrm.additionalEnumTypeAnnotations.ExampleNullableRecord; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import org.springframework.lang.Nullable; import java.util.NoSuchElementException; @@ -30,41 +25,21 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, @Valid ExampleNullableRecord field7, ExampleNullableEnum field8) { @JsonCreator public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithRequiredFieldsOfEachType.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithRequiredFieldsOfEachType.java index c02625ee..abfbde46 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithRequiredFieldsOfEachType.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithRequiredFieldsOfEachType.java @@ -5,15 +5,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.github.chrimle.o2jrm.additionalEnumTypeAnnotations.ExampleEnum; import io.github.chrimle.o2jrm.additionalEnumTypeAnnotations.ExampleRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.springframework.lang.Nullable; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; @@ -28,41 +21,21 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - @NotNull Boolean field1, - @NotNull String field2, @NotNull Integer field3, - @NotNull BigDecimal field4, - @NotNull List field5, - @NotNull Set field6, @Valid @NotNull ExampleRecord field7, @NotNull ExampleEnum field8) { @JsonCreator public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithNullableFieldsOfEachType.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithNullableFieldsOfEachType.java index 6960a28d..4da1cef9 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithNullableFieldsOfEachType.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithNullableFieldsOfEachType.java @@ -8,12 +8,7 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.github.chrimle.o2jrm.additionalModelTypeAnnotations.ExampleNullableEnum; import io.github.chrimle.o2jrm.additionalModelTypeAnnotations.ExampleNullableRecord; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import org.springframework.lang.Nullable; import java.util.NoSuchElementException; @@ -30,12 +25,7 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ @@ -43,31 +33,16 @@ @io.github.chrimle.o2jrm.test.annotations.TestAnnotationTwo @io.github.chrimle.o2jrm.test.annotations.TestAnnotationThree public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, @Valid ExampleNullableRecord field7, ExampleNullableEnum field8) { @JsonCreator public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithRequiredFieldsOfEachType.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithRequiredFieldsOfEachType.java index 16e09c1d..166c3481 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithRequiredFieldsOfEachType.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithRequiredFieldsOfEachType.java @@ -5,15 +5,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.github.chrimle.o2jrm.additionalModelTypeAnnotations.ExampleEnum; import io.github.chrimle.o2jrm.additionalModelTypeAnnotations.ExampleRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.springframework.lang.Nullable; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; @@ -28,12 +21,7 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ @@ -41,31 +29,16 @@ @io.github.chrimle.o2jrm.test.annotations.TestAnnotationTwo @io.github.chrimle.o2jrm.test.annotations.TestAnnotationThree public record RecordWithRequiredFieldsOfEachType( - @NotNull Boolean field1, - @NotNull String field2, @NotNull Integer field3, - @NotNull BigDecimal field4, - @NotNull List field5, - @NotNull Set field6, @Valid @NotNull ExampleRecord field7, @NotNull ExampleEnum field8) { @JsonCreator public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithNullableFieldsOfEachType.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithNullableFieldsOfEachType.java index 2e8f9bd4..32749199 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithNullableFieldsOfEachType.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithNullableFieldsOfEachType.java @@ -8,12 +8,7 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.github.chrimle.o2jrm.enumDefaultCaseAndCaseInsensitive.ExampleNullableEnum; import io.github.chrimle.o2jrm.enumDefaultCaseAndCaseInsensitive.ExampleNullableRecord; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import org.springframework.lang.Nullable; import java.util.NoSuchElementException; @@ -30,41 +25,21 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, @Valid ExampleNullableRecord field7, ExampleNullableEnum field8) { @JsonCreator public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithRequiredFieldsOfEachType.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithRequiredFieldsOfEachType.java index 8745385b..436f5652 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithRequiredFieldsOfEachType.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithRequiredFieldsOfEachType.java @@ -5,15 +5,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.github.chrimle.o2jrm.enumDefaultCaseAndCaseInsensitive.ExampleEnum; import io.github.chrimle.o2jrm.enumDefaultCaseAndCaseInsensitive.ExampleRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.springframework.lang.Nullable; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; @@ -28,41 +21,21 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - @NotNull Boolean field1, - @NotNull String field2, @NotNull Integer field3, - @NotNull BigDecimal field4, - @NotNull List field5, - @NotNull Set field6, @Valid @NotNull ExampleRecord field7, @NotNull ExampleEnum field8) { @JsonCreator public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithNullableFieldsOfEachType.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithNullableFieldsOfEachType.java index f27630b5..42b65c7f 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithNullableFieldsOfEachType.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithNullableFieldsOfEachType.java @@ -8,12 +8,7 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.github.chrimle.o2jrm.enumUnknownDefaultCase.ExampleNullableEnum; import io.github.chrimle.o2jrm.enumUnknownDefaultCase.ExampleNullableRecord; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import org.springframework.lang.Nullable; import java.util.NoSuchElementException; @@ -30,41 +25,21 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, @Valid ExampleNullableRecord field7, ExampleNullableEnum field8) { @JsonCreator public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithRequiredFieldsOfEachType.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithRequiredFieldsOfEachType.java index 4372f0dc..efcf60b1 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithRequiredFieldsOfEachType.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithRequiredFieldsOfEachType.java @@ -5,15 +5,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.github.chrimle.o2jrm.enumUnknownDefaultCase.ExampleEnum; import io.github.chrimle.o2jrm.enumUnknownDefaultCase.ExampleRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.springframework.lang.Nullable; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; @@ -28,41 +21,21 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - @NotNull Boolean field1, - @NotNull String field2, @NotNull Integer field3, - @NotNull BigDecimal field4, - @NotNull List field5, - @NotNull Set field6, @Valid @NotNull ExampleRecord field7, @NotNull ExampleEnum field8) { @JsonCreator public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithNullableFieldsOfEachType.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithNullableFieldsOfEachType.java index 74e34db8..f734eccf 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithNullableFieldsOfEachType.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithNullableFieldsOfEachType.java @@ -8,12 +8,7 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.github.chrimle.o2jrm.generateBuilders.ExampleNullableEnum; import io.github.chrimle.o2jrm.generateBuilders.ExampleNullableRecord; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import org.springframework.lang.Nullable; import java.util.NoSuchElementException; @@ -30,41 +25,21 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, @Valid ExampleNullableRecord field7, ExampleNullableEnum field8) { @JsonCreator public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } @@ -72,41 +47,10 @@ public RecordWithNullableFieldsOfEachType( /** Builder class for {@link RecordWithNullableFieldsOfEachType }. */ public static class Builder { - private Boolean field1; - private String field2; private Integer field3; - private BigDecimal field4; - private List field5; - private Set field6; private ExampleNullableRecord field7; private ExampleNullableEnum field8; - /** - * Sets the value of {@link RecordWithNullableFieldsOfEachType#field1 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field1 a Boolean field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field1(final Boolean field1) { - this.field1 = field1; - return this; - } - - /** - * Sets the value of {@link RecordWithNullableFieldsOfEachType#field2 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field2 a String field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field2(final String field2) { - this.field2 = field2; - return this; - } - /** * Sets the value of {@link RecordWithNullableFieldsOfEachType#field3 }. * @@ -120,45 +64,6 @@ public Builder field3(final Integer field3) { return this; } - /** - * Sets the value of {@link RecordWithNullableFieldsOfEachType#field4 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field4 a Number field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field4(final BigDecimal field4) { - this.field4 = field4; - return this; - } - - /** - * Sets the value of {@link RecordWithNullableFieldsOfEachType#field5 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field5 an Array of Boolean field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field5(final List field5) { - this.field5 = field5; - return this; - } - - /** - * Sets the value of {@link RecordWithNullableFieldsOfEachType#field6 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field6 a Set field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field6(final Set field6) { - this.field6 = field6; - return this; - } - /** * Sets the value of {@link RecordWithNullableFieldsOfEachType#field7 }. * @@ -195,12 +100,7 @@ public Builder field8(final ExampleNullableEnum field8) { */ public RecordWithNullableFieldsOfEachType build() { return new RecordWithNullableFieldsOfEachType( - field1, - field2, field3, - field4, - field5, - field6, field7, field8); } diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithRequiredFieldsOfEachType.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithRequiredFieldsOfEachType.java index 42df956b..0abc4aa5 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithRequiredFieldsOfEachType.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithRequiredFieldsOfEachType.java @@ -5,15 +5,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.github.chrimle.o2jrm.generateBuilders.ExampleEnum; import io.github.chrimle.o2jrm.generateBuilders.ExampleRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.springframework.lang.Nullable; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; @@ -28,41 +21,21 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - @NotNull Boolean field1, - @NotNull String field2, @NotNull Integer field3, - @NotNull BigDecimal field4, - @NotNull List field5, - @NotNull Set field6, @Valid @NotNull ExampleRecord field7, @NotNull ExampleEnum field8) { @JsonCreator public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } @@ -70,41 +43,10 @@ public RecordWithRequiredFieldsOfEachType( /** Builder class for {@link RecordWithRequiredFieldsOfEachType }. */ public static class Builder { - private Boolean field1; - private String field2; private Integer field3; - private BigDecimal field4; - private List field5; - private Set field6; private ExampleRecord field7; private ExampleEnum field8; - /** - * Sets the value of {@link RecordWithRequiredFieldsOfEachType#field1 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field1 a Boolean field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field1(final Boolean field1) { - this.field1 = field1; - return this; - } - - /** - * Sets the value of {@link RecordWithRequiredFieldsOfEachType#field2 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field2 a String field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field2(final String field2) { - this.field2 = field2; - return this; - } - /** * Sets the value of {@link RecordWithRequiredFieldsOfEachType#field3 }. * @@ -118,45 +60,6 @@ public Builder field3(final Integer field3) { return this; } - /** - * Sets the value of {@link RecordWithRequiredFieldsOfEachType#field4 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field4 a Number field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field4(final BigDecimal field4) { - this.field4 = field4; - return this; - } - - /** - * Sets the value of {@link RecordWithRequiredFieldsOfEachType#field5 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field5 an Array of Boolean field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field5(final List field5) { - this.field5 = field5; - return this; - } - - /** - * Sets the value of {@link RecordWithRequiredFieldsOfEachType#field6 }. - * - *

NOTE: Pass-by-reference is used! - * - * @param field6 a Set field. - * @return this {@link Builder}-instance for method-chaining. - */ - public Builder field6(final Set field6) { - this.field6 = field6; - return this; - } - /** * Sets the value of {@link RecordWithRequiredFieldsOfEachType#field7 }. * @@ -193,12 +96,7 @@ public Builder field8(final ExampleEnum field8) { */ public RecordWithRequiredFieldsOfEachType build() { return new RecordWithRequiredFieldsOfEachType( - field1, - field2, field3, - field4, - field5, - field6, field7, field8); } diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithNullableFieldsOfEachType.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithNullableFieldsOfEachType.java index e840376e..339cf71c 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithNullableFieldsOfEachType.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithNullableFieldsOfEachType.java @@ -8,12 +8,7 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.github.chrimle.o2jrm.serializableModel.ExampleNullableEnum; import io.github.chrimle.o2jrm.serializableModel.ExampleNullableRecord; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import org.springframework.lang.Nullable; import java.util.NoSuchElementException; @@ -31,42 +26,22 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, @Valid ExampleNullableRecord field7, ExampleNullableEnum field8) implements Serializable { @JsonCreator public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithRequiredFieldsOfEachType.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithRequiredFieldsOfEachType.java index 1e029126..da4ad462 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithRequiredFieldsOfEachType.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithRequiredFieldsOfEachType.java @@ -5,15 +5,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.github.chrimle.o2jrm.serializableModel.ExampleEnum; import io.github.chrimle.o2jrm.serializableModel.ExampleRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.springframework.lang.Nullable; import org.openapitools.jackson.nullable.JsonNullable; import java.io.Serializable; @@ -29,42 +22,22 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - @NotNull Boolean field1, - @NotNull String field2, @NotNull Integer field3, - @NotNull BigDecimal field4, - @NotNull List field5, - @NotNull Set field6, @Valid @NotNull ExampleRecord field7, @NotNull ExampleEnum field8) implements Serializable { @JsonCreator public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithNullableFieldsOfEachType.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithNullableFieldsOfEachType.java index 0bbd6b2b..8ca70d9e 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithNullableFieldsOfEachType.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithNullableFieldsOfEachType.java @@ -8,12 +8,7 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.github.chrimle.o2jrm.standard.ExampleNullableEnum; import io.github.chrimle.o2jrm.standard.ExampleNullableRecord; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import org.springframework.lang.Nullable; import java.util.NoSuchElementException; @@ -30,41 +25,21 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, @Valid ExampleNullableRecord field7, ExampleNullableEnum field8) { @JsonCreator public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithRequiredFieldsOfEachType.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithRequiredFieldsOfEachType.java index dc2455a3..7c8e9671 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithRequiredFieldsOfEachType.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithRequiredFieldsOfEachType.java @@ -5,15 +5,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.github.chrimle.o2jrm.standard.ExampleEnum; import io.github.chrimle.o2jrm.standard.ExampleRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.springframework.lang.Nullable; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; @@ -28,41 +21,21 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - @NotNull Boolean field1, - @NotNull String field2, @NotNull Integer field3, - @NotNull BigDecimal field4, - @NotNull List field5, - @NotNull Set field6, @Valid @NotNull ExampleRecord field7, @NotNull ExampleEnum field8) { @JsonCreator public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithNullableFieldsOfEachType.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithNullableFieldsOfEachType.java index e9c5a90f..2a4477a8 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithNullableFieldsOfEachType.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithNullableFieldsOfEachType.java @@ -8,12 +8,7 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.github.chrimle.o2jrm.useBeanValidation.ExampleNullableEnum; import io.github.chrimle.o2jrm.useBeanValidation.ExampleNullableRecord; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import org.springframework.lang.Nullable; import java.util.NoSuchElementException; @@ -30,41 +25,21 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, @Valid ExampleNullableRecord field7, ExampleNullableEnum field8) { @JsonCreator public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithRequiredFieldsOfEachType.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithRequiredFieldsOfEachType.java index 3edc8b81..a89148a6 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithRequiredFieldsOfEachType.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithRequiredFieldsOfEachType.java @@ -5,15 +5,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.github.chrimle.o2jrm.useBeanValidation.ExampleEnum; import io.github.chrimle.o2jrm.useBeanValidation.ExampleRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.springframework.lang.Nullable; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; @@ -28,41 +21,21 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - @NotNull Boolean field1, - @NotNull String field2, @NotNull Integer field3, - @NotNull BigDecimal field4, - @NotNull List field5, - @NotNull Set field6, @Valid @NotNull ExampleRecord field7, @NotNull ExampleEnum field8) { @JsonCreator public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithNullableFieldsOfEachType.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithNullableFieldsOfEachType.java index 5994a0ab..9c401635 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithNullableFieldsOfEachType.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithNullableFieldsOfEachType.java @@ -8,12 +8,7 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.github.chrimle.o2jrm.useEnumCaseInsensitive.ExampleNullableEnum; import io.github.chrimle.o2jrm.useEnumCaseInsensitive.ExampleNullableRecord; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.openapitools.jackson.nullable.JsonNullable; import org.springframework.lang.Nullable; import java.util.NoSuchElementException; @@ -30,41 +25,21 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleNullableRecord. * @param field8 ExampleNullableEnum. */ public record RecordWithNullableFieldsOfEachType( - Boolean field1, - String field2, Integer field3, - BigDecimal field4, - List field5, - Set field6, @Valid ExampleNullableRecord field7, ExampleNullableEnum field8) { @JsonCreator public RecordWithNullableFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleNullableRecord field7, final ExampleNullableEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = field5; - this.field6 = field6; this.field7 = field7; this.field8 = field8; } diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithRequiredFieldsOfEachType.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithRequiredFieldsOfEachType.java index 394f3a64..40726ed2 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithRequiredFieldsOfEachType.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithRequiredFieldsOfEachType.java @@ -5,15 +5,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.github.chrimle.o2jrm.useEnumCaseInsensitive.ExampleEnum; import io.github.chrimle.o2jrm.useEnumCaseInsensitive.ExampleRecord; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; import org.springframework.lang.Nullable; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; @@ -28,41 +21,21 @@ /** * Example of a Record with fields of each type * - * @param field1 a Boolean field - * @param field2 a String field * @param field3 an Integer field - * @param field4 a Number field - * @param field5 an Array of Boolean field - * @param field6 a Set field * @param field7 ExampleRecord. * @param field8 ExampleEnum. */ public record RecordWithRequiredFieldsOfEachType( - @NotNull Boolean field1, - @NotNull String field2, @NotNull Integer field3, - @NotNull BigDecimal field4, - @NotNull List field5, - @NotNull Set field6, @Valid @NotNull ExampleRecord field7, @NotNull ExampleEnum field8) { @JsonCreator public RecordWithRequiredFieldsOfEachType( - final Boolean field1, - final String field2, final Integer field3, - final BigDecimal field4, - final List field5, - final Set field6, final ExampleRecord field7, final ExampleEnum field8) { - this.field1 = field1; - this.field2 = field2; this.field3 = field3; - this.field4 = field4; - this.field5 = Objects.requireNonNullElseGet(field5, () -> new ArrayList<>()); - this.field6 = Objects.requireNonNullElseGet(field6, () -> new LinkedHashSet<>()); this.field7 = field7; this.field8 = field8; } From 25e9144be85d5345804721ea0942cdab2c01eb0b Mon Sep 17 00:00:00 2001 From: Chrimle <28791817+Chrimle@users.noreply.github.com> Date: Mon, 27 Jul 2026 23:32:59 +0200 Subject: [PATCH 13/13] Update `RecordWithAllConstraints` test record --- test/common/src/main/resources/api.yaml | 16 +++ .../o2jrm/models/GeneratedRecordImpl.java | 4 + .../RecordWithAllConstraints.java | 58 +++++++++ .../RecordWithAllConstraints.java | 58 +++++++++ .../RecordWithAllConstraints.java | 58 +++++++++ .../RecordWithAllConstraints.java | 58 +++++++++ .../RecordWithAllConstraints.java | 118 ++++++++++++++++++ .../RecordWithAllConstraints.java | 58 +++++++++ .../standard/RecordWithAllConstraints.java | 58 +++++++++ .../RecordWithAllConstraints.java | 58 +++++++++ .../RecordWithAllConstraints.java | 58 +++++++++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 76 +++++++++++ .../RecordWithAllConstraints.java | 16 +++ .../standard/RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../o2jrm/models/GeneratedRecordImpl.java | 4 + .../RecordWithAllConstraints.java | 58 +++++++++ .../RecordWithAllConstraints.java | 58 +++++++++ .../RecordWithAllConstraints.java | 58 +++++++++ .../RecordWithAllConstraints.java | 58 +++++++++ .../RecordWithAllConstraints.java | 118 ++++++++++++++++++ .../RecordWithAllConstraints.java | 58 +++++++++ .../standard/RecordWithAllConstraints.java | 58 +++++++++ .../RecordWithAllConstraints.java | 58 +++++++++ .../RecordWithAllConstraints.java | 58 +++++++++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 76 +++++++++++ .../RecordWithAllConstraints.java | 16 +++ .../standard/RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../o2jrm/models/GeneratedRecordImpl.java | 4 + .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 76 +++++++++++ .../RecordWithAllConstraints.java | 16 +++ .../standard/RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ .../RecordWithAllConstraints.java | 16 +++ 49 files changed, 1804 insertions(+) diff --git a/test/common/src/main/resources/api.yaml b/test/common/src/main/resources/api.yaml index a95bfaba..10682077 100644 --- a/test/common/src/main/resources/api.yaml +++ b/test/common/src/main/resources/api.yaml @@ -306,6 +306,8 @@ components: - arrayRequiredNullable - arrayUniqueRequired - arrayUniqueRequiredNullable + - intRequired + - intRequiredNullable - longRequired - longRequiredNullable - bigDecimalRequired @@ -438,6 +440,20 @@ components: items: type: string ### INTEGER FIELDS ### + intStandard: + description: "Non-required, non-nullable Integer." + type: integer + intNullable: + description: "Non-required, nullable Integer." + type: integer + nullable: true + intRequired: + description: "Required, non-nullable Integer." + type: integer + intRequiredNullable: + description: "Required, nullable Integer." + type: integer + nullable: true intMinimum: description: "Non-required, non-nullable Integer with minimum: 18." type: integer diff --git a/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java b/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java index f71b1c62..d7fe97b9 100644 --- a/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java +++ b/test/java-useJakartaEe/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java @@ -159,6 +159,10 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { .isRequired() .isNullable() .build(), + GeneratedField.of("intStandard", Integer.class).build(), + GeneratedField.of("intNullable", Integer.class).isNullable().build(), + GeneratedField.of("intRequired", Integer.class).isRequired().build(), + GeneratedField.of("intRequiredNullable", Integer.class).isRequired().isNullable().build(), GeneratedField.of("intMinimum", Integer.class).minimum(18).build(), GeneratedField.of("intMaximum", Integer.class).maximum(100).build(), GeneratedField.of("intMinimumAndMaximum", Integer.class).minimum(0).maximum(100).build(), diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index bf3482bc..9b39f4b4 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -71,6 +71,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -116,6 +120,10 @@ public record RecordWithAllConstraints( Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + Integer intRequired, + Integer intRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -163,6 +171,10 @@ public record RecordWithAllConstraints( "arrayUniqueRequired", "arrayUniqueNullable", "arrayUniqueRequiredNullable", + "intStandard", + "intNullable", + "intRequired", + "intRequiredNullable", "intMinimum", "intMaximum", "intMinimumAndMaximum", @@ -193,6 +205,8 @@ public record RecordWithAllConstraints( "arrayRequiredNullable", "arrayUniqueRequired", "arrayUniqueRequiredNullable", + "intRequired", + "intRequiredNullable", "longRequired", "longRequiredNullable", "bigDecimalRequired", @@ -225,6 +239,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -268,6 +286,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -568,6 +590,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("arrayUniqueRequiredNullable"))); } + if (jsonObj.get("intStandard") != null && !jsonObj.get("intStandard").isJsonNull()) { + if (!jsonObj.get("intStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intStandard"))); + } + } + + if (jsonObj.get("intNullable") != null && !jsonObj.get("intNullable").isJsonNull()) { + if (!jsonObj.get("intNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intNullable"))); + } + } + + if (!jsonObj.get("intRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intRequired"))); + } + + if (!jsonObj.get("intRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intRequiredNullable"))); + } + if (jsonObj.get("intMinimum") != null && !jsonObj.get("intMinimum").isJsonNull()) { if (!jsonObj.get("intMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java index 1abad713..082aacbd 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -71,6 +71,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -119,6 +123,10 @@ public record RecordWithAllConstraints( Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + Integer intRequired, + Integer intRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -166,6 +174,10 @@ public record RecordWithAllConstraints( "arrayUniqueRequired", "arrayUniqueNullable", "arrayUniqueRequiredNullable", + "intStandard", + "intNullable", + "intRequired", + "intRequiredNullable", "intMinimum", "intMaximum", "intMinimumAndMaximum", @@ -196,6 +208,8 @@ public record RecordWithAllConstraints( "arrayRequiredNullable", "arrayUniqueRequired", "arrayUniqueRequiredNullable", + "intRequired", + "intRequiredNullable", "longRequired", "longRequiredNullable", "bigDecimalRequired", @@ -228,6 +242,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -271,6 +289,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -571,6 +593,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("arrayUniqueRequiredNullable"))); } + if (jsonObj.get("intStandard") != null && !jsonObj.get("intStandard").isJsonNull()) { + if (!jsonObj.get("intStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intStandard"))); + } + } + + if (jsonObj.get("intNullable") != null && !jsonObj.get("intNullable").isJsonNull()) { + if (!jsonObj.get("intNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intNullable"))); + } + } + + if (!jsonObj.get("intRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intRequired"))); + } + + if (!jsonObj.get("intRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intRequiredNullable"))); + } + if (jsonObj.get("intMinimum") != null && !jsonObj.get("intMinimum").isJsonNull()) { if (!jsonObj.get("intMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index da323034..311c4659 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -71,6 +71,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -116,6 +120,10 @@ public record RecordWithAllConstraints( Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + Integer intRequired, + Integer intRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -163,6 +171,10 @@ public record RecordWithAllConstraints( "arrayUniqueRequired", "arrayUniqueNullable", "arrayUniqueRequiredNullable", + "intStandard", + "intNullable", + "intRequired", + "intRequiredNullable", "intMinimum", "intMaximum", "intMinimumAndMaximum", @@ -193,6 +205,8 @@ public record RecordWithAllConstraints( "arrayRequiredNullable", "arrayUniqueRequired", "arrayUniqueRequiredNullable", + "intRequired", + "intRequiredNullable", "longRequired", "longRequiredNullable", "bigDecimalRequired", @@ -225,6 +239,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -268,6 +286,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -568,6 +590,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("arrayUniqueRequiredNullable"))); } + if (jsonObj.get("intStandard") != null && !jsonObj.get("intStandard").isJsonNull()) { + if (!jsonObj.get("intStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intStandard"))); + } + } + + if (jsonObj.get("intNullable") != null && !jsonObj.get("intNullable").isJsonNull()) { + if (!jsonObj.get("intNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intNullable"))); + } + } + + if (!jsonObj.get("intRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intRequired"))); + } + + if (!jsonObj.get("intRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intRequiredNullable"))); + } + if (jsonObj.get("intMinimum") != null && !jsonObj.get("intMinimum").isJsonNull()) { if (!jsonObj.get("intMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java index 50c4a8d6..48d5be5a 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -71,6 +71,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -116,6 +120,10 @@ public record RecordWithAllConstraints( Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + Integer intRequired, + Integer intRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -163,6 +171,10 @@ public record RecordWithAllConstraints( "arrayUniqueRequired", "arrayUniqueNullable", "arrayUniqueRequiredNullable", + "intStandard", + "intNullable", + "intRequired", + "intRequiredNullable", "intMinimum", "intMaximum", "intMinimumAndMaximum", @@ -193,6 +205,8 @@ public record RecordWithAllConstraints( "arrayRequiredNullable", "arrayUniqueRequired", "arrayUniqueRequiredNullable", + "intRequired", + "intRequiredNullable", "longRequired", "longRequiredNullable", "bigDecimalRequired", @@ -225,6 +239,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -268,6 +286,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -568,6 +590,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("arrayUniqueRequiredNullable"))); } + if (jsonObj.get("intStandard") != null && !jsonObj.get("intStandard").isJsonNull()) { + if (!jsonObj.get("intStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intStandard"))); + } + } + + if (jsonObj.get("intNullable") != null && !jsonObj.get("intNullable").isJsonNull()) { + if (!jsonObj.get("intNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intNullable"))); + } + } + + if (!jsonObj.get("intRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intRequired"))); + } + + if (!jsonObj.get("intRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intRequiredNullable"))); + } + if (jsonObj.get("intMinimum") != null && !jsonObj.get("intMinimum").isJsonNull()) { if (!jsonObj.get("intMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java index b35b0066..484ed38f 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java @@ -71,6 +71,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -116,6 +120,10 @@ public record RecordWithAllConstraints( Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + Integer intRequired, + Integer intRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -163,6 +171,10 @@ public record RecordWithAllConstraints( "arrayUniqueRequired", "arrayUniqueNullable", "arrayUniqueRequiredNullable", + "intStandard", + "intNullable", + "intRequired", + "intRequiredNullable", "intMinimum", "intMaximum", "intMinimumAndMaximum", @@ -193,6 +205,8 @@ public record RecordWithAllConstraints( "arrayRequiredNullable", "arrayUniqueRequired", "arrayUniqueRequiredNullable", + "intRequired", + "intRequiredNullable", "longRequired", "longRequiredNullable", "bigDecimalRequired", @@ -225,6 +239,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -268,6 +286,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -316,6 +338,10 @@ public static class Builder { private Set arrayUniqueRequired; private Set arrayUniqueNullable; private Set arrayUniqueRequiredNullable; + private Integer intStandard; + private Integer intNullable; + private Integer intRequired; + private Integer intRequiredNullable; private Integer intMinimum; private Integer intMaximum; private Integer intMinimumAndMaximum; @@ -672,6 +698,58 @@ public Builder arrayUniqueRequiredNullable(final Set arrayUniqueRequired return this; } + /** + * Sets the value of {@link RecordWithAllConstraints#intStandard }. + * + *

NOTE: Pass-by-reference is used! + * + * @param intStandard Non-required, non-nullable Integer.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder intStandard(final Integer intStandard) { + this.intStandard = intStandard; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#intNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param intNullable Non-required, nullable Integer.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder intNullable(final Integer intNullable) { + this.intNullable = intNullable; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#intRequired }. + * + *

NOTE: Pass-by-reference is used! + * + * @param intRequired Required, non-nullable Integer.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder intRequired(final Integer intRequired) { + this.intRequired = intRequired; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#intRequiredNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param intRequiredNullable Required, nullable Integer.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder intRequiredNullable(final Integer intRequiredNullable) { + this.intRequiredNullable = intRequiredNullable; + return this; + } + /** * Sets the value of {@link RecordWithAllConstraints#intMinimum }. * @@ -929,6 +1007,10 @@ public RecordWithAllConstraints build() { arrayUniqueRequired, arrayUniqueNullable, arrayUniqueRequiredNullable, + intStandard, + intNullable, + intRequired, + intRequiredNullable, intMinimum, intMaximum, intMinimumAndMaximum, @@ -1235,6 +1317,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("arrayUniqueRequiredNullable"))); } + if (jsonObj.get("intStandard") != null && !jsonObj.get("intStandard").isJsonNull()) { + if (!jsonObj.get("intStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intStandard"))); + } + } + + if (jsonObj.get("intNullable") != null && !jsonObj.get("intNullable").isJsonNull()) { + if (!jsonObj.get("intNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intNullable"))); + } + } + + if (!jsonObj.get("intRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intRequired"))); + } + + if (!jsonObj.get("intRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intRequiredNullable"))); + } + if (jsonObj.get("intMinimum") != null && !jsonObj.get("intMinimum").isJsonNull()) { if (!jsonObj.get("intMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java index fbade165..d141f3aa 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java @@ -72,6 +72,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -117,6 +121,10 @@ public record RecordWithAllConstraints( Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + Integer intRequired, + Integer intRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -165,6 +173,10 @@ public record RecordWithAllConstraints( "arrayUniqueRequired", "arrayUniqueNullable", "arrayUniqueRequiredNullable", + "intStandard", + "intNullable", + "intRequired", + "intRequiredNullable", "intMinimum", "intMaximum", "intMinimumAndMaximum", @@ -195,6 +207,8 @@ public record RecordWithAllConstraints( "arrayRequiredNullable", "arrayUniqueRequired", "arrayUniqueRequiredNullable", + "intRequired", + "intRequiredNullable", "longRequired", "longRequiredNullable", "bigDecimalRequired", @@ -227,6 +241,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -270,6 +288,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -570,6 +592,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("arrayUniqueRequiredNullable"))); } + if (jsonObj.get("intStandard") != null && !jsonObj.get("intStandard").isJsonNull()) { + if (!jsonObj.get("intStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intStandard"))); + } + } + + if (jsonObj.get("intNullable") != null && !jsonObj.get("intNullable").isJsonNull()) { + if (!jsonObj.get("intNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intNullable"))); + } + } + + if (!jsonObj.get("intRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intRequired"))); + } + + if (!jsonObj.get("intRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intRequiredNullable"))); + } + if (jsonObj.get("intMinimum") != null && !jsonObj.get("intMinimum").isJsonNull()) { if (!jsonObj.get("intMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java index 462e9309..8775805b 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java @@ -71,6 +71,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -116,6 +120,10 @@ public record RecordWithAllConstraints( Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + Integer intRequired, + Integer intRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -163,6 +171,10 @@ public record RecordWithAllConstraints( "arrayUniqueRequired", "arrayUniqueNullable", "arrayUniqueRequiredNullable", + "intStandard", + "intNullable", + "intRequired", + "intRequiredNullable", "intMinimum", "intMaximum", "intMinimumAndMaximum", @@ -193,6 +205,8 @@ public record RecordWithAllConstraints( "arrayRequiredNullable", "arrayUniqueRequired", "arrayUniqueRequiredNullable", + "intRequired", + "intRequiredNullable", "longRequired", "longRequiredNullable", "bigDecimalRequired", @@ -225,6 +239,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -268,6 +286,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -568,6 +590,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("arrayUniqueRequiredNullable"))); } + if (jsonObj.get("intStandard") != null && !jsonObj.get("intStandard").isJsonNull()) { + if (!jsonObj.get("intStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intStandard"))); + } + } + + if (jsonObj.get("intNullable") != null && !jsonObj.get("intNullable").isJsonNull()) { + if (!jsonObj.get("intNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intNullable"))); + } + } + + if (!jsonObj.get("intRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intRequired"))); + } + + if (!jsonObj.get("intRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intRequiredNullable"))); + } + if (jsonObj.get("intMinimum") != null && !jsonObj.get("intMinimum").isJsonNull()) { if (!jsonObj.get("intMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java index 8f7b4900..ab068cd1 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java @@ -73,6 +73,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -118,6 +122,10 @@ public record RecordWithAllConstraints( @NotNull Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + @NotNull Integer intRequired, + Integer intRequiredNullable, @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, @@ -165,6 +173,10 @@ public record RecordWithAllConstraints( "arrayUniqueRequired", "arrayUniqueNullable", "arrayUniqueRequiredNullable", + "intStandard", + "intNullable", + "intRequired", + "intRequiredNullable", "intMinimum", "intMaximum", "intMinimumAndMaximum", @@ -195,6 +207,8 @@ public record RecordWithAllConstraints( "arrayRequiredNullable", "arrayUniqueRequired", "arrayUniqueRequiredNullable", + "intRequired", + "intRequiredNullable", "longRequired", "longRequiredNullable", "bigDecimalRequired", @@ -227,6 +241,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -270,6 +288,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -570,6 +592,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("arrayUniqueRequiredNullable"))); } + if (jsonObj.get("intStandard") != null && !jsonObj.get("intStandard").isJsonNull()) { + if (!jsonObj.get("intStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intStandard"))); + } + } + + if (jsonObj.get("intNullable") != null && !jsonObj.get("intNullable").isJsonNull()) { + if (!jsonObj.get("intNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intNullable"))); + } + } + + if (!jsonObj.get("intRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intRequired"))); + } + + if (!jsonObj.get("intRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intRequiredNullable"))); + } + if (jsonObj.get("intMinimum") != null && !jsonObj.get("intMinimum").isJsonNull()) { if (!jsonObj.get("intMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java index 5110e584..4ecd050f 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -71,6 +71,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -116,6 +120,10 @@ public record RecordWithAllConstraints( Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + Integer intRequired, + Integer intRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -163,6 +171,10 @@ public record RecordWithAllConstraints( "arrayUniqueRequired", "arrayUniqueNullable", "arrayUniqueRequiredNullable", + "intStandard", + "intNullable", + "intRequired", + "intRequiredNullable", "intMinimum", "intMaximum", "intMinimumAndMaximum", @@ -193,6 +205,8 @@ public record RecordWithAllConstraints( "arrayRequiredNullable", "arrayUniqueRequired", "arrayUniqueRequiredNullable", + "intRequired", + "intRequiredNullable", "longRequired", "longRequiredNullable", "bigDecimalRequired", @@ -225,6 +239,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -268,6 +286,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -568,6 +590,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("arrayUniqueRequiredNullable"))); } + if (jsonObj.get("intStandard") != null && !jsonObj.get("intStandard").isJsonNull()) { + if (!jsonObj.get("intStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intStandard"))); + } + } + + if (jsonObj.get("intNullable") != null && !jsonObj.get("intNullable").isJsonNull()) { + if (!jsonObj.get("intNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intNullable"))); + } + } + + if (!jsonObj.get("intRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intRequired"))); + } + + if (!jsonObj.get("intRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intRequiredNullable"))); + } + if (jsonObj.get("intMinimum") != null && !jsonObj.get("intMinimum").isJsonNull()) { if (!jsonObj.get("intMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index 146f6293..3e0d33e8 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -69,6 +69,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -114,6 +118,10 @@ public record RecordWithAllConstraints( Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + Integer intRequired, + Integer intRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -160,6 +168,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -203,6 +215,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java index 4d4f271f..7d7b571f 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -69,6 +69,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -117,6 +121,10 @@ public record RecordWithAllConstraints( Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + Integer intRequired, + Integer intRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -163,6 +171,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -206,6 +218,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index 346112e6..564261f5 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -69,6 +69,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -114,6 +118,10 @@ public record RecordWithAllConstraints( Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + Integer intRequired, + Integer intRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -160,6 +168,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -203,6 +215,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java index 799e69b2..dddc6677 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -69,6 +69,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -114,6 +118,10 @@ public record RecordWithAllConstraints( Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + Integer intRequired, + Integer intRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -160,6 +168,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -203,6 +215,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java index a1785615..a0950d89 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java @@ -69,6 +69,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -114,6 +118,10 @@ public record RecordWithAllConstraints( Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + Integer intRequired, + Integer intRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -160,6 +168,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -203,6 +215,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -251,6 +267,10 @@ public static class Builder { private Set arrayUniqueRequired; private Set arrayUniqueNullable; private Set arrayUniqueRequiredNullable; + private Integer intStandard; + private Integer intNullable; + private Integer intRequired; + private Integer intRequiredNullable; private Integer intMinimum; private Integer intMaximum; private Integer intMinimumAndMaximum; @@ -607,6 +627,58 @@ public Builder arrayUniqueRequiredNullable(final Set arrayUniqueRequired return this; } + /** + * Sets the value of {@link RecordWithAllConstraints#intStandard }. + * + *

NOTE: Pass-by-reference is used! + * + * @param intStandard Non-required, non-nullable Integer.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder intStandard(final Integer intStandard) { + this.intStandard = intStandard; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#intNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param intNullable Non-required, nullable Integer.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder intNullable(final Integer intNullable) { + this.intNullable = intNullable; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#intRequired }. + * + *

NOTE: Pass-by-reference is used! + * + * @param intRequired Required, non-nullable Integer.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder intRequired(final Integer intRequired) { + this.intRequired = intRequired; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#intRequiredNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param intRequiredNullable Required, nullable Integer.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder intRequiredNullable(final Integer intRequiredNullable) { + this.intRequiredNullable = intRequiredNullable; + return this; + } + /** * Sets the value of {@link RecordWithAllConstraints#intMinimum }. * @@ -864,6 +936,10 @@ public RecordWithAllConstraints build() { arrayUniqueRequired, arrayUniqueNullable, arrayUniqueRequiredNullable, + intStandard, + intNullable, + intRequired, + intRequiredNullable, intMinimum, intMaximum, intMinimumAndMaximum, diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java index 86238dbb..dac5612a 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java @@ -70,6 +70,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -115,6 +119,10 @@ public record RecordWithAllConstraints( Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + Integer intRequired, + Integer intRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -162,6 +170,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -205,6 +217,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java index 1032dba8..6f1bf5c4 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java @@ -69,6 +69,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -114,6 +118,10 @@ public record RecordWithAllConstraints( Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + Integer intRequired, + Integer intRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -160,6 +168,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -203,6 +215,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java index 2894adc7..b9f62def 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java @@ -71,6 +71,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -116,6 +120,10 @@ public record RecordWithAllConstraints( @NotNull Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + @NotNull Integer intRequired, + Integer intRequiredNullable, @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, @@ -162,6 +170,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -205,6 +217,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java index 45eeb7f7..5149b3dc 100644 --- a/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java-useJakartaEe/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -69,6 +69,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -114,6 +118,10 @@ public record RecordWithAllConstraints( Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + Integer intRequired, + Integer intRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -160,6 +168,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -203,6 +215,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java b/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java index cbd7da17..b4e5ce8c 100644 --- a/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java +++ b/test/java/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java @@ -159,6 +159,10 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { .isRequired() .isNullable() .build(), + GeneratedField.of("intStandard", Integer.class).build(), + GeneratedField.of("intNullable", Integer.class).isNullable().build(), + GeneratedField.of("intRequired", Integer.class).isRequired().build(), + GeneratedField.of("intRequiredNullable", Integer.class).isRequired().isNullable().build(), GeneratedField.of("intMinimum", Integer.class).minimum(18).build(), GeneratedField.of("intMaximum", Integer.class).maximum(100).build(), GeneratedField.of("intMinimumAndMaximum", Integer.class).minimum(0).maximum(100).build(), diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index bf3482bc..9b39f4b4 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -71,6 +71,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -116,6 +120,10 @@ public record RecordWithAllConstraints( Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + Integer intRequired, + Integer intRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -163,6 +171,10 @@ public record RecordWithAllConstraints( "arrayUniqueRequired", "arrayUniqueNullable", "arrayUniqueRequiredNullable", + "intStandard", + "intNullable", + "intRequired", + "intRequiredNullable", "intMinimum", "intMaximum", "intMinimumAndMaximum", @@ -193,6 +205,8 @@ public record RecordWithAllConstraints( "arrayRequiredNullable", "arrayUniqueRequired", "arrayUniqueRequiredNullable", + "intRequired", + "intRequiredNullable", "longRequired", "longRequiredNullable", "bigDecimalRequired", @@ -225,6 +239,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -268,6 +286,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -568,6 +590,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("arrayUniqueRequiredNullable"))); } + if (jsonObj.get("intStandard") != null && !jsonObj.get("intStandard").isJsonNull()) { + if (!jsonObj.get("intStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intStandard"))); + } + } + + if (jsonObj.get("intNullable") != null && !jsonObj.get("intNullable").isJsonNull()) { + if (!jsonObj.get("intNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intNullable"))); + } + } + + if (!jsonObj.get("intRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intRequired"))); + } + + if (!jsonObj.get("intRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intRequiredNullable"))); + } + if (jsonObj.get("intMinimum") != null && !jsonObj.get("intMinimum").isJsonNull()) { if (!jsonObj.get("intMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java index 1abad713..082aacbd 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -71,6 +71,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -119,6 +123,10 @@ public record RecordWithAllConstraints( Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + Integer intRequired, + Integer intRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -166,6 +174,10 @@ public record RecordWithAllConstraints( "arrayUniqueRequired", "arrayUniqueNullable", "arrayUniqueRequiredNullable", + "intStandard", + "intNullable", + "intRequired", + "intRequiredNullable", "intMinimum", "intMaximum", "intMinimumAndMaximum", @@ -196,6 +208,8 @@ public record RecordWithAllConstraints( "arrayRequiredNullable", "arrayUniqueRequired", "arrayUniqueRequiredNullable", + "intRequired", + "intRequiredNullable", "longRequired", "longRequiredNullable", "bigDecimalRequired", @@ -228,6 +242,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -271,6 +289,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -571,6 +593,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("arrayUniqueRequiredNullable"))); } + if (jsonObj.get("intStandard") != null && !jsonObj.get("intStandard").isJsonNull()) { + if (!jsonObj.get("intStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intStandard"))); + } + } + + if (jsonObj.get("intNullable") != null && !jsonObj.get("intNullable").isJsonNull()) { + if (!jsonObj.get("intNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intNullable"))); + } + } + + if (!jsonObj.get("intRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intRequired"))); + } + + if (!jsonObj.get("intRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intRequiredNullable"))); + } + if (jsonObj.get("intMinimum") != null && !jsonObj.get("intMinimum").isJsonNull()) { if (!jsonObj.get("intMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index da323034..311c4659 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -71,6 +71,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -116,6 +120,10 @@ public record RecordWithAllConstraints( Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + Integer intRequired, + Integer intRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -163,6 +171,10 @@ public record RecordWithAllConstraints( "arrayUniqueRequired", "arrayUniqueNullable", "arrayUniqueRequiredNullable", + "intStandard", + "intNullable", + "intRequired", + "intRequiredNullable", "intMinimum", "intMaximum", "intMinimumAndMaximum", @@ -193,6 +205,8 @@ public record RecordWithAllConstraints( "arrayRequiredNullable", "arrayUniqueRequired", "arrayUniqueRequiredNullable", + "intRequired", + "intRequiredNullable", "longRequired", "longRequiredNullable", "bigDecimalRequired", @@ -225,6 +239,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -268,6 +286,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -568,6 +590,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("arrayUniqueRequiredNullable"))); } + if (jsonObj.get("intStandard") != null && !jsonObj.get("intStandard").isJsonNull()) { + if (!jsonObj.get("intStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intStandard"))); + } + } + + if (jsonObj.get("intNullable") != null && !jsonObj.get("intNullable").isJsonNull()) { + if (!jsonObj.get("intNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intNullable"))); + } + } + + if (!jsonObj.get("intRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intRequired"))); + } + + if (!jsonObj.get("intRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intRequiredNullable"))); + } + if (jsonObj.get("intMinimum") != null && !jsonObj.get("intMinimum").isJsonNull()) { if (!jsonObj.get("intMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java index 50c4a8d6..48d5be5a 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -71,6 +71,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -116,6 +120,10 @@ public record RecordWithAllConstraints( Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + Integer intRequired, + Integer intRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -163,6 +171,10 @@ public record RecordWithAllConstraints( "arrayUniqueRequired", "arrayUniqueNullable", "arrayUniqueRequiredNullable", + "intStandard", + "intNullable", + "intRequired", + "intRequiredNullable", "intMinimum", "intMaximum", "intMinimumAndMaximum", @@ -193,6 +205,8 @@ public record RecordWithAllConstraints( "arrayRequiredNullable", "arrayUniqueRequired", "arrayUniqueRequiredNullable", + "intRequired", + "intRequiredNullable", "longRequired", "longRequiredNullable", "bigDecimalRequired", @@ -225,6 +239,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -268,6 +286,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -568,6 +590,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("arrayUniqueRequiredNullable"))); } + if (jsonObj.get("intStandard") != null && !jsonObj.get("intStandard").isJsonNull()) { + if (!jsonObj.get("intStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intStandard"))); + } + } + + if (jsonObj.get("intNullable") != null && !jsonObj.get("intNullable").isJsonNull()) { + if (!jsonObj.get("intNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intNullable"))); + } + } + + if (!jsonObj.get("intRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intRequired"))); + } + + if (!jsonObj.get("intRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intRequiredNullable"))); + } + if (jsonObj.get("intMinimum") != null && !jsonObj.get("intMinimum").isJsonNull()) { if (!jsonObj.get("intMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java index b35b0066..484ed38f 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java @@ -71,6 +71,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -116,6 +120,10 @@ public record RecordWithAllConstraints( Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + Integer intRequired, + Integer intRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -163,6 +171,10 @@ public record RecordWithAllConstraints( "arrayUniqueRequired", "arrayUniqueNullable", "arrayUniqueRequiredNullable", + "intStandard", + "intNullable", + "intRequired", + "intRequiredNullable", "intMinimum", "intMaximum", "intMinimumAndMaximum", @@ -193,6 +205,8 @@ public record RecordWithAllConstraints( "arrayRequiredNullable", "arrayUniqueRequired", "arrayUniqueRequiredNullable", + "intRequired", + "intRequiredNullable", "longRequired", "longRequiredNullable", "bigDecimalRequired", @@ -225,6 +239,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -268,6 +286,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -316,6 +338,10 @@ public static class Builder { private Set arrayUniqueRequired; private Set arrayUniqueNullable; private Set arrayUniqueRequiredNullable; + private Integer intStandard; + private Integer intNullable; + private Integer intRequired; + private Integer intRequiredNullable; private Integer intMinimum; private Integer intMaximum; private Integer intMinimumAndMaximum; @@ -672,6 +698,58 @@ public Builder arrayUniqueRequiredNullable(final Set arrayUniqueRequired return this; } + /** + * Sets the value of {@link RecordWithAllConstraints#intStandard }. + * + *

NOTE: Pass-by-reference is used! + * + * @param intStandard Non-required, non-nullable Integer.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder intStandard(final Integer intStandard) { + this.intStandard = intStandard; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#intNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param intNullable Non-required, nullable Integer.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder intNullable(final Integer intNullable) { + this.intNullable = intNullable; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#intRequired }. + * + *

NOTE: Pass-by-reference is used! + * + * @param intRequired Required, non-nullable Integer.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder intRequired(final Integer intRequired) { + this.intRequired = intRequired; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#intRequiredNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param intRequiredNullable Required, nullable Integer.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder intRequiredNullable(final Integer intRequiredNullable) { + this.intRequiredNullable = intRequiredNullable; + return this; + } + /** * Sets the value of {@link RecordWithAllConstraints#intMinimum }. * @@ -929,6 +1007,10 @@ public RecordWithAllConstraints build() { arrayUniqueRequired, arrayUniqueNullable, arrayUniqueRequiredNullable, + intStandard, + intNullable, + intRequired, + intRequiredNullable, intMinimum, intMaximum, intMinimumAndMaximum, @@ -1235,6 +1317,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("arrayUniqueRequiredNullable"))); } + if (jsonObj.get("intStandard") != null && !jsonObj.get("intStandard").isJsonNull()) { + if (!jsonObj.get("intStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intStandard"))); + } + } + + if (jsonObj.get("intNullable") != null && !jsonObj.get("intNullable").isJsonNull()) { + if (!jsonObj.get("intNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intNullable"))); + } + } + + if (!jsonObj.get("intRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intRequired"))); + } + + if (!jsonObj.get("intRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intRequiredNullable"))); + } + if (jsonObj.get("intMinimum") != null && !jsonObj.get("intMinimum").isJsonNull()) { if (!jsonObj.get("intMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java index fbade165..d141f3aa 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java @@ -72,6 +72,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -117,6 +121,10 @@ public record RecordWithAllConstraints( Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + Integer intRequired, + Integer intRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -165,6 +173,10 @@ public record RecordWithAllConstraints( "arrayUniqueRequired", "arrayUniqueNullable", "arrayUniqueRequiredNullable", + "intStandard", + "intNullable", + "intRequired", + "intRequiredNullable", "intMinimum", "intMaximum", "intMinimumAndMaximum", @@ -195,6 +207,8 @@ public record RecordWithAllConstraints( "arrayRequiredNullable", "arrayUniqueRequired", "arrayUniqueRequiredNullable", + "intRequired", + "intRequiredNullable", "longRequired", "longRequiredNullable", "bigDecimalRequired", @@ -227,6 +241,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -270,6 +288,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -570,6 +592,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("arrayUniqueRequiredNullable"))); } + if (jsonObj.get("intStandard") != null && !jsonObj.get("intStandard").isJsonNull()) { + if (!jsonObj.get("intStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intStandard"))); + } + } + + if (jsonObj.get("intNullable") != null && !jsonObj.get("intNullable").isJsonNull()) { + if (!jsonObj.get("intNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intNullable"))); + } + } + + if (!jsonObj.get("intRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intRequired"))); + } + + if (!jsonObj.get("intRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intRequiredNullable"))); + } + if (jsonObj.get("intMinimum") != null && !jsonObj.get("intMinimum").isJsonNull()) { if (!jsonObj.get("intMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java index 462e9309..8775805b 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java @@ -71,6 +71,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -116,6 +120,10 @@ public record RecordWithAllConstraints( Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + Integer intRequired, + Integer intRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -163,6 +171,10 @@ public record RecordWithAllConstraints( "arrayUniqueRequired", "arrayUniqueNullable", "arrayUniqueRequiredNullable", + "intStandard", + "intNullable", + "intRequired", + "intRequiredNullable", "intMinimum", "intMaximum", "intMinimumAndMaximum", @@ -193,6 +205,8 @@ public record RecordWithAllConstraints( "arrayRequiredNullable", "arrayUniqueRequired", "arrayUniqueRequiredNullable", + "intRequired", + "intRequiredNullable", "longRequired", "longRequiredNullable", "bigDecimalRequired", @@ -225,6 +239,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -268,6 +286,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -568,6 +590,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("arrayUniqueRequiredNullable"))); } + if (jsonObj.get("intStandard") != null && !jsonObj.get("intStandard").isJsonNull()) { + if (!jsonObj.get("intStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intStandard"))); + } + } + + if (jsonObj.get("intNullable") != null && !jsonObj.get("intNullable").isJsonNull()) { + if (!jsonObj.get("intNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intNullable"))); + } + } + + if (!jsonObj.get("intRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intRequired"))); + } + + if (!jsonObj.get("intRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intRequiredNullable"))); + } + if (jsonObj.get("intMinimum") != null && !jsonObj.get("intMinimum").isJsonNull()) { if (!jsonObj.get("intMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java index 8fb6d8b4..82fe9640 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java @@ -73,6 +73,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -118,6 +122,10 @@ public record RecordWithAllConstraints( @NotNull Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + @NotNull Integer intRequired, + Integer intRequiredNullable, @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, @@ -165,6 +173,10 @@ public record RecordWithAllConstraints( "arrayUniqueRequired", "arrayUniqueNullable", "arrayUniqueRequiredNullable", + "intStandard", + "intNullable", + "intRequired", + "intRequiredNullable", "intMinimum", "intMaximum", "intMinimumAndMaximum", @@ -195,6 +207,8 @@ public record RecordWithAllConstraints( "arrayRequiredNullable", "arrayUniqueRequired", "arrayUniqueRequiredNullable", + "intRequired", + "intRequiredNullable", "longRequired", "longRequiredNullable", "bigDecimalRequired", @@ -227,6 +241,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -270,6 +288,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -570,6 +592,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("arrayUniqueRequiredNullable"))); } + if (jsonObj.get("intStandard") != null && !jsonObj.get("intStandard").isJsonNull()) { + if (!jsonObj.get("intStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intStandard"))); + } + } + + if (jsonObj.get("intNullable") != null && !jsonObj.get("intNullable").isJsonNull()) { + if (!jsonObj.get("intNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intNullable"))); + } + } + + if (!jsonObj.get("intRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intRequired"))); + } + + if (!jsonObj.get("intRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intRequiredNullable"))); + } + if (jsonObj.get("intMinimum") != null && !jsonObj.get("intMinimum").isJsonNull()) { if (!jsonObj.get("intMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java index 5110e584..4ecd050f 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -71,6 +71,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -116,6 +120,10 @@ public record RecordWithAllConstraints( Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + Integer intRequired, + Integer intRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -163,6 +171,10 @@ public record RecordWithAllConstraints( "arrayUniqueRequired", "arrayUniqueNullable", "arrayUniqueRequiredNullable", + "intStandard", + "intNullable", + "intRequired", + "intRequiredNullable", "intMinimum", "intMaximum", "intMinimumAndMaximum", @@ -193,6 +205,8 @@ public record RecordWithAllConstraints( "arrayRequiredNullable", "arrayUniqueRequired", "arrayUniqueRequiredNullable", + "intRequired", + "intRequiredNullable", "longRequired", "longRequiredNullable", "bigDecimalRequired", @@ -225,6 +239,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -268,6 +286,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -568,6 +590,42 @@ public static void validateJsonElement(final JsonElement jsonElement) throws IOE jsonObj.get("arrayUniqueRequiredNullable"))); } + if (jsonObj.get("intStandard") != null && !jsonObj.get("intStandard").isJsonNull()) { + if (!jsonObj.get("intStandard").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intStandard` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intStandard"))); + } + } + + if (jsonObj.get("intNullable") != null && !jsonObj.get("intNullable").isJsonNull()) { + if (!jsonObj.get("intNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intNullable"))); + } + } + + if (!jsonObj.get("intRequired").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intRequired` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intRequired"))); + } + + if (!jsonObj.get("intRequiredNullable").isJsonPrimitive()) { + throw new IllegalArgumentException( + String.format( + java.util.Locale.ROOT, + "Expected the field `intRequiredNullable` to be a primitive type in the JSON string but got `%s`", + jsonObj.get("intRequiredNullable"))); + } + if (jsonObj.get("intMinimum") != null && !jsonObj.get("intMinimum").isJsonNull()) { if (!jsonObj.get("intMinimum").isJsonPrimitive()) { throw new IllegalArgumentException( diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index 146f6293..3e0d33e8 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -69,6 +69,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -114,6 +118,10 @@ public record RecordWithAllConstraints( Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + Integer intRequired, + Integer intRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -160,6 +168,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -203,6 +215,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java index 4d4f271f..7d7b571f 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -69,6 +69,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -117,6 +121,10 @@ public record RecordWithAllConstraints( Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + Integer intRequired, + Integer intRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -163,6 +171,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -206,6 +218,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index 346112e6..564261f5 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -69,6 +69,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -114,6 +118,10 @@ public record RecordWithAllConstraints( Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + Integer intRequired, + Integer intRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -160,6 +168,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -203,6 +215,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java index 799e69b2..dddc6677 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -69,6 +69,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -114,6 +118,10 @@ public record RecordWithAllConstraints( Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + Integer intRequired, + Integer intRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -160,6 +168,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -203,6 +215,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java index a1785615..a0950d89 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/generateBuilders/RecordWithAllConstraints.java @@ -69,6 +69,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -114,6 +118,10 @@ public record RecordWithAllConstraints( Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + Integer intRequired, + Integer intRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -160,6 +168,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -203,6 +215,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -251,6 +267,10 @@ public static class Builder { private Set arrayUniqueRequired; private Set arrayUniqueNullable; private Set arrayUniqueRequiredNullable; + private Integer intStandard; + private Integer intNullable; + private Integer intRequired; + private Integer intRequiredNullable; private Integer intMinimum; private Integer intMaximum; private Integer intMinimumAndMaximum; @@ -607,6 +627,58 @@ public Builder arrayUniqueRequiredNullable(final Set arrayUniqueRequired return this; } + /** + * Sets the value of {@link RecordWithAllConstraints#intStandard }. + * + *

NOTE: Pass-by-reference is used! + * + * @param intStandard Non-required, non-nullable Integer.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder intStandard(final Integer intStandard) { + this.intStandard = intStandard; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#intNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param intNullable Non-required, nullable Integer.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder intNullable(final Integer intNullable) { + this.intNullable = intNullable; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#intRequired }. + * + *

NOTE: Pass-by-reference is used! + * + * @param intRequired Required, non-nullable Integer.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder intRequired(final Integer intRequired) { + this.intRequired = intRequired; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#intRequiredNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param intRequiredNullable Required, nullable Integer.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder intRequiredNullable(final Integer intRequiredNullable) { + this.intRequiredNullable = intRequiredNullable; + return this; + } + /** * Sets the value of {@link RecordWithAllConstraints#intMinimum }. * @@ -864,6 +936,10 @@ public RecordWithAllConstraints build() { arrayUniqueRequired, arrayUniqueNullable, arrayUniqueRequiredNullable, + intStandard, + intNullable, + intRequired, + intRequiredNullable, intMinimum, intMaximum, intMinimumAndMaximum, diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java index 86238dbb..dac5612a 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/serializableModel/RecordWithAllConstraints.java @@ -70,6 +70,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -115,6 +119,10 @@ public record RecordWithAllConstraints( Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + Integer intRequired, + Integer intRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -162,6 +170,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -205,6 +217,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java index 1032dba8..6f1bf5c4 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/standard/RecordWithAllConstraints.java @@ -69,6 +69,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -114,6 +118,10 @@ public record RecordWithAllConstraints( Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + Integer intRequired, + Integer intRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -160,6 +168,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -203,6 +215,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java index 2ca29ca0..59ad479d 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useBeanValidation/RecordWithAllConstraints.java @@ -71,6 +71,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -116,6 +120,10 @@ public record RecordWithAllConstraints( @NotNull Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + @NotNull Integer intRequired, + Integer intRequiredNullable, @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, @@ -162,6 +170,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -205,6 +217,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java index 45eeb7f7..5149b3dc 100644 --- a/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/java/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/webclient/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -69,6 +69,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -114,6 +118,10 @@ public record RecordWithAllConstraints( Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + Integer intRequired, + Integer intRequiredNullable, Integer intMinimum, Integer intMaximum, Integer intMinimumAndMaximum, @@ -160,6 +168,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -203,6 +215,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java b/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java index cbd7da17..b4e5ce8c 100644 --- a/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java +++ b/test/spring/src/test/java/io/github/chrimle/o2jrm/models/GeneratedRecordImpl.java @@ -159,6 +159,10 @@ public enum GeneratedRecordImpl implements GeneratedRecord, GeneratedClassImpl { .isRequired() .isNullable() .build(), + GeneratedField.of("intStandard", Integer.class).build(), + GeneratedField.of("intNullable", Integer.class).isNullable().build(), + GeneratedField.of("intRequired", Integer.class).isRequired().build(), + GeneratedField.of("intRequiredNullable", Integer.class).isRequired().isNullable().build(), GeneratedField.of("intMinimum", Integer.class).minimum(18).build(), GeneratedField.of("intMaximum", Integer.class).maximum(100).build(), GeneratedField.of("intMinimumAndMaximum", Integer.class).minimum(0).maximum(100).build(), diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java index c6963a10..1d51591a 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalEnumTypeAnnotations/RecordWithAllConstraints.java @@ -55,6 +55,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -100,6 +104,10 @@ public record RecordWithAllConstraints( @NotNull Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + @NotNull Integer intRequired, + Integer intRequiredNullable, @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, @@ -146,6 +154,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -189,6 +201,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java index e761e687..fe932afd 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/additionalModelTypeAnnotations/RecordWithAllConstraints.java @@ -55,6 +55,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -103,6 +107,10 @@ public record RecordWithAllConstraints( @NotNull Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + @NotNull Integer intRequired, + Integer intRequiredNullable, @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, @@ -149,6 +157,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -192,6 +204,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java index 233d564e..2ae5a1b0 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumDefaultCaseAndCaseInsensitive/RecordWithAllConstraints.java @@ -55,6 +55,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -100,6 +104,10 @@ public record RecordWithAllConstraints( @NotNull Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + @NotNull Integer intRequired, + Integer intRequiredNullable, @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, @@ -146,6 +154,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -189,6 +201,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java index ebb69d87..41ca1f40 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/enumUnknownDefaultCase/RecordWithAllConstraints.java @@ -55,6 +55,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -100,6 +104,10 @@ public record RecordWithAllConstraints( @NotNull Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + @NotNull Integer intRequired, + Integer intRequiredNullable, @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, @@ -146,6 +154,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -189,6 +201,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java index cda67672..464dd29b 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/generateBuilders/RecordWithAllConstraints.java @@ -55,6 +55,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -100,6 +104,10 @@ public record RecordWithAllConstraints( @NotNull Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + @NotNull Integer intRequired, + Integer intRequiredNullable, @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, @@ -146,6 +154,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -189,6 +201,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; @@ -237,6 +253,10 @@ public static class Builder { private Set arrayUniqueRequired; private Set arrayUniqueNullable; private Set arrayUniqueRequiredNullable; + private Integer intStandard; + private Integer intNullable; + private Integer intRequired; + private Integer intRequiredNullable; private Integer intMinimum; private Integer intMaximum; private Integer intMinimumAndMaximum; @@ -593,6 +613,58 @@ public Builder arrayUniqueRequiredNullable(final Set arrayUniqueRequired return this; } + /** + * Sets the value of {@link RecordWithAllConstraints#intStandard }. + * + *

NOTE: Pass-by-reference is used! + * + * @param intStandard Non-required, non-nullable Integer.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder intStandard(final Integer intStandard) { + this.intStandard = intStandard; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#intNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param intNullable Non-required, nullable Integer.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder intNullable(final Integer intNullable) { + this.intNullable = intNullable; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#intRequired }. + * + *

NOTE: Pass-by-reference is used! + * + * @param intRequired Required, non-nullable Integer.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder intRequired(final Integer intRequired) { + this.intRequired = intRequired; + return this; + } + + /** + * Sets the value of {@link RecordWithAllConstraints#intRequiredNullable }. + * + *

NOTE: Pass-by-reference is used! + * + * @param intRequiredNullable Required, nullable Integer.. + * @return this {@link Builder}-instance for method-chaining. + */ + public Builder intRequiredNullable(final Integer intRequiredNullable) { + this.intRequiredNullable = intRequiredNullable; + return this; + } + /** * Sets the value of {@link RecordWithAllConstraints#intMinimum }. * @@ -850,6 +922,10 @@ public RecordWithAllConstraints build() { arrayUniqueRequired, arrayUniqueNullable, arrayUniqueRequiredNullable, + intStandard, + intNullable, + intRequired, + intRequiredNullable, intMinimum, intMaximum, intMinimumAndMaximum, diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java index 71bcec25..df3055ae 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/serializableModel/RecordWithAllConstraints.java @@ -56,6 +56,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -101,6 +105,10 @@ public record RecordWithAllConstraints( @NotNull Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + @NotNull Integer intRequired, + Integer intRequiredNullable, @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, @@ -148,6 +156,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -191,6 +203,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java index f6f66145..d2356bf1 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/standard/RecordWithAllConstraints.java @@ -55,6 +55,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -100,6 +104,10 @@ public record RecordWithAllConstraints( @NotNull Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + @NotNull Integer intRequired, + Integer intRequiredNullable, @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, @@ -146,6 +154,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -189,6 +201,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java index 446e4842..1e2a4333 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useBeanValidation/RecordWithAllConstraints.java @@ -55,6 +55,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -100,6 +104,10 @@ public record RecordWithAllConstraints( @NotNull Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + @NotNull Integer intRequired, + Integer intRequiredNullable, @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, @@ -146,6 +154,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -189,6 +201,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum; diff --git a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java index 53fe1b16..17e10365 100644 --- a/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java +++ b/test/spring/target/generated-sources/src/gen/java/main/io/github/chrimle/o2jrm/useEnumCaseInsensitive/RecordWithAllConstraints.java @@ -55,6 +55,10 @@ * @param arrayUniqueRequired Required, non-nullable Set. * @param arrayUniqueNullable Non-required, nullable Set. * @param arrayUniqueRequiredNullable Required, nullable Set. + * @param intStandard Non-required, non-nullable Integer. + * @param intNullable Non-required, nullable Integer. + * @param intRequired Required, non-nullable Integer. + * @param intRequiredNullable Required, nullable Integer. * @param intMinimum Non-required, non-nullable Integer with minimum: 18. * @param intMaximum Non-required, non-nullable Integer with maximum: 100. * @param intMinimumAndMaximum Non-required, non-nullable Integer with minimum: 0 and maximum: 100. @@ -100,6 +104,10 @@ public record RecordWithAllConstraints( @NotNull Set arrayUniqueRequired, Set arrayUniqueNullable, Set arrayUniqueRequiredNullable, + Integer intStandard, + Integer intNullable, + @NotNull Integer intRequired, + Integer intRequiredNullable, @Min(18) Integer intMinimum, @Max(100) Integer intMaximum, @Min(0) @Max(100) Integer intMinimumAndMaximum, @@ -146,6 +154,10 @@ public RecordWithAllConstraints( final Set arrayUniqueRequired, final Set arrayUniqueNullable, final Set arrayUniqueRequiredNullable, + final Integer intStandard, + final Integer intNullable, + final Integer intRequired, + final Integer intRequiredNullable, final Integer intMinimum, final Integer intMaximum, final Integer intMinimumAndMaximum, @@ -189,6 +201,10 @@ public RecordWithAllConstraints( this.arrayUniqueRequired = Objects.requireNonNullElseGet(arrayUniqueRequired, () -> new LinkedHashSet<>()); this.arrayUniqueNullable = arrayUniqueNullable; this.arrayUniqueRequiredNullable = arrayUniqueRequiredNullable; + this.intStandard = intStandard; + this.intNullable = intNullable; + this.intRequired = intRequired; + this.intRequiredNullable = intRequiredNullable; this.intMinimum = intMinimum; this.intMaximum = intMaximum; this.intMinimumAndMaximum = intMinimumAndMaximum;