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 3910e320889..2e8ef241f49 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
@@ -1,7 +1,7 @@
 package io.swagger.api;
 
 import io.swagger.model.Pet;
-import io.swagger.model.InlineResponse200;
+import io.swagger.model.ApiResponse;
 import java.io.File;
 
 import javax.ws.rs.*;
@@ -14,57 +14,42 @@ public interface PetApi  {
     @POST
     @Path("/pet")
     @Consumes({ "application/json", "application/xml" })
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
     public Response addPet(Pet body);
-    @POST
-    @Path("/pet?testing_byte_array=true")
-    @Consumes({ "application/json", "application/xml" })
-    @Produces({ "application/json", "application/xml" })
-    public Response addPetUsingByteArray(byte[] body);
     @DELETE
     @Path("/pet/{petId}")
     
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
     public Response deletePet(@PathParam("petId") Long petId,@HeaderParam("api_key") String apiKey);
     @GET
     @Path("/pet/findByStatus")
     
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
     public Response findPetsByStatus(@QueryParam("status") List<String> status);
     @GET
     @Path("/pet/findByTags")
     
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
     public Response findPetsByTags(@QueryParam("tags") List<String> tags);
     @GET
     @Path("/pet/{petId}")
     
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
     public Response getPetById(@PathParam("petId") Long petId);
-    @GET
-    @Path("/pet/{petId}?response=inline_arbitrary_object")
-    
-    @Produces({ "application/json", "application/xml" })
-    public Response getPetByIdInObject(@PathParam("petId") Long petId);
-    @GET
-    @Path("/pet/{petId}?testing_byte_array=true")
-    
-    @Produces({ "application/json", "application/xml" })
-    public Response petPetIdtestingByteArraytrueGet(@PathParam("petId") Long petId);
     @PUT
     @Path("/pet")
     @Consumes({ "application/json", "application/xml" })
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
     public Response updatePet(Pet body);
     @POST
     @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);
+    @Produces({ "application/xml", "application/json" })
+    public Response 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", "application/xml" })
+    @Produces({ "application/json" })
     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);
 }
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 2aeb7aa49d8..7b26e047746 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
@@ -1,7 +1,7 @@
 package io.swagger.api;
 
-import io.swagger.model.Order;
 import java.util.Map;
+import io.swagger.model.Order;
 
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
@@ -13,32 +13,22 @@ public interface StoreApi  {
     @DELETE
     @Path("/store/order/{orderId}")
     
-    @Produces({ "application/json", "application/xml" })
-    public Response deleteOrder(@PathParam("orderId") String orderId);
-    @GET
-    @Path("/store/findByStatus")
-    
-    @Produces({ "application/json", "application/xml" })
-    public Response findOrdersByStatus(@QueryParam("status") String status);
+    @Produces({ "application/xml", "application/json" })
+    public Response deleteOrder(@PathParam("orderId") Long orderId);
     @GET
     @Path("/store/inventory")
     
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/json" })
     public Response getInventory();
     @GET
-    @Path("/store/inventory?response=arbitrary_object")
-    
-    @Produces({ "application/json", "application/xml" })
-    public Response getInventoryInObject();
-    @GET
     @Path("/store/order/{orderId}")
     
-    @Produces({ "application/json", "application/xml" })
-    public Response getOrderById(@PathParam("orderId") String orderId);
+    @Produces({ "application/xml", "application/json" })
+    public Response getOrderById(@PathParam("orderId") Long orderId);
     @POST
     @Path("/store/order")
     
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
     public Response placeOrder(Order body);
 }
 
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 615cc26f58b..19e5ab04f3a 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
@@ -13,42 +13,42 @@ public interface UserApi  {
     @POST
     @Path("/user")
     
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
     public Response createUser(User body);
     @POST
     @Path("/user/createWithArray")
     
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
     public Response createUsersWithArrayInput(List<User> body);
     @POST
     @Path("/user/createWithList")
     
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
     public Response createUsersWithListInput(List<User> body);
     @DELETE
     @Path("/user/{username}")
     
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
     public Response deleteUser(@PathParam("username") String username);
     @GET
     @Path("/user/{username}")
     
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
     public Response getUserByName(@PathParam("username") String username);
     @GET
     @Path("/user/login")
     
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
     public Response loginUser(@QueryParam("username") String username,@QueryParam("password") String password);
     @GET
     @Path("/user/logout")
     
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
     public Response logoutUser();
     @PUT
     @Path("/user/{username}")
     
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
     public Response updateUser(@PathParam("username") String username,User body);
 }
 
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 60ffccbd8f9..93c120e6c5a 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
@@ -45,7 +45,7 @@ public enum Order {
 
   private StatusEnum status = null;
 
-  private Boolean complete = null;
+  private Boolean complete = false;
 
   
   /**