diff --git a/modules/swagger-codegen-maven-plugin/README.md b/modules/swagger-codegen-maven-plugin/README.md
index a7284fdb3c5..cc54e2ad447 100644
--- a/modules/swagger-codegen-maven-plugin/README.md
+++ b/modules/swagger-codegen-maven-plugin/README.md
@@ -45,7 +45,8 @@ mvn clean compile
- `modelPackage` - the package to use for generated model objects/classes
- `apiPackage` - the package to use for generated api objects/classes
- `invokerPackage` - the package to use for the generated invoker objects
-- `modelNamePrefix` and `modelNameSuffix` - Sets the pre- or suffix for model classes and enums.
+- `modelNamePrefix` and `modelNameSuffix` - Sets the pre- or suffix for model classes and enums
+- `useJaxbAnnotations` - enable Jaxb annotations inside the generated models
- `configOptions` - a map of language-specific parameters (see below)
- `configHelp` - dumps the configuration help for the specified library (generates no sources)
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache
index 2d74634919c..acce6134304 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache
@@ -25,8 +25,8 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {
{{>enumClass}}{{/items}}{{/items.isEnum}}
{{#useJaxbAnnotations}}
- @XmlElement(name="{{baseName}}")
-{{/useJaxbAnnotations}}
+ @XmlElement(name="{{baseName}}"{{#required}}, required = {{required}}{{/required}})
+{{/useJaxbAnnotations}}
@ApiModelProperty({{#example}}example = "{{example}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}};{{/vars}}
diff --git a/samples/client/petstore-security-test/java/okhttp-gson/pom.xml b/samples/client/petstore-security-test/java/okhttp-gson/pom.xml
index d6ce1873282..be07768b92e 100644
--- a/samples/client/petstore-security-test/java/okhttp-gson/pom.xml
+++ b/samples/client/petstore-security-test/java/okhttp-gson/pom.xml
@@ -15,6 +15,14 @@
2.2.0
+
+
+ Unlicense
+ http://www.apache.org/licenses/LICENSE-2.0.html *_/ ' \" =end -- \\r\\n \\n \\r
+ repo
+
+
+
@@ -129,7 +137,6 @@
joda-time
${jodatime-version}
-
junit
@@ -150,4 +157,4 @@
4.12
UTF-8
-
\ No newline at end of file
+
diff --git a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java
index 0d0407f94b3..8a4e08dc244 100644
--- a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java
+++ b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java
@@ -9,146 +9,159 @@
* https://github.com/swagger-api/swagger-codegen.git
* Do not edit the class manually.
*/
-
-
-package io.swagger.client.api;
-
-import io.swagger.client.ApiCallback;
-import io.swagger.client.ApiClient;
-import io.swagger.client.ApiException;
-import io.swagger.client.ApiResponse;
-import io.swagger.client.Configuration;
-import io.swagger.client.Pair;
-import io.swagger.client.ProgressRequestBody;
-import io.swagger.client.ProgressResponseBody;
-
-import com.google.gson.reflect.TypeToken;
-
-import java.io.IOException;
-
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class FakeApi {
- private ApiClient apiClient;
-
- public FakeApi() {
- this(Configuration.getDefaultApiClient());
- }
-
- public FakeApi(ApiClient apiClient) {
- this.apiClient = apiClient;
- }
-
- public ApiClient getApiClient() {
- return apiClient;
- }
-
- public void setApiClient(ApiClient apiClient) {
- this.apiClient = apiClient;
- }
-
- /* Build call for testCodeInjectEndRnNR */
- private com.squareup.okhttp.Call testCodeInjectEndRnNRCall(String testCodeInjectEndRnNR, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
- Object localVarPostBody = null;
-
-
- // create path and map variables
- String localVarPath = "/fake".replaceAll("\\{format\\}","json");
-
- List localVarQueryParams = new ArrayList();
-
- Map localVarHeaderParams = new HashMap();
-
- Map localVarFormParams = new HashMap();
- if (testCodeInjectEndRnNR != null)
- localVarFormParams.put("test code inject */ ' " =end -- \r\n \n \r", testCodeInjectEndRnNR);
-
- final String[] localVarAccepts = {
- "application/json", "*_/ ' =end -- "
- };
- final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
- if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
- final String[] localVarContentTypes = {
- "application/json", "*_/ ' =end -- "
- };
- final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
- localVarHeaderParams.put("Content-Type", localVarContentType);
-
- if(progressListener != null) {
- apiClient.getHttpClient().networkInterceptors().add(new com.squareup.okhttp.Interceptor() {
- @Override
- public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Chain chain) throws IOException {
- com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
- return originalResponse.newBuilder()
- .body(new ProgressResponseBody(originalResponse.body(), progressListener))
- .build();
- }
- });
- }
-
- String[] localVarAuthNames = new String[] { };
- return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
- }
-
- /**
- * To test code injection *_/ ' \" =end -- \\r\\n \\n \\r
- *
- * @param testCodeInjectEndRnNR To test code injection *_/ ' \" =end -- \\r\\n \\n \\r (optional)
- * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
- */
- public void testCodeInjectEndRnNR(String testCodeInjectEndRnNR) throws ApiException {
- testCodeInjectEndRnNRWithHttpInfo(testCodeInjectEndRnNR);
- }
-
- /**
- * To test code injection *_/ ' \" =end -- \\r\\n \\n \\r
- *
- * @param testCodeInjectEndRnNR To test code injection *_/ ' \" =end -- \\r\\n \\n \\r (optional)
- * @return ApiResponse<Void>
- * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
- */
- public ApiResponse testCodeInjectEndRnNRWithHttpInfo(String testCodeInjectEndRnNR) throws ApiException {
- com.squareup.okhttp.Call call = testCodeInjectEndRnNRCall(testCodeInjectEndRnNR, null, null);
- return apiClient.execute(call);
- }
-
- /**
- * To test code injection *_/ ' \" =end -- \\r\\n \\n \\r (asynchronously)
- *
- * @param testCodeInjectEndRnNR To test code injection *_/ ' \" =end -- \\r\\n \\n \\r (optional)
- * @param callback The callback to be executed when the API call finishes
- * @return The request call
- * @throws ApiException If fail to process the API call, e.g. serializing the request body object
- */
- public com.squareup.okhttp.Call testCodeInjectEndRnNRAsync(String testCodeInjectEndRnNR, final ApiCallback callback) throws ApiException {
-
- ProgressResponseBody.ProgressListener progressListener = null;
- ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
- if (callback != null) {
- progressListener = new ProgressResponseBody.ProgressListener() {
- @Override
- public void update(long bytesRead, long contentLength, boolean done) {
- callback.onDownloadProgress(bytesRead, contentLength, done);
- }
- };
-
- progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
- @Override
- public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
- callback.onUploadProgress(bytesWritten, contentLength, done);
- }
- };
- }
-
- com.squareup.okhttp.Call call = testCodeInjectEndRnNRCall(testCodeInjectEndRnNR, progressListener, progressRequestListener);
- apiClient.executeAsync(call, callback);
- return call;
- }
-}
+
+
+package io.swagger.client.api;
+
+import io.swagger.client.ApiCallback;
+import io.swagger.client.ApiClient;
+import io.swagger.client.ApiException;
+import io.swagger.client.ApiResponse;
+import io.swagger.client.Configuration;
+import io.swagger.client.Pair;
+import io.swagger.client.ProgressRequestBody;
+import io.swagger.client.ProgressResponseBody;
+
+import com.google.gson.reflect.TypeToken;
+
+import java.io.IOException;
+
+
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class FakeApi {
+ private ApiClient apiClient;
+
+ public FakeApi() {
+ this(Configuration.getDefaultApiClient());
+ }
+
+ public FakeApi(ApiClient apiClient) {
+ this.apiClient = apiClient;
+ }
+
+ public ApiClient getApiClient() {
+ return apiClient;
+ }
+
+ public void setApiClient(ApiClient apiClient) {
+ this.apiClient = apiClient;
+ }
+
+ /* Build call for testCodeInjectEndRnNR */
+ private com.squareup.okhttp.Call testCodeInjectEndRnNRCall(String testCodeInjectEndRnNR, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+ Object localVarPostBody = null;
+
+ // create path and map variables
+ String localVarPath = "/fake".replaceAll("\\{format\\}","json");
+
+ List localVarQueryParams = new ArrayList();
+
+ Map localVarHeaderParams = new HashMap();
+
+ Map localVarFormParams = new HashMap();
+ if (testCodeInjectEndRnNR != null)
+ localVarFormParams.put("test code inject */ ' " =end -- \r\n \n \r", testCodeInjectEndRnNR);
+
+ final String[] localVarAccepts = {
+ "application/json", "*_/ ' =end -- "
+ };
+ final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+ if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+ final String[] localVarContentTypes = {
+ "application/json", "*_/ ' =end -- "
+ };
+ final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+ localVarHeaderParams.put("Content-Type", localVarContentType);
+
+ if(progressListener != null) {
+ apiClient.getHttpClient().networkInterceptors().add(new com.squareup.okhttp.Interceptor() {
+ @Override
+ public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Chain chain) throws IOException {
+ com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
+ return originalResponse.newBuilder()
+ .body(new ProgressResponseBody(originalResponse.body(), progressListener))
+ .build();
+ }
+ });
+ }
+
+ String[] localVarAuthNames = new String[] { };
+ return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
+ }
+
+ @SuppressWarnings("rawtypes")
+ private com.squareup.okhttp.Call testCodeInjectEndRnNRValidateBeforeCall(String testCodeInjectEndRnNR, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+
+
+ com.squareup.okhttp.Call call = testCodeInjectEndRnNRCall(testCodeInjectEndRnNR, progressListener, progressRequestListener);
+ return call;
+
+
+
+
+
+ }
+
+ /**
+ * To test code injection *_/ ' \" =end -- \\r\\n \\n \\r
+ *
+ * @param testCodeInjectEndRnNR To test code injection *_/ ' \" =end -- \\r\\n \\n \\r (optional)
+ * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+ */
+ public void testCodeInjectEndRnNR(String testCodeInjectEndRnNR) throws ApiException {
+ testCodeInjectEndRnNRWithHttpInfo(testCodeInjectEndRnNR);
+ }
+
+ /**
+ * To test code injection *_/ ' \" =end -- \\r\\n \\n \\r
+ *
+ * @param testCodeInjectEndRnNR To test code injection *_/ ' \" =end -- \\r\\n \\n \\r (optional)
+ * @return ApiResponse<Void>
+ * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+ */
+ public ApiResponse testCodeInjectEndRnNRWithHttpInfo(String testCodeInjectEndRnNR) throws ApiException {
+ com.squareup.okhttp.Call call = testCodeInjectEndRnNRValidateBeforeCall(testCodeInjectEndRnNR, null, null);
+ return apiClient.execute(call);
+ }
+
+ /**
+ * To test code injection *_/ ' \" =end -- \\r\\n \\n \\r (asynchronously)
+ *
+ * @param testCodeInjectEndRnNR To test code injection *_/ ' \" =end -- \\r\\n \\n \\r (optional)
+ * @param callback The callback to be executed when the API call finishes
+ * @return The request call
+ * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+ */
+ public com.squareup.okhttp.Call testCodeInjectEndRnNRAsync(String testCodeInjectEndRnNR, final ApiCallback callback) throws ApiException {
+
+ ProgressResponseBody.ProgressListener progressListener = null;
+ ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
+
+ if (callback != null) {
+ progressListener = new ProgressResponseBody.ProgressListener() {
+ @Override
+ public void update(long bytesRead, long contentLength, boolean done) {
+ callback.onDownloadProgress(bytesRead, contentLength, done);
+ }
+ };
+
+ progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+ @Override
+ public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+ callback.onUploadProgress(bytesWritten, contentLength, done);
+ }
+ };
+ }
+
+ com.squareup.okhttp.Call call = testCodeInjectEndRnNRValidateBeforeCall(testCodeInjectEndRnNR, progressListener, progressRequestListener);
+ apiClient.executeAsync(call, callback);
+ return call;
+ }
+}
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/PetApi.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/PetApi.java
index 4ef2db0e204..edd25fbd563 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/PetApi.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/PetApi.java
@@ -1,75 +1,75 @@
-package io.swagger.api;
-
-import java.io.File;
-import io.swagger.model.ModelApiResponse;
-import io.swagger.model.Pet;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.List;
-import java.util.Map;
-import javax.ws.rs.*;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-@Path("/")
-@Api(value = "/", description = "")
-public interface PetApi {
-
- @POST
- @Path("/pet")
- @Consumes({ "application/json", "application/xml" })
- @Produces({ "application/xml", "application/json" })
- @ApiOperation(value = "Add a new pet to the store", tags={ "pet", })
- public void addPet(Pet body);
-
- @DELETE
- @Path("/pet/{petId}")
- @Produces({ "application/xml", "application/json" })
- @ApiOperation(value = "Deletes a pet", tags={ "pet", })
- public void deletePet(@PathParam("petId") Long petId, @HeaderParam("api_key") String apiKey);
-
- @GET
- @Path("/pet/findByStatus")
- @Produces({ "application/xml", "application/json" })
- @ApiOperation(value = "Finds Pets by status", tags={ "pet", })
- public List findPetsByStatus(@QueryParam("status")List status);
-
- @GET
- @Path("/pet/findByTags")
- @Produces({ "application/xml", "application/json" })
- @ApiOperation(value = "Finds Pets by tags", tags={ "pet", })
- public List findPetsByTags(@QueryParam("tags")List tags);
-
- @GET
- @Path("/pet/{petId}")
- @Produces({ "application/xml", "application/json" })
- @ApiOperation(value = "Find pet by ID", tags={ "pet", })
- public Pet getPetById(@PathParam("petId") Long petId);
-
- @PUT
- @Path("/pet")
- @Consumes({ "application/json", "application/xml" })
- @Produces({ "application/xml", "application/json" })
- @ApiOperation(value = "Update an existing pet", tags={ "pet", })
- public void updatePet(Pet body);
-
- @POST
- @Path("/pet/{petId}")
- @Consumes({ "application/x-www-form-urlencoded" })
- @Produces({ "application/xml", "application/json" })
- @ApiOperation(value = "Updates a pet in the store with form data", tags={ "pet", })
- public void updatePetWithForm(@PathParam("petId") Long petId, @Multipart(value = "name", required = false) String name, @Multipart(value = "status", required = false) String status);
-
- @POST
- @Path("/pet/{petId}/uploadImage")
- @Consumes({ "multipart/form-data" })
- @Produces({ "application/json" })
- @ApiOperation(value = "uploads an image", tags={ "pet" })
- public ModelApiResponse uploadFile(@PathParam("petId") Long petId, @Multipart(value = "additionalMetadata", required = false) String additionalMetadata, @Multipart(value = "file" , required = false) Attachment fileDetail);
-}
-
+package io.swagger.api;
+
+import java.io.File;
+import io.swagger.model.ModelApiResponse;
+import io.swagger.model.Pet;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.List;
+import java.util.Map;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.MediaType;
+import org.apache.cxf.jaxrs.ext.multipart.*;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+@Path("/")
+@Api(value = "/", description = "")
+public interface PetApi {
+
+ @POST
+ @Path("/pet")
+ @Consumes({ "application/json", "application/xml" })
+ @Produces({ "application/xml", "application/json" })
+ @ApiOperation(value = "Add a new pet to the store", tags={ "pet", })
+ public void addPet(Pet body);
+
+ @DELETE
+ @Path("/pet/{petId}")
+ @Produces({ "application/xml", "application/json" })
+ @ApiOperation(value = "Deletes a pet", tags={ "pet", })
+ public void deletePet(@PathParam("petId") Long petId, @HeaderParam("api_key") String apiKey);
+
+ @GET
+ @Path("/pet/findByStatus")
+ @Produces({ "application/xml", "application/json" })
+ @ApiOperation(value = "Finds Pets by status", tags={ "pet", })
+ public List findPetsByStatus(@QueryParam("status")List status);
+
+ @GET
+ @Path("/pet/findByTags")
+ @Produces({ "application/xml", "application/json" })
+ @ApiOperation(value = "Finds Pets by tags", tags={ "pet", })
+ public List findPetsByTags(@QueryParam("tags")List tags);
+
+ @GET
+ @Path("/pet/{petId}")
+ @Produces({ "application/xml", "application/json" })
+ @ApiOperation(value = "Find pet by ID", tags={ "pet", })
+ public Pet getPetById(@PathParam("petId") Long petId);
+
+ @PUT
+ @Path("/pet")
+ @Consumes({ "application/json", "application/xml" })
+ @Produces({ "application/xml", "application/json" })
+ @ApiOperation(value = "Update an existing pet", tags={ "pet", })
+ public void updatePet(Pet body);
+
+ @POST
+ @Path("/pet/{petId}")
+ @Consumes({ "application/x-www-form-urlencoded" })
+ @Produces({ "application/xml", "application/json" })
+ @ApiOperation(value = "Updates a pet in the store with form data", tags={ "pet", })
+ public void updatePetWithForm(@PathParam("petId") Long petId, @Multipart(value = "name", required = false) String name, @Multipart(value = "status", required = false) String status);
+
+ @POST
+ @Path("/pet/{petId}/uploadImage")
+ @Consumes({ "multipart/form-data" })
+ @Produces({ "application/json" })
+ @ApiOperation(value = "uploads an image", tags={ "pet" })
+ public ModelApiResponse uploadFile(@PathParam("petId") Long petId, @Multipart(value = "additionalMetadata", required = false) String additionalMetadata, @Multipart(value = "file" , required = false) Attachment fileDetail);
+}
+
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/StoreApi.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/StoreApi.java
index e26c47769b4..50f1b618273 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/StoreApi.java
@@ -1,46 +1,46 @@
-package io.swagger.api;
-
-import java.util.Map;
-import io.swagger.model.Order;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.List;
-import java.util.Map;
-import javax.ws.rs.*;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-@Path("/")
-@Api(value = "/", description = "")
-public interface StoreApi {
-
- @DELETE
- @Path("/store/order/{orderId}")
- @Produces({ "application/xml", "application/json" })
- @ApiOperation(value = "Delete purchase order by ID", tags={ "store", })
- public void deleteOrder(@PathParam("orderId") String orderId);
-
- @GET
- @Path("/store/inventory")
- @Produces({ "application/json" })
- @ApiOperation(value = "Returns pet inventories by status", tags={ "store", })
- public Map getInventory();
-
- @GET
- @Path("/store/order/{orderId}")
- @Produces({ "application/xml", "application/json" })
- @ApiOperation(value = "Find purchase order by ID", tags={ "store", })
- public Order getOrderById(@PathParam("orderId") Long orderId);
-
- @POST
- @Path("/store/order")
- @Produces({ "application/xml", "application/json" })
- @ApiOperation(value = "Place an order for a pet", tags={ "store" })
- public Order placeOrder(Order body);
-}
-
+package io.swagger.api;
+
+import java.util.Map;
+import io.swagger.model.Order;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.List;
+import java.util.Map;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.MediaType;
+import org.apache.cxf.jaxrs.ext.multipart.*;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+@Path("/")
+@Api(value = "/", description = "")
+public interface StoreApi {
+
+ @DELETE
+ @Path("/store/order/{orderId}")
+ @Produces({ "application/xml", "application/json" })
+ @ApiOperation(value = "Delete purchase order by ID", tags={ "store", })
+ public void deleteOrder(@PathParam("orderId") String orderId);
+
+ @GET
+ @Path("/store/inventory")
+ @Produces({ "application/json" })
+ @ApiOperation(value = "Returns pet inventories by status", tags={ "store", })
+ public Map getInventory();
+
+ @GET
+ @Path("/store/order/{orderId}")
+ @Produces({ "application/xml", "application/json" })
+ @ApiOperation(value = "Find purchase order by ID", tags={ "store", })
+ public Order getOrderById(@PathParam("orderId") Long orderId);
+
+ @POST
+ @Path("/store/order")
+ @Produces({ "application/xml", "application/json" })
+ @ApiOperation(value = "Place an order for a pet", tags={ "store" })
+ public Order placeOrder(Order body);
+}
+
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/UserApi.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/UserApi.java
index a51b1fe0c70..20347b8650c 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/UserApi.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/UserApi.java
@@ -1,70 +1,70 @@
-package io.swagger.api;
-
-import java.util.List;
-import io.swagger.model.User;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.List;
-import java.util.Map;
-import javax.ws.rs.*;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.ext.multipart.*;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-@Path("/")
-@Api(value = "/", description = "")
-public interface UserApi {
-
- @POST
- @Path("/user")
- @Produces({ "application/xml", "application/json" })
- @ApiOperation(value = "Create user", tags={ "user", })
- public void createUser(User body);
-
- @POST
- @Path("/user/createWithArray")
- @Produces({ "application/xml", "application/json" })
- @ApiOperation(value = "Creates list of users with given input array", tags={ "user", })
- public void createUsersWithArrayInput(List body);
-
- @POST
- @Path("/user/createWithList")
- @Produces({ "application/xml", "application/json" })
- @ApiOperation(value = "Creates list of users with given input array", tags={ "user", })
- public void createUsersWithListInput(List body);
-
- @DELETE
- @Path("/user/{username}")
- @Produces({ "application/xml", "application/json" })
- @ApiOperation(value = "Delete user", tags={ "user", })
- public void deleteUser(@PathParam("username") String username);
-
- @GET
- @Path("/user/{username}")
- @Produces({ "application/xml", "application/json" })
- @ApiOperation(value = "Get user by user name", tags={ "user", })
- public User getUserByName(@PathParam("username") String username);
-
- @GET
- @Path("/user/login")
- @Produces({ "application/xml", "application/json" })
- @ApiOperation(value = "Logs user into the system", tags={ "user", })
- public String loginUser(@QueryParam("username")String username, @QueryParam("password")String password);
-
- @GET
- @Path("/user/logout")
- @Produces({ "application/xml", "application/json" })
- @ApiOperation(value = "Logs out current logged in user session", tags={ "user", })
- public void logoutUser();
-
- @PUT
- @Path("/user/{username}")
- @Produces({ "application/xml", "application/json" })
- @ApiOperation(value = "Updated user", tags={ "user" })
- public void updateUser(@PathParam("username") String username, User body);
-}
-
+package io.swagger.api;
+
+import java.util.List;
+import io.swagger.model.User;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.List;
+import java.util.Map;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.MediaType;
+import org.apache.cxf.jaxrs.ext.multipart.*;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+@Path("/")
+@Api(value = "/", description = "")
+public interface UserApi {
+
+ @POST
+ @Path("/user")
+ @Produces({ "application/xml", "application/json" })
+ @ApiOperation(value = "Create user", tags={ "user", })
+ public void createUser(User body);
+
+ @POST
+ @Path("/user/createWithArray")
+ @Produces({ "application/xml", "application/json" })
+ @ApiOperation(value = "Creates list of users with given input array", tags={ "user", })
+ public void createUsersWithArrayInput(List body);
+
+ @POST
+ @Path("/user/createWithList")
+ @Produces({ "application/xml", "application/json" })
+ @ApiOperation(value = "Creates list of users with given input array", tags={ "user", })
+ public void createUsersWithListInput(List body);
+
+ @DELETE
+ @Path("/user/{username}")
+ @Produces({ "application/xml", "application/json" })
+ @ApiOperation(value = "Delete user", tags={ "user", })
+ public void deleteUser(@PathParam("username") String username);
+
+ @GET
+ @Path("/user/{username}")
+ @Produces({ "application/xml", "application/json" })
+ @ApiOperation(value = "Get user by user name", tags={ "user", })
+ public User getUserByName(@PathParam("username") String username);
+
+ @GET
+ @Path("/user/login")
+ @Produces({ "application/xml", "application/json" })
+ @ApiOperation(value = "Logs user into the system", tags={ "user", })
+ public String loginUser(@QueryParam("username")String username, @QueryParam("password")String password);
+
+ @GET
+ @Path("/user/logout")
+ @Produces({ "application/xml", "application/json" })
+ @ApiOperation(value = "Logs out current logged in user session", tags={ "user", })
+ public void logoutUser();
+
+ @PUT
+ @Path("/user/{username}")
+ @Produces({ "application/xml", "application/json" })
+ @ApiOperation(value = "Updated user", tags={ "user" })
+ public void updateUser(@PathParam("username") String username, User body);
+}
+