Use Jackson Annotations for getters and setters also for Micronaut Serde

modules/openapi-generator/src/main/resources/java-micronaut/common/model/pojo.mustache

@@ -199,8 +199,7 @@ Declare the class with extends and implements
 {{!unannotated, Jackson would pick this up automatically and add it *in addition* to the _JsonNullable getter field}}  @JsonIgnore
         {{/vendorExtensions.x-is-jackson-optional-nullable}}
         {{^vendorExtensions.x-is-jackson-optional-nullable}}
-            {{#jackson}}
-{{>common/model/jackson_annotations}}{{/jackson}}{{/vendorExtensions.x-is-jackson-optional-nullable}}    public {{#useOptional}}{{^required}}Optional<{{/required}}{{/useOptional}}{{{datatypeWithEnum}}}{{#useOptional}}{{^required}}>{{/required}}{{/useOptional}} {{getter}}() {
+{{>common/model/jackson_annotations}}{{/vendorExtensions.x-is-jackson-optional-nullable}}    public {{#useOptional}}{{^required}}Optional<{{/required}}{{/useOptional}}{{{datatypeWithEnum}}}{{#useOptional}}{{^required}}>{{/required}}{{/useOptional}} {{getter}}() {
         {{#vendorExtensions.x-is-jackson-optional-nullable}}
             {{#isReadOnly}}
 {{! A readonly attribute doesn't have setter => jackson will set null directly if explicitly returned by API, so make sure we have an empty JsonNullable}}    if ({{name}} == null) {
@@ -237,10 +236,9 @@ Declare the class with extends and implements
 
         {{/vendorExtensions.x-is-jackson-optional-nullable}}
         {{^isReadOnly}}
-            {{#jackson}}
                 {{^vendorExtensions.x-is-jackson-optional-nullable}}
 {{>common/model/jackson_annotations}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{#vendorExtensions.x-setter-extra-annotation}}       {{{vendorExtensions.x-setter-extra-annotation}}}
-{{/vendorExtensions.x-setter-extra-annotation}}{{/jackson}}    public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {
+{{/vendorExtensions.x-setter-extra-annotation}}    public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {
             {{#vendorExtensions.x-is-jackson-optional-nullable}}
         this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{name}});
             {{/vendorExtensions.x-is-jackson-optional-nullable}}

samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/api/openapi.yaml

@@ -753,7 +753,7 @@ paths:
         schema:
           enum:
           - 1
-          - -2
+          - null
           format: int32
           type: integer
         style: form
@@ -1650,13 +1650,13 @@ components:
         enum_integer:
           enum:
           - 1
-          - -1
+          - null
           format: int32
           type: integer
         enum_integer_only:
           enum:
           - 2
-          - -2
+          - null
           type: integer
         enum_number:
           enum:

samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumTest.cs

@@ -205,9 +205,9 @@
             NUMBER_1 = 1,
 
             /// <summary>
-            /// Enum NUMBER_MINUS_1 for value: -1
+            /// Enum NUMBER_null for value: null
             /// </summary>
-            NUMBER_MINUS_1 = -1
+            NUMBER_null = null
         }
 
 
@@ -247,9 +247,9 @@
             NUMBER_2 = 2,
 
             /// <summary>
-            /// Enum NUMBER_MINUS_2 for value: -2
+            /// Enum NUMBER_null for value: null
             /// </summary>
-            NUMBER_MINUS_2 = -2
+            NUMBER_null = null
         }
 
 

samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/api/openapi.yaml

@@ -753,7 +753,7 @@ paths:
         schema:
           enum:
           - 1
-          - -2
+          - null
           format: int32
           type: integer
         style: form
@@ -1650,13 +1650,13 @@ components:
         enum_integer:
           enum:
           - 1
-          - -1
+          - null
           format: int32
           type: integer
         enum_integer_only:
           enum:
           - 2
-          - -2
+          - null
           type: integer
         enum_number:
           enum:

samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/EnumTest.cs

@@ -72,9 +72,9 @@
             NUMBER_1 = 1,
 
             /// <summary>
-            /// Enum NUMBER_MINUS_1 for value: -1
+            /// Enum NUMBER_null for value: null
             /// </summary>
-            NUMBER_MINUS_1 = -1
+            NUMBER_null = null
         }
 
         /// <summary>
@@ -88,8 +88,8 @@
             if (value.Equals((1).ToString()))
                 return EnumIntegerEnum.NUMBER_1;
 
-            if (value.Equals((-1).ToString()))
-                return EnumIntegerEnum.NUMBER_MINUS_1;
+            if (value.Equals((null).ToString()))
+                return EnumIntegerEnum.NUMBER_null;
 
             throw new NotImplementedException($"Could not convert value to type EnumIntegerEnum: '{value}'");
         }
@@ -104,8 +104,8 @@
             if (value.Equals((1).ToString()))
                 return EnumIntegerEnum.NUMBER_1;
 
-            if (value.Equals((-1).ToString()))
-                return EnumIntegerEnum.NUMBER_MINUS_1;
+            if (value.Equals((null).ToString()))
+                return EnumIntegerEnum.NUMBER_null;
 
             return null;
         }
@@ -137,9 +137,9 @@
             NUMBER_2 = 2,
 
             /// <summary>
-            /// Enum NUMBER_MINUS_2 for value: -2
+            /// Enum NUMBER_null for value: null
             /// </summary>
-            NUMBER_MINUS_2 = -2
+            NUMBER_null = null
         }
 
         /// <summary>
@@ -153,8 +153,8 @@
             if (value.Equals((2).ToString()))
                 return EnumIntegerOnlyEnum.NUMBER_2;
 
-            if (value.Equals((-2).ToString()))
-                return EnumIntegerOnlyEnum.NUMBER_MINUS_2;
+            if (value.Equals((null).ToString()))
+                return EnumIntegerOnlyEnum.NUMBER_null;
 
             throw new NotImplementedException($"Could not convert value to type EnumIntegerOnlyEnum: '{value}'");
         }
@@ -169,8 +169,8 @@
             if (value.Equals((2).ToString()))
                 return EnumIntegerOnlyEnum.NUMBER_2;
 
-            if (value.Equals((-2).ToString()))
-                return EnumIntegerOnlyEnum.NUMBER_MINUS_2;
+            if (value.Equals((null).ToString()))
+                return EnumIntegerOnlyEnum.NUMBER_null;
 
             return null;
         }

samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/api/openapi.yaml

@@ -753,7 +753,7 @@ paths:
         schema:
           enum:
           - 1
-          - -2
+          - null
           format: int32
           type: integer
         style: form
@@ -1650,13 +1650,13 @@ components:
         enum_integer:
           enum:
           - 1
-          - -1
+          - null
           format: int32
           type: integer
         enum_integer_only:
           enum:
           - 2
-          - -2
+          - null
           type: integer
         enum_number:
           enum:

samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs

@@ -70,9 +70,9 @@
             NUMBER_1 = 1,
 
             /// <summary>
-            /// Enum NUMBER_MINUS_1 for value: -1
+            /// Enum NUMBER_null for value: null
             /// </summary>
-            NUMBER_MINUS_1 = -1
+            NUMBER_null = null
         }
 
         /// <summary>
@@ -86,8 +86,8 @@
             if (value.Equals((1).ToString()))
                 return EnumIntegerEnum.NUMBER_1;
 
-            if (value.Equals((-1).ToString()))
-                return EnumIntegerEnum.NUMBER_MINUS_1;
+            if (value.Equals((null).ToString()))
+                return EnumIntegerEnum.NUMBER_null;
 
             throw new NotImplementedException($"Could not convert value to type EnumIntegerEnum: '{value}'");
         }
@@ -102,8 +102,8 @@
             if (value.Equals((1).ToString()))
                 return EnumIntegerEnum.NUMBER_1;
 
-            if (value.Equals((-1).ToString()))
-                return EnumIntegerEnum.NUMBER_MINUS_1;
+            if (value.Equals((null).ToString()))
+                return EnumIntegerEnum.NUMBER_null;
 
             return null;
         }
@@ -135,9 +135,9 @@
             NUMBER_2 = 2,
 
             /// <summary>
-            /// Enum NUMBER_MINUS_2 for value: -2
+            /// Enum NUMBER_null for value: null
             /// </summary>
-            NUMBER_MINUS_2 = -2
+            NUMBER_null = null
         }
 
         /// <summary>
@@ -151,8 +151,8 @@
             if (value.Equals((2).ToString()))
                 return EnumIntegerOnlyEnum.NUMBER_2;
 
-            if (value.Equals((-2).ToString()))
-                return EnumIntegerOnlyEnum.NUMBER_MINUS_2;
+            if (value.Equals((null).ToString()))
+                return EnumIntegerOnlyEnum.NUMBER_null;
 
             throw new NotImplementedException($"Could not convert value to type EnumIntegerOnlyEnum: '{value}'");
         }
@@ -167,8 +167,8 @@
             if (value.Equals((2).ToString()))
                 return EnumIntegerOnlyEnum.NUMBER_2;
 
-            if (value.Equals((-2).ToString()))
-                return EnumIntegerOnlyEnum.NUMBER_MINUS_2;
+            if (value.Equals((null).ToString()))
+                return EnumIntegerOnlyEnum.NUMBER_null;
 
             return null;
         }

samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/api/openapi.yaml

@@ -753,7 +753,7 @@ paths:
         schema:
           enum:
           - 1
-          - -2
+          - null
           format: int32
           type: integer
         style: form
@@ -1650,13 +1650,13 @@ components:
         enum_integer:
           enum:
           - 1
-          - -1
+          - null
           format: int32
           type: integer
         enum_integer_only:
           enum:
           - 2
-          - -2
+          - null
           type: integer
         enum_number:
           enum:

samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs

@@ -68,9 +68,9 @@
             NUMBER_1 = 1,
 
             /// <summary>
-            /// Enum NUMBER_MINUS_1 for value: -1
+            /// Enum NUMBER_null for value: null
             /// </summary>
-            NUMBER_MINUS_1 = -1
+            NUMBER_null = null
         }
 
         /// <summary>
@@ -84,8 +84,8 @@
             if (value.Equals((1).ToString()))
                 return EnumIntegerEnum.NUMBER_1;
 
-            if (value.Equals((-1).ToString()))
-                return EnumIntegerEnum.NUMBER_MINUS_1;
+            if (value.Equals((null).ToString()))
+                return EnumIntegerEnum.NUMBER_null;
 
             throw new NotImplementedException($"Could not convert value to type EnumIntegerEnum: '{value}'");
         }
@@ -100,8 +100,8 @@
             if (value.Equals((1).ToString()))
                 return EnumIntegerEnum.NUMBER_1;
 
-            if (value.Equals((-1).ToString()))
-                return EnumIntegerEnum.NUMBER_MINUS_1;
+            if (value.Equals((null).ToString()))
+                return EnumIntegerEnum.NUMBER_null;
 
             return null;
         }
@@ -133,9 +133,9 @@
             NUMBER_2 = 2,
 
             /// <summary>
-            /// Enum NUMBER_MINUS_2 for value: -2
+            /// Enum NUMBER_null for value: null
             /// </summary>
-            NUMBER_MINUS_2 = -2
+            NUMBER_null = null
         }
 
         /// <summary>
