From 1b8b51e6149899b78bb1095198cbfb7f26955586 Mon Sep 17 00:00:00 2001 From: Tim Smyth Date: Fri, 3 Nov 2023 12:01:55 +0100 Subject: [PATCH 1/2] Ignore additionalProperties during serializing, not super.equal wo prnt --- gen/main/java/issue/_303/MapConstruct.java | 6 +++--- gen/main/java/issue/_315/ServiceScopes.java | 6 +++--- .../testmodel/micronaut_pojo/AdditionalPropertiesModel.java | 6 +++--- .../micronaut_pojo_nullable/AdditionalPropertiesModel.java | 6 +++--- .../testmodel/nomicronaut/AdditionalPropertiesModel.java | 6 +++--- src/main/resources/Micronaut/modelPojo.mustache | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/gen/main/java/issue/_303/MapConstruct.java b/gen/main/java/issue/_303/MapConstruct.java index ef9b8f81..5d7e2231 100644 --- a/gen/main/java/issue/_303/MapConstruct.java +++ b/gen/main/java/issue/_303/MapConstruct.java @@ -5,7 +5,8 @@ public class MapConstruct { - private java.util.Map additionalProperties; + @com.fasterxml.jackson.annotation.JsonIgnore + private java.util.Map additionalProperties; // methods @@ -18,8 +19,7 @@ public boolean equals(Object object) { return false; } MapConstruct other = (MapConstruct) object; - return java.util.Objects.equals(this.additionalProperties, other.additionalProperties) - && super.equals(object); + return java.util.Objects.equals(this.additionalProperties, other.additionalProperties); } @Override diff --git a/gen/main/java/issue/_315/ServiceScopes.java b/gen/main/java/issue/_315/ServiceScopes.java index b17c6951..7cee9366 100644 --- a/gen/main/java/issue/_315/ServiceScopes.java +++ b/gen/main/java/issue/_315/ServiceScopes.java @@ -5,7 +5,8 @@ public class ServiceScopes { - private java.util.Map additionalProperties; + @com.fasterxml.jackson.annotation.JsonIgnore + private java.util.Map additionalProperties; // methods @@ -18,8 +19,7 @@ public boolean equals(Object object) { return false; } ServiceScopes other = (ServiceScopes) object; - return java.util.Objects.equals(this.additionalProperties, other.additionalProperties) - && super.equals(object); + return java.util.Objects.equals(this.additionalProperties, other.additionalProperties); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo/AdditionalPropertiesModel.java b/gen/main/java/testmodel/micronaut_pojo/AdditionalPropertiesModel.java index 25f8b6f4..3f1601e5 100644 --- a/gen/main/java/testmodel/micronaut_pojo/AdditionalPropertiesModel.java +++ b/gen/main/java/testmodel/micronaut_pojo/AdditionalPropertiesModel.java @@ -10,7 +10,8 @@ public class AdditionalPropertiesModel { @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String id; - private java.util.Map additionalProperties; + @com.fasterxml.jackson.annotation.JsonIgnore + private java.util.Map additionalProperties; // methods @@ -23,8 +24,7 @@ public boolean equals(Object object) { return false; } AdditionalPropertiesModel other = (AdditionalPropertiesModel) object; - return java.util.Objects.equals(this.additionalProperties, other.additionalProperties) - && java.util.Objects.equals(id, other.id); + return java.util.Objects.equals(this.additionalProperties, other.additionalProperties) && java.util.Objects.equals(id, other.id); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/AdditionalPropertiesModel.java b/gen/main/java/testmodel/micronaut_pojo_nullable/AdditionalPropertiesModel.java index af947fbf..12264b4c 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/AdditionalPropertiesModel.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/AdditionalPropertiesModel.java @@ -10,7 +10,8 @@ public class AdditionalPropertiesModel { @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String id; - private java.util.Map additionalProperties; + @com.fasterxml.jackson.annotation.JsonIgnore + private java.util.Map additionalProperties; // methods @@ -23,8 +24,7 @@ public boolean equals(Object object) { return false; } AdditionalPropertiesModel other = (AdditionalPropertiesModel) object; - return java.util.Objects.equals(this.additionalProperties, other.additionalProperties) - && java.util.Objects.equals(id, other.id); + return java.util.Objects.equals(this.additionalProperties, other.additionalProperties) && java.util.Objects.equals(id, other.id); } @Override diff --git a/gen/main/java/testmodel/nomicronaut/AdditionalPropertiesModel.java b/gen/main/java/testmodel/nomicronaut/AdditionalPropertiesModel.java index 383a686e..2370e0b5 100644 --- a/gen/main/java/testmodel/nomicronaut/AdditionalPropertiesModel.java +++ b/gen/main/java/testmodel/nomicronaut/AdditionalPropertiesModel.java @@ -8,7 +8,8 @@ public class AdditionalPropertiesModel { @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String id; - private java.util.Map additionalProperties; + @com.fasterxml.jackson.annotation.JsonIgnore + private java.util.Map additionalProperties; // methods @@ -21,8 +22,7 @@ public boolean equals(Object object) { return false; } AdditionalPropertiesModel other = (AdditionalPropertiesModel) object; - return java.util.Objects.equals(this.additionalProperties, other.additionalProperties) - && java.util.Objects.equals(id, other.id); + return java.util.Objects.equals(this.additionalProperties, other.additionalProperties) && java.util.Objects.equals(id, other.id); } @Override diff --git a/src/main/resources/Micronaut/modelPojo.mustache b/src/main/resources/Micronaut/modelPojo.mustache index 5f5f0b41..c8daaf4e 100644 --- a/src/main/resources/Micronaut/modelPojo.mustache +++ b/src/main/resources/Micronaut/modelPojo.mustache @@ -18,7 +18,8 @@ public {{#discriminator}}abstract {{/discriminator}}class {{classname}}{{^parent private {{>modelPropertyType}} {{name}}{{>modelPropertyDefault}}; {{/vars}} -{{#vendorExtensions.additionalPropertiesMap}} private java.util.Map<{{{vendorExtensions.additionalPropertiesMap.keyType}}}, {{{vendorExtensions.additionalPropertiesMap.valueType}}}> additionalProperties; +{{#vendorExtensions.additionalPropertiesMap}} @com.fasterxml.jackson.annotation.JsonIgnore + private java.util.Map<{{{vendorExtensions.additionalPropertiesMap.keyType}}}, {{{vendorExtensions.additionalPropertiesMap.valueType}}}> additionalProperties; {{/vendorExtensions.additionalPropertiesMap}}{{#discriminator}} @com.fasterxml.jackson.annotation.JsonProperty(JSON_DISCRIMINATOR) public abstract {{discriminator.propertyType}} {{discriminator.propertyGetter}}(); @@ -41,8 +42,7 @@ public {{#discriminator}}abstract {{/discriminator}}class {{classname}}{{^parent {{^vars}}{{^discriminator}}{{#vendorExtensions.additionalPropertiesMap}} {{classname}} other = ({{classname}}) object; {{/vendorExtensions.additionalPropertiesMap}}{{/discriminator}}{{#discriminator}}{{^vendorExtensions.additionalPropertiesMap}} {{classname}} other = ({{classname}}) object; {{/vendorExtensions.additionalPropertiesMap}}{{/discriminator}}{{/vars}}{{#vars}}{{#-last}} {{classname}} other = ({{classname}}) object; -{{/-last}}{{/vars}} return {{#vendorExtensions.additionalPropertiesMap}}java.util.Objects.equals(this.additionalProperties, other.additionalProperties) - && {{/vendorExtensions.additionalPropertiesMap}}{{^vars}}{{#discriminator}}java.util.Objects.equals({{discriminator.propertyGetter}}(), other.{{discriminator.propertyGetter}}());{{/discriminator}}{{^discriminator}}super.equals(object);{{/discriminator}}{{/vars}}{{#vars}}{{^isFile}}{{^isByteArray}}java.util.Objects{{/isByteArray}}{{/isFile}}{{#isByteArray}}java.util.Arrays{{/isByteArray}}{{#isFile}}java.util.Arrays{{/isFile}}.equals({{name}}, other.{{name}}){{^-last}} +{{/-last}}{{/vars}} return {{#vendorExtensions.additionalPropertiesMap}}java.util.Objects.equals(this.additionalProperties, other.additionalProperties){{#vars}}{{#-last}} && {{/-last}}{{/vars}}{{/vendorExtensions.additionalPropertiesMap}}{{^vars}}{{#discriminator}}java.util.Objects.equals({{discriminator.propertyGetter}}(), other.{{discriminator.propertyGetter}}());{{/discriminator}}{{^discriminator}}{{#vendorExtensions.additionalPropertiesMap}};{{/vendorExtensions.additionalPropertiesMap}}{{^vendorExtensions.additionalPropertiesMap}}super.equals(object);{{/vendorExtensions.additionalPropertiesMap}}{{/discriminator}}{{/vars}}{{#vars}}{{^isFile}}{{^isByteArray}}java.util.Objects{{/isByteArray}}{{/isFile}}{{#isByteArray}}java.util.Arrays{{/isByteArray}}{{#isFile}}java.util.Arrays{{/isFile}}.equals({{name}}, other.{{name}}){{^-last}} && {{/-last}}{{#-last}}{{#discriminator}} && java.util.Objects.equals({{discriminator.propertyGetter}}(), other.{{discriminator.propertyGetter}}()){{/discriminator}}{{#parent}} && super.equals(object){{/parent}};{{/-last}}{{/vars}} From 7dce38aa9858eef4d2b733f494c6ae528e96a5ef Mon Sep 17 00:00:00 2001 From: Tim Smyth Date: Mon, 6 Nov 2023 09:36:56 +0100 Subject: [PATCH 2/2] Remove JsonIgnore --- gen/main/java/issue/_303/MapConstruct.java | 1 - gen/main/java/issue/_315/ServiceScopes.java | 1 - .../testmodel/micronaut_pojo/AdditionalPropertiesModel.java | 1 - .../micronaut_pojo_nullable/AdditionalPropertiesModel.java | 1 - .../java/testmodel/nomicronaut/AdditionalPropertiesModel.java | 1 - src/main/resources/Micronaut/modelPojo.mustache | 3 +-- 6 files changed, 1 insertion(+), 7 deletions(-) diff --git a/gen/main/java/issue/_303/MapConstruct.java b/gen/main/java/issue/_303/MapConstruct.java index 5d7e2231..fd888283 100644 --- a/gen/main/java/issue/_303/MapConstruct.java +++ b/gen/main/java/issue/_303/MapConstruct.java @@ -5,7 +5,6 @@ public class MapConstruct { - @com.fasterxml.jackson.annotation.JsonIgnore private java.util.Map additionalProperties; // methods diff --git a/gen/main/java/issue/_315/ServiceScopes.java b/gen/main/java/issue/_315/ServiceScopes.java index 7cee9366..eb60ab19 100644 --- a/gen/main/java/issue/_315/ServiceScopes.java +++ b/gen/main/java/issue/_315/ServiceScopes.java @@ -5,7 +5,6 @@ public class ServiceScopes { - @com.fasterxml.jackson.annotation.JsonIgnore private java.util.Map additionalProperties; // methods diff --git a/gen/main/java/testmodel/micronaut_pojo/AdditionalPropertiesModel.java b/gen/main/java/testmodel/micronaut_pojo/AdditionalPropertiesModel.java index 3f1601e5..af1f377e 100644 --- a/gen/main/java/testmodel/micronaut_pojo/AdditionalPropertiesModel.java +++ b/gen/main/java/testmodel/micronaut_pojo/AdditionalPropertiesModel.java @@ -10,7 +10,6 @@ public class AdditionalPropertiesModel { @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String id; - @com.fasterxml.jackson.annotation.JsonIgnore private java.util.Map additionalProperties; // methods diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/AdditionalPropertiesModel.java b/gen/main/java/testmodel/micronaut_pojo_nullable/AdditionalPropertiesModel.java index 12264b4c..1c686cda 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/AdditionalPropertiesModel.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/AdditionalPropertiesModel.java @@ -10,7 +10,6 @@ public class AdditionalPropertiesModel { @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String id; - @com.fasterxml.jackson.annotation.JsonIgnore private java.util.Map additionalProperties; // methods diff --git a/gen/main/java/testmodel/nomicronaut/AdditionalPropertiesModel.java b/gen/main/java/testmodel/nomicronaut/AdditionalPropertiesModel.java index 2370e0b5..d4339a65 100644 --- a/gen/main/java/testmodel/nomicronaut/AdditionalPropertiesModel.java +++ b/gen/main/java/testmodel/nomicronaut/AdditionalPropertiesModel.java @@ -8,7 +8,6 @@ public class AdditionalPropertiesModel { @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String id; - @com.fasterxml.jackson.annotation.JsonIgnore private java.util.Map additionalProperties; // methods diff --git a/src/main/resources/Micronaut/modelPojo.mustache b/src/main/resources/Micronaut/modelPojo.mustache index c8daaf4e..b19b7a62 100644 --- a/src/main/resources/Micronaut/modelPojo.mustache +++ b/src/main/resources/Micronaut/modelPojo.mustache @@ -18,8 +18,7 @@ public {{#discriminator}}abstract {{/discriminator}}class {{classname}}{{^parent private {{>modelPropertyType}} {{name}}{{>modelPropertyDefault}}; {{/vars}} -{{#vendorExtensions.additionalPropertiesMap}} @com.fasterxml.jackson.annotation.JsonIgnore - private java.util.Map<{{{vendorExtensions.additionalPropertiesMap.keyType}}}, {{{vendorExtensions.additionalPropertiesMap.valueType}}}> additionalProperties; +{{#vendorExtensions.additionalPropertiesMap}} private java.util.Map<{{{vendorExtensions.additionalPropertiesMap.keyType}}}, {{{vendorExtensions.additionalPropertiesMap.valueType}}}> additionalProperties; {{/vendorExtensions.additionalPropertiesMap}}{{#discriminator}} @com.fasterxml.jackson.annotation.JsonProperty(JSON_DISCRIMINATOR) public abstract {{discriminator.propertyType}} {{discriminator.propertyGetter}}();