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 7fbcc9cea4d..47062c394d2 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/api.mustache
@@ -37,7 +37,7 @@ public interface {{classname}}  {
     @Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} })
 {{/hasProduces}}
     @ApiOperation(value = "{{summary}}", tags={ {{#vendorExtensions.x-tags}}"{{tag}}"{{#hasMore}}, {{/hasMore}}{{/vendorExtensions.x-tags}} })
-    public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}} {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
+    public {{>returnTypes}} {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
 {{/operation}}
 }
 {{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/apiServiceImpl.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/apiServiceImpl.mustache
index ee5d8269955..70f5f4f37de 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/apiServiceImpl.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/apiServiceImpl.mustache
@@ -28,7 +28,7 @@ import org.springframework.stereotype.Service;
 public class {{classname}}ServiceImpl implements {{classname}} {
 {{#operations}}
 {{#operation}}
-    public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}} {{nickname}}({{#allParams}}{{>queryParamsImpl}}{{>pathParamsImpl}}{{>headerParamsImpl}}{{>bodyParams}}{{>formParamsImpl}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) {
+    public {{>returnTypes}} {{nickname}}({{#allParams}}{{>queryParamsImpl}}{{>pathParamsImpl}}{{>headerParamsImpl}}{{>bodyParams}}{{>formParamsImpl}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) {
         // TODO: Implement...
         
         {{^vendorExtensions.x-java-is-response-void}}return null;{{/vendorExtensions.x-java-is-response-void}}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/api_test.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/api_test.mustache
index 34308df4314..919e7d38206 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/api_test.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/api_test.mustache
@@ -103,7 +103,7 @@ public class {{classname}}Test {
         {{#allParams}}
         {{^isFile}}{{{dataType}}} {{paramName}} = null;{{/isFile}}{{#isFile}}org.apache.cxf.jaxrs.ext.multipart.Attachment {{paramName}} = null;{{/isFile}}
         {{/allParams}}
-        //{{^vendorExtensions.x-java-is-response-void}}{{{returnType}}} response = {{/vendorExtensions.x-java-is-response-void}}api.{{operationId}}({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
+	//{{^vendorExtensions.x-java-is-response-void}}{{>returnTypes}} response = {{/vendorExtensions.x-java-is-response-void}}api.{{operationId}}({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
         {{^vendorExtensions.x-java-is-response-void}}//assertNotNull(response);{{/vendorExtensions.x-java-is-response-void}}
         // TODO: test validations
         
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/returnTypes.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/returnTypes.mustache
new file mode 100644
index 00000000000..c8f7a56938a
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/returnTypes.mustache
@@ -0,0 +1 @@
+{{#returnContainer}}{{#isMapContainer}}Map<String, {{{returnType}}}>{{/isMapContainer}}{{#isListContainer}}List<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}
\ No newline at end of file
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 608b51f96d8..4ef2db0e204 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,8 +1,8 @@
 package io.swagger.api;
 
-import io.swagger.model.Pet;
-import io.swagger.model.ModelApiResponse;
 import java.io.File;
+import io.swagger.model.ModelApiResponse;
+import io.swagger.model.Pet;
 
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -18,8 +18,6 @@ import io.swagger.annotations.ApiOperation;
 
 @Path("/")
 @Api(value = "/", description = "")
-@Consumes(MediaType.APPLICATION_JSON)
-@Produces(MediaType.APPLICATION_JSON)
 public interface PetApi  {
 
     @POST
@@ -27,51 +25,51 @@ public interface PetApi  {
     @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);
+    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);
+    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 Pet  findPetsByStatus(@QueryParam("status")List<String> status);
+    public List<Pet> findPetsByStatus(@QueryParam("status")List<String> status);
 
     @GET
     @Path("/pet/findByTags")
     @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Finds Pets by tags", tags={ "pet",  })
-    public Pet  findPetsByTags(@QueryParam("tags")List<String> tags);
+    public List<Pet> findPetsByTags(@QueryParam("tags")List<String> 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);
+    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);
+    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);
+    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);
+    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 87a583b8712..e26c47769b4 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
@@ -17,32 +17,30 @@ import io.swagger.annotations.ApiOperation;
 
 @Path("/")
 @Api(value = "/", description = "")
-@Consumes(MediaType.APPLICATION_JSON)
-@Produces(MediaType.APPLICATION_JSON)
 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);
+    public void deleteOrder(@PathParam("orderId") String orderId);
 
     @GET
     @Path("/store/inventory")
     @Produces({ "application/json" })
     @ApiOperation(value = "Returns pet inventories by status", tags={ "store",  })
-    public Integer  getInventory();
+    public Map<String, Integer> 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);
+    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);
+    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 528af584f46..a51b1fe0c70 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,7 +1,7 @@
 package io.swagger.api;
 
-import io.swagger.model.User;
 import java.util.List;
+import io.swagger.model.User;
 
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -17,56 +17,54 @@ import io.swagger.annotations.ApiOperation;
 
 @Path("/")
 @Api(value = "/", description = "")
-@Consumes(MediaType.APPLICATION_JSON)
-@Produces(MediaType.APPLICATION_JSON)
 public interface UserApi  {
 
     @POST
     @Path("/user")
     @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Create user", tags={ "user",  })
-    public void  createUser(User body);
+    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<User> body);
+    public void createUsersWithArrayInput(List<User> 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<User> body);
+    public void createUsersWithListInput(List<User> body);
 
     @DELETE
     @Path("/user/{username}")
     @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Delete user", tags={ "user",  })
-    public void  deleteUser(@PathParam("username") String username);
+    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);
+    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);
+    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();
+    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);
+    public void updateUser(@PathParam("username") String username, User body);
 }
 
diff --git a/samples/server/petstore/jaxrs-cxf/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java
index 9c952820070..d9b9345d339 100644
--- a/samples/server/petstore/jaxrs-cxf/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-cxf/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java
@@ -1,9 +1,9 @@
 package io.swagger.api.impl;
 
 import io.swagger.api.*;
-import io.swagger.model.Pet;
-import io.swagger.model.ModelApiResponse;
 import java.io.File;
+import io.swagger.model.ModelApiResponse;
+import io.swagger.model.Pet;
 
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -19,49 +19,49 @@ import org.apache.cxf.jaxrs.ext.multipart.*;
 import io.swagger.annotations.Api;
 
 public class PetApiServiceImpl implements PetApi {
-    public void  addPet(Pet body) {
+    public void addPet(Pet body) {
         // TODO: Implement...
         
         
     }
     
-    public void  deletePet(Long petId, String apiKey) {
+    public void deletePet(Long petId, String apiKey) {
         // TODO: Implement...
         
         
     }
     
-    public Pet  findPetsByStatus(List<String> status) {
+    public List<Pet> findPetsByStatus(List<String> status) {
         // TODO: Implement...
         
         return null;
     }
     
-    public Pet  findPetsByTags(List<String> tags) {
+    public List<Pet> findPetsByTags(List<String> tags) {
         // TODO: Implement...
         
         return null;
     }
     
-    public Pet  getPetById(Long petId) {
+    public Pet getPetById(Long petId) {
         // TODO: Implement...
         
         return null;
     }
     
-    public void  updatePet(Pet body) {
+    public void updatePet(Pet body) {
         // TODO: Implement...
         
         
     }
     
-    public void  updatePetWithForm(Long petId, String name, String status) {
+    public void updatePetWithForm(Long petId, String name, String status) {
         // TODO: Implement...
         
         
     }
     
-    public ModelApiResponse  uploadFile(Long petId, String additionalMetadata,  Attachment fileDetail) {
+    public ModelApiResponse uploadFile(Long petId, String additionalMetadata,  Attachment fileDetail) {
         // TODO: Implement...
         
         return null;
diff --git a/samples/server/petstore/jaxrs-cxf/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java
index cbcc2de9e2a..3f791097b6b 100644
--- a/samples/server/petstore/jaxrs-cxf/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-cxf/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java
@@ -18,25 +18,25 @@ import org.apache.cxf.jaxrs.ext.multipart.*;
 import io.swagger.annotations.Api;
 
 public class StoreApiServiceImpl implements StoreApi {
-    public void  deleteOrder(String orderId) {
+    public void deleteOrder(String orderId) {
         // TODO: Implement...
         
         
     }
     
-    public Integer  getInventory() {
+    public Map<String, Integer> getInventory() {
         // TODO: Implement...
         
         return null;
     }
     
-    public Order  getOrderById(Long orderId) {
+    public Order getOrderById(Long orderId) {
         // TODO: Implement...
         
         return null;
     }
     
-    public Order  placeOrder(Order body) {
+    public Order placeOrder(Order body) {
         // TODO: Implement...
         
         return null;
diff --git a/samples/server/petstore/jaxrs-cxf/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java
index 8fac5414a23..861273cfb7b 100644
--- a/samples/server/petstore/jaxrs-cxf/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-cxf/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java
@@ -1,8 +1,8 @@
 package io.swagger.api.impl;
 
 import io.swagger.api.*;
-import io.swagger.model.User;
 import java.util.List;
+import io.swagger.model.User;
 
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -18,49 +18,49 @@ import org.apache.cxf.jaxrs.ext.multipart.*;
 import io.swagger.annotations.Api;
 
 public class UserApiServiceImpl implements UserApi {
-    public void  createUser(User body) {
+    public void createUser(User body) {
         // TODO: Implement...
         
         
     }
     
-    public void  createUsersWithArrayInput(List<User> body) {
+    public void createUsersWithArrayInput(List<User> body) {
         // TODO: Implement...
         
         
     }
     
-    public void  createUsersWithListInput(List<User> body) {
+    public void createUsersWithListInput(List<User> body) {
         // TODO: Implement...
         
         
     }
     
-    public void  deleteUser(String username) {
+    public void deleteUser(String username) {
         // TODO: Implement...
         
         
     }
     
-    public User  getUserByName(String username) {
+    public User getUserByName(String username) {
         // TODO: Implement...
         
         return null;
     }
     
-    public String  loginUser(String username, String password) {
+    public String loginUser(String username, String password) {
         // TODO: Implement...
         
         return null;
     }
     
-    public void  logoutUser() {
+    public void logoutUser() {
         // TODO: Implement...
         
         
     }
     
-    public void  updateUser(String username, User body) {
+    public void updateUser(String username, User body) {
         // TODO: Implement...