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

Fixing broken enumeration swagger/json types for JaxRS-CXF templates.

Browse Source
This commit is contained in:
oskar 2016-04-06 21:51:17 +02:00
parent c624311cab
commit d45d36d8a2
3 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/api.mustache
View File

@ -3,6 +3,10 @@ package {{package}};
{{#imports}}import {{import}}; {{#imports}}import {{import}};
{{/imports}} {{/imports}}
import java.io.InputStream;
import java.io.OutputStream;
import java.util.List;
import java.util.Map;
import javax.ws.rs.*; import javax.ws.rs.*;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;

27
modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/enumClass.mustache
View File

@ -1,16 +1,23 @@
import javax.xml.bind.annotation.XmlEnum; @XmlType(name="{{datatypeWithEnum}}")
import javax.xml.bind.annotation.XmlType;
@XmlType(name="{{classname}}")
@XmlEnum @XmlEnum
public enum {{classname}} { public enum {{datatypeWithEnum}} {
{{#allowableValues}}{{.}}{{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/allowableValues}}
{{#allowableValues}}
public String value() { {{#enumVars}}{{name}}({{datatype}}.valueOf("{{value}}")){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
return name(); {{/allowableValues}}
private {{datatype}} value;
{{datatypeWithEnum}} ({{datatype}} v) {
value = v;
} }
public static {{classname}} fromValue(String v) { public String value() {
return value;
}
public static {{datatypeWithEnum}} fromValue(String v) {
return valueOf(v); return valueOf(v);
} }
} }

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

@ -3,9 +3,10 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlEnum;
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
{{#hasVars}} @XmlType(name = "{{classn,ame}}", propOrder = {{#hasVars}} @XmlType(name = "{{classname}}", propOrder =
{ {{#vars}}"{{name}}"{{^-last}}, {{/-last}}{{/vars}} { {{#vars}}"{{name}}"{{^-last}}, {{/-last}}{{/vars}}
}){{/hasVars}} }){{/hasVars}}
{{^hasVars}}@XmlType(name = "{{classname}}"){{/hasVars}} {{^hasVars}}@XmlType(name = "{{classname}}"){{/hasVars}}