Update all jaxrs examples (#144)

samples/server/petstore/jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION

@@ -1 +1 @@
-2.3.0-SNAPSHOT
+3.0.0-SNAPSHOT

samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/io/swagger/api/PetApi.java

@@ -34,27 +34,21 @@ public interface PetApi  {
     /**
      * Add a new pet to the store
      *
-     * 
-     *
      */
     @POST
     @Path("/pet")
     @Consumes({ "application/json", "application/xml" })
-    @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Add a new pet to the store", tags={ "pet",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 405, message = "Invalid input") })
-    public void addPet(@Valid Pet body);
+    public void addPet(@Valid Pet pet);
 
     /**
      * Deletes a pet
      *
-     * 
-     *
      */
     @DELETE
     @Path("/pet/{petId}")
-    @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Deletes a pet", tags={ "pet",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid pet value") })
@@ -109,30 +103,24 @@ public interface PetApi  {
     /**
      * Update an existing pet
      *
-     * 
-     *
      */
     @PUT
     @Path("/pet")
     @Consumes({ "application/json", "application/xml" })
-    @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Update an existing pet", tags={ "pet",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Pet not found"),
         @ApiResponse(code = 405, message = "Validation exception") })
-    public void updatePet(@Valid Pet body);
+    public void updatePet(@Valid Pet pet);
 
     /**
      * Updates a pet in the store with form data
      *
-     * 
-     *
      */
     @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",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 405, message = "Invalid input") })
@@ -141,8 +129,6 @@ public interface PetApi  {
     /**
      * uploads an image
      *
-     * 
-     *
      */
     @POST
     @Path("/pet/{petId}/uploadImage")

samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/io/swagger/api/StoreApi.java

@@ -38,7 +38,6 @@ public interface StoreApi  {
      */
     @DELETE
     @Path("/store/order/{orderId}")
-    @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Delete purchase order by ID", tags={ "store",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
@@ -73,13 +72,11 @@ public interface StoreApi  {
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Order not found") })
-    public Order getOrderById(@PathParam("orderId") @Min(1) @Max(5) Long orderId);
+    public Order getOrderById(@PathParam("orderId") @Min(1L) @Max(5L) Long orderId);
 
     /**
      * Place an order for a pet
      *
-     * 
-     *
      */
     @POST
     @Path("/store/order")
@@ -88,6 +85,6 @@ public interface StoreApi  {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid Order") })
-    public Order placeOrder(@Valid Order body);
+    public Order placeOrder(@Valid Order order);
 }
 

samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/io/swagger/api/UserApi.java

@@ -38,39 +38,32 @@ public interface UserApi  {
      */
     @POST
     @Path("/user")
-    @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Create user", tags={ "user",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    public void createUser(@Valid User body);
+    public void createUser(@Valid User user);
 
     /**
      * Creates list of users with given input array
      *
-     * 
-     *
      */
     @POST
     @Path("/user/createWithArray")
-    @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Creates list of users with given input array", tags={ "user",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    public void createUsersWithArrayInput(@Valid List<User> body);
+    public void createUsersWithArrayInput(@Valid List<User> user);
 
     /**
      * Creates list of users with given input array
      *
-     * 
-     *
      */
     @POST
     @Path("/user/createWithList")
-    @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Creates list of users with given input array", tags={ "user",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    public void createUsersWithListInput(@Valid List<User> body);
+    public void createUsersWithListInput(@Valid List<User> user);
 
     /**
      * Delete user
@@ -80,7 +73,6 @@ public interface UserApi  {
      */
     @DELETE
     @Path("/user/{username}")
-    @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Delete user", tags={ "user",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied"),
@@ -90,8 +82,6 @@ public interface UserApi  {
     /**
      * Get user by user name
      *
-     * 
-     *
      */
     @GET
     @Path("/user/{username}")
@@ -106,8 +96,6 @@ public interface UserApi  {
     /**
      * Logs user into the system
      *
-     * 
-     *
      */
     @GET
     @Path("/user/login")
@@ -121,12 +109,9 @@ public interface UserApi  {
     /**
      * Logs out current logged in user session
      *
-     * 
-     *
      */
     @GET
     @Path("/user/logout")
-    @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Logs out current logged in user session", tags={ "user",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
@@ -140,11 +125,10 @@ public interface UserApi  {
      */
     @PUT
     @Path("/user/{username}")
-    @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Updated user", tags={ "user" })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid user supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    public void updateUser(@PathParam("username") String username, @Valid User body);
+    public void updateUser(@PathParam("username") String username, @Valid User user);
 }
 

samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/io/swagger/model/Category.java

@@ -2,6 +2,7 @@ package io.swagger.model;
 
 import io.swagger.annotations.ApiModel;
 import javax.validation.constraints.*;
+import javax.validation.Valid;
 
 import io.swagger.annotations.ApiModelProperty;
 import javax.xml.bind.annotation.XmlElement;
@@ -21,9 +22,9 @@ public class Category  {
   
   @ApiModelProperty(value = "")
   private Long id = null;
+
   @ApiModelProperty(value = "")
   private String name = null;
-
  /**
    * Get id
    * @return id

samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/io/swagger/model/ModelApiResponse.java

@@ -2,6 +2,7 @@ package io.swagger.model;
 
 import io.swagger.annotations.ApiModel;
 import javax.validation.constraints.*;
+import javax.validation.Valid;
 
 import io.swagger.annotations.ApiModelProperty;
 import javax.xml.bind.annotation.XmlElement;
@@ -21,11 +22,12 @@ public class ModelApiResponse  {
   
   @ApiModelProperty(value = "")
   private Integer code = null;
+
   @ApiModelProperty(value = "")
   private String type = null;
+
   @ApiModelProperty(value = "")
   private String message = null;
-
  /**
    * Get code
    * @return code

samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/io/swagger/model/Order.java

@@ -3,6 +3,7 @@ package io.swagger.model;
 import io.swagger.annotations.ApiModel;
 import java.util.Date;
 import javax.validation.constraints.*;
+import javax.validation.Valid;
 
 import io.swagger.annotations.ApiModelProperty;
 import javax.xml.bind.annotation.XmlElement;
@@ -22,13 +23,17 @@ public class Order  {
   
   @ApiModelProperty(value = "")
   private Long id = null;
+
   @ApiModelProperty(value = "")
   private Long petId = null;
+
   @ApiModelProperty(value = "")
   private Integer quantity = null;
+
   @ApiModelProperty(value = "")
   private Date shipDate = null;
 
+
 @XmlType(name="StatusEnum")
 @XmlEnum(String.class)
 public enum StatusEnum {
@@ -63,12 +68,12 @@ public enum StatusEnum {
 
   @ApiModelProperty(value = "Order Status")
  /**
-   * Order Status  
+   * Order Status
   **/
   private StatusEnum status = null;
+
   @ApiModelProperty(value = "")
   private Boolean complete = false;
-
  /**
    * Get id
    * @return id

samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/io/swagger/model/Pet.java

@@ -6,6 +6,7 @@ import io.swagger.model.Tag;
 import java.util.ArrayList;
 import java.util.List;
 import javax.validation.constraints.*;
+import javax.validation.Valid;
 
 import io.swagger.annotations.ApiModelProperty;
 import javax.xml.bind.annotation.XmlElement;
@@ -25,14 +26,21 @@ public class Pet  {
   
   @ApiModelProperty(value = "")
   private Long id = null;
+
   @ApiModelProperty(value = "")
+  @Valid
   private Category category = null;
+
   @ApiModelProperty(example = "doggie", required = true, value = "")
   private String name = null;
+
   @ApiModelProperty(required = true, value = "")
   private List<String> photoUrls = new ArrayList<String>();
+
   @ApiModelProperty(value = "")
-  private List<Tag> tags = new ArrayList<Tag>();
+  @Valid
+  private List<Tag> tags = null;
+
 
 @XmlType(name="StatusEnum")
 @XmlEnum(String.class)
@@ -68,10 +76,9 @@ public enum StatusEnum {
 
   @ApiModelProperty(value = "pet status in the store")
  /**
-   * pet status in the store  
+   * pet status in the store
   **/
   private StatusEnum status = null;
-
  /**
    * Get id
    * @return id

samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/io/swagger/model/Tag.java

@@ -2,6 +2,7 @@ package io.swagger.model;
 
 import io.swagger.annotations.ApiModel;
 import javax.validation.constraints.*;
+import javax.validation.Valid;
 
 import io.swagger.annotations.ApiModelProperty;
 import javax.xml.bind.annotation.XmlElement;
@@ -21,9 +22,9 @@ public class Tag  {
   
   @ApiModelProperty(value = "")
   private Long id = null;
+
   @ApiModelProperty(value = "")
   private String name = null;
-
  /**
    * Get id
    * @return id

samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/io/swagger/model/User.java

@@ -2,6 +2,7 @@ package io.swagger.model;
 
 import io.swagger.annotations.ApiModel;
 import javax.validation.constraints.*;
+import javax.validation.Valid;
 
 import io.swagger.annotations.ApiModelProperty;
 import javax.xml.bind.annotation.XmlElement;
@@ -21,24 +22,30 @@ public class User  {
   
   @ApiModelProperty(value = "")
   private Long id = null;
+
   @ApiModelProperty(value = "")
   private String username = null;
+
   @ApiModelProperty(value = "")
   private String firstName = null;
+
   @ApiModelProperty(value = "")
   private String lastName = null;
+
   @ApiModelProperty(value = "")
   private String email = null;
+
   @ApiModelProperty(value = "")
   private String password = null;
+
   @ApiModelProperty(value = "")
   private String phone = null;
+
   @ApiModelProperty(value = "User Status")
  /**
-   * User Status  
+   * User Status
   **/
   private Integer userStatus = null;
-
  /**
    * Get id
    * @return id

samples/server/petstore/jaxrs-cxf-annotated-base-path/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java

@@ -28,10 +28,8 @@ public class PetApiServiceImpl implements PetApi {
     /**
      * Add a new pet to the store
      *
-     * 
-     *
      */
-    public void addPet(Pet body) {
+    public void addPet(Pet pet) {
         // TODO: Implement...
         
         
@@ -40,8 +38,6 @@ public class PetApiServiceImpl implements PetApi {
     /**
      * Deletes a pet
      *
-     * 
-     *
      */
     public void deletePet(Long petId, String apiKey) {
         // TODO: Implement...
@@ -88,10 +84,8 @@ public class PetApiServiceImpl implements PetApi {
     /**
      * Update an existing pet
      *
-     * 
-     *
      */
-    public void updatePet(Pet body) {
+    public void updatePet(Pet pet) {
         // TODO: Implement...
         
         
@@ -100,8 +94,6 @@ public class PetApiServiceImpl implements PetApi {
     /**
      * Updates a pet in the store with form data
      *
-     * 
-     *
      */
     public void updatePetWithForm(Long petId, String name, String status) {
         // TODO: Implement...
@@ -112,8 +104,6 @@ public class PetApiServiceImpl implements PetApi {
     /**
      * uploads an image
      *
-     * 
-     *
      */
     public ModelApiResponse uploadFile(Long petId, String additionalMetadata,  Attachment fileDetail) {
         // TODO: Implement...

samples/server/petstore/jaxrs-cxf-annotated-base-path/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java

@@ -63,10 +63,8 @@ public class StoreApiServiceImpl implements StoreApi {
     /**
      * Place an order for a pet
      *
-     * 
-     *
      */
-    public Order placeOrder(Order body) {
+    public Order placeOrder(Order order) {
         // TODO: Implement...
         
         return null;

samples/server/petstore/jaxrs-cxf-annotated-base-path/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java

@@ -30,7 +30,7 @@ public class UserApiServiceImpl implements UserApi {
      * This can only be done by the logged in user.
      *
      */
-    public void createUser(User body) {
+    public void createUser(User user) {
         // TODO: Implement...
         
         
@@ -39,10 +39,8 @@ public class UserApiServiceImpl implements UserApi {
     /**
      * Creates list of users with given input array
      *
-     * 
-     *
      */
-    public void createUsersWithArrayInput(List<User> body) {
+    public void createUsersWithArrayInput(List<User> user) {
         // TODO: Implement...
         
         
@@ -51,10 +49,8 @@ public class UserApiServiceImpl implements UserApi {
     /**
      * Creates list of users with given input array
      *
-     * 
-     *
      */
-    public void createUsersWithListInput(List<User> body) {
+    public void createUsersWithListInput(List<User> user) {
         // TODO: Implement...
         
         
@@ -75,8 +71,6 @@ public class UserApiServiceImpl implements UserApi {
     /**
      * Get user by user name
      *
-     * 
-     *
      */
     public User getUserByName(String username) {
         // TODO: Implement...
@@ -87,8 +81,6 @@ public class UserApiServiceImpl implements UserApi {
     /**
      * Logs user into the system
      *
-     * 
-     *
      */
     public String loginUser(String username, String password) {
         // TODO: Implement...
@@ -99,8 +91,6 @@ public class UserApiServiceImpl implements UserApi {
     /**
      * Logs out current logged in user session
      *
-     * 
-     *
      */
     public void logoutUser() {
         // TODO: Implement...
@@ -114,7 +104,7 @@ public class UserApiServiceImpl implements UserApi {
      * This can only be done by the logged in user.
      *
      */
-    public void updateUser(String username, User body) {
+    public void updateUser(String username, User user) {
         // TODO: Implement...
         
         

samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION

@@ -1 +1 @@
-2.3.1-SNAPSHOT
+3.0.0-SNAPSHOT

samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/api/PetApi.java

@@ -39,7 +39,7 @@ public class PetApi  {
     @POST
     
     @Consumes({ "application/json", "application/xml" })
-    @Produces({ "application/xml", "application/json" })
+    
     @ApiOperation(value = "Add a new pet to the store", notes = "", response = Void.class, authorizations = {
         @Authorization(value = "petstore_auth", scopes = {
             @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
@@ -48,14 +48,14 @@ public class PetApi  {
     }, tags={ "pet",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 405, message = "Invalid input", response = Void.class) })
-    public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet body) {
+    public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet pet) {
-        return delegate.addPet(body, securityContext);
+        return delegate.addPet(pet, securityContext);
     }
 
     @DELETE
     @Path("/{petId}")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @ApiOperation(value = "Deletes a pet", notes = "", response = Void.class, authorizations = {
         @Authorization(value = "petstore_auth", scopes = {
             @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
@@ -120,7 +120,7 @@ public class PetApi  {
     @PUT
     
     @Consumes({ "application/json", "application/xml" })
-    @Produces({ "application/xml", "application/json" })
+    
     @ApiOperation(value = "Update an existing pet", notes = "", response = Void.class, authorizations = {
         @Authorization(value = "petstore_auth", scopes = {
             @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
@@ -131,14 +131,14 @@ public class PetApi  {
         @ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
         @ApiResponse(code = 404, message = "Pet not found", response = Void.class),
         @ApiResponse(code = 405, message = "Validation exception", response = Void.class) })
-    public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet body) {
+    public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet pet) {
-        return delegate.updatePet(body, securityContext);
+        return delegate.updatePet(pet, securityContext);
     }
 
     @POST
     @Path("/{petId}")
     @Consumes({ "application/x-www-form-urlencoded" })
-    @Produces({ "application/xml", "application/json" })
+    
     @ApiOperation(value = "Updates a pet in the store with form data", notes = "", response = Void.class, authorizations = {
         @Authorization(value = "petstore_auth", scopes = {
             @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),

samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/api/PetApiService.java

@@ -19,12 +19,12 @@ import javax.ws.rs.core.SecurityContext;
 
 
 public interface PetApiService {
-      public Response addPet(Pet body, SecurityContext securityContext);
+      public Response addPet(Pet pet, SecurityContext securityContext);
       public Response deletePet(Long petId, String apiKey, SecurityContext securityContext);
       public Response findPetsByStatus(List<String> status, SecurityContext securityContext);
       public Response findPetsByTags(List<String> tags, SecurityContext securityContext);
       public Response getPetById(Long petId, SecurityContext securityContext);
-      public Response updatePet(Pet body, SecurityContext securityContext);
+      public Response updatePet(Pet pet, SecurityContext securityContext);
       public Response updatePetWithForm(Long petId, String name, String status, SecurityContext securityContext);
       public Response uploadFile(Long petId, String additionalMetadata, InputStream fileInputStream, Attachment fileDetail, SecurityContext securityContext);
 }

samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/api/StoreApi.java

@@ -38,7 +38,7 @@ public class StoreApi  {
     @DELETE
     @Path("/order/{orderId}")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", response = Void.class, tags={ "store",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
@@ -69,7 +69,7 @@ public class StoreApi  {
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
         @ApiResponse(code = 404, message = "Order not found", response = Void.class) })
-    public Response getOrderById( @Min(1) @Max(5)@ApiParam(value = "ID of pet that needs to be fetched",required=true) @PathParam("orderId") Long orderId) {
+    public Response getOrderById( @Min(1L) @Max(5L)@ApiParam(value = "ID of pet that needs to be fetched",required=true, allowableValues="range=[1, 5]") @PathParam("orderId") Long orderId) {
         return delegate.getOrderById(orderId, securityContext);
     }
 
@@ -81,7 +81,7 @@ public class StoreApi  {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid Order", response = Void.class) })
-    public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true) Order body) {
+    public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true) Order order) {
-        return delegate.placeOrder(body, securityContext);
+        return delegate.placeOrder(order, securityContext);
     }
 }

samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/api/StoreApiService.java

@@ -21,5 +21,5 @@ public interface StoreApiService {
       public Response deleteOrder(String orderId, SecurityContext securityContext);
       public Response getInventory(SecurityContext securityContext);
       public Response getOrderById(Long orderId, SecurityContext securityContext);
-      public Response placeOrder(Order body, SecurityContext securityContext);
+      public Response placeOrder(Order order, SecurityContext securityContext);
 }

samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/api/UserApi.java

@@ -38,40 +38,40 @@ public class UserApi  {
     @POST
     
     
-    @Produces({ "application/xml", "application/json" })
+    
     @ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Void.class) })
-    public Response createUser(@ApiParam(value = "Created user object" ,required=true) User body) {
+    public Response createUser(@ApiParam(value = "Created user object" ,required=true) User user) {
-        return delegate.createUser(body, securityContext);
+        return delegate.createUser(user, securityContext);
     }
 
     @POST
     @Path("/createWithArray")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Void.class) })
-    public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) List<User> body) {
+    public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) List<User> user) {
-        return delegate.createUsersWithArrayInput(body, securityContext);
+        return delegate.createUsersWithArrayInput(user, securityContext);
     }
 
     @POST
     @Path("/createWithList")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Void.class) })
-    public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) List<User> body) {
+    public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) List<User> user) {
-        return delegate.createUsersWithListInput(body, securityContext);
+        return delegate.createUsersWithListInput(user, securityContext);
     }
 
     @DELETE
     @Path("/{username}")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @ApiOperation(value = "Delete user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
@@ -89,7 +89,7 @@ public class UserApi  {
         @ApiResponse(code = 200, message = "successful operation", response = User.class),
         @ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
         @ApiResponse(code = 404, message = "User not found", response = Void.class) })
-    public Response getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing. ",required=true) @PathParam("username") String username) {
+    public Response getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing.",required=true) @PathParam("username") String username) {
         return delegate.getUserByName(username, securityContext);
     }
 
@@ -108,7 +108,7 @@ public class UserApi  {
     @GET
     @Path("/logout")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @ApiOperation(value = "Logs out current logged in user session", notes = "", response = Void.class, tags={ "user",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Void.class) })
@@ -119,12 +119,12 @@ public class UserApi  {
     @PUT
     @Path("/{username}")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @ApiOperation(value = "Updated user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user" })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid user supplied", response = Void.class),
         @ApiResponse(code = 404, message = "User not found", response = Void.class) })
-    public Response updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathParam("username") String username, @ApiParam(value = "Updated user object" ,required=true) User body) {
+    public Response updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathParam("username") String username, @ApiParam(value = "Updated user object" ,required=true) User user) {
-        return delegate.updateUser(username, body, securityContext);
+        return delegate.updateUser(username, user, securityContext);
     }
 }

samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/api/UserApiService.java

@@ -18,12 +18,12 @@ import javax.ws.rs.core.SecurityContext;
 
 
 public interface UserApiService {
-      public Response createUser(User body, SecurityContext securityContext);
+      public Response createUser(User user, SecurityContext securityContext);
-      public Response createUsersWithArrayInput(List<User> body, SecurityContext securityContext);
+      public Response createUsersWithArrayInput(List<User> user, SecurityContext securityContext);
-      public Response createUsersWithListInput(List<User> body, SecurityContext securityContext);
+      public Response createUsersWithListInput(List<User> user, SecurityContext securityContext);
       public Response deleteUser(String username, SecurityContext securityContext);
       public Response getUserByName(String username, SecurityContext securityContext);
       public Response loginUser(String username, String password, SecurityContext securityContext);
       public Response logoutUser(SecurityContext securityContext);
-      public Response updateUser(String username, User body, SecurityContext securityContext);
+      public Response updateUser(String username, User user, SecurityContext securityContext);
 }

samples/server/petstore/jaxrs-cxf-cdi/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java

@@ -21,7 +21,7 @@ import javax.ws.rs.core.SecurityContext;
 
 public class PetApiServiceImpl implements PetApiService {
       @Override
-      public Response addPet(Pet body, SecurityContext securityContext) {
+      public Response addPet(Pet pet, SecurityContext securityContext) {
       // do some magic!
       return Response.ok().entity("magic!").build();
   }
@@ -46,7 +46,7 @@ public class PetApiServiceImpl implements PetApiService {
       return Response.ok().entity("magic!").build();
   }
       @Override
-      public Response updatePet(Pet body, SecurityContext securityContext) {
+      public Response updatePet(Pet pet, SecurityContext securityContext) {
       // do some magic!
       return Response.ok().entity("magic!").build();
   }

samples/server/petstore/jaxrs-cxf-cdi/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java

@@ -35,7 +35,7 @@ public class StoreApiServiceImpl implements StoreApiService {
       return Response.ok().entity("magic!").build();
   }
       @Override
-      public Response placeOrder(Order body, SecurityContext securityContext) {
+      public Response placeOrder(Order order, SecurityContext securityContext) {
       // do some magic!
       return Response.ok().entity("magic!").build();
   }

samples/server/petstore/jaxrs-cxf-cdi/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java

@@ -20,17 +20,17 @@ import javax.ws.rs.core.SecurityContext;
 
 public class UserApiServiceImpl implements UserApiService {
       @Override
-      public Response createUser(User body, SecurityContext securityContext) {
+      public Response createUser(User user, SecurityContext securityContext) {
       // do some magic!
       return Response.ok().entity("magic!").build();
   }
       @Override
-      public Response createUsersWithArrayInput(List<User> body, SecurityContext securityContext) {
+      public Response createUsersWithArrayInput(List<User> user, SecurityContext securityContext) {
       // do some magic!
       return Response.ok().entity("magic!").build();
   }
       @Override
-      public Response createUsersWithListInput(List<User> body, SecurityContext securityContext) {
+      public Response createUsersWithListInput(List<User> user, SecurityContext securityContext) {
       // do some magic!
       return Response.ok().entity("magic!").build();
   }
@@ -55,7 +55,7 @@ public class UserApiServiceImpl implements UserApiService {
       return Response.ok().entity("magic!").build();
   }
       @Override
-      public Response updateUser(String username, User body, SecurityContext securityContext) {
+      public Response updateUser(String username, User user, SecurityContext securityContext) {
       // do some magic!
       return Response.ok().entity("magic!").build();
   }

samples/server/petstore/jaxrs-cxf-non-spring-app/.openapi-generator/VERSION

@@ -1 +1 @@
-2.3.0-SNAPSHOT
+3.0.0-SNAPSHOT

samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/api/PetApi.java

@@ -34,27 +34,21 @@ public interface PetApi  {
     /**
      * Add a new pet to the store
      *
-     * 
-     *
      */
     @POST
     @Path("/pet")
     @Consumes({ "application/json", "application/xml" })
-    @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Add a new pet to the store", tags={ "pet",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 405, message = "Invalid input") })
-    public void addPet(@Valid Pet body);
+    public void addPet(@Valid Pet pet);
 
     /**
      * Deletes a pet
      *
-     * 
-     *
      */
     @DELETE
     @Path("/pet/{petId}")
-    @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Deletes a pet", tags={ "pet",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid pet value") })
@@ -109,30 +103,24 @@ public interface PetApi  {
     /**
      * Update an existing pet
      *
-     * 
-     *
      */
     @PUT
     @Path("/pet")
     @Consumes({ "application/json", "application/xml" })
-    @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Update an existing pet", tags={ "pet",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Pet not found"),
         @ApiResponse(code = 405, message = "Validation exception") })
-    public void updatePet(@Valid Pet body);
+    public void updatePet(@Valid Pet pet);
 
     /**
      * Updates a pet in the store with form data
      *
-     * 
-     *
      */
     @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",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 405, message = "Invalid input") })
@@ -141,8 +129,6 @@ public interface PetApi  {
     /**
      * uploads an image
      *
-     * 
-     *
      */
     @POST
     @Path("/pet/{petId}/uploadImage")

samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/api/StoreApi.java

@@ -38,7 +38,6 @@ public interface StoreApi  {
      */
     @DELETE
     @Path("/store/order/{orderId}")
-    @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Delete purchase order by ID", tags={ "store",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
@@ -73,13 +72,11 @@ public interface StoreApi  {
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Order not found") })
-    public Order getOrderById(@PathParam("orderId") @Min(1) @Max(5) Long orderId);
+    public Order getOrderById(@PathParam("orderId") @Min(1L) @Max(5L) Long orderId);
 
     /**
      * Place an order for a pet
      *
-     * 
-     *
      */
     @POST
     @Path("/store/order")
@@ -88,6 +85,6 @@ public interface StoreApi  {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid Order") })
-    public Order placeOrder(@Valid Order body);
+    public Order placeOrder(@Valid Order order);
 }
 

samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/api/UserApi.java

@@ -38,39 +38,32 @@ public interface UserApi  {
      */
     @POST
     @Path("/user")
-    @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Create user", tags={ "user",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    public void createUser(@Valid User body);
+    public void createUser(@Valid User user);
 
     /**
      * Creates list of users with given input array
      *
-     * 
-     *
      */
     @POST
     @Path("/user/createWithArray")
-    @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Creates list of users with given input array", tags={ "user",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    public void createUsersWithArrayInput(@Valid List<User> body);
+    public void createUsersWithArrayInput(@Valid List<User> user);
 
     /**
      * Creates list of users with given input array
      *
-     * 
-     *
      */
     @POST
     @Path("/user/createWithList")
-    @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Creates list of users with given input array", tags={ "user",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    public void createUsersWithListInput(@Valid List<User> body);
+    public void createUsersWithListInput(@Valid List<User> user);
 
     /**
      * Delete user
@@ -80,7 +73,6 @@ public interface UserApi  {
      */
     @DELETE
     @Path("/user/{username}")
-    @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Delete user", tags={ "user",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied"),
@@ -90,8 +82,6 @@ public interface UserApi  {
     /**
      * Get user by user name
      *
-     * 
-     *
      */
     @GET
     @Path("/user/{username}")
@@ -106,8 +96,6 @@ public interface UserApi  {
     /**
      * Logs user into the system
      *
-     * 
-     *
      */
     @GET
     @Path("/user/login")
@@ -121,12 +109,9 @@ public interface UserApi  {
     /**
      * Logs out current logged in user session
      *
-     * 
-     *
      */
     @GET
     @Path("/user/logout")
-    @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Logs out current logged in user session", tags={ "user",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
@@ -140,11 +125,10 @@ public interface UserApi  {
      */
     @PUT
     @Path("/user/{username}")
-    @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Updated user", tags={ "user" })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid user supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    public void updateUser(@PathParam("username") String username, @Valid User body);
+    public void updateUser(@PathParam("username") String username, @Valid User user);
 }
 

samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/model/Category.java

@@ -2,6 +2,7 @@ package io.swagger.model;
 
 import io.swagger.annotations.ApiModel;
 import javax.validation.constraints.*;
+import javax.validation.Valid;
 
 import io.swagger.annotations.ApiModelProperty;
 import javax.xml.bind.annotation.XmlElement;
@@ -21,9 +22,9 @@ public class Category  {
   
   @ApiModelProperty(value = "")
   private Long id = null;
+
   @ApiModelProperty(value = "")
   private String name = null;
-
  /**
    * Get id
    * @return id

samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/model/ModelApiResponse.java

@@ -2,6 +2,7 @@ package io.swagger.model;
 
 import io.swagger.annotations.ApiModel;
 import javax.validation.constraints.*;
+import javax.validation.Valid;
 
 import io.swagger.annotations.ApiModelProperty;
 import javax.xml.bind.annotation.XmlElement;
@@ -21,11 +22,12 @@ public class ModelApiResponse  {
   
   @ApiModelProperty(value = "")
   private Integer code = null;
+
   @ApiModelProperty(value = "")
   private String type = null;
+
   @ApiModelProperty(value = "")
   private String message = null;
-
  /**
    * Get code
    * @return code

samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/model/Order.java

@@ -3,6 +3,7 @@ package io.swagger.model;
 import io.swagger.annotations.ApiModel;
 import java.util.Date;
 import javax.validation.constraints.*;
+import javax.validation.Valid;
 
 import io.swagger.annotations.ApiModelProperty;
 import javax.xml.bind.annotation.XmlElement;
@@ -22,13 +23,17 @@ public class Order  {
   
   @ApiModelProperty(value = "")
   private Long id = null;
+
   @ApiModelProperty(value = "")
   private Long petId = null;
+
   @ApiModelProperty(value = "")
   private Integer quantity = null;
+
   @ApiModelProperty(value = "")
   private Date shipDate = null;
 
+
 @XmlType(name="StatusEnum")
 @XmlEnum(String.class)
 public enum StatusEnum {
@@ -63,12 +68,12 @@ public enum StatusEnum {
 
   @ApiModelProperty(value = "Order Status")
  /**
-   * Order Status  
+   * Order Status
   **/
   private StatusEnum status = null;
+
   @ApiModelProperty(value = "")
   private Boolean complete = false;
-
  /**
    * Get id
    * @return id

samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/model/Pet.java

@@ -6,6 +6,7 @@ import io.swagger.model.Tag;
 import java.util.ArrayList;
 import java.util.List;
 import javax.validation.constraints.*;
+import javax.validation.Valid;
 
 import io.swagger.annotations.ApiModelProperty;
 import javax.xml.bind.annotation.XmlElement;
@@ -25,14 +26,21 @@ public class Pet  {
   
   @ApiModelProperty(value = "")
   private Long id = null;
+
   @ApiModelProperty(value = "")
+  @Valid
   private Category category = null;
+
   @ApiModelProperty(example = "doggie", required = true, value = "")
   private String name = null;
+
   @ApiModelProperty(required = true, value = "")
   private List<String> photoUrls = new ArrayList<String>();
+
   @ApiModelProperty(value = "")
-  private List<Tag> tags = new ArrayList<Tag>();
+  @Valid
+  private List<Tag> tags = null;
+
 
 @XmlType(name="StatusEnum")
 @XmlEnum(String.class)
@@ -68,10 +76,9 @@ public enum StatusEnum {
 
   @ApiModelProperty(value = "pet status in the store")
  /**
-   * pet status in the store  
+   * pet status in the store
   **/
   private StatusEnum status = null;
-
  /**
    * Get id
    * @return id

samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/model/Tag.java

@@ -2,6 +2,7 @@ package io.swagger.model;
 
 import io.swagger.annotations.ApiModel;
 import javax.validation.constraints.*;
+import javax.validation.Valid;
 
 import io.swagger.annotations.ApiModelProperty;
 import javax.xml.bind.annotation.XmlElement;
@@ -21,9 +22,9 @@ public class Tag  {
   
   @ApiModelProperty(value = "")
   private Long id = null;
+
   @ApiModelProperty(value = "")
   private String name = null;
-
  /**
    * Get id
    * @return id

samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/model/User.java

@@ -2,6 +2,7 @@ package io.swagger.model;
 
 import io.swagger.annotations.ApiModel;
 import javax.validation.constraints.*;
+import javax.validation.Valid;
 
 import io.swagger.annotations.ApiModelProperty;
 import javax.xml.bind.annotation.XmlElement;
@@ -21,24 +22,30 @@ public class User  {
   
   @ApiModelProperty(value = "")
   private Long id = null;
+
   @ApiModelProperty(value = "")
   private String username = null;
+
   @ApiModelProperty(value = "")
   private String firstName = null;
+
   @ApiModelProperty(value = "")
   private String lastName = null;
+
   @ApiModelProperty(value = "")
   private String email = null;
+
   @ApiModelProperty(value = "")
   private String password = null;
+
   @ApiModelProperty(value = "")
   private String phone = null;
+
   @ApiModelProperty(value = "User Status")
  /**
-   * User Status  
+   * User Status
   **/
   private Integer userStatus = null;
-
  /**
    * Get id
    * @return id

samples/server/petstore/jaxrs-cxf-non-spring-app/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java

@@ -28,10 +28,8 @@ public class PetApiServiceImpl implements PetApi {
     /**
      * Add a new pet to the store
      *
-     * 
-     *
      */
-    public void addPet(Pet body) {
+    public void addPet(Pet pet) {
         // TODO: Implement...
         
         
@@ -40,8 +38,6 @@ public class PetApiServiceImpl implements PetApi {
     /**
      * Deletes a pet
      *
-     * 
-     *
      */
     public void deletePet(Long petId, String apiKey) {
         // TODO: Implement...
@@ -88,10 +84,8 @@ public class PetApiServiceImpl implements PetApi {
     /**
      * Update an existing pet
      *
-     * 
-     *
      */
-    public void updatePet(Pet body) {
+    public void updatePet(Pet pet) {
         // TODO: Implement...
         
         
@@ -100,8 +94,6 @@ public class PetApiServiceImpl implements PetApi {
     /**
      * Updates a pet in the store with form data
      *
-     * 
-     *
      */
     public void updatePetWithForm(Long petId, String name, String status) {
         // TODO: Implement...
@@ -112,8 +104,6 @@ public class PetApiServiceImpl implements PetApi {
     /**
      * uploads an image
      *
-     * 
-     *
      */
     public ModelApiResponse uploadFile(Long petId, String additionalMetadata,  Attachment fileDetail) {
         // TODO: Implement...

samples/server/petstore/jaxrs-cxf-non-spring-app/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java

@@ -63,10 +63,8 @@ public class StoreApiServiceImpl implements StoreApi {
     /**
      * Place an order for a pet
      *
-     * 
-     *
      */
-    public Order placeOrder(Order body) {
+    public Order placeOrder(Order order) {
         // TODO: Implement...
         
         return null;

samples/server/petstore/jaxrs-cxf-non-spring-app/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java

@@ -30,7 +30,7 @@ public class UserApiServiceImpl implements UserApi {
      * This can only be done by the logged in user.
      *
      */
-    public void createUser(User body) {
+    public void createUser(User user) {
         // TODO: Implement...
         
         
@@ -39,10 +39,8 @@ public class UserApiServiceImpl implements UserApi {
     /**
      * Creates list of users with given input array
      *
-     * 
-     *
      */
-    public void createUsersWithArrayInput(List<User> body) {
+    public void createUsersWithArrayInput(List<User> user) {
         // TODO: Implement...
         
         
@@ -51,10 +49,8 @@ public class UserApiServiceImpl implements UserApi {
     /**
      * Creates list of users with given input array
      *
-     * 
-     *
      */
-    public void createUsersWithListInput(List<User> body) {
+    public void createUsersWithListInput(List<User> user) {
         // TODO: Implement...
         
         
@@ -75,8 +71,6 @@ public class UserApiServiceImpl implements UserApi {
     /**
      * Get user by user name
      *
-     * 
-     *
      */
     public User getUserByName(String username) {
         // TODO: Implement...
@@ -87,8 +81,6 @@ public class UserApiServiceImpl implements UserApi {
     /**
      * Logs user into the system
      *
-     * 
-     *
      */
     public String loginUser(String username, String password) {
         // TODO: Implement...
@@ -99,8 +91,6 @@ public class UserApiServiceImpl implements UserApi {
     /**
      * Logs out current logged in user session
      *
-     * 
-     *
      */
     public void logoutUser() {
         // TODO: Implement...
@@ -114,7 +104,7 @@ public class UserApiServiceImpl implements UserApi {
      * This can only be done by the logged in user.
      *
      */
-    public void updateUser(String username, User body) {
+    public void updateUser(String username, User user) {
         // TODO: Implement...
         
         

samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION

@@ -1 +1 @@
-2.4.0-SNAPSHOT
+3.0.0-SNAPSHOT

samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/AnotherFakeApi.java

@@ -42,6 +42,6 @@ public interface AnotherFakeApi  {
     @ApiOperation(value = "To test special tags", tags={ "$another-fake?" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    public Client testSpecialTags(@Valid Client body);
+    public Client testSpecialTags(@Valid Client client);
 }
 

samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/FakeApi.java

@@ -3,8 +3,11 @@ package io.swagger.api;
 import java.math.BigDecimal;
 import io.swagger.model.Client;
 import java.util.Date;
+import java.io.File;
 import org.joda.time.LocalDate;
+import java.util.Map;
 import io.swagger.model.OuterComposite;
+import io.swagger.model.User;
 
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -35,20 +38,23 @@ public interface FakeApi  {
 
     @POST
     @Path("/fake/outer/boolean")
+    @Produces({ "*/*" })
     @ApiOperation(value = "", tags={ "fake",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) })
-    public Boolean fakeOuterBooleanSerialize(@Valid Boolean body);
+    public Boolean fakeOuterBooleanSerialize(@Valid Boolean booleanPostBody);
 
     @POST
     @Path("/fake/outer/composite")
+    @Produces({ "*/*" })
     @ApiOperation(value = "", tags={ "fake",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) })
-    public OuterComposite fakeOuterCompositeSerialize(@Valid OuterComposite body);
+    public OuterComposite fakeOuterCompositeSerialize(@Valid OuterComposite outerComposite);
 
     @POST
     @Path("/fake/outer/number")
+    @Produces({ "*/*" })
     @ApiOperation(value = "", tags={ "fake",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) })
@@ -56,11 +62,20 @@ public interface FakeApi  {
 
     @POST
     @Path("/fake/outer/string")
+    @Produces({ "*/*" })
     @ApiOperation(value = "", tags={ "fake",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output string", response = String.class) })
     public String fakeOuterStringSerialize(@Valid String body);
 
+    @PUT
+    @Path("/fake/body-with-query-params")
+    @Consumes({ "application/json" })
+    @ApiOperation(value = "", tags={ "fake",  })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "Success") })
+    public void testBodyWithQueryParams(@QueryParam("query") @NotNull String query, @Valid User user);
+
     /**
      * To test \"client\" model
      *
@@ -74,7 +89,7 @@ public interface FakeApi  {
     @ApiOperation(value = "To test \"client\" model", tags={ "fake",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    public Client testClientModel(@Valid Client body);
+    public Client testClientModel(@Valid Client client);
 
     /**
      * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -84,13 +99,12 @@ public interface FakeApi  {
      */
     @POST
     @Path("/fake")
-    @Consumes({ "application/xml; charset=utf-8", "application/json; charset=utf-8" })
+    @Consumes({ "application/x-www-form-urlencoded" })
-    @Produces({ "application/xml; charset=utf-8", "application/json; charset=utf-8" })
     @ApiOperation(value = "Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 ", tags={ "fake",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    public void testEndpointParameters(@Multipart(value = "number")  BigDecimal number, @Multipart(value = "double")  Double _double, @Multipart(value = "pattern_without_delimiter")  String patternWithoutDelimiter, @Multipart(value = "byte")  byte[] _byte, @Multipart(value = "integer", required = false)  Integer integer, @Multipart(value = "int32", required = false)  Integer int32, @Multipart(value = "int64", required = false)  Long int64, @Multipart(value = "float", required = false)  Float _float, @Multipart(value = "string", required = false)  String string, @Multipart(value = "binary", required = false)  byte[] binary, @Multipart(value = "date", required = false)  LocalDate date, @Multipart(value = "dateTime", required = false)  Date dateTime, @Multipart(value = "password", required = false)  String password, @Multipart(value = "callback", required = false)  String paramCallback);
+    public void testEndpointParameters(@Multipart(value = "number")  BigDecimal number, @Multipart(value = "double")  Double _double, @Multipart(value = "pattern_without_delimiter")  String patternWithoutDelimiter, @Multipart(value = "byte")  byte[] _byte, @Multipart(value = "integer", required = false)  Integer integer, @Multipart(value = "int32", required = false)  Integer int32, @Multipart(value = "int64", required = false)  Long int64, @Multipart(value = "float", required = false)  Float _float, @Multipart(value = "string", required = false)  String string,  @Multipart(value = "binary" , required = false) Attachment binaryDetail, @Multipart(value = "date", required = false)  LocalDate date, @Multipart(value = "dateTime", required = false)  Date dateTime, @Multipart(value = "password", required = false)  String password, @Multipart(value = "callback", required = false)  String paramCallback);
 
     /**
      * To test enum parameters
@@ -100,19 +114,16 @@ public interface FakeApi  {
      */
     @GET
     @Path("/fake")
-    @Consumes({ "*/*" })
+    @Consumes({ "application/x-www-form-urlencoded" })
-    @Produces({ "*/*" })
     @ApiOperation(value = "To test enum parameters", tags={ "fake",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid request"),
         @ApiResponse(code = 404, message = "Not found") })
-    public void testEnumParameters(@Multipart(value = "enum_form_string_array", required = false)  List<String> enumFormStringArray, @Multipart(value = "enum_form_string", required = false)  String enumFormString, @HeaderParam("enum_header_string_array") List<String> enumHeaderStringArray, @HeaderParam("enum_header_string") String enumHeaderString, @QueryParam("enum_query_string_array") List<String> enumQueryStringArray, @QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString, @QueryParam("enum_query_integer") Integer enumQueryInteger, @Multipart(value = "enum_query_double", required = false)  Double enumQueryDouble);
+    public void testEnumParameters(@HeaderParam("enum_header_string_array") List<String> enumHeaderStringArray, @HeaderParam("enum_header_string") String enumHeaderString, @QueryParam("enum_query_string_array") List<String> enumQueryStringArray, @QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString, @QueryParam("enum_query_integer") Integer enumQueryInteger, @QueryParam("enum_query_double") Double enumQueryDouble, @Multipart(value = "enum_form_string_array", required = false)  List<String> enumFormStringArray, @Multipart(value = "enum_form_string", required = false)  String enumFormString);
 
     /**
      * test inline additionalProperties
      *
-     * 
-     *
      */
     @POST
     @Path("/fake/inline-additionalProperties")
@@ -120,17 +131,15 @@ public interface FakeApi  {
     @ApiOperation(value = "test inline additionalProperties", tags={ "fake",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    public void testInlineAdditionalProperties(@Valid Object param);
+    public void testInlineAdditionalProperties(@Valid String requestBody);
 
     /**
      * test json serialization of form data
      *
-     * 
-     *
      */
     @GET
     @Path("/fake/jsonFormData")
-    @Consumes({ "application/json" })
+    @Consumes({ "application/x-www-form-urlencoded" })
     @ApiOperation(value = "test json serialization of form data", tags={ "fake" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })

samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/FakeClassnameTags123Api.java

@@ -42,6 +42,6 @@ public interface FakeClassnameTags123Api  {
     @ApiOperation(value = "To test class name in snake case", tags={ "fake_classname_tags 123#$%^" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    public Client testClassname(@Valid Client body);
+    public Client testClassname(@Valid Client client);
 }
 

samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/PetApi.java

@@ -34,27 +34,21 @@ public interface PetApi  {
     /**
      * Add a new pet to the store
      *
-     * 
-     *
      */
     @POST
     @Path("/pet")
     @Consumes({ "application/json", "application/xml" })
-    @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Add a new pet to the store", tags={ "pet",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 405, message = "Invalid input") })
-    public void addPet(@Valid Pet body);
+    public void addPet(@Valid Pet pet);
 
     /**
      * Deletes a pet
      *
-     * 
-     *
      */
     @DELETE
     @Path("/pet/{petId}")
-    @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Deletes a pet", tags={ "pet",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid pet value") })
@@ -109,30 +103,24 @@ public interface PetApi  {
     /**
      * Update an existing pet
      *
-     * 
-     *
      */
     @PUT
     @Path("/pet")
     @Consumes({ "application/json", "application/xml" })
-    @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Update an existing pet", tags={ "pet",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Pet not found"),
         @ApiResponse(code = 405, message = "Validation exception") })
-    public void updatePet(@Valid Pet body);
+    public void updatePet(@Valid Pet pet);
 
     /**
      * Updates a pet in the store with form data
      *
-     * 
-     *
      */
     @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",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 405, message = "Invalid input") })
@@ -141,8 +129,6 @@ public interface PetApi  {
     /**
      * uploads an image
      *
-     * 
-     *
      */
     @POST
     @Path("/pet/{petId}/uploadImage")

samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/StoreApi.java

@@ -38,7 +38,6 @@ public interface StoreApi  {
      */
     @DELETE
     @Path("/store/order/{order_id}")
-    @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Delete purchase order by ID", tags={ "store",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
@@ -78,8 +77,6 @@ public interface StoreApi  {
     /**
      * Place an order for a pet
      *
-     * 
-     *
      */
     @POST
     @Path("/store/order")
@@ -88,6 +85,6 @@ public interface StoreApi  {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid Order") })
-    public Order placeOrder(@Valid Order body);
+    public Order placeOrder(@Valid Order order);
 }
 

samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/UserApi.java

@@ -38,39 +38,32 @@ public interface UserApi  {
      */
     @POST
     @Path("/user")
-    @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Create user", tags={ "user",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    public void createUser(@Valid User body);
+    public void createUser(@Valid User user);
 
     /**
      * Creates list of users with given input array
      *
-     * 
-     *
      */
     @POST
     @Path("/user/createWithArray")
-    @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Creates list of users with given input array", tags={ "user",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    public void createUsersWithArrayInput(@Valid List<User> body);
+    public void createUsersWithArrayInput(@Valid List<User> user);
 
     /**
      * Creates list of users with given input array
      *
-     * 
-     *
      */
     @POST
     @Path("/user/createWithList")
-    @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Creates list of users with given input array", tags={ "user",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
-    public void createUsersWithListInput(@Valid List<User> body);
+    public void createUsersWithListInput(@Valid List<User> user);
 
     /**
      * Delete user
@@ -80,7 +73,6 @@ public interface UserApi  {
      */
     @DELETE
     @Path("/user/{username}")
-    @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Delete user", tags={ "user",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied"),
@@ -90,8 +82,6 @@ public interface UserApi  {
     /**
      * Get user by user name
      *
-     * 
-     *
      */
     @GET
     @Path("/user/{username}")
@@ -106,8 +96,6 @@ public interface UserApi  {
     /**
      * Logs user into the system
      *
-     * 
-     *
      */
     @GET
     @Path("/user/login")
@@ -121,12 +109,9 @@ public interface UserApi  {
     /**
      * Logs out current logged in user session
      *
-     * 
-     *
      */
     @GET
     @Path("/user/logout")
-    @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Logs out current logged in user session", tags={ "user",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
@@ -140,11 +125,10 @@ public interface UserApi  {
      */
     @PUT
     @Path("/user/{username}")
-    @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Updated user", tags={ "user" })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid user supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    public void updateUser(@PathParam("username") String username, @Valid User body);
+    public void updateUser(@PathParam("username") String username, @Valid User user);
 }
 

samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/FormatTest.java

@@ -1,5 +1,6 @@
 package io.swagger.model;
 
+import java.io.File;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.UUID;
@@ -45,7 +46,7 @@ public class FormatTest  {
   private byte[] _byte = null;
 
   @ApiModelProperty(value = "")
-  private byte[] binary = null;
+  private File binary = null;
 
   @ApiModelProperty(required = true, value = "")
   private LocalDate date = null;
@@ -219,15 +220,15 @@ public class FormatTest  {
    * @return binary
   **/
   @JsonProperty("binary")
-  public byte[] getBinary() {
+  public File getBinary() {
     return binary;
   }
 
-  public void setBinary(byte[] binary) {
+  public void setBinary(File binary) {
     this.binary = binary;
   }
 
-  public FormatTest binary(byte[] binary) {
+  public FormatTest binary(File binary) {
     this.binary = binary;
     return this;
   }

samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/OuterBoolean.java

@@ -0,0 +1,38 @@
+package io.swagger.model;
+
+import javax.validation.constraints.*;
+import javax.validation.Valid;
+
+import io.swagger.annotations.ApiModelProperty;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class OuterBoolean  {
+  
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class OuterBoolean {\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(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+

samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/OuterNumber.java

@@ -0,0 +1,38 @@
+package io.swagger.model;
+
+import javax.validation.constraints.*;
+import javax.validation.Valid;
+
+import io.swagger.annotations.ApiModelProperty;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class OuterNumber  {
+  
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class OuterNumber {\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(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+

samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/OuterString.java

@@ -0,0 +1,38 @@
+package io.swagger.model;
+
+import javax.validation.constraints.*;
+import javax.validation.Valid;
+
+import io.swagger.annotations.ApiModelProperty;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class OuterString  {
+  
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class OuterString {\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(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+

samples/server/petstore/jaxrs-cxf/src/main/java/io/swagger/api/impl/AnotherFakeApiServiceImpl.java

@@ -29,7 +29,7 @@ public class AnotherFakeApiServiceImpl implements AnotherFakeApi {
      * To test special tags
      *
      */
-    public Client testSpecialTags(Client body) {
+    public Client testSpecialTags(Client client) {
         // TODO: Implement...
         
         return null;

samples/server/petstore/jaxrs-cxf/src/main/java/io/swagger/api/impl/FakeApiServiceImpl.java

@@ -4,8 +4,11 @@ import io.swagger.api.*;
 import java.math.BigDecimal;
 import io.swagger.model.Client;
 import java.util.Date;
+import java.io.File;
 import org.joda.time.LocalDate;
+import java.util.Map;
 import io.swagger.model.OuterComposite;
+import io.swagger.model.User;
 
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -27,13 +30,13 @@ import io.swagger.annotations.Api;
  *
  */
 public class FakeApiServiceImpl implements FakeApi {
-    public Boolean fakeOuterBooleanSerialize(Boolean body) {
+    public Boolean fakeOuterBooleanSerialize(Boolean booleanPostBody) {
         // TODO: Implement...
         
         return null;
     }
     
-    public OuterComposite fakeOuterCompositeSerialize(OuterComposite body) {
+    public OuterComposite fakeOuterCompositeSerialize(OuterComposite outerComposite) {
         // TODO: Implement...
         
         return null;
@@ -51,13 +54,19 @@ public class FakeApiServiceImpl implements FakeApi {
         return null;
     }
     
+    public void testBodyWithQueryParams(String query, User user) {
+        // TODO: Implement...
+        
+        
+    }
+    
     /**
      * To test \"client\" model
      *
      * To test \"client\" model
      *
      */
-    public Client testClientModel(Client body) {
+    public Client testClientModel(Client client) {
         // TODO: Implement...
         
         return null;
@@ -69,7 +78,7 @@ public class FakeApiServiceImpl implements FakeApi {
      * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
      *
      */
-    public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, byte[] binary, LocalDate date, Date dateTime, String password, String paramCallback) {
+    public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string,  Attachment binaryDetail, LocalDate date, Date dateTime, String password, String paramCallback) {
         // TODO: Implement...
         
         
@@ -81,7 +90,7 @@ public class FakeApiServiceImpl implements FakeApi {
      * To test enum parameters
      *
      */
-    public void testEnumParameters(List<String> enumFormStringArray, String enumFormString, List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble) {
+    public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString) {
         // TODO: Implement...
         
         
@@ -90,10 +99,8 @@ public class FakeApiServiceImpl implements FakeApi {
     /**
      * test inline additionalProperties
      *
-     * 
-     *
      */
-    public void testInlineAdditionalProperties(Object param) {
+    public void testInlineAdditionalProperties(String requestBody) {
         // TODO: Implement...
         
         
@@ -102,8 +109,6 @@ public class FakeApiServiceImpl implements FakeApi {
     /**
      * test json serialization of form data
      *
-     * 
-     *
      */
     public void testJsonFormData(String param, String param2) {
         // TODO: Implement...

samples/server/petstore/jaxrs-cxf/src/main/java/io/swagger/api/impl/FakeClassnameTags123ApiServiceImpl.java

@@ -29,7 +29,7 @@ public class FakeClassnameTags123ApiServiceImpl implements FakeClassnameTags123A
      * To test class name in snake case
      *
      */
-    public Client testClassname(Client body) {
+    public Client testClassname(Client client) {
         // TODO: Implement...
         
         return null;

samples/server/petstore/jaxrs-cxf/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java

@@ -28,10 +28,8 @@ public class PetApiServiceImpl implements PetApi {
     /**
      * Add a new pet to the store
      *
-     * 
-     *
      */
-    public void addPet(Pet body) {
+    public void addPet(Pet pet) {
         // TODO: Implement...
         
         
@@ -40,8 +38,6 @@ public class PetApiServiceImpl implements PetApi {
     /**
      * Deletes a pet
      *
-     * 
-     *
      */
     public void deletePet(Long petId, String apiKey) {
         // TODO: Implement...
@@ -88,10 +84,8 @@ public class PetApiServiceImpl implements PetApi {
     /**
      * Update an existing pet
      *
-     * 
-     *
      */
-    public void updatePet(Pet body) {
+    public void updatePet(Pet pet) {
         // TODO: Implement...
         
         
@@ -100,8 +94,6 @@ public class PetApiServiceImpl implements PetApi {
     /**
      * Updates a pet in the store with form data
      *
-     * 
-     *
      */
     public void updatePetWithForm(Long petId, String name, String status) {
         // TODO: Implement...
@@ -112,8 +104,6 @@ public class PetApiServiceImpl implements PetApi {
     /**
      * uploads an image
      *
-     * 
-     *
      */
     public ModelApiResponse uploadFile(Long petId, String additionalMetadata,  Attachment fileDetail) {
         // TODO: Implement...

samples/server/petstore/jaxrs-cxf/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java

@@ -63,10 +63,8 @@ public class StoreApiServiceImpl implements StoreApi {
     /**
      * Place an order for a pet
      *
-     * 
-     *
      */
-    public Order placeOrder(Order body) {
+    public Order placeOrder(Order order) {
         // TODO: Implement...
         
         return null;

samples/server/petstore/jaxrs-cxf/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java

@@ -30,7 +30,7 @@ public class UserApiServiceImpl implements UserApi {
      * This can only be done by the logged in user.
      *
      */
-    public void createUser(User body) {
+    public void createUser(User user) {
         // TODO: Implement...
         
         
@@ -39,10 +39,8 @@ public class UserApiServiceImpl implements UserApi {
     /**
      * Creates list of users with given input array
      *
-     * 
-     *
      */
-    public void createUsersWithArrayInput(List<User> body) {
+    public void createUsersWithArrayInput(List<User> user) {
         // TODO: Implement...
         
         
@@ -51,10 +49,8 @@ public class UserApiServiceImpl implements UserApi {
     /**
      * Creates list of users with given input array
      *
-     * 
-     *
      */
-    public void createUsersWithListInput(List<User> body) {
+    public void createUsersWithListInput(List<User> user) {
         // TODO: Implement...
         
         
@@ -75,8 +71,6 @@ public class UserApiServiceImpl implements UserApi {
     /**
      * Get user by user name
      *
-     * 
-     *
      */
     public User getUserByName(String username) {
         // TODO: Implement...
@@ -87,8 +81,6 @@ public class UserApiServiceImpl implements UserApi {
     /**
      * Logs user into the system
      *
-     * 
-     *
      */
     public String loginUser(String username, String password) {
         // TODO: Implement...
@@ -99,8 +91,6 @@ public class UserApiServiceImpl implements UserApi {
     /**
      * Logs out current logged in user session
      *
-     * 
-     *
      */
     public void logoutUser() {
         // TODO: Implement...
@@ -114,7 +104,7 @@ public class UserApiServiceImpl implements UserApi {
      * This can only be done by the logged in user.
      *
      */
-    public void updateUser(String username, User body) {
+    public void updateUser(String username, User user) {
         // TODO: Implement...
         
         

samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION

@@ -1 +1 @@
-2.3.1-SNAPSHOT
+3.0.0-SNAPSHOT

samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/PetApi.java

@@ -37,7 +37,7 @@ public class PetApi  {
     @POST
     
     @Consumes({ "application/json", "application/xml" })
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Add a new pet to the store", notes = "", response = Void.class, authorizations = {
         @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
             @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
@@ -46,14 +46,14 @@ public class PetApi  {
     }, tags={ "pet", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = Void.class) })
-    public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet body,@Context SecurityContext securityContext)
+    public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet pet,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return service.addPet(body,securityContext);
+        return service.addPet(pet,securityContext);
     }
     @DELETE
     @Path("/{petId}")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Deletes a pet", notes = "", response = Void.class, authorizations = {
         @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
             @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
@@ -122,7 +122,7 @@ public class PetApi  {
     @PUT
     
     @Consumes({ "application/json", "application/xml" })
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Update an existing pet", notes = "", response = Void.class, authorizations = {
         @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
             @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
@@ -135,14 +135,14 @@ public class PetApi  {
         @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = Void.class),
         
         @io.swagger.annotations.ApiResponse(code = 405, message = "Validation exception", response = Void.class) })
-    public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet body,@Context SecurityContext securityContext)
+    public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet pet,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return service.updatePet(body,securityContext);
+        return service.updatePet(pet,securityContext);
     }
     @POST
     @Path("/{petId}")
     @Consumes({ "application/x-www-form-urlencoded" })
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Updates a pet in the store with form data", notes = "", response = Void.class, authorizations = {
         @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
             @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),

samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/PetApiService.java

@@ -19,7 +19,7 @@ import javax.ws.rs.core.SecurityContext;
 
 
 public interface PetApiService {
-      Response addPet(Pet body,SecurityContext securityContext)
+      Response addPet(Pet pet,SecurityContext securityContext)
       throws NotFoundException;
       Response deletePet(Long petId,String apiKey,SecurityContext securityContext)
       throws NotFoundException;
@@ -29,7 +29,7 @@ public interface PetApiService {
       throws NotFoundException;
       Response getPetById(Long petId,SecurityContext securityContext)
       throws NotFoundException;
-      Response updatePet(Pet body,SecurityContext securityContext)
+      Response updatePet(Pet pet,SecurityContext securityContext)
       throws NotFoundException;
       Response updatePetWithForm(Long petId,String name,String status,SecurityContext securityContext)
       throws NotFoundException;

samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/StoreApi.java

@@ -35,7 +35,7 @@ public class StoreApi  {
     @DELETE
     @Path("/order/{orderId}")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", response = Void.class, tags={ "store", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
@@ -69,7 +69,7 @@ public class StoreApi  {
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
         
         @io.swagger.annotations.ApiResponse(code = 404, message = "Order not found", response = Void.class) })
-    public Response getOrderById( @Min(1) @Max(5) @PathParam("orderId") Long orderId,@Context SecurityContext securityContext)
+    public Response getOrderById( @Min(1L) @Max(5L) @PathParam("orderId") Long orderId,@Context SecurityContext securityContext)
     throws NotFoundException {
         return service.getOrderById(orderId,securityContext);
     }
@@ -82,8 +82,8 @@ public class StoreApi  {
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class),
         
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid Order", response = Void.class) })
-    public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true) Order body,@Context SecurityContext securityContext)
+    public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true) Order order,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return service.placeOrder(body,securityContext);
+        return service.placeOrder(order,securityContext);
     }
 }

samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/StoreApiService.java

@@ -23,6 +23,6 @@ public interface StoreApiService {
       throws NotFoundException;
       Response getOrderById(Long orderId,SecurityContext securityContext)
       throws NotFoundException;
-      Response placeOrder(Order body,SecurityContext securityContext)
+      Response placeOrder(Order order,SecurityContext securityContext)
       throws NotFoundException;
 }

samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/UserApi.java

@@ -35,40 +35,40 @@ public class UserApi  {
     @POST
     
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
-    public Response createUser(@ApiParam(value = "Created user object" ,required=true) User body,@Context SecurityContext securityContext)
+    public Response createUser(@ApiParam(value = "Created user object" ,required=true) User user,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return service.createUser(body,securityContext);
+        return service.createUser(user,securityContext);
     }
     @POST
     @Path("/createWithArray")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
-    public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) List<User> body,@Context SecurityContext securityContext)
+    public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) List<User> user,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return service.createUsersWithArrayInput(body,securityContext);
+        return service.createUsersWithArrayInput(user,securityContext);
     }
     @POST
     @Path("/createWithList")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
-    public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) List<User> body,@Context SecurityContext securityContext)
+    public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) List<User> user,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return service.createUsersWithListInput(body,securityContext);
+        return service.createUsersWithListInput(user,securityContext);
     }
     @DELETE
     @Path("/{username}")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Delete user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
@@ -109,7 +109,7 @@ public class UserApi  {
     @GET
     @Path("/logout")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Logs out current logged in user session", notes = "", response = Void.class, tags={ "user", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
@@ -120,14 +120,14 @@ public class UserApi  {
     @PUT
     @Path("/{username}")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Updated user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid user supplied", response = Void.class),
         
         @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) })
-    public Response updateUser( @PathParam("username") String username,@ApiParam(value = "Updated user object" ,required=true) User body,@Context SecurityContext securityContext)
+    public Response updateUser( @PathParam("username") String username,@ApiParam(value = "Updated user object" ,required=true) User user,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return service.updateUser(username,body,securityContext);
+        return service.updateUser(username,user,securityContext);
     }
 }

samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/UserApiService.java

@@ -17,11 +17,11 @@ import javax.ws.rs.core.SecurityContext;
 
 
 public interface UserApiService {
-      Response createUser(User body,SecurityContext securityContext)
+      Response createUser(User user,SecurityContext securityContext)
       throws NotFoundException;
-      Response createUsersWithArrayInput(List<User> body,SecurityContext securityContext)
+      Response createUsersWithArrayInput(List<User> user,SecurityContext securityContext)
       throws NotFoundException;
-      Response createUsersWithListInput(List<User> body,SecurityContext securityContext)
+      Response createUsersWithListInput(List<User> user,SecurityContext securityContext)
       throws NotFoundException;
       Response deleteUser(String username,SecurityContext securityContext)
       throws NotFoundException;
@@ -31,6 +31,6 @@ public interface UserApiService {
       throws NotFoundException;
       Response logoutUser(SecurityContext securityContext)
       throws NotFoundException;
-      Response updateUser(String username,User body,SecurityContext securityContext)
+      Response updateUser(String username,User user,SecurityContext securityContext)
       throws NotFoundException;
 }

samples/server/petstore/jaxrs-resteasy/default/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java

@@ -21,7 +21,7 @@ import javax.ws.rs.core.SecurityContext;
 @RequestScoped
 
 public class PetApiServiceImpl implements PetApiService {
-      public Response addPet(Pet body,SecurityContext securityContext)
+      public Response addPet(Pet pet,SecurityContext securityContext)
       throws NotFoundException {
       // do some magic!
       return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
@@ -46,7 +46,7 @@ public class PetApiServiceImpl implements PetApiService {
       // do some magic!
       return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
   }
-      public Response updatePet(Pet body,SecurityContext securityContext)
+      public Response updatePet(Pet pet,SecurityContext securityContext)
       throws NotFoundException {
       // do some magic!
       return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();

samples/server/petstore/jaxrs-resteasy/default/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java

@@ -34,7 +34,7 @@ public class StoreApiServiceImpl implements StoreApiService {
       // do some magic!
       return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
   }
-      public Response placeOrder(Order body,SecurityContext securityContext)
+      public Response placeOrder(Order order,SecurityContext securityContext)
       throws NotFoundException {
       // do some magic!
       return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();

samples/server/petstore/jaxrs-resteasy/default/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java

@@ -19,17 +19,17 @@ import javax.ws.rs.core.SecurityContext;
 @RequestScoped
 
 public class UserApiServiceImpl implements UserApiService {
-      public Response createUser(User body,SecurityContext securityContext)
+      public Response createUser(User user,SecurityContext securityContext)
       throws NotFoundException {
       // do some magic!
       return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
   }
-      public Response createUsersWithArrayInput(List<User> body,SecurityContext securityContext)
+      public Response createUsersWithArrayInput(List<User> user,SecurityContext securityContext)
       throws NotFoundException {
       // do some magic!
       return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
   }
-      public Response createUsersWithListInput(List<User> body,SecurityContext securityContext)
+      public Response createUsersWithListInput(List<User> user,SecurityContext securityContext)
       throws NotFoundException {
       // do some magic!
       return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
@@ -54,7 +54,7 @@ public class UserApiServiceImpl implements UserApiService {
       // do some magic!
       return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
   }
-      public Response updateUser(String username,User body,SecurityContext securityContext)
+      public Response updateUser(String username,User user,SecurityContext securityContext)
       throws NotFoundException {
       // do some magic!
       return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();

samples/server/petstore/jaxrs-resteasy/eap-java8/.openapi-generator-ignore

@@ -1,5 +1,5 @@
-# Swagger Codegen Ignore
+# Openapi Generator Ignore
-# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
 
 # Use this file to prevent files from being overwritten by the generator.
 # The patterns follow closely to .gitignore or .dockerignore.

samples/server/petstore/jaxrs-resteasy/eap-java8/.openapi-generator/VERSION

@@ -1 +1 @@
-2.3.1-SNAPSHOT
+3.0.0-SNAPSHOT

samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/io/swagger/api/PetApi.java

@@ -31,7 +31,7 @@ public interface PetApi  {
     @POST
     
     @Consumes({ "application/json", "application/xml" })
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Add a new pet to the store", notes = "", response = Void.class, authorizations = {
         @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
             @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
@@ -40,11 +40,11 @@ public interface PetApi  {
     }, tags={ "pet", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = Void.class) })
-    public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet body,@Context SecurityContext securityContext);
+    public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet pet,@Context SecurityContext securityContext);
     @DELETE
     @Path("/{petId}")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Deletes a pet", notes = "", response = Void.class, authorizations = {
         @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
             @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
@@ -101,7 +101,7 @@ public interface PetApi  {
     @PUT
     
     @Consumes({ "application/json", "application/xml" })
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Update an existing pet", notes = "", response = Void.class, authorizations = {
         @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
             @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
@@ -114,11 +114,11 @@ public interface PetApi  {
         @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = Void.class),
         
         @io.swagger.annotations.ApiResponse(code = 405, message = "Validation exception", response = Void.class) })
-    public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet body,@Context SecurityContext securityContext);
+    public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet pet,@Context SecurityContext securityContext);
     @POST
     @Path("/{petId}")
     @Consumes({ "application/x-www-form-urlencoded" })
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Updates a pet in the store with form data", notes = "", response = Void.class, authorizations = {
         @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
             @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),

samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/io/swagger/api/StoreApi.java

@@ -29,7 +29,7 @@ public interface StoreApi  {
     @DELETE
     @Path("/order/{orderId}")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", response = Void.class, tags={ "store", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
@@ -67,5 +67,5 @@ public interface StoreApi  {
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class),
         
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid Order", response = Void.class) })
-    public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true) Order body,@Context SecurityContext securityContext);
+    public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true) Order order,@Context SecurityContext securityContext);
 }

samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/io/swagger/api/UserApi.java

@@ -29,31 +29,31 @@ public interface UserApi  {
     @POST
     
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
-    public Response createUser(@ApiParam(value = "Created user object" ,required=true) User body,@Context SecurityContext securityContext);
+    public Response createUser(@ApiParam(value = "Created user object" ,required=true) User user,@Context SecurityContext securityContext);
     @POST
     @Path("/createWithArray")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
-    public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) List<User> body,@Context SecurityContext securityContext);
+    public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) List<User> user,@Context SecurityContext securityContext);
     @POST
     @Path("/createWithList")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
-    public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) List<User> body,@Context SecurityContext securityContext);
+    public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) List<User> user,@Context SecurityContext securityContext);
     @DELETE
     @Path("/{username}")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Delete user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
@@ -85,7 +85,7 @@ public interface UserApi  {
     @GET
     @Path("/logout")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Logs out current logged in user session", notes = "", response = Void.class, tags={ "user", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
@@ -93,11 +93,11 @@ public interface UserApi  {
     @PUT
     @Path("/{username}")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Updated user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid user supplied", response = Void.class),
         
         @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) })
-    public Response updateUser( @PathParam("username") String username,@ApiParam(value = "Updated user object" ,required=true) User body,@Context SecurityContext securityContext);
+    public Response updateUser( @PathParam("username") String username,@ApiParam(value = "Updated user object" ,required=true) User user,@Context SecurityContext securityContext);
 }

samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java

@@ -18,7 +18,7 @@ import javax.ws.rs.core.SecurityContext;
 
 
 public class PetApiServiceImpl implements PetApi {
-      public Response addPet(Pet body,SecurityContext securityContext) {
+      public Response addPet(Pet pet,SecurityContext securityContext) {
       // do some magic!
       return Response.ok().build();
   }
@@ -38,7 +38,7 @@ public class PetApiServiceImpl implements PetApi {
       // do some magic!
       return Response.ok().build();
   }
-      public Response updatePet(Pet body,SecurityContext securityContext) {
+      public Response updatePet(Pet pet,SecurityContext securityContext) {
       // do some magic!
       return Response.ok().build();
   }

samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java

@@ -28,7 +28,7 @@ public class StoreApiServiceImpl implements StoreApi {
       // do some magic!
       return Response.ok().build();
   }
-      public Response placeOrder(Order body,SecurityContext securityContext) {
+      public Response placeOrder(Order order,SecurityContext securityContext) {
       // do some magic!
       return Response.ok().build();
   }

samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java

@@ -16,15 +16,15 @@ import javax.ws.rs.core.SecurityContext;
 
 
 public class UserApiServiceImpl implements UserApi {
-      public Response createUser(User body,SecurityContext securityContext) {
+      public Response createUser(User user,SecurityContext securityContext) {
       // do some magic!
       return Response.ok().build();
   }
-      public Response createUsersWithArrayInput(List<User> body,SecurityContext securityContext) {
+      public Response createUsersWithArrayInput(List<User> user,SecurityContext securityContext) {
       // do some magic!
       return Response.ok().build();
   }
-      public Response createUsersWithListInput(List<User> body,SecurityContext securityContext) {
+      public Response createUsersWithListInput(List<User> user,SecurityContext securityContext) {
       // do some magic!
       return Response.ok().build();
   }
@@ -44,7 +44,7 @@ public class UserApiServiceImpl implements UserApi {
       // do some magic!
       return Response.ok().build();
   }
-      public Response updateUser(String username,User body,SecurityContext securityContext) {
+      public Response updateUser(String username,User user,SecurityContext securityContext) {
       // do some magic!
       return Response.ok().build();
   }

samples/server/petstore/jaxrs-resteasy/eap-joda/.openapi-generator-ignore

@@ -1,5 +1,5 @@
-# Swagger Codegen Ignore
+# Openapi Generator Ignore
-# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
 
 # Use this file to prevent files from being overwritten by the generator.
 # The patterns follow closely to .gitignore or .dockerignore.

samples/server/petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION

@@ -1 +1 @@
-2.3.1-SNAPSHOT
+3.0.0-SNAPSHOT

samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/io/swagger/api/PetApi.java

@@ -31,7 +31,7 @@ public interface PetApi  {
     @POST
     
     @Consumes({ "application/json", "application/xml" })
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Add a new pet to the store", notes = "", response = Void.class, authorizations = {
         @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
             @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
@@ -40,11 +40,11 @@ public interface PetApi  {
     }, tags={ "pet", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = Void.class) })
-    public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet body,@Context SecurityContext securityContext);
+    public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet pet,@Context SecurityContext securityContext);
     @DELETE
     @Path("/{petId}")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Deletes a pet", notes = "", response = Void.class, authorizations = {
         @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
             @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
@@ -101,7 +101,7 @@ public interface PetApi  {
     @PUT
     
     @Consumes({ "application/json", "application/xml" })
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Update an existing pet", notes = "", response = Void.class, authorizations = {
         @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
             @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
@@ -114,11 +114,11 @@ public interface PetApi  {
         @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = Void.class),
         
         @io.swagger.annotations.ApiResponse(code = 405, message = "Validation exception", response = Void.class) })
-    public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet body,@Context SecurityContext securityContext);
+    public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet pet,@Context SecurityContext securityContext);
     @POST
     @Path("/{petId}")
     @Consumes({ "application/x-www-form-urlencoded" })
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Updates a pet in the store with form data", notes = "", response = Void.class, authorizations = {
         @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
             @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),

samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/io/swagger/api/StoreApi.java

@@ -29,7 +29,7 @@ public interface StoreApi  {
     @DELETE
     @Path("/order/{orderId}")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", response = Void.class, tags={ "store", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
@@ -67,5 +67,5 @@ public interface StoreApi  {
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class),
         
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid Order", response = Void.class) })
-    public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true) Order body,@Context SecurityContext securityContext);
+    public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true) Order order,@Context SecurityContext securityContext);
 }

samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/io/swagger/api/UserApi.java

@@ -29,31 +29,31 @@ public interface UserApi  {
     @POST
     
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
-    public Response createUser(@ApiParam(value = "Created user object" ,required=true) User body,@Context SecurityContext securityContext);
+    public Response createUser(@ApiParam(value = "Created user object" ,required=true) User user,@Context SecurityContext securityContext);
     @POST
     @Path("/createWithArray")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
-    public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) List<User> body,@Context SecurityContext securityContext);
+    public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) List<User> user,@Context SecurityContext securityContext);
     @POST
     @Path("/createWithList")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
-    public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) List<User> body,@Context SecurityContext securityContext);
+    public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) List<User> user,@Context SecurityContext securityContext);
     @DELETE
     @Path("/{username}")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Delete user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
@@ -85,7 +85,7 @@ public interface UserApi  {
     @GET
     @Path("/logout")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Logs out current logged in user session", notes = "", response = Void.class, tags={ "user", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
@@ -93,11 +93,11 @@ public interface UserApi  {
     @PUT
     @Path("/{username}")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Updated user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid user supplied", response = Void.class),
         
         @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) })
-    public Response updateUser( @PathParam("username") String username,@ApiParam(value = "Updated user object" ,required=true) User body,@Context SecurityContext securityContext);
+    public Response updateUser( @PathParam("username") String username,@ApiParam(value = "Updated user object" ,required=true) User user,@Context SecurityContext securityContext);
 }

samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java

@@ -18,7 +18,7 @@ import javax.ws.rs.core.SecurityContext;
 
 
 public class PetApiServiceImpl implements PetApi {
-      public Response addPet(Pet body,SecurityContext securityContext) {
+      public Response addPet(Pet pet,SecurityContext securityContext) {
       // do some magic!
       return Response.ok().build();
   }
@@ -38,7 +38,7 @@ public class PetApiServiceImpl implements PetApi {
       // do some magic!
       return Response.ok().build();
   }
-      public Response updatePet(Pet body,SecurityContext securityContext) {
+      public Response updatePet(Pet pet,SecurityContext securityContext) {
       // do some magic!
       return Response.ok().build();
   }

samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java

@@ -28,7 +28,7 @@ public class StoreApiServiceImpl implements StoreApi {
       // do some magic!
       return Response.ok().build();
   }
-      public Response placeOrder(Order body,SecurityContext securityContext) {
+      public Response placeOrder(Order order,SecurityContext securityContext) {
       // do some magic!
       return Response.ok().build();
   }

samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java

@@ -16,15 +16,15 @@ import javax.ws.rs.core.SecurityContext;
 
 
 public class UserApiServiceImpl implements UserApi {
-      public Response createUser(User body,SecurityContext securityContext) {
+      public Response createUser(User user,SecurityContext securityContext) {
       // do some magic!
       return Response.ok().build();
   }
-      public Response createUsersWithArrayInput(List<User> body,SecurityContext securityContext) {
+      public Response createUsersWithArrayInput(List<User> user,SecurityContext securityContext) {
       // do some magic!
       return Response.ok().build();
   }
-      public Response createUsersWithListInput(List<User> body,SecurityContext securityContext) {
+      public Response createUsersWithListInput(List<User> user,SecurityContext securityContext) {
       // do some magic!
       return Response.ok().build();
   }
@@ -44,7 +44,7 @@ public class UserApiServiceImpl implements UserApi {
       // do some magic!
       return Response.ok().build();
   }
-      public Response updateUser(String username,User body,SecurityContext securityContext) {
+      public Response updateUser(String username,User user,SecurityContext securityContext) {
       // do some magic!
       return Response.ok().build();
   }

samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator-ignore

@@ -1,5 +1,5 @@
-# Swagger Codegen Ignore
+# Openapi Generator Ignore
-# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
 
 # Use this file to prevent files from being overwritten by the generator.
 # The patterns follow closely to .gitignore or .dockerignore.

samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION

@@ -1 +1 @@
-2.3.1-SNAPSHOT
+3.0.0-SNAPSHOT

samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/io/swagger/api/PetApi.java

@@ -31,7 +31,7 @@ public interface PetApi  {
     @POST
     
     @Consumes({ "application/json", "application/xml" })
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Add a new pet to the store", notes = "", response = Void.class, authorizations = {
         @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
             @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
@@ -40,11 +40,11 @@ public interface PetApi  {
     }, tags={ "pet", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = Void.class) })
-    public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet body,@Context SecurityContext securityContext);
+    public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet pet,@Context SecurityContext securityContext);
     @DELETE
     @Path("/{petId}")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Deletes a pet", notes = "", response = Void.class, authorizations = {
         @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
             @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
@@ -101,7 +101,7 @@ public interface PetApi  {
     @PUT
     
     @Consumes({ "application/json", "application/xml" })
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Update an existing pet", notes = "", response = Void.class, authorizations = {
         @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
             @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
@@ -114,11 +114,11 @@ public interface PetApi  {
         @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = Void.class),
         
         @io.swagger.annotations.ApiResponse(code = 405, message = "Validation exception", response = Void.class) })
-    public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet body,@Context SecurityContext securityContext);
+    public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet pet,@Context SecurityContext securityContext);
     @POST
     @Path("/{petId}")
     @Consumes({ "application/x-www-form-urlencoded" })
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Updates a pet in the store with form data", notes = "", response = Void.class, authorizations = {
         @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
             @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),

samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/io/swagger/api/StoreApi.java

@@ -29,7 +29,7 @@ public interface StoreApi  {
     @DELETE
     @Path("/order/{orderId}")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", response = Void.class, tags={ "store", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
@@ -67,5 +67,5 @@ public interface StoreApi  {
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class),
         
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid Order", response = Void.class) })
-    public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true) Order body,@Context SecurityContext securityContext);
+    public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true) Order order,@Context SecurityContext securityContext);
 }

samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/io/swagger/api/UserApi.java

@@ -29,31 +29,31 @@ public interface UserApi  {
     @POST
     
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
-    public Response createUser(@ApiParam(value = "Created user object" ,required=true) User body,@Context SecurityContext securityContext);
+    public Response createUser(@ApiParam(value = "Created user object" ,required=true) User user,@Context SecurityContext securityContext);
     @POST
     @Path("/createWithArray")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
-    public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) List<User> body,@Context SecurityContext securityContext);
+    public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) List<User> user,@Context SecurityContext securityContext);
     @POST
     @Path("/createWithList")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
-    public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) List<User> body,@Context SecurityContext securityContext);
+    public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) List<User> user,@Context SecurityContext securityContext);
     @DELETE
     @Path("/{username}")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Delete user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
@@ -85,7 +85,7 @@ public interface UserApi  {
     @GET
     @Path("/logout")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Logs out current logged in user session", notes = "", response = Void.class, tags={ "user", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
@@ -93,11 +93,11 @@ public interface UserApi  {
     @PUT
     @Path("/{username}")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Updated user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid user supplied", response = Void.class),
         
         @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) })
-    public Response updateUser( @PathParam("username") String username,@ApiParam(value = "Updated user object" ,required=true) User body,@Context SecurityContext securityContext);
+    public Response updateUser( @PathParam("username") String username,@ApiParam(value = "Updated user object" ,required=true) User user,@Context SecurityContext securityContext);
 }

samples/server/petstore/jaxrs-resteasy/eap/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java

@@ -18,7 +18,7 @@ import javax.ws.rs.core.SecurityContext;
 
 
 public class PetApiServiceImpl implements PetApi {
-      public Response addPet(Pet body,SecurityContext securityContext) {
+      public Response addPet(Pet pet,SecurityContext securityContext) {
       // do some magic!
       return Response.ok().build();
   }
@@ -38,7 +38,7 @@ public class PetApiServiceImpl implements PetApi {
       // do some magic!
       return Response.ok().build();
   }
-      public Response updatePet(Pet body,SecurityContext securityContext) {
+      public Response updatePet(Pet pet,SecurityContext securityContext) {
       // do some magic!
       return Response.ok().build();
   }

samples/server/petstore/jaxrs-resteasy/eap/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java

@@ -28,7 +28,7 @@ public class StoreApiServiceImpl implements StoreApi {
       // do some magic!
       return Response.ok().build();
   }
-      public Response placeOrder(Order body,SecurityContext securityContext) {
+      public Response placeOrder(Order order,SecurityContext securityContext) {
       // do some magic!
       return Response.ok().build();
   }

samples/server/petstore/jaxrs-resteasy/eap/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java

@@ -16,15 +16,15 @@ import javax.ws.rs.core.SecurityContext;
 
 
 public class UserApiServiceImpl implements UserApi {
-      public Response createUser(User body,SecurityContext securityContext) {
+      public Response createUser(User user,SecurityContext securityContext) {
       // do some magic!
       return Response.ok().build();
   }
-      public Response createUsersWithArrayInput(List<User> body,SecurityContext securityContext) {
+      public Response createUsersWithArrayInput(List<User> user,SecurityContext securityContext) {
       // do some magic!
       return Response.ok().build();
   }
-      public Response createUsersWithListInput(List<User> body,SecurityContext securityContext) {
+      public Response createUsersWithListInput(List<User> user,SecurityContext securityContext) {
       // do some magic!
       return Response.ok().build();
   }
@@ -44,7 +44,7 @@ public class UserApiServiceImpl implements UserApi {
       // do some magic!
       return Response.ok().build();
   }
-      public Response updateUser(String username,User body,SecurityContext securityContext) {
+      public Response updateUser(String username,User user,SecurityContext securityContext) {
       // do some magic!
       return Response.ok().build();
   }

samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION

@@ -1 +1 @@
-2.3.1-SNAPSHOT
+3.0.0-SNAPSHOT

samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/PetApi.java

@@ -37,7 +37,7 @@ public class PetApi  {
     @POST
     
     @Consumes({ "application/json", "application/xml" })
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Add a new pet to the store", notes = "", response = Void.class, authorizations = {
         @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
             @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
@@ -46,14 +46,14 @@ public class PetApi  {
     }, tags={ "pet", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = Void.class) })
-    public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet body,@Context SecurityContext securityContext)
+    public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet pet,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return service.addPet(body,securityContext);
+        return service.addPet(pet,securityContext);
     }
     @DELETE
     @Path("/{petId}")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Deletes a pet", notes = "", response = Void.class, authorizations = {
         @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
             @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
@@ -122,7 +122,7 @@ public class PetApi  {
     @PUT
     
     @Consumes({ "application/json", "application/xml" })
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Update an existing pet", notes = "", response = Void.class, authorizations = {
         @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
             @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
@@ -135,14 +135,14 @@ public class PetApi  {
         @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = Void.class),
         
         @io.swagger.annotations.ApiResponse(code = 405, message = "Validation exception", response = Void.class) })
-    public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet body,@Context SecurityContext securityContext)
+    public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet pet,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return service.updatePet(body,securityContext);
+        return service.updatePet(pet,securityContext);
     }
     @POST
     @Path("/{petId}")
     @Consumes({ "application/x-www-form-urlencoded" })
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Updates a pet in the store with form data", notes = "", response = Void.class, authorizations = {
         @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
             @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),

samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/PetApiService.java

@@ -19,7 +19,7 @@ import javax.ws.rs.core.SecurityContext;
 
 
 public interface PetApiService {
-      Response addPet(Pet body,SecurityContext securityContext)
+      Response addPet(Pet pet,SecurityContext securityContext)
       throws NotFoundException;
       Response deletePet(Long petId,String apiKey,SecurityContext securityContext)
       throws NotFoundException;
@@ -29,7 +29,7 @@ public interface PetApiService {
       throws NotFoundException;
       Response getPetById(Long petId,SecurityContext securityContext)
       throws NotFoundException;
-      Response updatePet(Pet body,SecurityContext securityContext)
+      Response updatePet(Pet pet,SecurityContext securityContext)
       throws NotFoundException;
       Response updatePetWithForm(Long petId,String name,String status,SecurityContext securityContext)
       throws NotFoundException;

samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/StoreApi.java

@@ -35,7 +35,7 @@ public class StoreApi  {
     @DELETE
     @Path("/order/{orderId}")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", response = Void.class, tags={ "store", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
@@ -69,7 +69,7 @@ public class StoreApi  {
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
         
         @io.swagger.annotations.ApiResponse(code = 404, message = "Order not found", response = Void.class) })
-    public Response getOrderById( @Min(1) @Max(5) @PathParam("orderId") Long orderId,@Context SecurityContext securityContext)
+    public Response getOrderById( @Min(1L) @Max(5L) @PathParam("orderId") Long orderId,@Context SecurityContext securityContext)
     throws NotFoundException {
         return service.getOrderById(orderId,securityContext);
     }
@@ -82,8 +82,8 @@ public class StoreApi  {
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class),
         
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid Order", response = Void.class) })
-    public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true) Order body,@Context SecurityContext securityContext)
+    public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true) Order order,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return service.placeOrder(body,securityContext);
+        return service.placeOrder(order,securityContext);
     }
 }

samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/StoreApiService.java

@@ -23,6 +23,6 @@ public interface StoreApiService {
       throws NotFoundException;
       Response getOrderById(Long orderId,SecurityContext securityContext)
       throws NotFoundException;
-      Response placeOrder(Order body,SecurityContext securityContext)
+      Response placeOrder(Order order,SecurityContext securityContext)
       throws NotFoundException;
 }

samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/UserApi.java

@@ -35,40 +35,40 @@ public class UserApi  {
     @POST
     
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
-    public Response createUser(@ApiParam(value = "Created user object" ,required=true) User body,@Context SecurityContext securityContext)
+    public Response createUser(@ApiParam(value = "Created user object" ,required=true) User user,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return service.createUser(body,securityContext);
+        return service.createUser(user,securityContext);
     }
     @POST
     @Path("/createWithArray")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
-    public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) List<User> body,@Context SecurityContext securityContext)
+    public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) List<User> user,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return service.createUsersWithArrayInput(body,securityContext);
+        return service.createUsersWithArrayInput(user,securityContext);
     }
     @POST
     @Path("/createWithList")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
-    public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) List<User> body,@Context SecurityContext securityContext)
+    public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) List<User> user,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return service.createUsersWithListInput(body,securityContext);
+        return service.createUsersWithListInput(user,securityContext);
     }
     @DELETE
     @Path("/{username}")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Delete user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
@@ -109,7 +109,7 @@ public class UserApi  {
     @GET
     @Path("/logout")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Logs out current logged in user session", notes = "", response = Void.class, tags={ "user", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
@@ -120,14 +120,14 @@ public class UserApi  {
     @PUT
     @Path("/{username}")
     
-    @Produces({ "application/xml", "application/json" })
+    
     @io.swagger.annotations.ApiOperation(value = "Updated user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid user supplied", response = Void.class),
         
         @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) })
-    public Response updateUser( @PathParam("username") String username,@ApiParam(value = "Updated user object" ,required=true) User body,@Context SecurityContext securityContext)
+    public Response updateUser( @PathParam("username") String username,@ApiParam(value = "Updated user object" ,required=true) User user,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return service.updateUser(username,body,securityContext);
+        return service.updateUser(username,user,securityContext);
     }
 }

samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/UserApiService.java

@@ -17,11 +17,11 @@ import javax.ws.rs.core.SecurityContext;
 
 
 public interface UserApiService {
-      Response createUser(User body,SecurityContext securityContext)
+      Response createUser(User user,SecurityContext securityContext)
       throws NotFoundException;
-      Response createUsersWithArrayInput(List<User> body,SecurityContext securityContext)
+      Response createUsersWithArrayInput(List<User> user,SecurityContext securityContext)
       throws NotFoundException;
-      Response createUsersWithListInput(List<User> body,SecurityContext securityContext)
+      Response createUsersWithListInput(List<User> user,SecurityContext securityContext)
       throws NotFoundException;
       Response deleteUser(String username,SecurityContext securityContext)
       throws NotFoundException;
@@ -31,6 +31,6 @@ public interface UserApiService {
       throws NotFoundException;
       Response logoutUser(SecurityContext securityContext)
       throws NotFoundException;
-      Response updateUser(String username,User body,SecurityContext securityContext)
+      Response updateUser(String username,User user,SecurityContext securityContext)
       throws NotFoundException;
 }

samples/server/petstore/jaxrs-resteasy/joda/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java

@@ -21,7 +21,7 @@ import javax.ws.rs.core.SecurityContext;
 @RequestScoped
 
 public class PetApiServiceImpl implements PetApiService {
-      public Response addPet(Pet body,SecurityContext securityContext)
+      public Response addPet(Pet pet,SecurityContext securityContext)
       throws NotFoundException {
       // do some magic!
       return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
@@ -46,7 +46,7 @@ public class PetApiServiceImpl implements PetApiService {
       // do some magic!
       return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
   }
-      public Response updatePet(Pet body,SecurityContext securityContext)
+      public Response updatePet(Pet pet,SecurityContext securityContext)
       throws NotFoundException {
       // do some magic!
       return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();

samples/server/petstore/jaxrs-resteasy/joda/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java

@@ -34,7 +34,7 @@ public class StoreApiServiceImpl implements StoreApiService {
       // do some magic!
       return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
   }
-      public Response placeOrder(Order body,SecurityContext securityContext)
+      public Response placeOrder(Order order,SecurityContext securityContext)
       throws NotFoundException {
       // do some magic!
       return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();

samples/server/petstore/jaxrs-resteasy/joda/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java

@@ -19,17 +19,17 @@ import javax.ws.rs.core.SecurityContext;
 @RequestScoped
 
 public class UserApiServiceImpl implements UserApiService {
-      public Response createUser(User body,SecurityContext securityContext)
+      public Response createUser(User user,SecurityContext securityContext)
       throws NotFoundException {
       // do some magic!
       return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
   }
-      public Response createUsersWithArrayInput(List<User> body,SecurityContext securityContext)
+      public Response createUsersWithArrayInput(List<User> user,SecurityContext securityContext)
       throws NotFoundException {
       // do some magic!
       return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
   }
-      public Response createUsersWithListInput(List<User> body,SecurityContext securityContext)
+      public Response createUsersWithListInput(List<User> user,SecurityContext securityContext)
       throws NotFoundException {
       // do some magic!
       return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
@@ -54,7 +54,7 @@ public class UserApiServiceImpl implements UserApiService {
       // do some magic!
       return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
   }
-      public Response updateUser(String username,User body,SecurityContext securityContext)
+      public Response updateUser(String username,User user,SecurityContext securityContext)
       throws NotFoundException {
       // do some magic!
       return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();

samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION

@@ -1 +1 @@
-2.4.0-SNAPSHOT
+3.0.0-SNAPSHOT

samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/api/AnotherFakeApi.java

@@ -23,5 +23,5 @@ public interface AnotherFakeApi {
     @ApiOperation(value = "To test special tags", notes = "To test special tags", tags={ "$another-fake?" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    Client testSpecialTags(@Valid Client body);
+    Client testSpecialTags(@Valid Client client);
 }

samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/api/FakeApi.java

@@ -3,8 +3,11 @@ package io.swagger.api;
 import java.math.BigDecimal;
 import io.swagger.model.Client;
 import java.util.Date;
+import java.io.File;
 import org.joda.time.LocalDate;
+import java.util.Map;
 import io.swagger.model.OuterComposite;
+import io.swagger.model.User;
 
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
@@ -22,20 +25,23 @@ public interface FakeApi {
 
     @POST
     @Path("/outer/boolean")
+    @Produces({ "*/*" })
     @ApiOperation(value = "", notes = "Test serialization of outer boolean types", tags={ "fake",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) })
-    Boolean fakeOuterBooleanSerialize(@Valid Boolean body);
+    Boolean fakeOuterBooleanSerialize(@Valid Boolean booleanPostBody);
 
     @POST
     @Path("/outer/composite")
+    @Produces({ "*/*" })
     @ApiOperation(value = "", notes = "Test serialization of object with outer number type", tags={ "fake",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) })
-    OuterComposite fakeOuterCompositeSerialize(@Valid OuterComposite body);
+    OuterComposite fakeOuterCompositeSerialize(@Valid OuterComposite outerComposite);
 
     @POST
     @Path("/outer/number")
+    @Produces({ "*/*" })
     @ApiOperation(value = "", notes = "Test serialization of outer number types", tags={ "fake",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) })
@@ -43,38 +49,46 @@ public interface FakeApi {
 
     @POST
     @Path("/outer/string")
+    @Produces({ "*/*" })
     @ApiOperation(value = "", notes = "Test serialization of outer string types", tags={ "fake",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output string", response = String.class) })
     String fakeOuterStringSerialize(@Valid String body);
 
+    @PUT
+    @Path("/body-with-query-params")
+    @Consumes({ "application/json" })
+    @ApiOperation(value = "", notes = "", tags={ "fake",  })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "Success", response = Void.class) })
+    void testBodyWithQueryParams(@QueryParam("query") @NotNull    String query,@Valid User user);
+
     @PATCH
     @Consumes({ "application/json" })
     @Produces({ "application/json" })
     @ApiOperation(value = "To test \"client\" model", notes = "To test \"client\" model", tags={ "fake",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    Client testClientModel(@Valid Client body);
+    Client testClientModel(@Valid Client client);
 
     @POST
-    @Consumes({ "application/xml; charset=utf-8", "application/json; charset=utf-8" })
+    @Consumes({ "application/x-www-form-urlencoded" })
-    @Produces({ "application/xml; charset=utf-8", "application/json; charset=utf-8" })
     @ApiOperation(value = "Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 ", notes = "Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 ", authorizations = {
         @Authorization(value = "http_basic_test")
     }, tags={ "fake",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
         @ApiResponse(code = 404, message = "User not found", response = Void.class) })
-    void testEndpointParameters(@FormParam(value = "number")  BigDecimal number,@FormParam(value = "double")  Double _double,@FormParam(value = "pattern_without_delimiter")  String patternWithoutDelimiter,@FormParam(value = "byte")  byte[] _byte,@FormParam(value = "integer")  Integer integer,@FormParam(value = "int32")  Integer int32,@FormParam(value = "int64")  Long int64,@FormParam(value = "float")  Float _float,@FormParam(value = "string")  String string,@FormParam(value = "binary")  byte[] binary,@FormParam(value = "date")  LocalDate date,@FormParam(value = "dateTime")  Date dateTime,@FormParam(value = "password")  String password,@FormParam(value = "callback")  String paramCallback);
+    void testEndpointParameters(@FormParam(value = "number")  BigDecimal number,@FormParam(value = "double")  Double _double,@FormParam(value = "pattern_without_delimiter")  String patternWithoutDelimiter,@FormParam(value = "byte")  byte[] _byte,@FormParam(value = "integer")  Integer integer,@FormParam(value = "int32")  Integer int32,@FormParam(value = "int64")  Long int64,@FormParam(value = "float")  Float _float,@FormParam(value = "string")  String string, @FormParam(value = "binary") InputStream binaryInputStream,
+   @FormParam(value = "binary") Attachment binaryDetail,@FormParam(value = "date")  LocalDate date,@FormParam(value = "dateTime")  Date dateTime,@FormParam(value = "password")  String password,@FormParam(value = "callback")  String paramCallback);
 
     @GET
-    @Consumes({ "*/*" })
+    @Consumes({ "application/x-www-form-urlencoded" })
-    @Produces({ "*/*" })
     @ApiOperation(value = "To test enum parameters", notes = "To test enum parameters", tags={ "fake",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid request", response = Void.class),
         @ApiResponse(code = 404, message = "Not found", response = Void.class) })
-    void testEnumParameters(@FormParam(value = "enum_form_string_array")  List<String> enumFormStringArray,@FormParam(value = "enum_form_string")  String enumFormString,@HeaderParam("enum_header_string_array")   @ApiParam("Header parameter enum test (string array)") List<String> enumHeaderStringArray,@HeaderParam("enum_header_string")  @DefaultValue("-efg")  @ApiParam("Header parameter enum test (string)") String enumHeaderString,@QueryParam("enum_query_string_array")   @ApiParam("Query parameter enum test (string array)")  List<String> enumQueryStringArray,@QueryParam("enum_query_string")  @DefaultValue("-efg")  @ApiParam("Query parameter enum test (string)")  String enumQueryString,@QueryParam("enum_query_integer")   @ApiParam("Query parameter enum test (double)")  Integer enumQueryInteger,@FormParam(value = "enum_query_double")  Double enumQueryDouble);
+    void testEnumParameters(@HeaderParam("enum_header_string_array")   @ApiParam("Header parameter enum test (string array)") List<String> enumHeaderStringArray,@HeaderParam("enum_header_string")  @DefaultValue("-efg")  @ApiParam("Header parameter enum test (string)") String enumHeaderString,@QueryParam("enum_query_string_array")   @ApiParam("Query parameter enum test (string array)")  List<String> enumQueryStringArray,@QueryParam("enum_query_string")  @DefaultValue("-efg")  @ApiParam("Query parameter enum test (string)")  String enumQueryString,@QueryParam("enum_query_integer")   @ApiParam("Query parameter enum test (double)")  Integer enumQueryInteger,@QueryParam("enum_query_double")   @ApiParam("Query parameter enum test (double)")  Double enumQueryDouble,@FormParam(value = "enum_form_string_array")  List<String> enumFormStringArray,@FormParam(value = "enum_form_string")  String enumFormString);
 
     @POST
     @Path("/inline-additionalProperties")
@@ -82,11 +96,11 @@ public interface FakeApi {
     @ApiOperation(value = "test inline additionalProperties", notes = "", tags={ "fake",  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Void.class) })
-    void testInlineAdditionalProperties(@Valid Object param);
+    void testInlineAdditionalProperties(@Valid String requestBody);
 
     @GET
     @Path("/jsonFormData")
-    @Consumes({ "application/json" })
+    @Consumes({ "application/x-www-form-urlencoded" })
     @ApiOperation(value = "test json serialization of form data", notes = "", tags={ "fake" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Void.class) })