Skip to content

Commit 16d08a3

Browse files
jorgerodjorgerod
committed
fix: update generated annotation version in EnumConverterConfiguration
1 parent 0cb169d commit 16d08a3

5 files changed

Lines changed: 9 additions & 70 deletions

File tree

‎modules/openapi-generator/src/main/resources/Java/libraries/restclient/pojo.mustache‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -241,24 +241,11 @@ public {{>sealed}}class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#v
241241
{{/vendorExtensions.x-is-jackson-optional-nullable}}
242242
{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#jackson}}{{> jackson_annotations}}{{/jackson}}{{/vendorExtensions.x-is-jackson-optional-nullable}}
243243
public {{#optionalGettersForNullableFieldsOnly}}{{^required}}{{^vendorExtensions.x-is-jackson-optional-nullable}}java.util.Optional<{{/vendorExtensions.x-is-jackson-optional-nullable}}{{/required}}{{/optionalGettersForNullableFieldsOnly}}{{>nullableDatatypeWithEnum}}{{#optionalGettersForNullableFieldsOnly}}{{^required}}{{^vendorExtensions.x-is-jackson-optional-nullable}}>{{/vendorExtensions.x-is-jackson-optional-nullable}}{{/required}}{{/optionalGettersForNullableFieldsOnly}} {{getter}}() {
244-
{{#vendorExtensions.x-is-jackson-optional-nullable}}
245-
{{#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}}
244+
{{#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}}
246245
if ({{name}} == null) {
247246
{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>{{#defaultValue}}of({{{.}}}){{/defaultValue}}{{^defaultValue}}undefined(){{/defaultValue}};
248247
}
249-
{{/isReadOnly}}
250-
return {{name}}.orElse(null);
251-
{{/vendorExtensions.x-is-jackson-optional-nullable}}
252-
{{^vendorExtensions.x-is-jackson-optional-nullable}}
253-
{{#optionalGettersForNullableFieldsOnly}}{{^required}}
254-
return java.util.Optional.ofNullable({{name}});
255-
{{/required}}{{#required}}
256-
return {{name}};
257-
{{/required}}{{/optionalGettersForNullableFieldsOnly}}
258-
{{^optionalGettersForNullableFieldsOnly}}
259-
return {{name}};
260-
{{/optionalGettersForNullableFieldsOnly}}
261-
{{/vendorExtensions.x-is-jackson-optional-nullable}}
248+
{{/isReadOnly}}return {{name}}.orElse(null);{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}return {{#optionalGettersForNullableFieldsOnly}}{{^required}}java.util.Optional.ofNullable({{name}}){{/required}}{{#required}}{{name}}{{/required}}{{/optionalGettersForNullableFieldsOnly}}{{^optionalGettersForNullableFieldsOnly}}{{name}}{{/optionalGettersForNullableFieldsOnly}};{{/vendorExtensions.x-is-jackson-optional-nullable}}
262249
}
263250
264251
{{#vendorExtensions.x-is-jackson-optional-nullable}}

‎modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pojo.mustache‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -241,24 +241,11 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
241241
{{/vendorExtensions.x-is-jackson-optional-nullable}}
242242
{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#jackson}}{{> jackson_annotations}}{{/jackson}}{{/vendorExtensions.x-is-jackson-optional-nullable}}
243243
public {{#optionalGettersForNullableFieldsOnly}}{{^required}}{{^vendorExtensions.x-is-jackson-optional-nullable}}java.util.Optional<{{/vendorExtensions.x-is-jackson-optional-nullable}}{{/required}}{{/optionalGettersForNullableFieldsOnly}}{{>nullableDatatypeWithEnum}}{{#optionalGettersForNullableFieldsOnly}}{{^required}}{{^vendorExtensions.x-is-jackson-optional-nullable}}>{{/vendorExtensions.x-is-jackson-optional-nullable}}{{/required}}{{/optionalGettersForNullableFieldsOnly}} {{getter}}() {
244-
{{#vendorExtensions.x-is-jackson-optional-nullable}}
245-
{{#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}}
244+
{{#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}}
246245
if ({{name}} == null) {
247246
{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>{{#defaultValue}}of({{{.}}}){{/defaultValue}}{{^defaultValue}}undefined(){{/defaultValue}};
248247
}
249-
{{/isReadOnly}}
250-
return {{name}}.orElse(null);
251-
{{/vendorExtensions.x-is-jackson-optional-nullable}}
252-
{{^vendorExtensions.x-is-jackson-optional-nullable}}
253-
{{#optionalGettersForNullableFieldsOnly}}{{^required}}
254-
return java.util.Optional.ofNullable({{name}});
255-
{{/required}}{{#required}}
256-
return {{name}};
257-
{{/required}}{{/optionalGettersForNullableFieldsOnly}}
258-
{{^optionalGettersForNullableFieldsOnly}}
259-
return {{name}};
260-
{{/optionalGettersForNullableFieldsOnly}}
261-
{{/vendorExtensions.x-is-jackson-optional-nullable}}
248+
{{/isReadOnly}}return {{name}}.orElse(null);{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}return {{#optionalGettersForNullableFieldsOnly}}{{^required}}java.util.Optional.ofNullable({{name}}){{/required}}{{#required}}{{name}}{{/required}}{{/optionalGettersForNullableFieldsOnly}}{{^optionalGettersForNullableFieldsOnly}}{{name}}{{/optionalGettersForNullableFieldsOnly}};{{/vendorExtensions.x-is-jackson-optional-nullable}}
262249
}
263250
264251
{{#vendorExtensions.x-is-jackson-optional-nullable}}

‎modules/openapi-generator/src/main/resources/Java/libraries/webclient/pojo.mustache‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -241,24 +241,11 @@ public {{>sealed}}class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#v
241241
{{/vendorExtensions.x-is-jackson-optional-nullable}}
242242
{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#jackson}}{{> jackson_annotations}}{{/jackson}}{{/vendorExtensions.x-is-jackson-optional-nullable}}
243243
public {{#optionalGettersForNullableFieldsOnly}}{{^required}}{{^vendorExtensions.x-is-jackson-optional-nullable}}java.util.Optional<{{/vendorExtensions.x-is-jackson-optional-nullable}}{{/required}}{{/optionalGettersForNullableFieldsOnly}}{{>nullableDatatypeWithEnum}}{{#optionalGettersForNullableFieldsOnly}}{{^required}}{{^vendorExtensions.x-is-jackson-optional-nullable}}>{{/vendorExtensions.x-is-jackson-optional-nullable}}{{/required}}{{/optionalGettersForNullableFieldsOnly}} {{getter}}() {
244-
{{#vendorExtensions.x-is-jackson-optional-nullable}}
245-
{{#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}}
244+
{{#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}}
246245
if ({{name}} == null) {
247246
{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>{{#defaultValue}}of({{{.}}}){{/defaultValue}}{{^defaultValue}}undefined(){{/defaultValue}};
248247
}
249-
{{/isReadOnly}}
250-
return {{name}}.orElse(null);
251-
{{/vendorExtensions.x-is-jackson-optional-nullable}}
252-
{{^vendorExtensions.x-is-jackson-optional-nullable}}
253-
{{#optionalGettersForNullableFieldsOnly}}{{^required}}
254-
return java.util.Optional.ofNullable({{name}});
255-
{{/required}}{{#required}}
256-
return {{name}};
257-
{{/required}}{{/optionalGettersForNullableFieldsOnly}}
258-
{{^optionalGettersForNullableFieldsOnly}}
259-
return {{name}};
260-
{{/optionalGettersForNullableFieldsOnly}}
261-
{{/vendorExtensions.x-is-jackson-optional-nullable}}
248+
{{/isReadOnly}}return {{name}}.orElse(null);{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}return {{#optionalGettersForNullableFieldsOnly}}{{^required}}java.util.Optional.ofNullable({{name}}){{/required}}{{#required}}{{name}}{{/required}}{{/optionalGettersForNullableFieldsOnly}}{{^optionalGettersForNullableFieldsOnly}}{{name}}{{/optionalGettersForNullableFieldsOnly}};{{/vendorExtensions.x-is-jackson-optional-nullable}}
262249
}
263250
264251
{{#vendorExtensions.x-is-jackson-optional-nullable}}

‎modules/openapi-generator/src/main/resources/Java/pojo.mustache‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -244,24 +244,11 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
244244
{{/vendorExtensions.x-is-jackson-optional-nullable}}
245245
{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#jackson}}{{> jackson_annotations}}{{/jackson}}{{/vendorExtensions.x-is-jackson-optional-nullable}}
246246
public {{#optionalGettersForNullableFieldsOnly}}{{^required}}{{^vendorExtensions.x-is-jackson-optional-nullable}}java.util.Optional<{{/vendorExtensions.x-is-jackson-optional-nullable}}{{/required}}{{/optionalGettersForNullableFieldsOnly}}{{{datatypeWithEnum}}}{{#optionalGettersForNullableFieldsOnly}}{{^required}}{{^vendorExtensions.x-is-jackson-optional-nullable}}>{{/vendorExtensions.x-is-jackson-optional-nullable}}{{/required}}{{/optionalGettersForNullableFieldsOnly}} {{getter}}() {
247-
{{#vendorExtensions.x-is-jackson-optional-nullable}}
248-
{{#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}}
247+
{{#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}}
249248
if ({{name}} == null) {
250249
{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>{{#defaultValue}}of({{{.}}}){{/defaultValue}}{{^defaultValue}}undefined(){{/defaultValue}};
251250
}
252-
{{/isReadOnly}}
253-
return {{name}}.orElse(null);
254-
{{/vendorExtensions.x-is-jackson-optional-nullable}}
255-
{{^vendorExtensions.x-is-jackson-optional-nullable}}
256-
{{#optionalGettersForNullableFieldsOnly}}{{^required}}
257-
return java.util.Optional.ofNullable({{name}});
258-
{{/required}}{{#required}}
259-
return {{name}};
260-
{{/required}}{{/optionalGettersForNullableFieldsOnly}}
261-
{{^optionalGettersForNullableFieldsOnly}}
262-
return {{name}};
263-
{{/optionalGettersForNullableFieldsOnly}}
264-
{{/vendorExtensions.x-is-jackson-optional-nullable}}
251+
{{/isReadOnly}}return {{name}}.orElse(null);{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}return {{#optionalGettersForNullableFieldsOnly}}{{^required}}java.util.Optional.ofNullable({{name}}){{/required}}{{#required}}{{name}}{{/required}}{{/optionalGettersForNullableFieldsOnly}}{{^optionalGettersForNullableFieldsOnly}}{{name}}{{/optionalGettersForNullableFieldsOnly}};{{/vendorExtensions.x-is-jackson-optional-nullable}}
265252
}
266253
267254
{{#vendorExtensions.x-is-jackson-optional-nullable}}

‎modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -236,16 +236,7 @@ public {{>sealed}}class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}
236236
@Deprecated
237237
{{/deprecated}}
238238
{{#jackson}}{{>jackson_annotations}}{{/jackson}}{{#withXml}}{{>xmlAccessorAnnotation}}{{/withXml}} public {{>nullableAnnotation}}{{#optionalGettersForNullableFieldsOnly}}{{^required}}{{^isNullable}}java.util.Optional<{{/isNullable}}{{/required}}{{/optionalGettersForNullableFieldsOnly}}{{>nullableDataTypeBeanValidation}}{{#optionalGettersForNullableFieldsOnly}}{{^required}}{{^isNullable}}>{{/isNullable}}{{/required}}{{/optionalGettersForNullableFieldsOnly}} {{getter}}() {
239-
{{#optionalGettersForNullableFieldsOnly}}{{^required}}{{^isNullable}}
240-
return java.util.Optional.ofNullable({{name}});
241-
{{/isNullable}}{{#isNullable}}
242-
return {{name}};
243-
{{/isNullable}}{{/required}}{{#required}}
244-
return {{name}};
245-
{{/required}}{{/optionalGettersForNullableFieldsOnly}}
246-
{{^optionalGettersForNullableFieldsOnly}}
247-
return {{name}};
248-
{{/optionalGettersForNullableFieldsOnly}}
239+
{{#optionalGettersForNullableFieldsOnly}}{{^required}}{{^isNullable}}return java.util.Optional.ofNullable({{name}});{{/isNullable}}{{#isNullable}}return {{name}};{{/isNullable}}{{/required}}{{#required}}return {{name}};{{/required}}{{/optionalGettersForNullableFieldsOnly}}{{^optionalGettersForNullableFieldsOnly}}return {{name}};{{/optionalGettersForNullableFieldsOnly}}
249240
}
250241
{{/lombok.Getter}}
251242

0 commit comments

Comments
 (0)