update jaxrs junit to newer version (#11410)

modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache

@@ -217,7 +217,7 @@
     <jersey-version>1.19.1</jersey-version>
     <jackson-version>2.9.9</jackson-version>
     <slf4j-version>1.7.21</slf4j-version>
-    <junit-version>4.13</junit-version>
+    <junit-version>4.13.1</junit-version>
     <servlet-api-version>4.0.4</servlet-api-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>

samples/client/petstore/jaxrs-cxf-client-jackson/.openapi-generator/VERSION

@@ -1 +1 @@
-5.2.0-SNAPSHOT
+5.4.0-SNAPSHOT

samples/client/petstore/jaxrs-cxf-client-jackson/pom.xml

@@ -6,6 +6,8 @@
   <name>jaxrs-cxf-jackson-petstore-client</name>
   <description>This is a sample server Petstore server. For this sample, you can use the api key &#x60;special-key&#x60; to test the authorization filters.</description>
   <version>1.0.0</version>
+
+
   <build>
     <sourceDirectory>src/main/java</sourceDirectory>
     <plugins>
@@ -111,7 +113,7 @@
         <version>${cxf-version}</version>
         <scope>test</scope>
     </dependency>
-    
+
      <!-- CXF server -->
     <dependency>
         <groupId>org.apache.cxf</groupId>
@@ -172,7 +174,6 @@
     <jetty-version>9.2.9.v20150224</jetty-version>
     <junit-version>4.13.1</junit-version>
     <logback-version>1.2.0</logback-version>
-    <servlet-api-version>2.5</servlet-api-version>
     <cxf-version>3.3.0</cxf-version>
     <jackson-jaxrs-version>2.9.9</jackson-jaxrs-version>
     <jakarta-annotation-version>1.3.5</jakarta-annotation-version>

samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/api/PetApi.java

@@ -135,6 +135,5 @@ public interface PetApi  {
     @ApiOperation(value = "uploads an image", tags={  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
-    public ModelApiResponse uploadFile(@PathParam("petId") Long petId, @Multipart(value = "additionalMetadata", required = false)  String additionalMetadata,  @Multipart(value = "file" , required = false) Attachment fileDetail);
+    public ModelApiResponse uploadFile(@PathParam("petId") Long petId, @Multipart(value = "additionalMetadata", required = false)  String additionalMetadata,  @Multipart(value = "file" , required = false) Attachment _fileDetail);
 }
-

samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/api/StoreApi.java

@@ -84,4 +84,3 @@ public interface StoreApi  {
         @ApiResponse(code = 400, message = "Invalid Order") })
     public Order placeOrder(Order body);
 }
-

samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/api/UserApi.java

@@ -1,5 +1,6 @@
 package org.openapitools.api;
 
+import java.util.Date;
 import org.openapitools.model.User;
 
 import java.io.InputStream;
@@ -128,4 +129,3 @@ public interface UserApi  {
         @ApiResponse(code = 404, message = "User not found") })
     public void updateUser(@PathParam("username") String username, User body);
 }
-

samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/model/Category.java

@@ -3,13 +3,6 @@ package org.openapitools.model;
 import io.swagger.annotations.ApiModel;
 
 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;
 
 /**

samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/model/ModelApiResponse.java

@@ -3,13 +3,6 @@ package org.openapitools.model;
 import io.swagger.annotations.ApiModel;
 
 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;
 
 /**

samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/model/Order.java

@@ -6,13 +6,6 @@ import io.swagger.annotations.ApiModel;
 import java.util.Date;
 
 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;
 
 /**
@@ -33,11 +26,9 @@ public class Order  {
   @ApiModelProperty(value = "")
   private Date shipDate;
 
-@XmlType(name="StatusEnum")
-@XmlEnum(String.class)
 public enum StatusEnum {
 
-@XmlEnumValue("placed") PLACED(String.valueOf("placed")), @XmlEnumValue("approved") APPROVED(String.valueOf("approved")), @XmlEnumValue("delivered") DELIVERED(String.valueOf("delivered"));
+PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));
 
 
     private String value;

samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/model/Pet.java

@@ -9,13 +9,6 @@ import org.openapitools.model.Category;
 import org.openapitools.model.Tag;
 
 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;
 
 /**
@@ -39,11 +32,9 @@ public class Pet  {
   @ApiModelProperty(value = "")
   private List<Tag> tags = null;
 
-@XmlType(name="StatusEnum")
-@XmlEnum(String.class)
 public enum StatusEnum {
 
-@XmlEnumValue("available") AVAILABLE(String.valueOf("available")), @XmlEnumValue("pending") PENDING(String.valueOf("pending")), @XmlEnumValue("sold") SOLD(String.valueOf("sold"));
+AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));
 
 
     private String value;

samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/model/Tag.java

@@ -3,13 +3,6 @@ package org.openapitools.model;
 import io.swagger.annotations.ApiModel;
 
 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;
 
 /**

samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/model/User.java

@@ -3,13 +3,6 @@ package org.openapitools.model;
 import io.swagger.annotations.ApiModel;
 
 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;
 
 /**

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

@@ -1 +1 @@
-5.2.0-SNAPSHOT
+5.4.0-SNAPSHOT

samples/client/petstore/jaxrs-cxf-client/pom.xml

@@ -6,6 +6,8 @@
   <name>jaxrs-cxf-petstore-client</name>
   <description>This is a sample server Petstore server. For this sample, you can use the api key &#x60;special-key&#x60; to test the authorization filters.</description>
   <version>1.0.0</version>
+
+
   <build>
     <sourceDirectory>src/main/java</sourceDirectory>
     <plugins>
@@ -111,7 +113,7 @@
         <version>${cxf-version}</version>
         <scope>test</scope>
     </dependency>
-    
+
      <!-- CXF server -->
     <dependency>
         <groupId>org.apache.cxf</groupId>
@@ -172,7 +174,6 @@
     <jetty-version>9.2.9.v20150224</jetty-version>
     <junit-version>4.13.1</junit-version>
     <logback-version>1.2.0</logback-version>
-    <servlet-api-version>2.5</servlet-api-version>
     <cxf-version>3.3.0</cxf-version>
     <jackson-jaxrs-version>2.9.9</jackson-jaxrs-version>
     <jakarta-annotation-version>1.3.5</jakarta-annotation-version>

samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/api/PetApi.java

@@ -135,6 +135,5 @@ public interface PetApi  {
     @ApiOperation(value = "uploads an image", tags={  })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
-    public ModelApiResponse uploadFile(@PathParam("petId") Long petId, @Multipart(value = "additionalMetadata", required = false)  String additionalMetadata,  @Multipart(value = "file" , required = false) Attachment fileDetail);
+    public ModelApiResponse uploadFile(@PathParam("petId") Long petId, @Multipart(value = "additionalMetadata", required = false)  String additionalMetadata,  @Multipart(value = "file" , required = false) Attachment _fileDetail);
 }
-

samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/api/StoreApi.java

@@ -84,4 +84,3 @@ public interface StoreApi  {
         @ApiResponse(code = 400, message = "Invalid Order") })
     public Order placeOrder(Order body);
 }
-

samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/api/UserApi.java

@@ -1,5 +1,6 @@
 package org.openapitools.api;
 
+import java.util.Date;
 import org.openapitools.model.User;
 
 import java.io.InputStream;
@@ -128,4 +129,3 @@ public interface UserApi  {
         @ApiResponse(code = 404, message = "User not found") })
     public void updateUser(@PathParam("username") String username, User body);
 }
-

samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Category.java

@@ -3,13 +3,6 @@ package org.openapitools.model;
 import io.swagger.annotations.ApiModel;
 
 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;
 
 /**

samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/ModelApiResponse.java

@@ -3,13 +3,6 @@ package org.openapitools.model;
 import io.swagger.annotations.ApiModel;
 
 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;
 
 /**

samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Order.java

@@ -4,13 +4,6 @@ import io.swagger.annotations.ApiModel;
 import java.util.Date;
 
 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;
 
 /**
@@ -31,11 +24,9 @@ public class Order  {
   @ApiModelProperty(value = "")
   private Date shipDate;
 
-@XmlType(name="StatusEnum")
-@XmlEnum(String.class)
 public enum StatusEnum {
 
-@XmlEnumValue("placed") PLACED(String.valueOf("placed")), @XmlEnumValue("approved") APPROVED(String.valueOf("approved")), @XmlEnumValue("delivered") DELIVERED(String.valueOf("delivered"));
+PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));
 
 
     private String value;

samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Pet.java

@@ -7,13 +7,6 @@ import org.openapitools.model.Category;
 import org.openapitools.model.Tag;
 
 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;
 
 /**
@@ -37,11 +30,9 @@ public class Pet  {
   @ApiModelProperty(value = "")
   private List<Tag> tags = null;
 
-@XmlType(name="StatusEnum")
-@XmlEnum(String.class)
 public enum StatusEnum {
 
-@XmlEnumValue("available") AVAILABLE(String.valueOf("available")), @XmlEnumValue("pending") PENDING(String.valueOf("pending")), @XmlEnumValue("sold") SOLD(String.valueOf("sold"));
+AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));
 
 
     private String value;

samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Tag.java

@@ -3,13 +3,6 @@ package org.openapitools.model;
 import io.swagger.annotations.ApiModel;
 
 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;
 
 /**

samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/User.java

@@ -3,13 +3,6 @@ package org.openapitools.model;
 import io.swagger.annotations.ApiModel;
 
 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;
 
 /**

samples/server/petstore/jaxrs-cxf-test-data/.openapi-generator/FILES

@@ -40,6 +40,8 @@ src/gen/java/org/openapitools/model/MapTest.java
 src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
 src/gen/java/org/openapitools/model/Model200Response.java
 src/gen/java/org/openapitools/model/ModelApiResponse.java
+src/gen/java/org/openapitools/model/ModelFile.java
+src/gen/java/org/openapitools/model/ModelList.java
 src/gen/java/org/openapitools/model/ModelReturn.java
 src/gen/java/org/openapitools/model/Name.java
 src/gen/java/org/openapitools/model/NumberOnly.java
@@ -62,6 +64,7 @@ src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
 src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
 src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
 src/main/resources/ApplicationContext.xml
+src/main/resources/test-data.json
 src/main/webapp/WEB-INF/context.xml
 src/main/webapp/WEB-INF/web.xml
 src/test/java/org/openapitools/api/SpringBootApplication.java

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

@@ -1 +1 @@
-5.2.0-SNAPSHOT
+5.4.0-SNAPSHOT

samples/server/petstore/jaxrs-cxf-test-data/pom.xml

@@ -43,8 +43,8 @@
         </configuration>
         <dependencies>
           <dependency>
-              <groupId>javax.validation</groupId>
-              <artifactId>validation-api</artifactId>
+              <groupId>jakarta.validation</groupId>
+              <artifactId>jakarta.validation-api</artifactId>
               <version>${beanvalidation-version}</version>
           </dependency>
         </dependencies>
@@ -87,7 +87,7 @@
           </execution>
         </executions>
       </plugin>
-      
+
       <!-- build WAR file -->
       <plugin>
         <artifactId>maven-war-plugin</artifactId>
@@ -127,8 +127,8 @@
     </dependency>
     <!-- Bean Validation API support -->
     <dependency>
-      <groupId>javax.validation</groupId>
-      <artifactId>validation-api</artifactId>
+      <groupId>jakarta.validation</groupId>
+      <artifactId>jakarta.validation-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <!-- CXF Client -->
@@ -200,7 +200,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-    </dependency>    
+    </dependency>
     <!-- Spring Boot dependencies for integration tests -->
     <!--dependency>
       <groupId>org.springframework.boot</groupId>
@@ -233,7 +233,7 @@
     <dependency>
       <groupId>org.openapitools</groupId>
       <artifactId>openapi-generator</artifactId>
-      <version>5.2.0-SNAPSHOT</version>
+      <version>5.4.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
   <repositories>
@@ -258,7 +258,7 @@
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <swagger-core-version>1.5.18</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
-    <beanvalidation-version>1.1.0.Final</beanvalidation-version>
+    <beanvalidation-version>2.0.2</beanvalidation-version>
     <cxf-version>3.3.0</cxf-version>
     <jackson-jaxrs-version>2.9.9</jackson-jaxrs-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/api/AnotherFakeApi.java

@@ -46,4 +46,3 @@ public interface AnotherFakeApi  {
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
     public Client call123testSpecialTags(@Valid Client body);
 }
-

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/api/FakeApi.java

@@ -8,6 +8,7 @@ import org.openapitools.model.FileSchemaTestClass;
 import java.util.List;
 import org.joda.time.LocalDate;
 import java.util.Map;
+import org.openapitools.model.ModelFile;
 import org.openapitools.model.OuterComposite;
 import org.openapitools.model.User;
 import org.openapitools.model.XmlItem;
@@ -103,7 +104,7 @@ public interface FakeApi  {
     @ApiOperation(value = "", tags={ "fake" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success") })
-    public void testBodyWithQueryParams(@QueryParam("query") @NotNull  String query, @Valid User body);
+    public void testBodyWithQueryParams(@QueryParam("query") @NotNull String query, @Valid User body);
 
     /**
      * To test \"client\" model
@@ -148,7 +149,7 @@ public interface FakeApi  {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid request"),
         @ApiResponse(code = 404, message = "Not found") })
-    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);
+    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);
 
     /**
      * Fake endpoint to test group parameters (optional)
@@ -161,7 +162,7 @@ public interface FakeApi  {
     @ApiOperation(value = "Fake endpoint to test group parameters (optional)", tags={ "fake" })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Someting wrong") })
-    public void testGroupParameters(@QueryParam("required_string_group") @NotNull  Integer requiredStringGroup, @HeaderParam("required_boolean_group")  @NotNull  Boolean requiredBooleanGroup, @QueryParam("required_int64_group") @NotNull  Long requiredInt64Group, @QueryParam("string_group")  Integer stringGroup, @HeaderParam("boolean_group")   Boolean booleanGroup, @QueryParam("int64_group")  Long int64Group);
+    public void testGroupParameters(@QueryParam("required_string_group") @NotNull Integer requiredStringGroup, @HeaderParam("required_boolean_group")  @NotNull Boolean requiredBooleanGroup, @QueryParam("required_int64_group") @NotNull Long requiredInt64Group, @QueryParam("string_group") Integer stringGroup, @HeaderParam("boolean_group")  Boolean booleanGroup, @QueryParam("int64_group") Long int64Group);
 
     /**
      * test inline additionalProperties
@@ -192,6 +193,5 @@ public interface FakeApi  {
     @ApiOperation(value = "", tags={ "fake" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success") })
-    public void testQueryParameterCollectionFormat(@QueryParam("pipe") @NotNull  List<String> pipe, @QueryParam("ioutil") @NotNull  List<String> ioutil, @QueryParam("http") @NotNull  List<String> http, @QueryParam("url") @NotNull  List<String> url, @QueryParam("context") @NotNull  List<String> context);
+    public void testQueryParameterCollectionFormat(@QueryParam("pipe") @NotNull List<String> pipe, @QueryParam("ioutil") @NotNull List<String> ioutil, @QueryParam("http") @NotNull List<String> http, @QueryParam("url") @NotNull List<String> url, @QueryParam("context") @NotNull List<String> context);
 }
-

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/api/FakeClassnameTags123Api.java

@@ -46,4 +46,3 @@ public interface FakeClassnameTags123Api  {
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
     public Client testClassname(@Valid Client body);
 }
-

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/api/PetApi.java

@@ -58,7 +58,7 @@ public interface PetApi  {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation"),
         @ApiResponse(code = 400, message = "Invalid pet value") })
-    public void deletePet(@PathParam("petId") Long petId, @HeaderParam("api_key")   String apiKey);
+    public void deletePet(@PathParam("petId") Long petId, @HeaderParam("api_key")  String apiKey);
 
     /**
      * Finds Pets by status
@@ -73,7 +73,7 @@ public interface PetApi  {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
         @ApiResponse(code = 400, message = "Invalid status value") })
-    public List<Pet> findPetsByStatus(@QueryParam("status") @NotNull  List<String> status);
+    public List<Pet> findPetsByStatus(@QueryParam("status") @NotNull List<String> status);
 
     /**
      * Finds Pets by tags
@@ -88,7 +88,7 @@ public interface PetApi  {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"),
         @ApiResponse(code = 400, message = "Invalid tag value") })
-    public Set<Pet> findPetsByTags(@QueryParam("tags") @NotNull  Set<String> tags);
+    public Set<Pet> findPetsByTags(@QueryParam("tags") @NotNull Set<String> tags);
 
     /**
      * Find pet by ID
@@ -144,7 +144,7 @@ public interface PetApi  {
     @ApiOperation(value = "uploads an image", tags={ "pet" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
-    public ModelApiResponse uploadFile(@PathParam("petId") Long petId, @Multipart(value = "additionalMetadata", required = false)  String additionalMetadata,  @Multipart(value = "file" , required = false) Attachment fileDetail);
+    public ModelApiResponse uploadFile(@PathParam("petId") Long petId, @Multipart(value = "additionalMetadata", required = false)  String additionalMetadata,  @Multipart(value = "file" , required = false) Attachment _fileDetail);
 
     /**
      * uploads an image (required)
@@ -159,4 +159,3 @@ public interface PetApi  {
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
     public ModelApiResponse uploadFileWithRequiredFile(@PathParam("petId") Long petId,  @Multipart(value = "requiredFile" ) Attachment requiredFileDetail, @Multipart(value = "additionalMetadata", required = false)  String additionalMetadata);
 }
-

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/api/StoreApi.java

@@ -89,4 +89,3 @@ public interface StoreApi  {
         @ApiResponse(code = 400, message = "Invalid Order") })
     public Order placeOrder(@Valid Order body);
 }
-

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/api/UserApi.java

@@ -1,5 +1,6 @@
 package org.openapitools.api;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import org.openapitools.model.User;
@@ -108,7 +109,7 @@ public interface UserApi  {
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = String.class),
         @ApiResponse(code = 400, message = "Invalid username/password supplied") })
-    public String loginUser(@QueryParam("username") @NotNull  String username, @QueryParam("password") @NotNull  String password);
+    public String loginUser(@QueryParam("username") @NotNull String username, @QueryParam("password") @NotNull String password);
 
     /**
      * Logs out current logged in user session
@@ -136,4 +137,3 @@ public interface UserApi  {
         @ApiResponse(code = 404, message = "User not found") })
     public void updateUser(@PathParam("username") String username, @Valid User body);
 }
-

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java

@@ -6,13 +6,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -33,7 +26,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
   /**
    * Sets the <code>name</code> property.
    */
