Skip to content

Commit 8aef689

Browse files
authored
[Java] allow setting boolean getter (is, has, get) in templates (#7344)
* allow setting java boolean getter (is, has, get) in templates * update msf4j boolean getter * update jaxrs-spec boolean handler * update jaxrs boolean getter * update reasteasy, spring, cxf boolean getter * update inflector boolean getter * update java play boolean getter * update java boolean getter * update spring samples
1 parent 4241b11 commit 8aef689

File tree

141 files changed

+297
-174
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+297
-174
lines changed

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1269,13 +1269,13 @@ public void writePropertyBack(String propertyKey, boolean value) {
12691269
}
12701270

12711271
/**
1272-
* Output the Getter name for boolean property, e.g. isActive
1272+
* Output the partial Getter name for boolean property, e.g. Active
12731273
*
12741274
* @param name the name of the property
1275-
* @return getter name based on naming convention
1275+
* @return partial getter name based on naming convention
12761276
*/
12771277
public String toBooleanGetter(String name) {
1278-
return "is" + getterAndSetterCapitalize(name);
1278+
return getterAndSetterCapitalize(name);
12791279
}
12801280

12811281
@Override

modules/swagger-codegen/src/main/resources/Java/pojo.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#parcela
118118
{{#vendorExtensions.extraAnnotation}}
119119
{{{vendorExtensions.extraAnnotation}}}
120120
{{/vendorExtensions.extraAnnotation}}
121-
public {{{datatypeWithEnum}}} {{getter}}() {
121+
public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
122122
return {{name}};
123123
}
124124
{{^isReadOnly}}

modules/swagger-codegen/src/main/resources/JavaInflector/pojo.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
4242
{{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}
4343
@ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
4444
@JsonProperty("{{baseName}}")
45-
public {{{datatypeWithEnum}}} {{getter}}() {
45+
public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
4646
return {{name}};
4747
}
4848
public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {

modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf-cdi/pojo.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
3333
{{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}
3434
@ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
3535
@JsonProperty("{{baseName}}")
36-
{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} public {{{datatypeWithEnum}}} {{getter}}() {
36+
{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
3737
return {{name}};
3838
}
3939
public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {

modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,16 +64,16 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {
6464
{{#vendorExtensions.extraAnnotation}}
6565
{{{vendorExtensions.extraAnnotation}}}
6666
{{/vendorExtensions.extraAnnotation}}
67-
{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} {{#isEnum}}{{^isListContainer}}{{^isMapContainer}}public {{datatype}} {{getter}}() {
67+
{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} {{#isEnum}}{{^isListContainer}}{{^isMapContainer}}public {{datatype}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
6868
if ({{name}} == null) {
6969
return null;
7070
}
7171
return {{name}}.value();
72-
}{{/isMapContainer}}{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isListContainer}}public {{{datatypeWithEnum}}} {{getter}}() {
72+
}{{/isMapContainer}}{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isListContainer}}public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
7373
return {{name}};
74-
}{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isMapContainer}}public {{{datatypeWithEnum}}} {{getter}}() {
74+
}{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isMapContainer}}public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
7575
return {{name}};
76-
}{{/isMapContainer}}{{/isEnum}}{{^isEnum}}public {{{datatypeWithEnum}}} {{getter}}() {
76+
}{{/isMapContainer}}{{/isEnum}}{{^isEnum}}public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
7777
return {{name}};
7878
}{{/isEnum}}
7979

modules/swagger-codegen/src/main/resources/JavaJaxRS/pojo.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
8585
@JsonProperty("{{baseName}}")
8686
{{/jackson}}
8787
@ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
88-
{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} public {{{datatypeWithEnum}}} {{getter}}() {
88+
{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
8989
return {{name}};
9090
}
9191
{{^isReadOnly}}

modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/pojo.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
2828
{{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}
2929
@ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
3030
@JsonProperty("{{baseName}}")
31-
{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} public {{{datatypeWithEnum}}} {{getter}}() {
31+
{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
3232
return {{name}};
3333
}
3434
public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {

modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pojo.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
2828
{{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}
2929
@ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
3030
@JsonProperty("{{baseName}}")
31-
{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} public {{{datatypeWithEnum}}} {{getter}}() {
31+
{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
3232
return {{name}};
3333
}
3434
public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {

modules/swagger-codegen/src/main/resources/JavaJaxRS/spec/pojo.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
3131
{{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}
3232
@ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
3333
@JsonProperty("{{baseName}}")
34-
{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} public {{{datatypeWithEnum}}} {{getter}}() {
34+
{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
3535
return {{name}};
3636
}
3737
public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {

modules/swagger-codegen/src/main/resources/JavaPlayFramework/pojo.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
8383
{{#vendorExtensions.extraAnnotation}}
8484
{{{vendorExtensions.extraAnnotation}}}
8585
{{/vendorExtensions.extraAnnotation}}
86-
{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} public {{{datatypeWithEnum}}} {{getter}}() {
86+
{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
8787
return {{name}};
8888
}
8989

0 commit comments

Comments
 (0)