Skip to content

[Java][jaxrs-spec] evaluating withXml in enum and pojo for jaxrs-spec #9868

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

[Java][jaxrs-spec] evaluating withXml in enum and pojo for jaxrs-spec #9868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f7148e9
added evaluating withXml in jaxrs-spec for enum and pojo
mppperez Jun 30, 2021
72360f8
Merge branch 'OpenAPITools:master' into master
mppperez Aug 12, 2021
39bb52e
Merge branch 'OpenAPITools:master' into master
mppperez Aug 14, 2021
8ed1e68
Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene…
mppperez Aug 25, 2021
4d4d1f8
Merge branch 'master' into master
mppperez Oct 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion modules/openapi-generator/src/main/resources/JavaJaxRS/spec/enumClass.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
{{#withXml}}
@XmlType(name="{{datatypeWithEnum}}")
@XmlEnum({{dataType}}.class)
{{/withXml}}
{{>additionalEnumTypeAnnotations}}public enum {{datatypeWithEnum}} {

{{#allowableValues}}
{{#enumVars}}{{name}}({{dataType}}.valueOf({{{value}}})){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
{{#enumVars}}{{#withXml}}@XmlEnumValue({{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}{{{value}}}{{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}){{/withXml}} {{name}}({{dataType}}.valueOf({{{value}}})){{^-last}},

{{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
{{/allowableValues}}


Expand Down
15 changes: 14 additions & 1 deletion modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
{{#useSwaggerAnnotations}}
import io.swagger.annotations.*;
{{/useSwaggerAnnotations}}
{{#withXml}}
import io.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlEnum;
import javax.xml.bind.annotation.XmlEnumValue;
{{#jackson}}
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
{{/jackson}}
{{/withXml}}
import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
Expand All @@ -12,7 +25,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
**/{{/description}}
{{#useSwaggerAnnotations}}{{#description}}@ApiModel(description = "{{{.}}}"){{/description}}{{/useSwaggerAnnotations}}
@JsonTypeName("{{name}}")
{{>generatedAnnotation}}{{>additionalModelTypeAnnotations}}public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
{{>generatedAnnotation}}{{>additionalModelTypeAnnotations}}{{>xmlAnnotation}}public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
{{#vars}}{{#isEnum}}{{^isContainer}}

{{>enumClass}}{{/isContainer}}{{#isContainer}}{{#mostInnerItems}}
Expand Down