Skip to content

Commit acde051

Browse files
HugoMarioHugoMario
committed
updated enum jaxrs templates
1 parent d9709b8 commit acde051

13 files changed

+40
-32
lines changed

‎src/main/resources/handlebars/JavaJaxRS/cxf-cdi/api.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public class {{classname}} {
7979
@ApiResponse(responseCode = "{{{code}}}", description = "{{{message}}}"{{^vendorExtensions.x-java-is-response-void}}, content = @Content({{^containerType}}schema = @Schema(implementation = {{{baseType}}}.class)){{/containerType}}{{#containerType}}array = @ArraySchema(schema = @Schema(implementation = {{{baseType}}}.class))){{/containerType}}{{/vendorExtensions.x-java-is-response-void}}){{#hasMore}},{{/hasMore}}{{/responses}} })
8080
{{/useOas2}}
8181
public Response {{nickname}}({{#parameters}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}}, {{/hasMore}}{{/parameters}}) {
82-
return delegate.{{nickname}}({{#parameters}}{{#isBinary}}{{paramName}}InputStream, {{paramName}}Detail{{/isBinary}}{{^isBinary}}{{paramName}}{{/isBinary}}, {{/parameters}}securityContext);
82+
return delegate.{{nickname}}({{#parameters}}{{#isFile}}{{paramName}}InputStream, {{paramName}}Detail{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}}, {{/parameters}}securityContext);
8383
}
8484
{{/contents}}
8585
{{/operation}}

‎src/main/resources/handlebars/JavaJaxRS/cxf-cdi/enumClass.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
public enum {{datatypeWithEnum}} {
44
55
{{#allowableValues}}
6-
{{#enumVars}}@XmlEnumValue({{{value}}}) {{name}}({{datatype}}.valueOf({{{value}}})){{^@last}}, {{/@last}}{{#@last}};{{/@last}}{{/enumVars}}
6+
{{#enumVars}}{{#value}}@XmlEnumValue({{{value}}}) {{name}}({{datatype}}.valueOf({{{value}}})){{/value}}{{^value}}@XmlEnumValue("") {{name}}(null){{/value}}{{^@last}}, {{/@last}}{{#@last}};{{/@last}}{{/enumVars}}
77
{{/allowableValues}}
88

99

‎src/main/resources/handlebars/JavaJaxRS/cxf/enumClass.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
public enum {{datatypeWithEnum}} {
44
55
{{#allowableValues}}
6-
{{#enumVars}}@XmlEnumValue({{#is ../../this 'integer'}}"{{/is}}{{#is ../../this 'double'}}"{{/is}}{{#is ../../this 'long'}}"{{/is}}{{#is ../../this 'float'}}"{{/is}}{{{value}}}{{#is ../../this 'integer'}}"{{/is}}{{#is ../../this 'double'}}"{{/is}}{{#is ../../this 'long'}}"{{/is}}{{#is ../../this 'float'}}"{{/is}}) {{name}}({{datatype}}.valueOf({{{value}}})){{^@last}}, {{/@last}}{{#@last}};{{/@last}}{{/enumVars}}
6+
{{#enumVars}}@XmlEnumValue({{#is ../../this 'integer'}}"{{/is}}{{#is ../../this 'double'}}"{{/is}}{{#is ../../this 'long'}}"{{/is}}{{#is ../../this 'float'}}"{{/is}}{{{value}}}{{#is ../../this 'integer'}}"{{/is}}{{#is ../../this 'double'}}"{{/is}}{{#is ../../this 'long'}}"{{/is}}{{#is ../../this 'float'}}"{{/is}}) {{name}}({{#value}}{{datatype}}.valueOf({{{value}}}){{/value}}{{^value}}null{{/value}})){{^@last}}, {{/@last}}{{#@last}};{{/@last}}{{/enumVars}}
77
{{/allowableValues}}
88

99

‎src/main/resources/handlebars/JavaJaxRS/cxf/enumOuterClass.mustache

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,30 @@ import javax.xml.bind.annotation.XmlEnumValue;
1414
{{#if withXml}}
1515
@XmlType(name="{{classname}}")
1616
@XmlEnum({{dataType}}.class)
17-
{{/if~}}
17+
{{/if}}
1818
public enum {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} {
1919
{{#if gson}}
20-
{{#allowableValues}}{{#enumVars}}
20+
{{#allowableValues}}
21+
{{#enumVars}}
2122
@SerializedName({{#is ../../this 'integer'}}"{{/is}}{{#is ../../this 'double'}}"{{/is}}{{#is ../../this 'long'}}"{{/is}}{{#is ../../this 'float'}}"{{/is}}{{{value}}}{{#is ../../this 'integer'}}"{{/is}}{{#is ../../this 'double'}}"{{/is}}{{#is ../../this 'long'}}"{{/is}}{{#is ../../this 'float'}}"{{/is}})
2223
{{#if withXml}}
23-
@XmlEnumValue({{{value}}})
24-
{{/if~}}
25-
{{{name}}}({{{value}}}){{^@last}},
26-
{{/@last}}{{#@last}};{{/@last}}{{/enumVars}}{{/allowableValues}}
24+
@XmlEnumValue({{#value}}{{{value}}}{{/value}}{{^value}}""{{/value}})
25+
{{/if}}
26+
{{{name}}}({{#value}}{{{value}}}{{/value}}{{^value}}null{{/value}}){{^@last}},
27+
{{/@last}}{{#@last}};{{/@last}}
28+
{{/enumVars}}
29+
{{/allowableValues}}
2730
{{/if}}
2831
{{#unless gson}}
29-
{{#allowableValues}}{{#enumVars}}
32+
{{#allowableValues}}
33+
{{#enumVars}}
3034
{{#if withXml}}
31-
@XmlEnumValue({{{value}}})
32-
{{/if~}}
33-
{{{name}}}({{{value}}}){{^@last}},
34-
{{/@last}}{{#@last}};{{/@last}}{{/enumVars}}{{/allowableValues}}
35+
@XmlEnumValue({{#value}}{{{value}}}{{/value}}{{^value}}""{{/value}})
36+
{{/if}}
37+
{{{name}}}({{#value}}{{{value}}}{{/value}}{{^value}}null{{/value}}){{^@last}},
38+
{{/@last}}{{#@last}};{{/@last}}
39+
{{/enumVars}}
40+
{{/allowableValues}}
3541
{{/unless}}
3642

3743
private {{{dataType}}} value;

‎src/main/resources/handlebars/JavaJaxRS/cxf/modelInnerEnum.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
public enum {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} {
22
{{#allowableValues}}
33
{{#enumVars}}
4-
{{{name}}}({{{value}}}){{^@last}},{{/@last}}{{#@last}};{{/@last}}
4+
{{{name}}}({{#value}}{{{value}}}{{/value}}{{^value}}null{{/value}}){{^@last}},{{/@last}}{{#@last}};{{/@last}}
55
{{/enumVars}}
66
{{/allowableValues}}
77

‎src/main/resources/handlebars/JavaJaxRS/cxf/pojo.mustache

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,12 @@ import com.fasterxml.jackson.annotation.JsonCreator;
3030
{{#useOas2}}@ApiModel{{/useOas2}}{{^useOas2}}@Schema{{/useOas2}}(description="{{{description}}}")
3131
{{/description}}
3232
public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#interfaceModels}}{{#@first}}implements {{/@first}}{{classname}}{{^@last}}, {{/@last}}{{#@last}} {{/@last}}{{/interfaceModels}} {
33-
{{#vars}}{{#baseItems this}}{{#is this 'enum'}}
34-
{{>modelInnerEnum}}{{/is~}}{{/baseItems}}
33+
{{#vars}}
34+
{{#baseItems this}}
35+
{{#is this 'enum'}}
36+
{{>modelInnerEnum}}
37+
{{/is}}
38+
{{/baseItems}}
3539
{{#withXml}}
3640
@XmlElement(name="{{baseName}}"{{#required}}, required = {{required}}{{/required}})
3741
{{/withXml}}

‎src/main/resources/handlebars/JavaJaxRS/enumClass.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
{{#allowableValues}}
77
{{#enumVars}}
88
@SerializedName({{#is ../../this 'integer'}}"{{/is}}{{#is ../../this 'double'}}"{{/is}}{{#is ../../this 'long'}}"{{/is}}{{#is ../../this 'float'}}"{{/is}}{{{value}}}{{#is ../../this 'integer'}}"{{/is}}{{#is ../../this 'double'}}"{{/is}}{{#is ../../this 'long'}}"{{/is}}{{#is ../../this 'float'}}"{{/is}})
9-
{{{name}}}({{{value}}}){{^@last}},
9+
{{{name}}}({{#value}}{{{value}}}{{/value}}{{^value}}null{{/value}}){{^@last}},
1010
{{/@last}}{{#@last}};{{/@last}}
1111
{{/enumVars}}
1212
{{/allowableValues}}
1313
{{/if}}
1414
{{#unless gson}}
1515
{{#allowableValues}}
1616
{{#enumVars}}
17-
{{{name}}}({{{value}}}){{^@last}},
17+
{{{name}}}({{#value}}{{{value}}}{{/value}}{{^value}}null{{/value}}){{^@last}},
1818
{{/@last}}{{#@last}};{{/@last}}
1919
{{/enumVars}}
2020
{{/allowableValues}}

‎src/main/resources/handlebars/JavaJaxRS/enumOuterClass.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ public enum {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum
99
{{#if gson}}
1010
{{#allowableValues}}{{#enumVars}}
1111
@SerializedName({{#is ../../this 'integer'}}"{{/is}}{{#is ../../this 'double'}}"{{/is}}{{#is ../../this 'long'}}"{{/is}}{{#is ../../this 'float'}}"{{/is}}{{{value}}}{{#is ../../this 'integer'}}"{{/is}}{{#is ../../this 'double'}}"{{/is}}{{#is ../../this 'long'}}"{{/is}}{{#is ../../this 'float'}}"{{/is}})
12-
{{{name}}}({{{value}}}){{^@last}},
12+
{{{name}}}({{#value}}{{{value}}}{{/value}}{{^value}}null{{/value}}){{^@last}},
1313
{{/@last}}{{#@last}};{{/@last}}{{/enumVars}}{{/allowableValues}}
1414
{{/if}}
1515
{{#unless gson}}
1616
{{#allowableValues}}{{#enumVars}}
17-
{{{name}}}({{{value}}}){{^@last}},
17+
{{{name}}}({{#value}}{{{value}}}{{/value}}{{^value}}null{{/value}}){{^@last}},
1818
{{/@last}}{{#@last}};{{/@last}}{{/enumVars}}{{/allowableValues}}
1919
{{/unless}}
2020

‎src/main/resources/handlebars/JavaJaxRS/modelEnum.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ public enum {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum
99
{{#if gson}}
1010
{{#allowableValues}}{{#enumVars}}
1111
@SerializedName({{#is ../../this 'integer'}}"{{/is}}{{#is ../../this 'double'}}"{{/is}}{{#is ../../this 'long'}}"{{/is}}{{#is ../../this 'float'}}"{{/is}}{{{value}}}{{#is ../../this 'integer'}}"{{/is}}{{#is ../../this 'double'}}"{{/is}}{{#is ../../this 'long'}}"{{/is}}{{#is ../../this 'float'}}"{{/is}})
12-
{{{name}}}({{{value}}}){{^@last}},
12+
{{{name}}}({{#value}}{{{value}}}{{/value}}{{^value}}null{{/value}}){{^@last}},
1313
{{/@last}}{{#@last}};{{/@last}}{{/enumVars}}{{/allowableValues}}
1414
{{/if}}
1515
{{#unless gson}}
1616
{{#allowableValues}}{{#enumVars}}
17-
{{{name}}}({{{value}}}){{^@last}},
17+
{{{name}}}({{#value}}{{{value}}}{{/value}}{{^value}}null{{/value}}){{^@last}},
1818
{{/@last}}{{#@last}};{{/@last}}{{/enumVars}}{{/allowableValues}}
1919
{{/unless}}
2020

‎src/main/resources/handlebars/JavaJaxRS/resteasy/eap/enumClass.mustache

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
public enum {{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} {
55
{{#allowableValues}}
66
{{#enumVars}}
7-
{{{name}}}({{{value}}}){{^@last}},
8-
9-
{{/@last}}{{#@last}};
7+
{{{name}}}({{#value}}{{{value}}}{{/value}}{{^value}}null{{/value}}){{^@last}},
8+
{{/@last}}{{#@last}};
109
{{/@last}}
1110
{{/enumVars}}
1211
{{/allowableValues}}

0 commit comments

Comments
 (0)