-  public void setName(String name) {
+ public void setName(String name) {
     this.name = name;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java

@@ -7,13 +7,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -34,7 +27,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
   /**
    * Sets the <code>name</code> property.
    */
-  public void setName(String name) {
+ public void setName(String name) {
     this.name = name;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java

@@ -6,13 +6,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -33,7 +26,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
   /**
    * Sets the <code>name</code> property.
    */
-  public void setName(String name) {
+ public void setName(String name) {
     this.name = name;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java

@@ -8,13 +8,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -70,7 +63,7 @@ public class AdditionalPropertiesClass  {
   /**
    * Sets the <code>mapString</code> property.
    */
-  public void setMapString(Map<String, String> mapString) {
+ public void setMapString(Map<String, String> mapString) {
     this.mapString = mapString;
   }
 
@@ -102,7 +95,7 @@ public class AdditionalPropertiesClass  {
   /**
    * Sets the <code>mapNumber</code> property.
    */
-  public void setMapNumber(Map<String, BigDecimal> mapNumber) {
+ public void setMapNumber(Map<String, BigDecimal> mapNumber) {
     this.mapNumber = mapNumber;
   }
 
@@ -134,7 +127,7 @@ public class AdditionalPropertiesClass  {
   /**
    * Sets the <code>mapInteger</code> property.
    */
-  public void setMapInteger(Map<String, Integer> mapInteger) {
+ public void setMapInteger(Map<String, Integer> mapInteger) {
     this.mapInteger = mapInteger;
   }
 
@@ -166,7 +159,7 @@ public class AdditionalPropertiesClass  {
   /**
    * Sets the <code>mapBoolean</code> property.
    */
-  public void setMapBoolean(Map<String, Boolean> mapBoolean) {
+ public void setMapBoolean(Map<String, Boolean> mapBoolean) {
     this.mapBoolean = mapBoolean;
   }
 
@@ -198,7 +191,7 @@ public class AdditionalPropertiesClass  {
   /**
    * Sets the <code>mapArrayInteger</code> property.
    */
-  public void setMapArrayInteger(Map<String, List<Integer>> mapArrayInteger) {
+ public void setMapArrayInteger(Map<String, List<Integer>> mapArrayInteger) {
     this.mapArrayInteger = mapArrayInteger;
   }
 
@@ -230,7 +223,7 @@ public class AdditionalPropertiesClass  {
   /**
    * Sets the <code>mapArrayAnytype</code> property.
    */
-  public void setMapArrayAnytype(Map<String, List<Object>> mapArrayAnytype) {
+ public void setMapArrayAnytype(Map<String, List<Object>> mapArrayAnytype) {
     this.mapArrayAnytype = mapArrayAnytype;
   }
 
@@ -262,7 +255,7 @@ public class AdditionalPropertiesClass  {
   /**
    * Sets the <code>mapMapString</code> property.
    */
-  public void setMapMapString(Map<String, Map<String, String>> mapMapString) {
+ public void setMapMapString(Map<String, Map<String, String>> mapMapString) {
     this.mapMapString = mapMapString;
   }
 
@@ -294,7 +287,7 @@ public class AdditionalPropertiesClass  {
   /**
    * Sets the <code>mapMapAnytype</code> property.
    */
-  public void setMapMapAnytype(Map<String, Map<String, Object>> mapMapAnytype) {
+ public void setMapMapAnytype(Map<String, Map<String, Object>> mapMapAnytype) {
     this.mapMapAnytype = mapMapAnytype;
   }
 
@@ -326,7 +319,7 @@ public class AdditionalPropertiesClass  {
   /**
    * Sets the <code>anytype1</code> property.
    */
-  public void setAnytype1(Object anytype1) {
+ public void setAnytype1(Object anytype1) {
     this.anytype1 = anytype1;
   }
 
@@ -350,7 +343,7 @@ public class AdditionalPropertiesClass  {
   /**
    * Sets the <code>anytype2</code> property.
    */
-  public void setAnytype2(Object anytype2) {
+ public void setAnytype2(Object anytype2) {
     this.anytype2 = anytype2;
   }
 
@@ -374,7 +367,7 @@ public class AdditionalPropertiesClass  {
   /**
    * Sets the <code>anytype3</code> property.
    */
-  public void setAnytype3(Object anytype3) {
+ public void setAnytype3(Object anytype3) {
     this.anytype3 = anytype3;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java

@@ -6,13 +6,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -33,7 +26,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
   /**
    * Sets the <code>name</code> property.
    */
-  public void setName(String name) {
+ public void setName(String name) {
     this.name = name;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java

@@ -7,13 +7,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -34,7 +27,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
   /**
    * Sets the <code>name</code> property.
    */
-  public void setName(String name) {
+ public void setName(String name) {
     this.name = name;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java

@@ -6,13 +6,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -33,7 +26,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
   /**
    * Sets the <code>name</code> property.
    */
-  public void setName(String name) {
+ public void setName(String name) {
     this.name = name;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java

@@ -6,13 +6,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -33,7 +26,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
   /**
    * Sets the <code>name</code> property.
    */
-  public void setName(String name) {
+ public void setName(String name) {
     this.name = name;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/Animal.java

@@ -6,13 +6,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -43,7 +36,7 @@ public class Animal  {
   /**
    * Sets the <code>className</code> property.
    */
-  public void setClassName(String className) {
+ public void setClassName(String className) {
     this.className = className;
   }
 
@@ -67,7 +60,7 @@ public class Animal  {
   /**
    * Sets the <code>color</code> property.
    */
-  public void setColor(String color) {
+ public void setColor(String color) {
     this.color = color;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/AnimalFarm.java

@@ -7,13 +7,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java

@@ -7,13 +7,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -35,7 +28,7 @@ public class ArrayOfArrayOfNumberOnly  {
   /**
    * Sets the <code>arrayArrayNumber</code> property.
    */
-  public void setArrayArrayNumber(List<List<BigDecimal>> arrayArrayNumber) {
+ public void setArrayArrayNumber(List<List<BigDecimal>> arrayArrayNumber) {
     this.arrayArrayNumber = arrayArrayNumber;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java

@@ -7,13 +7,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -35,7 +28,7 @@ public class ArrayOfNumberOnly  {
   /**
    * Sets the <code>arrayNumber</code> property.
    */
-  public void setArrayNumber(List<BigDecimal> arrayNumber) {
+ public void setArrayNumber(List<BigDecimal> arrayNumber) {
     this.arrayNumber = arrayNumber;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/ArrayTest.java

@@ -7,13 +7,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -42,7 +35,7 @@ public class ArrayTest  {
   /**
    * Sets the <code>arrayOfString</code> property.
    */
-  public void setArrayOfString(List<String> arrayOfString) {
+ public void setArrayOfString(List<String> arrayOfString) {
     this.arrayOfString = arrayOfString;
   }
 
@@ -74,7 +67,7 @@ public class ArrayTest  {
   /**
    * Sets the <code>arrayArrayOfInteger</code> property.
    */
-  public void setArrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
+ public void setArrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
     this.arrayArrayOfInteger = arrayArrayOfInteger;
   }
 
@@ -106,7 +99,7 @@ public class ArrayTest  {
   /**
    * Sets the <code>arrayArrayOfModel</code> property.
    */
-  public void setArrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
+ public void setArrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
     this.arrayArrayOfModel = arrayArrayOfModel;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/BigCat.java

@@ -8,27 +8,18 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 public class BigCat extends Cat {
   
-@XmlType(name="KindEnum")
-@XmlEnum(String.class)
 public enum KindEnum {
 
-    @XmlEnumValue("lions") @JsonProperty("lions") LIONS(String.valueOf("lions")), 
-    @XmlEnumValue("tigers") @JsonProperty("tigers") TIGERS(String.valueOf("tigers")), 
-    @XmlEnumValue("leopards") @JsonProperty("leopards") LEOPARDS(String.valueOf("leopards")), 
-    @XmlEnumValue("jaguars") @JsonProperty("jaguars") JAGUARS(String.valueOf("jaguars"));
+    @JsonProperty("lions") LIONS(String.valueOf("lions")),
+    @JsonProperty("tigers") TIGERS(String.valueOf("tigers")),
+    @JsonProperty("leopards") LEOPARDS(String.valueOf("leopards")),
+    @JsonProperty("jaguars") JAGUARS(String.valueOf("jaguars"));
 
     private String value;
 
@@ -69,7 +60,7 @@ public enum KindEnum {
   /**
    * Sets the <code>kind</code> property.
    */
-  public void setKind(KindEnum kind) {
+ public void setKind(KindEnum kind) {
     this.kind = kind;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/BigCatAllOf.java

@@ -6,27 +6,18 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 public class BigCatAllOf  {
   
-@XmlType(name="KindEnum")
-@XmlEnum(String.class)
 public enum KindEnum {
 
-    @XmlEnumValue("lions") @JsonProperty("lions") LIONS(String.valueOf("lions")), 
-    @XmlEnumValue("tigers") @JsonProperty("tigers") TIGERS(String.valueOf("tigers")), 
-    @XmlEnumValue("leopards") @JsonProperty("leopards") LEOPARDS(String.valueOf("leopards")), 
-    @XmlEnumValue("jaguars") @JsonProperty("jaguars") JAGUARS(String.valueOf("jaguars"));
+    @JsonProperty("lions") LIONS(String.valueOf("lions")),
+    @JsonProperty("tigers") TIGERS(String.valueOf("tigers")),
+    @JsonProperty("leopards") LEOPARDS(String.valueOf("leopards")),
+    @JsonProperty("jaguars") JAGUARS(String.valueOf("jaguars"));
 
     private String value;
 
@@ -67,7 +58,7 @@ public enum KindEnum {
   /**
    * Sets the <code>kind</code> property.
    */
-  public void setKind(KindEnum kind) {
+ public void setKind(KindEnum kind) {
     this.kind = kind;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/Capitalization.java

@@ -4,13 +4,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -49,7 +42,7 @@ public class Capitalization  {
   /**
    * Sets the <code>smallCamel</code> property.
    */
-  public void setSmallCamel(String smallCamel) {
+ public void setSmallCamel(String smallCamel) {
     this.smallCamel = smallCamel;
   }
 
@@ -73,7 +66,7 @@ public class Capitalization  {
   /**
    * Sets the <code>capitalCamel</code> property.
    */
-  public void setCapitalCamel(String capitalCamel) {
+ public void setCapitalCamel(String capitalCamel) {
     this.capitalCamel = capitalCamel;
   }
 
@@ -97,7 +90,7 @@ public class Capitalization  {
   /**
    * Sets the <code>smallSnake</code> property.
    */
-  public void setSmallSnake(String smallSnake) {
+ public void setSmallSnake(String smallSnake) {
     this.smallSnake = smallSnake;
   }
 
@@ -121,7 +114,7 @@ public class Capitalization  {
   /**
    * Sets the <code>capitalSnake</code> property.
    */
-  public void setCapitalSnake(String capitalSnake) {
+ public void setCapitalSnake(String capitalSnake) {
     this.capitalSnake = capitalSnake;
   }
 
@@ -145,7 +138,7 @@ public class Capitalization  {
   /**
    * Sets the <code>scAETHFlowPoints</code> property.
    */
-  public void setScAETHFlowPoints(String scAETHFlowPoints) {
+ public void setScAETHFlowPoints(String scAETHFlowPoints) {
     this.scAETHFlowPoints = scAETHFlowPoints;
   }
 
@@ -169,7 +162,7 @@ public class Capitalization  {
   /**
    * Sets the <code>ATT_NAME</code> property.
    */
-  public void setATTNAME(String ATT_NAME) {
+ public void setATTNAME(String ATT_NAME) {
     this.ATT_NAME = ATT_NAME;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/Cat.java

@@ -6,13 +6,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -33,7 +26,7 @@ public class Cat extends Animal {
   /**
    * Sets the <code>declawed</code> property.
    */
-  public void setDeclawed(Boolean declawed) {
+ public void setDeclawed(Boolean declawed) {
     this.declawed = declawed;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/CatAllOf.java

@@ -4,13 +4,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -31,7 +24,7 @@ public class CatAllOf  {
   /**
    * Sets the <code>declawed</code> property.
    */
-  public void setDeclawed(Boolean declawed) {
+ public void setDeclawed(Boolean declawed) {
     this.declawed = declawed;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/Category.java

@@ -4,13 +4,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -34,7 +27,7 @@ public class Category  {
   /**
    * Sets the <code>id</code> property.
    */
-  public void setId(Long id) {
+ public void setId(Long id) {
     this.id = id;
   }
 
@@ -59,7 +52,7 @@ public class Category  {
   /**
    * Sets the <code>name</code> property.
    */
-  public void setName(String name) {
+ public void setName(String name) {
     this.name = name;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/ClassModel.java

@@ -5,13 +5,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -37,7 +30,7 @@ public class ClassModel  {
   /**
    * Sets the <code>propertyClass</code> property.
    */
-  public void setPropertyClass(String propertyClass) {
+ public void setPropertyClass(String propertyClass) {
     this.propertyClass = propertyClass;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/Client.java

@@ -4,13 +4,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -31,7 +24,7 @@ public class Client  {
   /**
    * Sets the <code>client</code> property.
    */
-  public void setClient(String client) {
+ public void setClient(String client) {
     this.client = client;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/Dog.java

@@ -6,13 +6,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -33,7 +26,7 @@ public class Dog extends Animal {
   /**
    * Sets the <code>breed</code> property.
    */
-  public void setBreed(String breed) {
+ public void setBreed(String breed) {
     this.breed = breed;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/DogAllOf.java

@@ -4,13 +4,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -31,7 +24,7 @@ public class DogAllOf  {
   /**
    * Sets the <code>breed</code> property.
    */
-  public void setBreed(String breed) {
+ public void setBreed(String breed) {
     this.breed = breed;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/EnumArrays.java

@@ -8,25 +8,16 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 public class EnumArrays  {
   
-@XmlType(name="JustSymbolEnum")
-@XmlEnum(String.class)
 public enum JustSymbolEnum {
 
-    @XmlEnumValue(">=") @JsonProperty(">=") GREATER_THAN_OR_EQUAL_TO(String.valueOf(">=")), 
-    @XmlEnumValue("$") @JsonProperty("$") DOLLAR(String.valueOf("$"));
+    @JsonProperty(">=") GREATER_THAN_OR_EQUAL_TO(String.valueOf(">=")),
+    @JsonProperty("$") DOLLAR(String.valueOf("$"));
 
     private String value;
 
@@ -56,12 +47,10 @@ public enum JustSymbolEnum {
   @ApiModelProperty(value = "")
   private JustSymbolEnum justSymbol;
 
-@XmlType(name="ArrayEnumEnum")
-@XmlEnum(String.class)
 public enum ArrayEnumEnum {
 
-    @XmlEnumValue("fish") @JsonProperty("fish") FISH(String.valueOf("fish")), 
-    @XmlEnumValue("crab") @JsonProperty("crab") CRAB(String.valueOf("crab"));
+    @JsonProperty("fish") FISH(String.valueOf("fish")),
+    @JsonProperty("crab") CRAB(String.valueOf("crab"));
 
     private String value;
 
@@ -102,7 +91,7 @@ public enum ArrayEnumEnum {
   /**
    * Sets the <code>justSymbol</code> property.
    */
-  public void setJustSymbol(JustSymbolEnum justSymbol) {
+ public void setJustSymbol(JustSymbolEnum justSymbol) {
     this.justSymbol = justSymbol;
   }
 
@@ -126,7 +115,7 @@ public enum ArrayEnumEnum {
   /**
    * Sets the <code>arrayEnum</code> property.
    */
-  public void setArrayEnum(List<ArrayEnumEnum> arrayEnum) {
+ public void setArrayEnum(List<ArrayEnumEnum> arrayEnum) {
     this.arrayEnum = arrayEnum;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/EnumClass.java

@@ -38,6 +38,6 @@ public enum EnumClass {
     }
     throw new IllegalArgumentException("Unexpected value '" + value + "'");
   }
-  
+
 }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/EnumTest.java

@@ -7,26 +7,17 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 public class EnumTest  {
   
-@XmlType(name="EnumStringEnum")
-@XmlEnum(String.class)
 public enum EnumStringEnum {
 
-    @XmlEnumValue("UPPER") @JsonProperty("UPPER") UPPER(String.valueOf("UPPER")), 
-    @XmlEnumValue("lower") @JsonProperty("lower") LOWER(String.valueOf("lower")), 
-    @XmlEnumValue("") @JsonProperty("") EMPTY(String.valueOf(""));
+    @JsonProperty("UPPER") UPPER(String.valueOf("UPPER")),
+    @JsonProperty("lower") LOWER(String.valueOf("lower")),
+    @JsonProperty("") EMPTY(String.valueOf(""));
 
     private String value;
 
@@ -56,13 +47,11 @@ public enum EnumStringEnum {
   @ApiModelProperty(value = "")
   private EnumStringEnum enumString;
 
-@XmlType(name="EnumStringRequiredEnum")
-@XmlEnum(String.class)
 public enum EnumStringRequiredEnum {
 
-    @XmlEnumValue("UPPER") @JsonProperty("UPPER") UPPER(String.valueOf("UPPER")), 
-    @XmlEnumValue("lower") @JsonProperty("lower") LOWER(String.valueOf("lower")), 
-    @XmlEnumValue("") @JsonProperty("") EMPTY(String.valueOf(""));
+    @JsonProperty("UPPER") UPPER(String.valueOf("UPPER")),
+    @JsonProperty("lower") LOWER(String.valueOf("lower")),
+    @JsonProperty("") EMPTY(String.valueOf(""));
 
     private String value;
 
@@ -92,12 +81,10 @@ public enum EnumStringRequiredEnum {
   @ApiModelProperty(required = true, value = "")
   private EnumStringRequiredEnum enumStringRequired;
 
-@XmlType(name="EnumIntegerEnum")
-@XmlEnum(Integer.class)
 public enum EnumIntegerEnum {
 
-    @XmlEnumValue("1") @JsonProperty("1") NUMBER_1(Integer.valueOf(1)), 
-    @XmlEnumValue("-1") @JsonProperty("-1") NUMBER_MINUS_1(Integer.valueOf(-1));
+    @JsonProperty("1") NUMBER_1(Integer.valueOf(1)),
+    @JsonProperty("-1") NUMBER_MINUS_1(Integer.valueOf(-1));
 
     private Integer value;
 
@@ -127,12 +114,10 @@ public enum EnumIntegerEnum {
   @ApiModelProperty(value = "")
   private EnumIntegerEnum enumInteger;
 
-@XmlType(name="EnumNumberEnum")
-@XmlEnum(Double.class)
 public enum EnumNumberEnum {
 
-    @XmlEnumValue("1.1") @JsonProperty("1.1") NUMBER_1_DOT_1(Double.valueOf(1.1)), 
-    @XmlEnumValue("-1.2") @JsonProperty("-1.2") NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    @JsonProperty("1.1") NUMBER_1_DOT_1(Double.valueOf(1.1)),
+    @JsonProperty("-1.2") NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
 
     private Double value;
 
@@ -177,7 +162,7 @@ public enum EnumNumberEnum {
   /**
    * Sets the <code>enumString</code> property.
    */
-  public void setEnumString(EnumStringEnum enumString) {
+ public void setEnumString(EnumStringEnum enumString) {
     this.enumString = enumString;
   }
 
@@ -202,7 +187,7 @@ public enum EnumNumberEnum {
   /**
    * Sets the <code>enumStringRequired</code> property.
    */
-  public void setEnumStringRequired(EnumStringRequiredEnum enumStringRequired) {
+ public void setEnumStringRequired(EnumStringRequiredEnum enumStringRequired) {
     this.enumStringRequired = enumStringRequired;
   }
 
@@ -226,7 +211,7 @@ public enum EnumNumberEnum {
   /**
    * Sets the <code>enumInteger</code> property.
    */
-  public void setEnumInteger(EnumIntegerEnum enumInteger) {
+ public void setEnumInteger(EnumIntegerEnum enumInteger) {
     this.enumInteger = enumInteger;
   }
 
@@ -250,7 +235,7 @@ public enum EnumNumberEnum {
   /**
    * Sets the <code>enumNumber</code> property.
    */
-  public void setEnumNumber(EnumNumberEnum enumNumber) {
+ public void setEnumNumber(EnumNumberEnum enumNumber) {
     this.enumNumber = enumNumber;
   }
 
@@ -274,7 +259,7 @@ public enum EnumNumberEnum {
   /**
    * Sets the <code>outerEnum</code> property.
    */
-  public void setOuterEnum(OuterEnum outerEnum) {
+ public void setOuterEnum(OuterEnum outerEnum) {
     this.outerEnum = outerEnum;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/FileSchemaTestClass.java

@@ -2,17 +2,11 @@ package org.openapitools.model;
 
 import java.util.ArrayList;
 import java.util.List;
+import org.openapitools.model.ModelFile;
 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -21,32 +15,32 @@ public class FileSchemaTestClass  {
   
   @ApiModelProperty(value = "")
   @Valid
-  private java.io.File file;
+  private ModelFile _file;
 
   @ApiModelProperty(value = "")
   @Valid
-  private List<java.io.File> files = null;
+  private List<ModelFile> files = null;
  /**
-  * Get file
-  * @return file
+  * Get _file
+  * @return _file
   */
   @JsonProperty("file")
-  public java.io.File getFile() {
-    return file;
+  public ModelFile getFile() {
+    return _file;
   }
 
   /**
-   * Sets the <code>file</code> property.
+   * Sets the <code>_file</code> property.
    */
-  public void setFile(java.io.File file) {
-    this.file = file;
+ public void setFile(ModelFile _file) {
+    this._file = _file;
   }
 
   /**
-   * Sets the <code>file</code> property.
+   * Sets the <code>_file</code> property.
    */
-  public FileSchemaTestClass file(java.io.File file) {
-    this.file = file;
+  public FileSchemaTestClass _file(ModelFile _file) {
+    this._file = _file;
     return this;
   }
 
@@ -55,21 +49,21 @@ public class FileSchemaTestClass  {
   * @return files
   */
   @JsonProperty("files")
-  public List<java.io.File> getFiles() {
+  public List<ModelFile> getFiles() {
     return files;
   }
 
   /**
    * Sets the <code>files</code> property.
    */
-  public void setFiles(List<java.io.File> files) {
+ public void setFiles(List<ModelFile> files) {
     this.files = files;
   }
 
   /**
    * Sets the <code>files</code> property.
    */
-  public FileSchemaTestClass files(List<java.io.File> files) {
+  public FileSchemaTestClass files(List<ModelFile> files) {
     this.files = files;
     return this;
   }
@@ -77,7 +71,7 @@ public class FileSchemaTestClass  {
   /**
    * Adds a new item to the <code>files</code> list.
    */
-  public FileSchemaTestClass addFilesItem(java.io.File filesItem) {
+  public FileSchemaTestClass addFilesItem(ModelFile filesItem) {
     this.files.add(filesItem);
     return this;
   }
@@ -88,7 +82,7 @@ public class FileSchemaTestClass  {
     StringBuilder sb = new StringBuilder();
     sb.append("class FileSchemaTestClass {\n");
     
-    sb.append("    file: ").append(toIndentedString(file)).append("\n");
+    sb.append("    _file: ").append(toIndentedString(_file)).append("\n");
     sb.append("    files: ").append(toIndentedString(files)).append("\n");
     sb.append("}");
     return sb.toString();

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/FormatTest.java

@@ -9,13 +9,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -81,7 +74,7 @@ public class FormatTest  {
   /**
    * Sets the <code>integer</code> property.
    */
-  public void setInteger(Integer integer) {
+ public void setInteger(Integer integer) {
     this.integer = integer;
   }
 
@@ -107,7 +100,7 @@ public class FormatTest  {
   /**
    * Sets the <code>int32</code> property.
    */
-  public void setInt32(Integer int32) {
+ public void setInt32(Integer int32) {
     this.int32 = int32;
   }
 
@@ -131,7 +124,7 @@ public class FormatTest  {
   /**
    * Sets the <code>int64</code> property.
    */
-  public void setInt64(Long int64) {
+ public void setInt64(Long int64) {
     this.int64 = int64;
   }
 
@@ -158,7 +151,7 @@ public class FormatTest  {
   /**
    * Sets the <code>number</code> property.
    */
-  public void setNumber(BigDecimal number) {
+ public void setNumber(BigDecimal number) {
     this.number = number;
   }
 
@@ -184,7 +177,7 @@ public class FormatTest  {
   /**
    * Sets the <code>_float</code> property.
    */
-  public void setFloat(Float _float) {
+ public void setFloat(Float _float) {
     this._float = _float;
   }
 
@@ -210,7 +203,7 @@ public class FormatTest  {
   /**
    * Sets the <code>_double</code> property.
    */
-  public void setDouble(Double _double) {
+ public void setDouble(Double _double) {
     this._double = _double;
   }
 
@@ -234,7 +227,7 @@ public class FormatTest  {
   /**
    * Sets the <code>string</code> property.
    */
-  public void setString(String string) {
+ public void setString(String string) {
     this.string = string;
   }
 
@@ -259,7 +252,7 @@ public class FormatTest  {
   /**
    * Sets the <code>_byte</code> property.
    */
-  public void setByte(byte[] _byte) {
+ public void setByte(byte[] _byte) {
     this._byte = _byte;
   }
 
@@ -283,7 +276,7 @@ public class FormatTest  {
   /**
    * Sets the <code>binary</code> property.
    */
-  public void setBinary(File binary) {
+ public void setBinary(File binary) {
     this.binary = binary;
   }
 
@@ -308,7 +301,7 @@ public class FormatTest  {
   /**
    * Sets the <code>date</code> property.
    */
-  public void setDate(LocalDate date) {
+ public void setDate(LocalDate date) {
     this.date = date;
   }
 
@@ -332,7 +325,7 @@ public class FormatTest  {
   /**
    * Sets the <code>dateTime</code> property.
    */
-  public void setDateTime(Date dateTime) {
+ public void setDateTime(Date dateTime) {
     this.dateTime = dateTime;
   }
 
@@ -356,7 +349,7 @@ public class FormatTest  {
   /**
    * Sets the <code>uuid</code> property.
    */
-  public void setUuid(UUID uuid) {
+ public void setUuid(UUID uuid) {
     this.uuid = uuid;
   }
 
@@ -381,7 +374,7 @@ public class FormatTest  {
   /**
    * Sets the <code>password</code> property.
    */
-  public void setPassword(String password) {
+ public void setPassword(String password) {
     this.password = password;
   }
 
@@ -405,7 +398,7 @@ public class FormatTest  {
   /**
    * Sets the <code>bigDecimal</code> property.
    */
-  public void setBigDecimal(BigDecimal bigDecimal) {
+ public void setBigDecimal(BigDecimal bigDecimal) {
     this.bigDecimal = bigDecimal;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java

@@ -4,13 +4,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -35,7 +28,7 @@ public class HasOnlyReadOnly  {
    * Sets the <code>bar</code> property.
    * <br><em>N.B. <code>bar</code> is <b>read only</b>; client code should not call this method</em>.
    */
-  public void setBar(String bar) {
+ public void setBar(String bar) {
     this.bar = bar;
   }
 
@@ -61,7 +54,7 @@ public class HasOnlyReadOnly  {
    * Sets the <code>foo</code> property.
    * <br><em>N.B. <code>foo</code> is <b>read only</b>; client code should not call this method</em>.
    */
-  public void setFoo(String foo) {
+ public void setFoo(String foo) {
     this.foo = foo;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/MapTest.java

@@ -10,13 +10,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -27,12 +20,10 @@ public class MapTest  {
   @Valid
   private Map<String, Map<String, String>> mapMapOfString = null;
 
-@XmlType(name="InnerEnum")
-@XmlEnum(String.class)
 public enum InnerEnum {
 
-    @XmlEnumValue("UPPER") @JsonProperty("UPPER") UPPER(String.valueOf("UPPER")), 
-    @XmlEnumValue("lower") @JsonProperty("lower") LOWER(String.valueOf("lower"));
+    @JsonProperty("UPPER") UPPER(String.valueOf("UPPER")),
+    @JsonProperty("lower") LOWER(String.valueOf("lower"));
 
     private String value;
 
@@ -80,7 +71,7 @@ public enum InnerEnum {
   /**
    * Sets the <code>mapMapOfString</code> property.
    */
-  public void setMapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
+ public void setMapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
     this.mapMapOfString = mapMapOfString;
   }
 
@@ -112,7 +103,7 @@ public enum InnerEnum {
   /**
    * Sets the <code>mapOfEnumString</code> property.
    */
-  public void setMapOfEnumString(Map<String, InnerEnum> mapOfEnumString) {
+ public void setMapOfEnumString(Map<String, InnerEnum> mapOfEnumString) {
     this.mapOfEnumString = mapOfEnumString;
   }
 
@@ -144,7 +135,7 @@ public enum InnerEnum {
   /**
    * Sets the <code>directMap</code> property.
    */
-  public void setDirectMap(Map<String, Boolean> directMap) {
+ public void setDirectMap(Map<String, Boolean> directMap) {
     this.directMap = directMap;
   }
 
@@ -176,7 +167,7 @@ public enum InnerEnum {
   /**
    * Sets the <code>indirectMap</code> property.
    */
-  public void setIndirectMap(StringBooleanMap indirectMap) {
+ public void setIndirectMap(StringBooleanMap indirectMap) {
     this.indirectMap = indirectMap;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -10,13 +10,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -45,7 +38,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass  {
   /**
    * Sets the <code>uuid</code> property.
    */
-  public void setUuid(UUID uuid) {
+ public void setUuid(UUID uuid) {
     this.uuid = uuid;
   }
 
@@ -69,7 +62,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass  {
   /**
    * Sets the <code>dateTime</code> property.
    */
-  public void setDateTime(Date dateTime) {
+ public void setDateTime(Date dateTime) {
     this.dateTime = dateTime;
   }
 
@@ -93,7 +86,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass  {
   /**
    * Sets the <code>map</code> property.
    */
-  public void setMap(Map<String, Animal> map) {
+ public void setMap(Map<String, Animal> map) {
     this.map = map;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/Model200Response.java

@@ -5,13 +5,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -40,7 +33,7 @@ public class Model200Response  {
   /**
    * Sets the <code>name</code> property.
    */
-  public void setName(Integer name) {
+ public void setName(Integer name) {
     this.name = name;
   }
 
@@ -64,7 +57,7 @@ public class Model200Response  {
   /**
    * Sets the <code>propertyClass</code> property.
    */
-  public void setPropertyClass(String propertyClass) {
+ public void setPropertyClass(String propertyClass) {
     this.propertyClass = propertyClass;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/ModelApiResponse.java

@@ -4,13 +4,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -37,7 +30,7 @@ public class ModelApiResponse  {
   /**
    * Sets the <code>code</code> property.
    */
-  public void setCode(Integer code) {
+ public void setCode(Integer code) {
     this.code = code;
   }
 
@@ -61,7 +54,7 @@ public class ModelApiResponse  {
   /**
    * Sets the <code>type</code> property.
    */
-  public void setType(String type) {
+ public void setType(String type) {
     this.type = type;
   }
 
@@ -85,7 +78,7 @@ public class ModelApiResponse  {
   /**
    * Sets the <code>message</code> property.
    */
-  public void setMessage(String message) {
+ public void setMessage(String message) {
     this.message = message;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/ModelFile.java

@@ -0,0 +1,70 @@
+package org.openapitools.model;
+
+import io.swagger.annotations.ApiModel;
+import javax.validation.constraints.*;
+import javax.validation.Valid;
+
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+/**
+ * Must be named `File` for test.
+ */
+@ApiModel(description="Must be named `File` for test.")
+
+public class ModelFile  {
+  
+ /**
+  * Test capitalization
+  */
+  @ApiModelProperty(value = "Test capitalization")
+  private String sourceURI;
+ /**
+  * Test capitalization
+  * @return sourceURI
+  */
+  @JsonProperty("sourceURI")
+  public String getSourceURI() {
+    return sourceURI;
+  }
+
+  /**
+   * Sets the <code>sourceURI</code> property.
+   */
+ public void setSourceURI(String sourceURI) {
+    this.sourceURI = sourceURI;
+  }
+
+  /**
+   * Sets the <code>sourceURI</code> property.
+   */
+  public ModelFile sourceURI(String sourceURI) {
+    this.sourceURI = sourceURI;
+    return this;
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ModelFile {\n");
+    
+    sb.append("    sourceURI: ").append(toIndentedString(sourceURI)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private static String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/ModelList.java

@@ -0,0 +1,61 @@
+package org.openapitools.model;
+
+import javax.validation.constraints.*;
+import javax.validation.Valid;
+
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+public class ModelList  {
+  
+  @ApiModelProperty(value = "")
+  private String _123list;
+ /**
+  * Get _123list
+  * @return _123list
+  */
+  @JsonProperty("123-list")
+  public String get123list() {
+    return _123list;
+  }
+
+  /**
+   * Sets the <code>_123list</code> property.
+   */
+ public void set123list(String _123list) {
+    this._123list = _123list;
+  }
+
+  /**
+   * Sets the <code>_123list</code> property.
+   */
+  public ModelList _123list(String _123list) {
+    this._123list = _123list;
+    return this;
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ModelList {\n");
+    
+    sb.append("    _123list: ").append(toIndentedString(_123list)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private static String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/ModelReturn.java

@@ -5,13 +5,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -37,7 +30,7 @@ public class ModelReturn  {
   /**
    * Sets the <code>_return</code> property.
    */
-  public void setReturn(Integer _return) {
+ public void setReturn(Integer _return) {
     this._return = _return;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/Name.java

@@ -5,13 +5,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -47,7 +40,7 @@ public class Name  {
   /**
    * Sets the <code>name</code> property.
    */
-  public void setName(Integer name) {
+ public void setName(Integer name) {
     this.name = name;
   }
 
@@ -72,7 +65,7 @@ public class Name  {
    * Sets the <code>snakeCase</code> property.
    * <br><em>N.B. <code>snakeCase</code> is <b>read only</b>; client code should not call this method</em>.
    */
-  public void setSnakeCase(Integer snakeCase) {
+ public void setSnakeCase(Integer snakeCase) {
     this.snakeCase = snakeCase;
   }
 
@@ -97,7 +90,7 @@ public class Name  {
   /**
    * Sets the <code>property</code> property.
    */
-  public void setProperty(String property) {
+ public void setProperty(String property) {
     this.property = property;
   }
 
@@ -122,7 +115,7 @@ public class Name  {
    * Sets the <code>_123number</code> property.
    * <br><em>N.B. <code>_123number</code> is <b>read only</b>; client code should not call this method</em>.
    */
-  public void set123number(Integer _123number) {
+ public void set123number(Integer _123number) {
     this._123number = _123number;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/NumberOnly.java

@@ -5,13 +5,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -33,7 +26,7 @@ public class NumberOnly  {
   /**
    * Sets the <code>justNumber</code> property.
    */
-  public void setJustNumber(BigDecimal justNumber) {
+ public void setJustNumber(BigDecimal justNumber) {
     this.justNumber = justNumber;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/Order.java

@@ -7,13 +7,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -33,13 +26,11 @@ public class Order  {
   @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'hh:mm:ss.SSSX")
   private Date shipDate;
 
-@XmlType(name="StatusEnum")
-@XmlEnum(String.class)
 public enum StatusEnum {
 
-    @XmlEnumValue("placed") @JsonProperty("placed") PLACED(String.valueOf("placed")), 
-    @XmlEnumValue("approved") @JsonProperty("approved") APPROVED(String.valueOf("approved")), 
-    @XmlEnumValue("delivered") @JsonProperty("delivered") DELIVERED(String.valueOf("delivered"));
+    @JsonProperty("placed") PLACED(String.valueOf("placed")),
+    @JsonProperty("approved") APPROVED(String.valueOf("approved")),
+    @JsonProperty("delivered") DELIVERED(String.valueOf("delivered"));
 
     private String value;
 
@@ -86,7 +77,7 @@ public enum StatusEnum {
   /**
    * Sets the <code>id</code> property.
    */
-  public void setId(Long id) {
+ public void setId(Long id) {
     this.id = id;
   }
 
@@ -110,7 +101,7 @@ public enum StatusEnum {
   /**
    * Sets the <code>petId</code> property.
    */
-  public void setPetId(Long petId) {
+ public void setPetId(Long petId) {
     this.petId = petId;
   }
 
@@ -134,7 +125,7 @@ public enum StatusEnum {
   /**
    * Sets the <code>quantity</code> property.
    */
-  public void setQuantity(Integer quantity) {
+ public void setQuantity(Integer quantity) {
     this.quantity = quantity;
   }
 
@@ -158,7 +149,7 @@ public enum StatusEnum {
   /**
    * Sets the <code>shipDate</code> property.
    */
-  public void setShipDate(Date shipDate) {
+ public void setShipDate(Date shipDate) {
     this.shipDate = shipDate;
   }
 
@@ -182,7 +173,7 @@ public enum StatusEnum {
   /**
    * Sets the <code>status</code> property.
    */
-  public void setStatus(StatusEnum status) {
+ public void setStatus(StatusEnum status) {
     this.status = status;
   }
 
@@ -206,7 +197,7 @@ public enum StatusEnum {
   /**
    * Sets the <code>complete</code> property.
    */
-  public void setComplete(Boolean complete) {
+ public void setComplete(Boolean complete) {
     this.complete = complete;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/OuterComposite.java

@@ -5,13 +5,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -39,7 +32,7 @@ public class OuterComposite  {
   /**
    * Sets the <code>myNumber</code> property.
    */
-  public void setMyNumber(BigDecimal myNumber) {
+ public void setMyNumber(BigDecimal myNumber) {
     this.myNumber = myNumber;
   }
 
@@ -63,7 +56,7 @@ public class OuterComposite  {
   /**
    * Sets the <code>myString</code> property.
    */
-  public void setMyString(String myString) {
+ public void setMyString(String myString) {
     this.myString = myString;
   }
 
@@ -87,7 +80,7 @@ public class OuterComposite  {
   /**
    * Sets the <code>myBoolean</code> property.
    */
-  public void setMyBoolean(Boolean myBoolean) {
+ public void setMyBoolean(Boolean myBoolean) {
     this.myBoolean = myBoolean;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/OuterEnum.java

@@ -38,6 +38,6 @@ public enum OuterEnum {
     }
     throw new IllegalArgumentException("Unexpected value '" + value + "'");
   }
-  
+
 }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/Pet.java

@@ -2,6 +2,7 @@ package org.openapitools.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -12,13 +13,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -42,13 +36,11 @@ public class Pet  {
   @Valid
   private List<Tag> tags = null;
 
-@XmlType(name="StatusEnum")
-@XmlEnum(String.class)
 public enum StatusEnum {
 
-    @XmlEnumValue("available") @JsonProperty("available") AVAILABLE(String.valueOf("available")), 
-    @XmlEnumValue("pending") @JsonProperty("pending") PENDING(String.valueOf("pending")), 
-    @XmlEnumValue("sold") @JsonProperty("sold") SOLD(String.valueOf("sold"));
+    @JsonProperty("available") AVAILABLE(String.valueOf("available")),
+    @JsonProperty("pending") PENDING(String.valueOf("pending")),
+    @JsonProperty("sold") SOLD(String.valueOf("sold"));
 
     private String value;
 
@@ -92,7 +84,7 @@ public enum StatusEnum {
   /**
    * Sets the <code>id</code> property.
    */
-  public void setId(Long id) {
+ public void setId(Long id) {
     this.id = id;
   }
 
@@ -116,7 +108,7 @@ public enum StatusEnum {
   /**
    * Sets the <code>category</code> property.
    */
-  public void setCategory(Category category) {
+ public void setCategory(Category category) {
     this.category = category;
   }
 
@@ -141,7 +133,7 @@ public enum StatusEnum {
   /**
    * Sets the <code>name</code> property.
    */
-  public void setName(String name) {
+ public void setName(String name) {
     this.name = name;
   }
 
@@ -166,7 +158,8 @@ public enum StatusEnum {
   /**
    * Sets the <code>photoUrls</code> property.
    */
-  public void setPhotoUrls(Set<String> photoUrls) {
+ @JsonDeserialize(as = LinkedHashSet.class)
+ public void setPhotoUrls(Set<String> photoUrls) {
     this.photoUrls = photoUrls;
   }
 
@@ -198,7 +191,7 @@ public enum StatusEnum {
   /**
    * Sets the <code>tags</code> property.
    */
-  public void setTags(List<Tag> tags) {
+ public void setTags(List<Tag> tags) {
     this.tags = tags;
   }
 
@@ -230,7 +223,7 @@ public enum StatusEnum {
   /**
    * Sets the <code>status</code> property.
    */
-  public void setStatus(StatusEnum status) {
+ public void setStatus(StatusEnum status) {
     this.status = status;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/ReadOnlyFirst.java

@@ -4,13 +4,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -35,7 +28,7 @@ public class ReadOnlyFirst  {
    * Sets the <code>bar</code> property.
    * <br><em>N.B. <code>bar</code> is <b>read only</b>; client code should not call this method</em>.
    */
-  public void setBar(String bar) {
+ public void setBar(String bar) {
     this.bar = bar;
   }
 
@@ -60,7 +53,7 @@ public class ReadOnlyFirst  {
   /**
    * Sets the <code>baz</code> property.
    */
-  public void setBaz(String baz) {
+ public void setBaz(String baz) {
     this.baz = baz;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/SpecialModelName.java

@@ -4,13 +4,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -31,7 +24,7 @@ public class SpecialModelName  {
   /**
    * Sets the <code>$specialPropertyName</code> property.
    */
-  public void set$SpecialPropertyName(Long $specialPropertyName) {
+ public void set$SpecialPropertyName(Long $specialPropertyName) {
     this.$specialPropertyName = $specialPropertyName;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/StringBooleanMap.java

@@ -6,13 +6,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/Tag.java

@@ -4,13 +4,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -34,7 +27,7 @@ public class Tag  {
   /**
    * Sets the <code>id</code> property.
    */
-  public void setId(Long id) {
+ public void setId(Long id) {
     this.id = id;
   }
 
@@ -58,7 +51,7 @@ public class Tag  {
   /**
    * Sets the <code>name</code> property.
    */
-  public void setName(String name) {
+ public void setName(String name) {
     this.name = name;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/TypeHolderDefault.java

@@ -7,13 +7,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -48,7 +41,7 @@ public class TypeHolderDefault  {
   /**
    * Sets the <code>stringItem</code> property.
    */
-  public void setStringItem(String stringItem) {
+ public void setStringItem(String stringItem) {
     this.stringItem = stringItem;
   }
 
@@ -73,7 +66,7 @@ public class TypeHolderDefault  {
   /**
    * Sets the <code>numberItem</code> property.
    */
-  public void setNumberItem(BigDecimal numberItem) {
+ public void setNumberItem(BigDecimal numberItem) {
     this.numberItem = numberItem;
   }
 
@@ -98,7 +91,7 @@ public class TypeHolderDefault  {
   /**
    * Sets the <code>integerItem</code> property.
    */
-  public void setIntegerItem(Integer integerItem) {
+ public void setIntegerItem(Integer integerItem) {
     this.integerItem = integerItem;
   }
 
@@ -123,7 +116,7 @@ public class TypeHolderDefault  {
   /**
    * Sets the <code>boolItem</code> property.
    */
-  public void setBoolItem(Boolean boolItem) {
+ public void setBoolItem(Boolean boolItem) {
     this.boolItem = boolItem;
   }
 
@@ -148,7 +141,7 @@ public class TypeHolderDefault  {
   /**
    * Sets the <code>arrayItem</code> property.
    */
-  public void setArrayItem(List<Integer> arrayItem) {
+ public void setArrayItem(List<Integer> arrayItem) {
     this.arrayItem = arrayItem;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/TypeHolderExample.java

@@ -7,13 +7,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -51,7 +44,7 @@ public class TypeHolderExample  {
   /**
    * Sets the <code>stringItem</code> property.
    */
-  public void setStringItem(String stringItem) {
+ public void setStringItem(String stringItem) {
     this.stringItem = stringItem;
   }
 
@@ -76,7 +69,7 @@ public class TypeHolderExample  {
   /**
    * Sets the <code>numberItem</code> property.
    */
-  public void setNumberItem(BigDecimal numberItem) {
+ public void setNumberItem(BigDecimal numberItem) {
     this.numberItem = numberItem;
   }
 
@@ -101,7 +94,7 @@ public class TypeHolderExample  {
   /**
    * Sets the <code>floatItem</code> property.
    */
-  public void setFloatItem(Float floatItem) {
+ public void setFloatItem(Float floatItem) {
     this.floatItem = floatItem;
   }
 
@@ -126,7 +119,7 @@ public class TypeHolderExample  {
   /**
    * Sets the <code>integerItem</code> property.
    */
-  public void setIntegerItem(Integer integerItem) {
+ public void setIntegerItem(Integer integerItem) {
     this.integerItem = integerItem;
   }
 
@@ -151,7 +144,7 @@ public class TypeHolderExample  {
   /**
    * Sets the <code>boolItem</code> property.
    */
-  public void setBoolItem(Boolean boolItem) {
+ public void setBoolItem(Boolean boolItem) {
     this.boolItem = boolItem;
   }
 
@@ -176,7 +169,7 @@ public class TypeHolderExample  {
   /**
    * Sets the <code>arrayItem</code> property.
    */
-  public void setArrayItem(List<Integer> arrayItem) {
+ public void setArrayItem(List<Integer> arrayItem) {
     this.arrayItem = arrayItem;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/User.java

@@ -4,13 +4,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -55,7 +48,7 @@ public class User  {
   /**
    * Sets the <code>id</code> property.
    */
-  public void setId(Long id) {
+ public void setId(Long id) {
     this.id = id;
   }
 
@@ -79,7 +72,7 @@ public class User  {
   /**
    * Sets the <code>username</code> property.
    */
-  public void setUsername(String username) {
+ public void setUsername(String username) {
     this.username = username;
   }
 
@@ -103,7 +96,7 @@ public class User  {
   /**
    * Sets the <code>firstName</code> property.
    */
-  public void setFirstName(String firstName) {
+ public void setFirstName(String firstName) {
     this.firstName = firstName;
   }
 
@@ -127,7 +120,7 @@ public class User  {
   /**
    * Sets the <code>lastName</code> property.
    */
-  public void setLastName(String lastName) {
+ public void setLastName(String lastName) {
     this.lastName = lastName;
   }
 
@@ -151,7 +144,7 @@ public class User  {
   /**
    * Sets the <code>email</code> property.
    */
-  public void setEmail(String email) {
+ public void setEmail(String email) {
     this.email = email;
   }
 
@@ -175,7 +168,7 @@ public class User  {
   /**
    * Sets the <code>password</code> property.
    */
-  public void setPassword(String password) {
+ public void setPassword(String password) {
     this.password = password;
   }
 
@@ -199,7 +192,7 @@ public class User  {
   /**
    * Sets the <code>phone</code> property.
    */
-  public void setPhone(String phone) {
+ public void setPhone(String phone) {
     this.phone = phone;
   }
 
@@ -223,7 +216,7 @@ public class User  {
   /**
    * Sets the <code>userStatus</code> property.
    */
-  public void setUserStatus(Integer userStatus) {
+ public void setUserStatus(Integer userStatus) {
     this.userStatus = userStatus;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/XmlItem.java

@@ -7,13 +7,6 @@ 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.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -123,7 +116,7 @@ public class XmlItem  {
   /**
    * Sets the <code>attributeString</code> property.
    */
-  public void setAttributeString(String attributeString) {
+ public void setAttributeString(String attributeString) {
     this.attributeString = attributeString;
   }
 
@@ -147,7 +140,7 @@ public class XmlItem  {
   /**
    * Sets the <code>attributeNumber</code> property.
    */
-  public void setAttributeNumber(BigDecimal attributeNumber) {
+ public void setAttributeNumber(BigDecimal attributeNumber) {
     this.attributeNumber = attributeNumber;
   }
 
@@ -171,7 +164,7 @@ public class XmlItem  {
   /**
    * Sets the <code>attributeInteger</code> property.
    */
-  public void setAttributeInteger(Integer attributeInteger) {
+ public void setAttributeInteger(Integer attributeInteger) {
     this.attributeInteger = attributeInteger;
   }
 
@@ -195,7 +188,7 @@ public class XmlItem  {
   /**
    * Sets the <code>attributeBoolean</code> property.
    */
-  public void setAttributeBoolean(Boolean attributeBoolean) {
+ public void setAttributeBoolean(Boolean attributeBoolean) {
     this.attributeBoolean = attributeBoolean;
   }
 
@@ -219,7 +212,7 @@ public class XmlItem  {
   /**
    * Sets the <code>wrappedArray</code> property.
    */
-  public void setWrappedArray(List<Integer> wrappedArray) {
+ public void setWrappedArray(List<Integer> wrappedArray) {
     this.wrappedArray = wrappedArray;
   }
 
@@ -251,7 +244,7 @@ public class XmlItem  {
   /**
    * Sets the <code>nameString</code> property.
    */
-  public void setNameString(String nameString) {
+ public void setNameString(String nameString) {
     this.nameString = nameString;
   }
 
@@ -275,7 +268,7 @@ public class XmlItem  {
   /**
    * Sets the <code>nameNumber</code> property.
    */
-  public void setNameNumber(BigDecimal nameNumber) {
+ public void setNameNumber(BigDecimal nameNumber) {
     this.nameNumber = nameNumber;
   }
 
@@ -299,7 +292,7 @@ public class XmlItem  {
   /**
    * Sets the <code>nameInteger</code> property.
    */
-  public void setNameInteger(Integer nameInteger) {
+ public void setNameInteger(Integer nameInteger) {
     this.nameInteger = nameInteger;
   }
 
@@ -323,7 +316,7 @@ public class XmlItem  {
   /**
    * Sets the <code>nameBoolean</code> property.
    */
-  public void setNameBoolean(Boolean nameBoolean) {
+ public void setNameBoolean(Boolean nameBoolean) {
     this.nameBoolean = nameBoolean;
   }
 
@@ -347,7 +340,7 @@ public class XmlItem  {
   /**
    * Sets the <code>nameArray</code> property.
    */
-  public void setNameArray(List<Integer> nameArray) {
+ public void setNameArray(List<Integer> nameArray) {
     this.nameArray = nameArray;
   }
 
@@ -379,7 +372,7 @@ public class XmlItem  {
   /**
    * Sets the <code>nameWrappedArray</code> property.
    */
-  public void setNameWrappedArray(List<Integer> nameWrappedArray) {
+ public void setNameWrappedArray(List<Integer> nameWrappedArray) {
     this.nameWrappedArray = nameWrappedArray;
   }
 
@@ -411,7 +404,7 @@ public class XmlItem  {
   /**
    * Sets the <code>prefixString</code> property.
    */
-  public void setPrefixString(String prefixString) {
+ public void setPrefixString(String prefixString) {
     this.prefixString = prefixString;
   }
 
@@ -435,7 +428,7 @@ public class XmlItem  {
   /**
    * Sets the <code>prefixNumber</code> property.
    */
-  public void setPrefixNumber(BigDecimal prefixNumber) {
+ public void setPrefixNumber(BigDecimal prefixNumber) {
     this.prefixNumber = prefixNumber;
   }
 
@@ -459,7 +452,7 @@ public class XmlItem  {
   /**
    * Sets the <code>prefixInteger</code> property.
    */
-  public void setPrefixInteger(Integer prefixInteger) {
+ public void setPrefixInteger(Integer prefixInteger) {
     this.prefixInteger = prefixInteger;
   }
 
@@ -483,7 +476,7 @@ public class XmlItem  {
   /**
    * Sets the <code>prefixBoolean</code> property.
    */
-  public void setPrefixBoolean(Boolean prefixBoolean) {
+ public void setPrefixBoolean(Boolean prefixBoolean) {
     this.prefixBoolean = prefixBoolean;
   }
 
@@ -507,7 +500,7 @@ public class XmlItem  {
   /**
    * Sets the <code>prefixArray</code> property.
    */
-  public void setPrefixArray(List<Integer> prefixArray) {
+ public void setPrefixArray(List<Integer> prefixArray) {
     this.prefixArray = prefixArray;
   }
 
@@ -539,7 +532,7 @@ public class XmlItem  {
   /**
    * Sets the <code>prefixWrappedArray</code> property.
    */
-  public void setPrefixWrappedArray(List<Integer> prefixWrappedArray) {
+ public void setPrefixWrappedArray(List<Integer> prefixWrappedArray) {
     this.prefixWrappedArray = prefixWrappedArray;
   }
 
@@ -571,7 +564,7 @@ public class XmlItem  {
   /**
    * Sets the <code>namespaceString</code> property.
    */
-  public void setNamespaceString(String namespaceString) {
+ public void setNamespaceString(String namespaceString) {
     this.namespaceString = namespaceString;
   }
 
@@ -595,7 +588,7 @@ public class XmlItem  {
   /**
    * Sets the <code>namespaceNumber</code> property.
    */
-  public void setNamespaceNumber(BigDecimal namespaceNumber) {
+ public void setNamespaceNumber(BigDecimal namespaceNumber) {
     this.namespaceNumber = namespaceNumber;
   }
 
@@ -619,7 +612,7 @@ public class XmlItem  {
   /**
    * Sets the <code>namespaceInteger</code> property.
    */
-  public void setNamespaceInteger(Integer namespaceInteger) {
+ public void setNamespaceInteger(Integer namespaceInteger) {
     this.namespaceInteger = namespaceInteger;
   }
 
@@ -643,7 +636,7 @@ public class XmlItem  {
   /**
    * Sets the <code>namespaceBoolean</code> property.
    */
-  public void setNamespaceBoolean(Boolean namespaceBoolean) {
+ public void setNamespaceBoolean(Boolean namespaceBoolean) {
     this.namespaceBoolean = namespaceBoolean;
   }
 
@@ -667,7 +660,7 @@ public class XmlItem  {
   /**
    * Sets the <code>namespaceArray</code> property.
    */
-  public void setNamespaceArray(List<Integer> namespaceArray) {
+ public void setNamespaceArray(List<Integer> namespaceArray) {
     this.namespaceArray = namespaceArray;
   }
 
@@ -699,7 +692,7 @@ public class XmlItem  {
   /**
    * Sets the <code>namespaceWrappedArray</code> property.
    */
-  public void setNamespaceWrappedArray(List<Integer> namespaceWrappedArray) {
+ public void setNamespaceWrappedArray(List<Integer> namespaceWrappedArray) {
     this.namespaceWrappedArray = namespaceWrappedArray;
   }
 
@@ -731,7 +724,7 @@ public class XmlItem  {
   /**
    * Sets the <code>prefixNsString</code> property.
    */
-  public void setPrefixNsString(String prefixNsString) {
+ public void setPrefixNsString(String prefixNsString) {
     this.prefixNsString = prefixNsString;
   }
 
@@ -755,7 +748,7 @@ public class XmlItem  {
   /**
    * Sets the <code>prefixNsNumber</code> property.
    */
-  public void setPrefixNsNumber(BigDecimal prefixNsNumber) {
+ public void setPrefixNsNumber(BigDecimal prefixNsNumber) {
     this.prefixNsNumber = prefixNsNumber;
   }
 
@@ -779,7 +772,7 @@ public class XmlItem  {
   /**
    * Sets the <code>prefixNsInteger</code> property.
    */
-  public void setPrefixNsInteger(Integer prefixNsInteger) {
+ public void setPrefixNsInteger(Integer prefixNsInteger) {
     this.prefixNsInteger = prefixNsInteger;
   }
 
@@ -803,7 +796,7 @@ public class XmlItem  {
   /**
    * Sets the <code>prefixNsBoolean</code> property.
    */
-  public void setPrefixNsBoolean(Boolean prefixNsBoolean) {
+ public void setPrefixNsBoolean(Boolean prefixNsBoolean) {
     this.prefixNsBoolean = prefixNsBoolean;
   }
 
@@ -827,7 +820,7 @@ public class XmlItem  {
   /**
    * Sets the <code>prefixNsArray</code> property.
    */
-  public void setPrefixNsArray(List<Integer> prefixNsArray) {
+ public void setPrefixNsArray(List<Integer> prefixNsArray) {
     this.prefixNsArray = prefixNsArray;
   }
 
@@ -859,7 +852,7 @@ public class XmlItem  {
   /**
    * Sets the <code>prefixNsWrappedArray</code> property.
    */
-  public void setPrefixNsWrappedArray(List<Integer> prefixNsWrappedArray) {
+ public void setPrefixNsWrappedArray(List<Integer> prefixNsWrappedArray) {
     this.prefixNsWrappedArray = prefixNsWrappedArray;
   }
 

samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java

@@ -35,7 +35,7 @@ public class AnotherFakeApiServiceImpl implements AnotherFakeApi {
     {
         try {
             File cacheFile = new File(System.getProperty("jaxrs.test.server.json",
-                    "/Users/williamcheng/Code/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));
+                    "/Users/williamcheng/Code/openapi-generator2/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));
             cache = JsonCache.Factory.instance.get("test-data").load(cacheFile).child("/org.openapitools.api/AnotherFakeApi");
         } catch (CacheException e) {
             e.printStackTrace();

samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java

@@ -9,6 +9,7 @@ import org.openapitools.model.FileSchemaTestClass;
 import java.util.List;
 import org.joda.time.LocalDate;
 import java.util.Map;
+import org.openapitools.model.ModelFile;
 import org.openapitools.model.OuterComposite;
 import org.openapitools.model.User;
 import org.openapitools.model.XmlItem;
@@ -43,7 +44,7 @@ public class FakeApiServiceImpl implements FakeApi {
     {
         try {
             File cacheFile = new File(System.getProperty("jaxrs.test.server.json",
-                    "/Users/williamcheng/Code/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));
+                    "/Users/williamcheng/Code/openapi-generator2/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));
             cache = JsonCache.Factory.instance.get("test-data").load(cacheFile).child("/org.openapitools.api/FakeApi");
         } catch (CacheException e) {
             e.printStackTrace();

samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/FakeClassnameTags123ApiServiceImpl.java

@@ -35,7 +35,7 @@ public class FakeClassnameTags123ApiServiceImpl implements FakeClassnameTags123A
     {
         try {
             File cacheFile = new File(System.getProperty("jaxrs.test.server.json",
-                    "/Users/williamcheng/Code/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));
+                    "/Users/williamcheng/Code/openapi-generator2/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));
             cache = JsonCache.Factory.instance.get("test-data").load(cacheFile).child("/org.openapitools.api/FakeClassnameTags123Api");
         } catch (CacheException e) {
             e.printStackTrace();

samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java

@@ -39,7 +39,7 @@ public class PetApiServiceImpl implements PetApi {
     {
         try {
             File cacheFile = new File(System.getProperty("jaxrs.test.server.json",
-                    "/Users/williamcheng/Code/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));
+                    "/Users/williamcheng/Code/openapi-generator2/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));
             cache = JsonCache.Factory.instance.get("test-data").load(cacheFile).child("/org.openapitools.api/PetApi");
         } catch (CacheException e) {
             e.printStackTrace();
@@ -135,7 +135,7 @@ public class PetApiServiceImpl implements PetApi {
      *
      */
     @Override
-    public ModelApiResponse uploadFile(Long petId, String additionalMetadata,  Attachment fileDetail) {
+    public ModelApiResponse uploadFile(Long petId, String additionalMetadata,  Attachment _fileDetail) {
         try {
             ModelApiResponse response = cache.getObject("/uploadFile/response", ModelApiResponse.class);
             return response;

samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java

@@ -35,7 +35,7 @@ public class StoreApiServiceImpl implements StoreApi {
     {
         try {
             File cacheFile = new File(System.getProperty("jaxrs.test.server.json",
-                    "/Users/williamcheng/Code/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));
+                    "/Users/williamcheng/Code/openapi-generator2/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));
             cache = JsonCache.Factory.instance.get("test-data").load(cacheFile).child("/org.openapitools.api/StoreApi");
         } catch (CacheException e) {
             e.printStackTrace();

samples/server/petstore/jaxrs-cxf-test-data/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java

@@ -1,6 +1,7 @@
 package org.openapitools.api.impl;
 
 import org.openapitools.api.*;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import org.openapitools.model.User;
@@ -35,7 +36,7 @@ public class UserApiServiceImpl implements UserApi {
     {
         try {
             File cacheFile = new File(System.getProperty("jaxrs.test.server.json",
-                    "/Users/williamcheng/Code/openapi-generator/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));
+                    "/Users/williamcheng/Code/openapi-generator2/samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json"));
             cache = JsonCache.Factory.instance.get("test-data").load(cacheFile).child("/org.openapitools.api/UserApi");
         } catch (CacheException e) {
             e.printStackTrace();

samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/ApplicationContext.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:cxf="http://cxf.apache.org/core"
        xmlns:jaxrs="http://cxf.apache.org/jaxrs"
        xmlns:jee="http://www.springframework.org/schema/jee"

samples/server/petstore/jaxrs-cxf-test-data/src/main/resources/test-data.json

@@ -79,7 +79,7 @@
         }
       },
       "testEndpointParameters" : {
-        "_double" : 77.14654636614235246584049686929773770316387526690959930419921875,
+        "_double" : 77.14654636614235,
         "patternWithoutDelimiter" : "^V莙샊䲎ꖣ",
         "_byte" : "/w==",
         "integer" : 70,
@@ -125,6 +125,16 @@
         "http" : [ "j1HS55g" ],
         "url" : [ "WIg2d" ],
         "context" : [ "h77kAFh84Xr" ]
+      },
+      "testBodyWithFileSchema" : {
+        "body" : {
+          "_file" : {
+            "sourceURI" : "pBPG5nH"
+          },
+          "files" : [ {
+            "sourceURI" : "Hhe7osLC9"
+          } ]
+        }
       }
     },
     "FakeClassnameTags123Api" : {
@@ -238,7 +248,8 @@
           "code" : -948139149,
           "type" : "dm3vxsNtg94DA",
           "message" : "I9pPJHHy"
-        }
+        },
+        "_file" : "D53FF1D3AA"
       },
       "uploadFileWithRequiredFile" : {
         "petId" : -3179009564025681920,

samples/server/petstore/jaxrs-cxf-test-data/src/main/webapp/WEB-INF/context.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:cxf="http://cxf.apache.org/core"
        xmlns:jaxrs="http://cxf.apache.org/jaxrs"
        xmlns:jee="http://www.springframework.org/schema/jee"
@@ -11,8 +11,8 @@
                            http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
                            http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee.xsd">
 
-    
-    
+
+
     <import resource="classpath:/ApplicationContext.xml" />
-     
+
 </beans>

samples/server/petstore/jaxrs-cxf-test-data/src/main/webapp/WEB-INF/web.xml

@@ -19,5 +19,5 @@
         <servlet-name>CXFServiceServlet</servlet-name>
         <url-pattern>/rest/*</url-pattern>
     </servlet-mapping>
-    
+
 </web-app>

samples/server/petstore/jaxrs-cxf-test-data/src/test/java/org/openapitools/api/SpringBootApplication.java

@@ -11,15 +11,15 @@ import org.springframework.context.annotation.ImportResource;
 @EnableAutoConfiguration
 @SpringBootConfiguration
 public class SpringBootApplication extends SpringBootServletInitializer {
-    
+
     @Override
     protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
         return application.sources(SpringBootApplication.class);
     }
-    
+
     public static void main(String[] args) {
         SpringApplication.run(SpringBootApplication.class, args);
     }
-    
-    
+
+
 }

samples/server/petstore/jaxrs-spec-interface-response/.openapi-generator/FILES

@@ -38,6 +38,8 @@ src/gen/java/org/openapitools/model/MapTest.java
 src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
 src/gen/java/org/openapitools/model/Model200Response.java
 src/gen/java/org/openapitools/model/ModelApiResponse.java
+src/gen/java/org/openapitools/model/ModelFile.java
+src/gen/java/org/openapitools/model/ModelList.java
 src/gen/java/org/openapitools/model/ModelReturn.java
 src/gen/java/org/openapitools/model/Name.java
 src/gen/java/org/openapitools/model/NumberOnly.java

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

@@ -1 +1 @@
-5.2.0-SNAPSHOT
+5.4.0-SNAPSHOT

samples/server/petstore/jaxrs-spec-interface-response/pom.xml

@@ -5,6 +5,8 @@
   <packaging>jar</packaging>
   <name>jaxrs-spec-interface-response-petstore-server</name>
   <version>1.0.0</version>
+
+
   <build>
     <sourceDirectory>src/main/java</sourceDirectory>
     <plugins>
@@ -36,9 +38,9 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>javax.ws.rs</groupId>
-      <artifactId>javax.ws.rs-api</artifactId>
-      <version>2.1.1</version>
+      <groupId>jakarta.ws.rs</groupId>
+      <artifactId>jakarta.ws.rs-api</artifactId>
+      <version>${jakarta.ws.rs-version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -71,14 +73,16 @@
     </dependency>
     <!-- Bean Validation API support -->
     <dependency>
-        <groupId>javax.validation</groupId>
-        <artifactId>validation-api</artifactId>
-        <version>1.1.0.Final</version>
+        <groupId>jakarta.validation</groupId>
+        <artifactId>jakarta.validation-api</artifactId>
+        <version>${beanvalidation-version}</version>
         <scope>provided</scope>
     </dependency>
   </dependencies>
   <properties>
     <jackson-version>2.9.9</jackson-version>
     <junit-version>4.13.1</junit-version>
+	<beanvalidation-version>2.0.2</beanvalidation-version>
+    <jakarta.ws.rs-version>2.1.6</jakarta.ws.rs-version>
   </properties>
 </project>

samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeApi.java

@@ -81,7 +81,7 @@ import javax.validation.Valid;
     @ApiOperation(value = "", notes = "", tags={ "fake" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success", response = Void.class) })
-    Response testBodyWithQueryParams(@QueryParam("query") @NotNull    String query,@Valid @NotNull User body);
+    Response testBodyWithQueryParams(@QueryParam("query") @NotNull   String query,@Valid @NotNull User body);
 
     @PATCH
     @Consumes({ "application/json" })
@@ -108,13 +108,13 @@ import javax.validation.Valid;
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid request", response = Void.class),
         @ApiResponse(code = 404, message = "Not found", response = Void.class) })
-    Response 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);
+    Response 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);
 
     @DELETE
     @ApiOperation(value = "Fake endpoint to test group parameters (optional)", notes = "Fake endpoint to test group parameters (optional)", tags={ "fake" })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Someting wrong", response = Void.class) })
-    Response testGroupParameters(@QueryParam("required_string_group") @NotNull   @ApiParam("Required String in group parameters")  Integer requiredStringGroup,@HeaderParam("required_boolean_group") @NotNull    @ApiParam("Required Boolean in group parameters") Boolean requiredBooleanGroup,@QueryParam("required_int64_group") @NotNull   @ApiParam("Required Integer in group parameters")  Long requiredInt64Group,@QueryParam("string_group")   @ApiParam("String in group parameters")  Integer stringGroup,@HeaderParam("boolean_group")    @ApiParam("Boolean in group parameters") Boolean booleanGroup,@QueryParam("int64_group")   @ApiParam("Integer in group parameters")  Long int64Group);
+    Response testGroupParameters(@QueryParam("required_string_group") @NotNull  @ApiParam("Required String in group parameters")  Integer requiredStringGroup,@HeaderParam("required_boolean_group") @NotNull   @ApiParam("Required Boolean in group parameters") Boolean requiredBooleanGroup,@QueryParam("required_int64_group") @NotNull  @ApiParam("Required Integer in group parameters")  Long requiredInt64Group,@QueryParam("string_group")  @ApiParam("String in group parameters")  Integer stringGroup,@HeaderParam("boolean_group")   @ApiParam("Boolean in group parameters") Boolean booleanGroup,@QueryParam("int64_group")  @ApiParam("Integer in group parameters")  Long int64Group);
 
     @POST
     @Path("/inline-additionalProperties")
@@ -137,7 +137,7 @@ import javax.validation.Valid;
     @ApiOperation(value = "", notes = "To test the collection format in query parameters", tags={ "fake" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success", response = Void.class) })
-    Response testQueryParameterCollectionFormat(@QueryParam("pipe") @NotNull    List<String> pipe,@QueryParam("ioutil") @NotNull    List<String> ioutil,@QueryParam("http") @NotNull    List<String> http,@QueryParam("url") @NotNull    List<String> url,@QueryParam("context") @NotNull    List<String> context);
+    Response testQueryParameterCollectionFormat(@QueryParam("pipe") @NotNull   List<String> pipe,@QueryParam("ioutil") @NotNull   List<String> ioutil,@QueryParam("http") @NotNull   List<String> http,@QueryParam("url") @NotNull   List<String> url,@QueryParam("context") @NotNull   List<String> context);
 
     @POST
     @Path("/{petId}/uploadImageWithRequiredFile")

samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/PetApi.java

@@ -42,7 +42,7 @@ import javax.validation.Valid;
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Void.class),
         @ApiResponse(code = 400, message = "Invalid pet value", response = Void.class) })
-    Response deletePet(@PathParam("petId") @ApiParam("Pet id to delete") Long petId,@HeaderParam("api_key")    String apiKey);
+    Response deletePet(@PathParam("petId") @ApiParam("Pet id to delete") Long petId,@HeaderParam("api_key")   String apiKey);
 
     @GET
     @Path("/findByStatus")
@@ -55,7 +55,7 @@ import javax.validation.Valid;
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
         @ApiResponse(code = 400, message = "Invalid status value", response = Void.class, responseContainer = "List") })
-    Response findPetsByStatus(@QueryParam("status") @NotNull   @ApiParam("Status values that need to be considered for filter")  List<String> status);
+    Response findPetsByStatus(@QueryParam("status") @NotNull  @ApiParam("Status values that need to be considered for filter")  List<String> status);
 
     @GET
     @Path("/findByTags")
@@ -68,7 +68,7 @@ import javax.validation.Valid;
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"),
         @ApiResponse(code = 400, message = "Invalid tag value", response = Void.class, responseContainer = "Set") })
-    Response findPetsByTags(@QueryParam("tags") @NotNull   @ApiParam("Tags to filter by")  Set<String> tags);
+    Response findPetsByTags(@QueryParam("tags") @NotNull  @ApiParam("Tags to filter by")  Set<String> tags);
 
     @GET
     @Path("/{petId}")
@@ -120,5 +120,5 @@ import javax.validation.Valid;
          }, tags={ "pet" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
-    Response uploadFile(@PathParam("petId") @ApiParam("ID of pet to update") Long petId,@FormParam(value = "additionalMetadata")  String additionalMetadata, @FormParam(value = "file") InputStream fileInputStream);
+    Response uploadFile(@PathParam("petId") @ApiParam("ID of pet to update") Long petId,@FormParam(value = "additionalMetadata")  String additionalMetadata, @FormParam(value = "file") InputStream _fileInputStream);
 }

samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/UserApi.java

@@ -1,5 +1,6 @@
 package org.openapitools.api;
 
+import java.util.Date;
 import java.util.List;
 import org.openapitools.model.User;
 
@@ -63,7 +64,7 @@ import javax.validation.Valid;
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = String.class),
         @ApiResponse(code = 400, message = "Invalid username/password supplied", response = Void.class) })
-    Response loginUser(@QueryParam("username") @NotNull   @ApiParam("The user name for login")  String username,@QueryParam("password") @NotNull   @ApiParam("The password for login in clear text")  String password);
+    Response loginUser(@QueryParam("username") @NotNull  @ApiParam("The user name for login")  String username,@QueryParam("password") @NotNull  @ApiParam("The password for login in clear text")  String password);
 
     @GET
     @Path("/logout")

samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java

@@ -13,9 +13,11 @@ import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
+import com.fasterxml.jackson.annotation.JsonTypeName;
 
 
 
+@JsonTypeName("AdditionalPropertiesAnyType")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesAnyType extends HashMap<String, Object> implements Serializable {
   
   private @Valid String name;
@@ -36,6 +38,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     return name;
   }
 
+  @JsonProperty("name")
   public void setName(String name) {
     this.name = name;
   }