diff --git a/README.md b/README.md index 1bb54548033..98b69dee3c9 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ Check out [Swagger-Spec](https://github.com/OAI/OpenAPI-Specification) for addit - [Ruby Sinatra](#ruby-sinatra) - [Scala Scalatra](#scala-scalatra) - [Java JAX-RS (Java JAX-RS (Jersey v1.18)](#java-jax-rs-jersey-v118) - - [Java JAX-RS (Apache CXF 3)](#java-jax-rs-apache-cxf-3) + - [Java JAX-RS (Apache CXF 2 / 3)](#java-jax-rs-apache-cxf-2--3) - [Java Spring MVC](#java-spring-mvc) - [Haskell Servant](#haskell-servant) - [ASP.NET 5 Web API](#aspnet-5-web-api) @@ -619,7 +619,7 @@ java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \ -o samples/server/petstore/jaxrs-jersey ``` -### Java JAX-RS (Apache CXF 3) +### Java JAX-RS (Apache CXF 2 / 3) ``` java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \ @@ -628,6 +628,23 @@ java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \ -o samples/server/petstore/jaxrs-cxf ``` +This Codegen only generate a minimalist server stub. You must add the CXF dependency to your classpath (eg: with Maven) +If you are using CXF v2.x, you must provided a custom ```ResourceComparator``` class. This class will help CXF to choose the good resource interface for mapping an incomming request. The default behavior of CXF v2.x is not correct when many resources interface have the same global path. +See: See http://cxf.apache.org/docs/jax-rs-basics.html#JAX-RSBasics-Customselectionbetweenmultipleresources + +You can found this class here: https://github.com/hiveship/CXF2-resource-comparator/blob/master/src/main/java/CXFInterfaceComparator.java +TODO: This class could be directly generated by the Codegen. + +You must register this class into your JAX-RS configuration file: +```xml + + + +``` + +This is no longer necessary if you are using CXF >=v3.x + + ### Java Spring MVC ``` diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaCXFServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaCXFServerCodegen.java index d69b68aafe7..5321e3a59db 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaCXFServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaCXFServerCodegen.java @@ -2,20 +2,23 @@ package io.swagger.codegen.languages; import java.io.File; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import io.swagger.codegen.CliOption; import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.CodegenModel; import io.swagger.codegen.CodegenOperation; +import io.swagger.codegen.CodegenProperty; import io.swagger.models.Operation; public class JavaCXFServerCodegen extends AbstractJavaJAXRSServerCodegen -{ +{ public JavaCXFServerCodegen() { super(); - + supportsInheritance = true; sourceFolder = "src/gen/java"; invokerPackage = "io.swagger.api"; artifactId = "swagger-jaxrs-server"; @@ -28,6 +31,11 @@ public JavaCXFServerCodegen() additionalProperties.put("title", title); + typeMapping.put("date", "LocalDate"); + typeMapping.put("DateTime", "javax.xml.datatype.XMLGregorianCalendar"); // Map DateTime fields to Java standart class 'XMLGregorianCalendar' + + importMapping.put("LocalDate", "org.joda.time.LocalDate"); + super.embeddedTemplateDir = templateDir = JAXRS_TEMPLATE_DIRECTORY_NAME + File.separator + "cxf"; for ( int i = 0; i < cliOptions.size(); i++ ) { @@ -36,21 +44,30 @@ public JavaCXFServerCodegen() break; } } - - cliOptions.add(new CliOption(CodegenConstants.IMPL_FOLDER, CodegenConstants.IMPL_FOLDER_DESC)); + + CliOption library = new CliOption(CodegenConstants.LIBRARY, "library template (sub-template) to use"); + library.setDefault(DEFAULT_LIBRARY); + + Map supportedLibraries = new LinkedHashMap(); + + supportedLibraries.put(DEFAULT_LIBRARY, "CXF"); + library.setEnum(supportedLibraries); + + cliOptions.add(library); + cliOptions.add(new CliOption(CodegenConstants.IMPL_FOLDER, CodegenConstants.IMPL_FOLDER_DESC)); cliOptions.add(new CliOption("title", "a title describing the application")); } - + @Override public void processOpts() { super.processOpts(); sourceFolder = "gen" + File.separator + "java"; - - modelTemplateFiles.clear(); - modelTemplateFiles.put("entityModel.mustache", ".java"); - - supportingFiles.clear(); + supportingFiles.clear(); // Don't need extra files provided by AbstractJAX-RS & Java Codegen + + //TODO + //final String invokerFolder = (sourceFolder + '/' + invokerPackage).replace(".", "/"); + //supportingFiles.add(new SupportingFile("CXF2InterfaceComparator.mustache", invokerFolder, "CXF2InterfaceComparator.java")); } @Override @@ -58,14 +75,24 @@ public String getName() { return "jaxrs-cxf"; } - @Override public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map> operations) { super.addOperationToGroup(tag, resourcePath, operation, co, operations); co.subresourceOperation = !co.path.isEmpty(); } - + + @Override + public void postProcessModelProperty(CodegenModel model, CodegenProperty property) { + super.postProcessModelProperty(model, property); + model.imports.remove("ApiModelProperty"); + model.imports.remove("ApiModel"); + model.imports.remove("JsonSerialize"); + model.imports.remove("ToStringSerializer"); + model.imports.remove("JsonValue"); + model.imports.remove("JsonProperty"); + } + @Override public String getHelp() { diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java index 121c62eadd1..78f3653671b 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java @@ -13,7 +13,7 @@ import java.util.*; -public class JavaInflectorServerCodegen extends JavaClientCodegen implements CodegenConfig { +public class JavaInflectorServerCodegen extends JavaClientCodegen { private static final Logger LOGGER = LoggerFactory.getLogger(JavaInflectorServerCodegen.class); diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/CXF2InterfaceComparator.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/CXF2InterfaceComparator.mustache new file mode 100644 index 00000000000..d1fd0bf82c8 --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/CXF2InterfaceComparator.mustache @@ -0,0 +1,120 @@ +package {{package}}; + + +import java.lang.reflect.Method; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import javax.ws.rs.HttpMethod; +import javax.ws.rs.Path; + +import org.apache.cxf.jaxrs.ext.ResourceComparator; +import org.apache.cxf.jaxrs.model.ClassResourceInfo; +import org.apache.cxf.jaxrs.model.OperationResourceInfo; +import org.apache.cxf.message.Message; + +/** + * This class only help CXF to decide which resource interface is more suitable. It used Java reflexion to iterate over Java methods but it *DO NOT* select the target method. + */ +public class CXFInterfaceComparator implements ResourceComparator { + + private static final Logger LOGGER = LoggerFactory.getLogger(CXFInterfaceComparator.class); + + @Override + public int compare(ClassResourceInfo cri1, ClassResourceInfo cri2, Message message) { + String requestVerb = (String) message.get(Message.HTTP_REQUEST_METHOD); + String requestURI = (String) message.get(Message.REQUEST_URI); + String requestPath = requestURI.replace((String) message.get(Message.BASE_PATH), ""); + + // remove "/"at the end of requestPath if present + if (requestPath.endsWith("/")){ + requestPath = requestPath.substring(0, requestPath.length()-1); + } + + if (analyseInterface(cri1, requestPath, requestVerb)) { + return -1; // Indicate that 'cri1' interface should be preferred + } else if (analyseInterface(cri2, requestPath, requestVerb)) { + return 1; // Indicate that 'cri2' interface should be preferred + } else { + return 0; // Nothing match, leave CXF decision + } + } + + /** + * Analyse each methods provided to check if there is a match with the + * message request path and request HTTP verb. + * + * @param cri + * the interface to be analysed + * @param requestPath + * the path of the request. Do not contains the host and base + * path + * @return true if a method match the request, false otherwise + */ + private static boolean analyseInterface(ClassResourceInfo cri, String requestPath, String requestVerb) { + assert cri.getServiceClass() != null; + assert cri.getServiceClass().getInterfaces() != null; + assert cri.getServiceClass().getInterfaces()[0] != null; + assert cri.getServiceClass().getInterfaces()[0].getMethods().length > 0; + + Method[] methods = cri.getServiceClass().getInterfaces()[0].getMethods(); + // Java reflexion. Check all the methods of an interface. + for (Method method : methods) { + Path pathAnnotation = method.getAnnotation(javax.ws.rs.Path.class); + if (pathAnnotation != null && pathAnnotation.value() != null) { + String pathValue = pathAnnotation.value(); + String methodHttpVerb = getMethodHttpVerb(method); + + // Always authorize OPTIONS request if the path is matching a method declaration + if (requestVerb.equals(HttpMethod.OPTIONS) && match(pathValue,requestPath)) { + return true; + } + // Also check the HTTP verb since a single path can be match do multiple request, depending of the HTTP request verb. + if (requestVerb.equals(methodHttpVerb) && match(pathValue, requestPath)) { + return true; + } + } + } + return false; + } + + private static String getMethodHttpVerb(Method method) { + if (method.getAnnotation(javax.ws.rs.POST.class) != null) { + return HttpMethod.POST; + } else if (method.getAnnotation(javax.ws.rs.GET.class) != null) { + return HttpMethod.GET; + } else if (method.getAnnotation(javax.ws.rs.PUT.class) != null) { + return HttpMethod.PUT; + } else if (method.getAnnotation(javax.ws.rs.OPTIONS.class) != null) { + return HttpMethod.OPTIONS; + } else if (method.getAnnotation(javax.ws.rs.DELETE.class) != null) { + return HttpMethod.DELETE; + } else if (method.getAnnotation(javax.ws.rs.HEAD.class) != null) { + return HttpMethod.HEAD; + } + assert false; + return null; + } + + /** + * Check whether if the pathValue match with the requestPath parameter. + * Every path params are considered to be declared as '{param}'. The tokens to start and close path params declaration are '{' and '}'. + * + * @param valueFromAnnotation + * @param valueFromRequest + * @return true if there is a match, false otherwise + */ + private static boolean match(String valueFromAnnotation, String valueFromRequest) { + String patternFinal = valueFromAnnotation.replaceAll("\\{(.*?)\\}", "([^/]*)").replace("/", "\\/"); + Matcher matcher = Pattern.compile(patternFinal).matcher(valueFromRequest); + if (matcher.matches()) { + return true; + } + return false; + } + + @Override + public int compare(OperationResourceInfo ori1, OperationResourceInfo ori2, Message message) { + return 0; // Leave CXF decision + } +} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/api.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/api.mustache index 869d1aa63de..57df497e533 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/api.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/api.mustache @@ -6,7 +6,7 @@ package {{package}}; import javax.ws.rs.*; import javax.ws.rs.core.Response; -@Path("{{contextPath}}") +@Path("/") public interface {{classname}} { {{#operations}} {{#operation}} @@ -14,8 +14,7 @@ public interface {{classname}} { {{#subresourceOperation}}@Path("{{path}}"){{/subresourceOperation}} {{#hasConsumes}}@Consumes({ {{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}} {{#hasProduces}}@Produces({ {{#produces}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}} - public Response {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}}, - {{/hasMore}}{{/allParams}}); + public Response {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},{{/hasMore}}{{/allParams}}); {{/operation}} } {{/operations}} diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/entityModel.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/entityModel.mustache deleted file mode 100644 index 9aea77c5bf7..00000000000 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/entityModel.mustache +++ /dev/null @@ -1,51 +0,0 @@ -package {{package}}; - -{{#imports}}import {{import}}; -{{/imports}} - -import javax.xml.bind.annotation.XmlRootElement; - -{{#models}} - -{{#model}}{{#description}} -/** - * {{description}} - **/{{/description}} -@XmlRootElement(name="{{classname}}") -public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} { - {{#vars}} - {{#isEnum}} - public enum {{datatypeWithEnum}} { - {{#allowableValues}}{{#values}} {{.}}, {{/values}}{{/allowableValues}} - }; - private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}};{{/isEnum}}{{^isEnum}} - private {{{datatype}}} {{name}} = {{{defaultValue}}};{{/isEnum}}{{/vars}} - - {{#vars}} - /**{{#description}} - * {{{description}}}{{/description}}{{#minimum}} - * minimum: {{minimum}}{{/minimum}}{{#maximum}} - * maximum: {{maximum}}{{/maximum}} - **/ - @JsonProperty("{{name}}") - public {{{datatypeWithEnum}}} {{getter}}() { - return {{name}}; - } - public void {{setter}}({{{datatypeWithEnum}}} {{name}}) { - this.{{name}} = {{name}}; - } - - {{/vars}} - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class {{classname}} {\n"); - {{#parent}}sb.append(" " + super.toString()).append("\n");{{/parent}} - {{#vars}}sb.append(" {{name}}: ").append({{name}}).append("\n"); - {{/vars}}sb.append("}\n"); - return sb.toString(); - } -} -{{/model}} -{{/models}} diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/enumClass.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/enumClass.mustache new file mode 100644 index 00000000000..1ef4a61efbe --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/enumClass.mustache @@ -0,0 +1,16 @@ +import javax.xml.bind.annotation.XmlEnum; +import javax.xml.bind.annotation.XmlType; + +@XmlType(name="{{classname}}") +@XmlEnum +public enum {{classname}} { + {{#allowableValues}}{{.}}{{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/allowableValues}} + + public String value() { + return name(); + } + + public static {{classname}} fromValue(String v) { + return valueOf(v); + } +} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/enumOuterClass.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/enumOuterClass.mustache deleted file mode 100644 index 7aea7b92f22..00000000000 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/enumOuterClass.mustache +++ /dev/null @@ -1,3 +0,0 @@ -public enum {{classname}} { - {{#allowableValues}}{{.}}{{^-last}}, {{/-last}}{{/allowableValues}} -} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/model.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/model.mustache index 578cd064df7..2c383a41a28 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/model.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/model.mustache @@ -1,15 +1,14 @@ package {{package}}; -{{#imports}}import{{import}}; +{{#imports}}import {{import}}; {{/imports}} -{{#serializableModel}}import java.io.Serializable;{{/serializableModel}} {{#models}} {{#model}}{{#description}} /** * {{description}} **/{{/description}} -{{#isEnum}}{{>enumOuterClass}}{{/isEnum}} +{{#isEnum}}{{>enumClass}}{{/isEnum}} {{^isEnum}}{{>pojo}}{{/isEnum}} {{/model}} {{/models}} diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache new file mode 100644 index 00000000000..b42a6d3b3eb --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache @@ -0,0 +1,57 @@ +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; + +@XmlAccessorType(XmlAccessType.FIELD) +{{#hasVars}} @XmlType(name = "{{classn,ame}}", propOrder = + { {{#vars}}"{{name}}"{{^-last}}, {{/-last}}{{/vars}} +}){{/hasVars}} +{{^hasVars}}@XmlType(name = "{{classname}}"){{/hasVars}} +{{^parent}}@XmlRootElement(name="{{classname}}"){{/parent}} +public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} { + {{#vars}}{{#isEnum}} + +{{>enumClass}}{{/isEnum}}{{#items.isEnum}}{{#items}} + +{{>enumClass}}{{/items}}{{/items.isEnum}} + + private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}};{{/vars}} + + {{#vars}} + /**{{#description}} + * {{{description}}}{{/description}}{{#minimum}} + * minimum: {{minimum}}{{/minimum}}{{#maximum}} + * maximum: {{maximum}}{{/maximum}} + **/ + {{#vendorExtensions.extraAnnotation}}{{vendorExtensions.extraAnnotation}}{{/vendorExtensions.extraAnnotation}} + public {{{datatypeWithEnum}}} {{getter}}() { + return {{name}}; + } + public void {{setter}}({{{datatypeWithEnum}}} {{name}}) { + this.{{name}} = {{name}}; + } + {{/vars}} + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class {{classname}} {\n"); + {{#parent}}sb.append(" ").append(toIndentedString(super.toString())).append("\n");{{/parent}} + {{#vars}}sb.append(" {{name}}: ").append(toIndentedString({{name}})).append("\n"); + {{/vars}}sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private static String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/project/build.properties b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/project/build.properties deleted file mode 100644 index a8c2f849be3..00000000000 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=0.12.0 diff --git a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/api/PetApi.java b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/api/PetApi.java index 62251207319..9d7192ff535 100644 --- a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/api/PetApi.java +++ b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/api/PetApi.java @@ -6,7 +6,7 @@ import javax.ws.rs.*; import javax.ws.rs.core.Response; -@Path("/v2") +@Path("/") public interface PetApi { @PUT @Path("/pet") @@ -37,28 +37,23 @@ public interface PetApi { @Path("/pet/{petId}") @Consumes({ "application/x-www-form-urlencoded" }) @Produces({ "application/json", "application/xml" }) - public Response updatePetWithForm(@PathParam("petId") String petId, - @Multipart(value = "name", required = false) String name, - @Multipart(value = "status", required = false) String status); + public Response updatePetWithForm(@PathParam("petId") String petId,@Multipart(value = "name", required = false) String name,@Multipart(value = "status", required = false) String status); @DELETE @Path("/pet/{petId}") @Produces({ "application/json", "application/xml" }) - public Response deletePet(@PathParam("petId") Long petId, - @HeaderParam("api_key") String apiKey); + public Response deletePet(@PathParam("petId") Long petId,@HeaderParam("api_key") String apiKey); @POST @Path("/pet/{petId}/uploadImage") @Consumes({ "multipart/form-data" }) @Produces({ "application/json", "application/xml" }) - public Response uploadFile(@PathParam("petId") Long petId, - @Multipart(value = "additionalMetadata", required = false) String additionalMetadata, - @Multipart(value = "file", required = false) InputStream fileInputStream, + public Response uploadFile(@PathParam("petId") Long petId,@Multipart(value = "additionalMetadata", required = false) String additionalMetadata, @Multipart(value = "file", required = false) InputStream fileInputStream, @Multipart(value = "file" , required = false) Attachment fileDetail); @GET @Path("/pet/{petId}?testing_byte_array=true") @Produces({ "application/json", "application/xml" }) - public Response getPetByIdWithByteArray(@PathParam("petId") Long petId); + public Response petPetIdtestingByteArraytrueGet(@PathParam("petId") Long petId); @POST @Path("/pet?testing_byte_array=true") @Consumes({ "application/json", "application/xml" }) diff --git a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/api/StoreApi.java b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/api/StoreApi.java index 4738649215d..f6729e7fafb 100644 --- a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/api/StoreApi.java @@ -6,7 +6,7 @@ import javax.ws.rs.*; import javax.ws.rs.core.Response; -@Path("/v2") +@Path("/") public interface StoreApi { @GET @Path("/store/inventory") diff --git a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/api/UserApi.java b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/api/UserApi.java index 840331009b1..88027929085 100644 --- a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/api/UserApi.java +++ b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/api/UserApi.java @@ -1,12 +1,12 @@ package io.swagger.api; import io.swagger.model.User; -import java.util.*; +import java.util.List; import javax.ws.rs.*; import javax.ws.rs.core.Response; -@Path("/v2") +@Path("/") public interface UserApi { @POST @Path("/user") @@ -27,8 +27,7 @@ public interface UserApi { @Path("/user/login") @Produces({ "application/json", "application/xml" }) - public Response loginUser(@QueryParam("username") String username, - @QueryParam("password") String password); + public Response loginUser(@QueryParam("username") String username,@QueryParam("password") String password); @GET @Path("/user/logout") @@ -43,8 +42,7 @@ public Response loginUser(@QueryParam("username") String username, @Path("/user/{username}") @Produces({ "application/json", "application/xml" }) - public Response updateUser(@PathParam("username") String username, - User body); + public Response updateUser(@PathParam("username") String username,User body); @DELETE @Path("/user/{username}") diff --git a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Category.java b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Category.java index c4dcc713964..d34537dc435 100644 --- a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Category.java +++ b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Category.java @@ -1,54 +1,69 @@ package io.swagger.model; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonValue; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import javax.xml.bind.annotation.XmlRootElement; +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; + +@XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = + { "id", "name" +}) @XmlRootElement(name="Category") public class Category { - + private Long id = null; - + private String name = null; /** **/ - @JsonProperty("id") + public Long getId() { return id; } public void setId(Long id) { this.id = id; } - /** **/ - @JsonProperty("name") + public String getName() { return name; } public void setName(String name) { this.name = name; } - @Override - public String toString() { + public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class Category {\n"); - sb.append(" id: ").append(id).append("\n"); - sb.append(" name: ").append(name).append("\n"); - sb.append("}\n"); + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append("}"); return sb.toString(); } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private static String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } } + diff --git a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Order.java b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Order.java index 333d1b8b604..60ffccbd8f9 100644 --- a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Order.java +++ b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Order.java @@ -1,115 +1,139 @@ package io.swagger.model; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonValue; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import java.util.Date; -import javax.xml.bind.annotation.XmlRootElement; +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; + +@XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = + { "id", "petId", "quantity", "shipDate", "status", "complete" +}) @XmlRootElement(name="Order") public class Order { - + private Long id = null; - + private Long petId = null; - + private Integer quantity = null; - - private Date shipDate = null; - - public enum StatusEnum { - placed, approved, delivered, - }; + + private javax.xml.datatype.XMLGregorianCalendar shipDate = null; + +import javax.xml.bind.annotation.XmlEnum; +import javax.xml.bind.annotation.XmlType; + +@XmlType(name="Order") +@XmlEnum +public enum Order { + {values=[placed, approved, delivered], enumVars=[{name=PLACED, value=placed}, {name=APPROVED, value=approved}, {name=DELIVERED, value=delivered}]}, + + public String value() { + return name(); + } + + public static Order fromValue(String v) { + return valueOf(v); + } +} + private StatusEnum status = null; - + private Boolean complete = null; /** **/ - @JsonProperty("id") + public Long getId() { return id; } public void setId(Long id) { this.id = id; } - /** **/ - @JsonProperty("petId") + public Long getPetId() { return petId; } public void setPetId(Long petId) { this.petId = petId; } - /** **/ - @JsonProperty("quantity") + public Integer getQuantity() { return quantity; } public void setQuantity(Integer quantity) { this.quantity = quantity; } - /** **/ - @JsonProperty("shipDate") - public Date getShipDate() { + + public javax.xml.datatype.XMLGregorianCalendar getShipDate() { return shipDate; } - public void setShipDate(Date shipDate) { + public void setShipDate(javax.xml.datatype.XMLGregorianCalendar shipDate) { this.shipDate = shipDate; } - /** * Order Status **/ - @JsonProperty("status") + public StatusEnum getStatus() { return status; } public void setStatus(StatusEnum status) { this.status = status; } - /** **/ - @JsonProperty("complete") + public Boolean getComplete() { return complete; } public void setComplete(Boolean complete) { this.complete = complete; } - @Override - public String toString() { + public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class Order {\n"); - sb.append(" id: ").append(id).append("\n"); - sb.append(" petId: ").append(petId).append("\n"); - sb.append(" quantity: ").append(quantity).append("\n"); - sb.append(" shipDate: ").append(shipDate).append("\n"); - sb.append(" status: ").append(status).append("\n"); - sb.append(" complete: ").append(complete).append("\n"); - sb.append("}\n"); + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" petId: ").append(toIndentedString(petId)).append("\n"); + sb.append(" quantity: ").append(toIndentedString(quantity)).append("\n"); + sb.append(" shipDate: ").append(toIndentedString(shipDate)).append("\n"); + sb.append(" status: ").append(toIndentedString(status)).append("\n"); + sb.append(" complete: ").append(toIndentedString(complete)).append("\n"); + sb.append("}"); return sb.toString(); } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private static String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } } + diff --git a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Pet.java b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Pet.java index 53fa2ef229d..979781f19e0 100644 --- a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Pet.java +++ b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Pet.java @@ -1,117 +1,143 @@ package io.swagger.model; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonValue; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import io.swagger.model.Category; import io.swagger.model.Tag; -import java.util.*; +import java.util.ArrayList; +import java.util.List; + -import javax.xml.bind.annotation.XmlRootElement; +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; +@XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = + { "id", "category", "name", "photoUrls", "tags", "status" +}) @XmlRootElement(name="Pet") public class Pet { - + private Long id = null; - + private Category category = null; - + private String name = null; - + private List photoUrls = new ArrayList(); - + private List tags = new ArrayList(); - - public enum StatusEnum { - available, pending, sold, - }; + +import javax.xml.bind.annotation.XmlEnum; +import javax.xml.bind.annotation.XmlType; + +@XmlType(name="Pet") +@XmlEnum +public enum Pet { + {values=[available, pending, sold], enumVars=[{name=AVAILABLE, value=available}, {name=PENDING, value=pending}, {name=SOLD, value=sold}]}, + + public String value() { + return name(); + } + + public static Pet fromValue(String v) { + return valueOf(v); + } +} + private StatusEnum status = null; /** **/ - @JsonProperty("id") + public Long getId() { return id; } public void setId(Long id) { this.id = id; } - /** **/ - @JsonProperty("category") + public Category getCategory() { return category; } public void setCategory(Category category) { this.category = category; } - /** **/ - @JsonProperty("name") + public String getName() { return name; } public void setName(String name) { this.name = name; } - /** **/ - @JsonProperty("photoUrls") + public List getPhotoUrls() { return photoUrls; } public void setPhotoUrls(List photoUrls) { this.photoUrls = photoUrls; } - /** **/ - @JsonProperty("tags") + public List getTags() { return tags; } public void setTags(List tags) { this.tags = tags; } - /** * pet status in the store **/ - @JsonProperty("status") + public StatusEnum getStatus() { return status; } public void setStatus(StatusEnum status) { this.status = status; } - @Override - public String toString() { + public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class Pet {\n"); - sb.append(" id: ").append(id).append("\n"); - sb.append(" category: ").append(category).append("\n"); - sb.append(" name: ").append(name).append("\n"); - sb.append(" photoUrls: ").append(photoUrls).append("\n"); - sb.append(" tags: ").append(tags).append("\n"); - sb.append(" status: ").append(status).append("\n"); - sb.append("}\n"); + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" category: ").append(toIndentedString(category)).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append(" photoUrls: ").append(toIndentedString(photoUrls)).append("\n"); + sb.append(" tags: ").append(toIndentedString(tags)).append("\n"); + sb.append(" status: ").append(toIndentedString(status)).append("\n"); + sb.append("}"); return sb.toString(); } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private static String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } } + diff --git a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Tag.java b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Tag.java index 933dda70086..b2a2bcaaff9 100644 --- a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Tag.java +++ b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Tag.java @@ -1,54 +1,69 @@ package io.swagger.model; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonValue; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import javax.xml.bind.annotation.XmlRootElement; +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; + +@XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = + { "id", "name" +}) @XmlRootElement(name="Tag") public class Tag { - + private Long id = null; - + private String name = null; /** **/ - @JsonProperty("id") + public Long getId() { return id; } public void setId(Long id) { this.id = id; } - /** **/ - @JsonProperty("name") + public String getName() { return name; } public void setName(String name) { this.name = name; } - @Override - public String toString() { + public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class Tag {\n"); - sb.append(" id: ").append(id).append("\n"); - sb.append(" name: ").append(name).append("\n"); - sb.append("}\n"); + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append("}"); return sb.toString(); } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private static String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } } + diff --git a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/User.java b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/User.java index a8da05deac7..8683a630e5c 100644 --- a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/User.java +++ b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/User.java @@ -1,139 +1,148 @@ package io.swagger.model; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonValue; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import javax.xml.bind.annotation.XmlRootElement; +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; + +@XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = + { "id", "username", "firstName", "lastName", "email", "password", "phone", "userStatus" +}) @XmlRootElement(name="User") public class User { - + private Long id = null; - + private String username = null; - + private String firstName = null; - + private String lastName = null; - + private String email = null; - + private String password = null; - + private String phone = null; - + private Integer userStatus = null; /** **/ - @JsonProperty("id") + public Long getId() { return id; } public void setId(Long id) { this.id = id; } - /** **/ - @JsonProperty("username") + public String getUsername() { return username; } public void setUsername(String username) { this.username = username; } - /** **/ - @JsonProperty("firstName") + public String getFirstName() { return firstName; } public void setFirstName(String firstName) { this.firstName = firstName; } - /** **/ - @JsonProperty("lastName") + public String getLastName() { return lastName; } public void setLastName(String lastName) { this.lastName = lastName; } - /** **/ - @JsonProperty("email") + public String getEmail() { return email; } public void setEmail(String email) { this.email = email; } - /** **/ - @JsonProperty("password") + public String getPassword() { return password; } public void setPassword(String password) { this.password = password; } - /** **/ - @JsonProperty("phone") + public String getPhone() { return phone; } public void setPhone(String phone) { this.phone = phone; } - /** * User Status **/ - @JsonProperty("userStatus") + public Integer getUserStatus() { return userStatus; } public void setUserStatus(Integer userStatus) { this.userStatus = userStatus; } - @Override - public String toString() { + public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class User {\n"); - sb.append(" id: ").append(id).append("\n"); - sb.append(" username: ").append(username).append("\n"); - sb.append(" firstName: ").append(firstName).append("\n"); - sb.append(" lastName: ").append(lastName).append("\n"); - sb.append(" email: ").append(email).append("\n"); - sb.append(" password: ").append(password).append("\n"); - sb.append(" phone: ").append(phone).append("\n"); - sb.append(" userStatus: ").append(userStatus).append("\n"); - sb.append("}\n"); + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" username: ").append(toIndentedString(username)).append("\n"); + sb.append(" firstName: ").append(toIndentedString(firstName)).append("\n"); + sb.append(" lastName: ").append(toIndentedString(lastName)).append("\n"); + sb.append(" email: ").append(toIndentedString(email)).append("\n"); + sb.append(" password: ").append(toIndentedString(password)).append("\n"); + sb.append(" phone: ").append(toIndentedString(phone)).append("\n"); + sb.append(" userStatus: ").append(toIndentedString(userStatus)).append("\n"); + sb.append("}"); return sb.toString(); } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private static String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } } +