loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

jaxrs-cxf-cdi: fix outer enum (#131)

Browse Source 
* jaxrs-cxf-cdi: fix model enum

* Fix script 'bin/jaxrs-cxf-cdi-petstore-server.sh'

See https://github.com/OpenAPITools/openapi-generator/pull/124

* Run 'bin/jaxrs-cxf-cdi-petstore-server.sh'
This commit is contained in:
Jérémie Bresson 2018-05-22 23:55:19 +02:00 committed by Jim Schubert
parent 8df3e54873
commit b73ab0260e
6 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/jaxrs-cxf-cdi-petstore-server.sh
View File

@ -27,6 +27,6 @@ fi
# if you've executed sbt assembly previously it will use that instead. # if you've executed sbt assembly previously it will use that instead.
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
="generate -t modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -l jaxrs-cxf-cdi -o samples/server/petstore/jaxrs-cxf-cdi -DhideGenerationTimestamp=true $@" ags="generate -t modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -l jaxrs-cxf-cdi -o samples/server/petstore/jaxrs-cxf-cdi -DhideGenerationTimestamp=true $@"
java $JAVA_OPTS -jar $executable $ags java $JAVA_OPTS -jar $executable $ags

6
modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/enumClass.mustache
View File

@ -1,6 +1,6 @@
@XmlType(name="{{datatypeWithEnum}}") @XmlType(name="{{datatypeWithEnum}}")
@XmlEnum({{dataType}}.class) @XmlEnum({{dataType}}.class)
public enum {{datatypeWithEnum}} { public enum {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} {
{{#allowableValues}} {{#allowableValues}}
{{#enumVars}}@XmlEnumValue({{{value}}}) {{name}}({{dataType}}.valueOf({{{value}}})){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}} {{#enumVars}}@XmlEnumValue({{{value}}}) {{name}}({{dataType}}.valueOf({{{value}}})){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
@ -9,7 +9,7 @@ public enum {{datatypeWithEnum}} {
private {{dataType}} value; private {{dataType}} value;
{{datatypeWithEnum}} ({{dataType}} v) { {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}({{dataType}} v) {
value = v; value = v;
} }
@ -22,7 +22,7 @@ public enum {{datatypeWithEnum}} {
return String.valueOf(value); return String.valueOf(value);
} }
public static {{datatypeWithEnum}} fromValue(String v) { public static {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue(String v) {
for ({{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} b : {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.values()) { for ({{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} b : {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.values()) {
if (String.valueOf(b.value).equals(v)) { if (String.valueOf(b.value).equals(v)) {
return b; return b;

5
modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/enumOuterClass.mustache Normal file
View File

@ -0,0 +1,5 @@
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlEnum;
import javax.xml.bind.annotation.XmlEnumValue;
{{>enumClass}}

2
modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/model.mustache
View File

@ -10,7 +10,7 @@ import javax.validation.constraints.*;
/** /**
* {{description}} * {{description}}
**/{{/description}} **/{{/description}}
{{#isEnum}}{{>enumClass}}{{/isEnum}} {{#isEnum}}{{>enumOuterClass}}{{/isEnum}}
{{^isEnum}}{{>pojo}}{{/isEnum}} {{^isEnum}}{{>pojo}}{{/isEnum}}
{{/model}} {{/model}}
{{/models}} {{/models}}

2
samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Order.java
View File

@ -36,7 +36,7 @@ public enum StatusEnum {
private String value; private String value;
StatusEnum (String v) { StatusEnum(String v) {
value = v; value = v;
} }

2
samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/model/Pet.java
View File

@ -42,7 +42,7 @@ public enum StatusEnum {
private String value; private String value;
StatusEnum (String v) { StatusEnum(String v) {
value = v; value = v;
} }