@@ -149,8 +149,8 @@
             if (value.Equals((2).ToString()))
                 return EnumIntegerOnlyEnum.NUMBER_2;
 
-            if (value.Equals((-2).ToString()))
-                return EnumIntegerOnlyEnum.NUMBER_MINUS_2;
+            if (value.Equals((null).ToString()))
+                return EnumIntegerOnlyEnum.NUMBER_null;
 
             throw new NotImplementedException($"Could not convert value to type EnumIntegerOnlyEnum: '{value}'");
         }
@@ -165,8 +165,8 @@
             if (value.Equals((2).ToString()))
                 return EnumIntegerOnlyEnum.NUMBER_2;
 
-            if (value.Equals((-2).ToString()))
-                return EnumIntegerOnlyEnum.NUMBER_MINUS_2;
+            if (value.Equals((null).ToString()))
+                return EnumIntegerOnlyEnum.NUMBER_null;
 
             return null;
         }

samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/api/openapi.yaml

@@ -753,7 +753,7 @@ paths:
         schema:
           enum:
           - 1
-          - -2
+          - null
           format: int32
           type: integer
         style: form
@@ -1650,13 +1650,13 @@ components:
         enum_integer:
           enum:
           - 1
-          - -1
+          - null
           format: int32
           type: integer
         enum_integer_only:
           enum:
           - 2
-          - -2
+          - null
           type: integer
         enum_number:
           enum: