Skip to content

Commit

Permalink
Fix generated records.
Browse files Browse the repository at this point in the history
  • Loading branch information
sschnabe committed Sep 25, 2023
1 parent 2133816 commit a2c9083
Show file tree
Hide file tree
Showing 88 changed files with 164 additions and 58 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
@io.micronaut.serde.annotation.Serdeable
public record AdditionalPropertiesModel(

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("id")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.lang.String id) {}
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,22 @@
@io.micronaut.serde.annotation.Serdeable
public record EnumerationModel(

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("string")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
EnumerationString string,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("string-default")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
EnumerationStringDefault stringDefault,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("embedded")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
Embedded embedded,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("embedded-default")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
EmbeddedDefault embeddedDefault) {
Expand Down
3 changes: 3 additions & 0 deletions gen/main/java/testmodel/micronaut_record/FirstModel.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,17 @@
@io.micronaut.serde.annotation.Serdeable
public record FirstModel(

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("type")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.lang.String type,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("first")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.lang.String first,

@io.micronaut.core.annotation.Nullable
@jakarta.validation.Valid
@com.fasterxml.jackson.annotation.JsonProperty("secondLevel")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
@io.micronaut.serde.annotation.Serdeable
public record InheritanceWithEnumType1(

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("d")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.lang.String d) implements InheritanceWithEnumType {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
@io.micronaut.serde.annotation.Serdeable
public record InheritanceWithEnumType2(

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("e")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.lang.String e) implements InheritanceWithEnumType {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@
@io.micronaut.serde.annotation.Serdeable
public record InheritanceWithStringType1(

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("a")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.lang.String a,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("b")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.lang.String b) implements InheritanceWithStringType {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@
@io.micronaut.serde.annotation.Serdeable
public record InheritanceWithStringType2(

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("a")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.lang.String a,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("c")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.lang.String c) implements InheritanceWithStringType {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@
@io.micronaut.serde.annotation.Serdeable
public record InheritanceWithoutType1(

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("e")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.lang.String e,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("f")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.lang.String f) implements InheritanceWithoutType {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@
@io.micronaut.serde.annotation.Serdeable
public record InheritanceWithoutType2(

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("e")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.lang.String e,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("g")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.lang.String g) implements InheritanceWithoutType {
Expand Down
27 changes: 27 additions & 0 deletions gen/main/java/testmodel/micronaut_record/Model.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,17 @@
@io.micronaut.serde.annotation.Serdeable
public record Model(

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("id")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.lang.Integer id,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("idWithExample")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.lang.Integer idWithExample,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("idWithDefault")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.lang.Integer idWithDefault,
Expand All @@ -22,42 +25,52 @@ public record Model(
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS)
java.lang.String name,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("nameWithExample")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.lang.String nameWithExample,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("nameWithDefault")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.lang.String nameWithDefault,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("date")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.time.LocalDate date,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("dateWithExample")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.time.LocalDate dateWithExample,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("date-time")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.time.Instant dateTime,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("date-timeWithExample")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.time.Instant dateTimeWithExample,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("number")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.lang.Double number,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("binary")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
byte[] binary,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("bytes")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
byte[] bytes,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("any")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT)
java.lang.Object any,
Expand All @@ -67,6 +80,7 @@ public record Model(
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS)
java.util.List<java.lang.String> array,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("arrayWithExample")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.util.List<java.lang.String> arrayWithExample,
Expand All @@ -76,6 +90,7 @@ public record Model(
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS)
java.util.Set<java.lang.String> set,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("setWithExamples")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.util.Set<java.lang.String> setWithExamples,
Expand All @@ -85,50 +100,62 @@ public record Model(
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS)
java.util.Map<String, java.lang.String> map,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("mapWithExample")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.util.Map<String, java.lang.String> mapWithExample,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("optionalArray")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.util.List<java.lang.String> optionalArray,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("optionalSet")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.util.Set<java.lang.String> optionalSet,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("optionalMap")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.util.Map<String, java.lang.String> optionalMap,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("nullableString")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT)
java.lang.String nullableString,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("nullableArray")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT)
java.util.List<java.lang.String> nullableArray,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("nullableSet")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT)
java.util.Set<java.lang.String> nullableSet,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("defaultString")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.lang.String defaultString,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("defaultInteger")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.lang.Integer defaultInteger,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("defaultLong")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.lang.Long defaultLong,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("defaultNullable")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT)
java.lang.String defaultNullable,

@io.micronaut.core.annotation.Nullable
@jakarta.validation.Valid
@com.fasterxml.jackson.annotation.JsonProperty("referenedModel")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
@io.micronaut.serde.annotation.Serdeable
public record OneOfImplementor1(

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("property")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.lang.String property) implements OneOfInterface {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
@io.micronaut.serde.annotation.Serdeable
public record OneOfImplementor2(

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("property")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.lang.Double property) implements OneOfInterface {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
@io.micronaut.serde.annotation.Serdeable
public record PropertyTypeOne(

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("type")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
Type type) implements AdditionalPropertiesModelValue {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
@io.micronaut.serde.annotation.Serdeable
public record PropertyTypeTwo(

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("type")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
Type type) implements AdditionalPropertiesModelValue {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@
@io.micronaut.serde.annotation.Serdeable
public record SecondLevelOneModel(

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("type")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.lang.String type,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("one")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.lang.String one) implements SecondLevelModel {}
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@
@io.micronaut.serde.annotation.Serdeable
public record SecondLevelTwoModel(

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("type")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.lang.String type,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty("two")
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.lang.String two) implements SecondLevelModel {}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
@io.micronaut.serde.annotation.Serdeable
public record AdditionalPropertiesModel(

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ID)
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.lang.String id) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,22 @@
@io.micronaut.serde.annotation.Serdeable
public record EnumerationModel(

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_STRING)
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
EnumerationString string,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_STRING_DEFAULT)
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
EnumerationStringDefault stringDefault,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_EMBEDDED)
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
Embedded embedded,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_EMBEDDED_DEFAULT)
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
EmbeddedDefault embeddedDefault) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,17 @@
@io.micronaut.serde.annotation.Serdeable
public record FirstModel(

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TYPE)
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.lang.String type,

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FIRST)
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.lang.String first,

@io.micronaut.core.annotation.Nullable
@jakarta.validation.Valid
@com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_SECOND_LEVEL)
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
@io.micronaut.serde.annotation.Serdeable
public record InheritanceWithEnumType1(

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_D)
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.lang.String d) implements InheritanceWithEnumType {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
@io.micronaut.serde.annotation.Serdeable
public record InheritanceWithEnumType2(

@io.micronaut.core.annotation.Nullable
@com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_E)
@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
java.lang.String e) implements InheritanceWithEnumType {
Expand Down
Loading

0 comments on commit a2c9083

Please sign in to comment.