Add Serializable import to JaxRS-spec models if serializableModel is set (#6651)

bin/jaxrs-spec-petstore-server-interface.sh

@@ -28,6 +28,7 @@ fi
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
 ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l jaxrs-spec -o samples/server/petstore/jaxrs-spec-interface
 -DhideGenerationTimestamp=true
+-DserializableModel=true
 -DinterfaceOnly=true"
 
 java $JAVA_OPTS -jar $executable $ags

bin/jaxrs-spec-petstore-server.sh

@@ -27,6 +27,7 @@ fi
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
 ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l jaxrs-spec -o samples/server/petstore/jaxrs-spec 
--DhideGenerationTimestamp=true"
+-DhideGenerationTimestamp=true
+-DserializableModel=true"
 
 java $JAVA_OPTS -jar $executable $ags

modules/swagger-codegen/src/main/resources/JavaJaxRS/spec/model.mustache

@@ -2,6 +2,9 @@ package {{package}};
 
 {{#imports}}import {{import}};
 {{/imports}}
+{{#serializableModel}}
+import java.io.Serializable;
+{{/serializableModel}}
 {{#useBeanValidation}}
 import javax.validation.constraints.*;
 import javax.validation.Valid;

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

@@ -0,0 +1,9 @@
+package io.swagger.api;
+
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.core.Application;
+
+@ApplicationPath("/")
+public class RestApplication extends Application {
+
+}

samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java

@@ -3,6 +3,7 @@ package io.swagger.model;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -11,7 +12,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class AdditionalPropertiesClass   {
+public class AdditionalPropertiesClass  implements Serializable {
   
   private @Valid Map<String, String> mapProperty = new HashMap<String, String>();
   private @Valid Map<String, Map<String, String>> mapOfMapProperty = new HashMap<String, Map<String, String>>();

samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Animal.java

@@ -2,6 +2,7 @@ package io.swagger.model;
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -10,7 +11,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class Animal   {
+public class Animal  implements Serializable {
   
   private @Valid String className = null;
   private @Valid String color = "red";

samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/AnimalFarm.java

@@ -3,6 +3,7 @@ package io.swagger.model;
 import io.swagger.model.Animal;
 import java.util.ArrayList;
 import java.util.List;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -11,7 +12,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class AnimalFarm extends ArrayList<Animal>  {
+public class AnimalFarm extends ArrayList<Animal> implements Serializable {
   
 
 

samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java

@@ -3,6 +3,7 @@ package io.swagger.model;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -11,7 +12,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class ArrayOfArrayOfNumberOnly   {
+public class ArrayOfArrayOfNumberOnly  implements Serializable {
   
   private @Valid List<List<BigDecimal>> arrayArrayNumber = new ArrayList<List<BigDecimal>>();
 

samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java

@@ -3,6 +3,7 @@ package io.swagger.model;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -11,7 +12,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class ArrayOfNumberOnly   {
+public class ArrayOfNumberOnly  implements Serializable {
   
   private @Valid List<BigDecimal> arrayNumber = new ArrayList<BigDecimal>();
 

samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/ArrayTest.java

@@ -3,6 +3,7 @@ package io.swagger.model;
 import io.swagger.model.ReadOnlyFirst;
 import java.util.ArrayList;
 import java.util.List;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -11,7 +12,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class ArrayTest   {
+public class ArrayTest  implements Serializable {
   
   private @Valid List<String> arrayOfString = new ArrayList<String>();
   private @Valid List<List<Long>> arrayArrayOfInteger = new ArrayList<List<Long>>();

samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Capitalization.java

@@ -1,5 +1,6 @@
 package io.swagger.model;
 
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -8,7 +9,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class Capitalization   {
+public class Capitalization  implements Serializable {
   
   private @Valid String smallCamel = null;
   private @Valid String capitalCamel = null;

samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Cat.java

@@ -1,6 +1,7 @@
 package io.swagger.model;
 
 import io.swagger.model.Animal;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -9,7 +10,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class Cat extends Animal  {
+public class Cat extends Animal implements Serializable {
   
   private @Valid Boolean declawed = null;
 

samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Category.java

@@ -1,5 +1,6 @@
 package io.swagger.model;
 
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -8,7 +9,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class Category   {
+public class Category  implements Serializable {
   
   private @Valid Long id = null;
   private @Valid String name = null;

samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/ClassModel.java

@@ -1,6 +1,7 @@
 package io.swagger.model;
 
 import io.swagger.annotations.ApiModel;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -12,7 +13,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 @ApiModel(description = "Model for testing model with \"_class\" property")
 
-public class ClassModel   {
+public class ClassModel  implements Serializable {
   
   private @Valid String propertyClass = null;
 

samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Client.java

@@ -1,5 +1,6 @@
 package io.swagger.model;
 
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -8,7 +9,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class Client   {
+public class Client  implements Serializable {
   
   private @Valid String client = null;
 

samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Dog.java

@@ -1,6 +1,7 @@
 package io.swagger.model;
 
 import io.swagger.model.Animal;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -9,7 +10,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class Dog extends Animal  {
+public class Dog extends Animal implements Serializable {
   
   private @Valid String breed = null;
 

samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/EnumArrays.java

@@ -2,6 +2,7 @@ package io.swagger.model;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -10,7 +11,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class EnumArrays   {
+public class EnumArrays  implements Serializable {
   
 
 public enum JustSymbolEnum {

samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/EnumClass.java

@@ -1,5 +1,6 @@
 package io.swagger.model;
 
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 

samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/EnumTest.java

@@ -1,6 +1,7 @@
 package io.swagger.model;
 
 import io.swagger.model.OuterEnum;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -9,7 +10,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class EnumTest   {
+public class EnumTest  implements Serializable {
   
 
 public enum EnumStringEnum {

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

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 import java.util.UUID;
 import org.joda.time.LocalDate;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -12,7 +13,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class FormatTest   {
+public class FormatTest  implements Serializable {
   
   private @Valid Integer integer = null;
   private @Valid Integer int32 = null;

samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/HasOnlyReadOnly.java

@@ -1,5 +1,6 @@
 package io.swagger.model;
 
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -8,7 +9,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class HasOnlyReadOnly   {
+public class HasOnlyReadOnly  implements Serializable {
   
   private @Valid String bar = null;
   private @Valid String foo = null;

samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/MapTest.java

@@ -3,6 +3,7 @@ package io.swagger.model;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -11,7 +12,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class MapTest   {
+public class MapTest  implements Serializable {
   
   private @Valid Map<String, Map<String, String>> mapMapOfString = new HashMap<String, Map<String, String>>();
 

samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -6,6 +6,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -14,7 +15,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class MixedPropertiesAndAdditionalPropertiesClass   {
+public class MixedPropertiesAndAdditionalPropertiesClass  implements Serializable {
   
   private @Valid UUID uuid = null;
   private @Valid Date dateTime = null;

samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Model200Response.java

@@ -1,6 +1,7 @@
 package io.swagger.model;
 
 import io.swagger.annotations.ApiModel;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -12,7 +13,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 @ApiModel(description = "Model for testing model name starting with number")
 
-public class Model200Response   {
+public class Model200Response  implements Serializable {
   
   private @Valid Integer name = null;
   private @Valid String propertyClass = null;

samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/ModelApiResponse.java

@@ -1,5 +1,6 @@
 package io.swagger.model;
 
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -8,7 +9,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class ModelApiResponse   {
+public class ModelApiResponse  implements Serializable {
   
   private @Valid Integer code = null;
   private @Valid String type = null;

samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/ModelReturn.java

@@ -1,6 +1,7 @@
 package io.swagger.model;
 
 import io.swagger.annotations.ApiModel;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -12,7 +13,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 @ApiModel(description = "Model for testing reserved words")
 
-public class ModelReturn   {
+public class ModelReturn  implements Serializable {
   
   private @Valid Integer _return = null;
 

samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Name.java

@@ -1,6 +1,7 @@
 package io.swagger.model;
 
 import io.swagger.annotations.ApiModel;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -12,7 +13,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 @ApiModel(description = "Model for testing model name same as property name")
 
-public class Name   {
+public class Name  implements Serializable {
   
   private @Valid Integer name = null;
   private @Valid Integer snakeCase = null;

samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/NumberOnly.java

@@ -1,6 +1,7 @@
 package io.swagger.model;
 
 import java.math.BigDecimal;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -9,7 +10,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class NumberOnly   {
+public class NumberOnly  implements Serializable {
   
   private @Valid BigDecimal justNumber = null;
 

samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Order.java

@@ -1,6 +1,7 @@
 package io.swagger.model;
 
 import java.util.Date;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -9,7 +10,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class Order   {
+public class Order  implements Serializable {
   
   private @Valid Long id = null;
   private @Valid Long petId = null;

samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/OuterComposite.java

@@ -1,6 +1,7 @@
 package io.swagger.model;
 
 import java.math.BigDecimal;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -9,7 +10,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class OuterComposite   {
+public class OuterComposite  implements Serializable {
   
   private @Valid BigDecimal myNumber = null;
   private @Valid String myString = null;

samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/OuterEnum.java

@@ -1,5 +1,6 @@
 package io.swagger.model;
 
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 

samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Pet.java

@@ -4,6 +4,7 @@ import io.swagger.model.Category;
 import io.swagger.model.Tag;
 import java.util.ArrayList;
 import java.util.List;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -12,7 +13,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class Pet   {
+public class Pet  implements Serializable {
   
   private @Valid Long id = null;
   private @Valid Category category = null;

samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/ReadOnlyFirst.java

@@ -1,5 +1,6 @@
 package io.swagger.model;
 
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -8,7 +9,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class ReadOnlyFirst   {
+public class ReadOnlyFirst  implements Serializable {
   
   private @Valid String bar = null;
   private @Valid String baz = null;

samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/SpecialModelName.java

@@ -1,5 +1,6 @@
 package io.swagger.model;
 
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -8,7 +9,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class SpecialModelName   {
+public class SpecialModelName  implements Serializable {
   
   private @Valid Long specialPropertyName = null;
 

samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Tag.java

@@ -1,5 +1,6 @@
 package io.swagger.model;
 
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -8,7 +9,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class Tag   {
+public class Tag  implements Serializable {
   
   private @Valid Long id = null;
   private @Valid String name = null;

samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/User.java

@@ -1,5 +1,6 @@
 package io.swagger.model;
 
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -8,7 +9,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class User   {
+public class User  implements Serializable {
   
   private @Valid Long id = null;
   private @Valid String username = null;

samples/server/petstore/jaxrs-spec-interface/swagger.json

@@ -108,8 +108,8 @@
           "type" : "array",
           "items" : {
             "type" : "string",
-            "default" : "available",
-            "enum" : [ "available", "pending", "sold" ]
+            "enum" : [ "available", "pending", "sold" ],
+            "default" : "available"
           },
           "collectionFormat" : "csv"
         } ],
@@ -680,8 +680,8 @@
           "type" : "array",
           "items" : {
             "type" : "string",
-            "default" : "$",
-            "enum" : [ ">", "$" ]
+            "enum" : [ ">", "$" ],
+            "default" : "$"
           }
         }, {
           "name" : "enum_form_string",
@@ -699,8 +699,8 @@
           "type" : "array",
           "items" : {
             "type" : "string",
-            "default" : "$",
-            "enum" : [ ">", "$" ]
+            "enum" : [ ">", "$" ],
+            "default" : "$"
           }
         }, {
           "name" : "enum_header_string",
@@ -718,8 +718,8 @@
           "type" : "array",
           "items" : {
             "type" : "string",
-            "default" : "$",
-            "enum" : [ ">", "$" ]
+            "enum" : [ ">", "$" ],
+            "default" : "$"
           }
         }, {
           "name" : "enum_query_string",

samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java

@@ -3,6 +3,7 @@ package io.swagger.model;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -11,7 +12,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class AdditionalPropertiesClass   {
+public class AdditionalPropertiesClass  implements Serializable {
   
   private @Valid Map<String, String> mapProperty = new HashMap<String, String>();
   private @Valid Map<String, Map<String, String>> mapOfMapProperty = new HashMap<String, Map<String, String>>();

samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Animal.java

@@ -2,6 +2,7 @@ package io.swagger.model;
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -10,7 +11,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class Animal   {
+public class Animal  implements Serializable {
   
   private @Valid String className = null;
   private @Valid String color = "red";

samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/AnimalFarm.java

@@ -3,6 +3,7 @@ package io.swagger.model;
 import io.swagger.model.Animal;
 import java.util.ArrayList;
 import java.util.List;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -11,7 +12,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class AnimalFarm extends ArrayList<Animal>  {
+public class AnimalFarm extends ArrayList<Animal> implements Serializable {
   
 
 

samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java

@@ -3,6 +3,7 @@ package io.swagger.model;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -11,7 +12,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class ArrayOfArrayOfNumberOnly   {
+public class ArrayOfArrayOfNumberOnly  implements Serializable {
   
   private @Valid List<List<BigDecimal>> arrayArrayNumber = new ArrayList<List<BigDecimal>>();
 

samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java

@@ -3,6 +3,7 @@ package io.swagger.model;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -11,7 +12,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class ArrayOfNumberOnly   {
+public class ArrayOfNumberOnly  implements Serializable {
   
   private @Valid List<BigDecimal> arrayNumber = new ArrayList<BigDecimal>();
 

samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/ArrayTest.java

@@ -3,6 +3,7 @@ package io.swagger.model;
 import io.swagger.model.ReadOnlyFirst;
 import java.util.ArrayList;
 import java.util.List;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -11,7 +12,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class ArrayTest   {
+public class ArrayTest  implements Serializable {
   
   private @Valid List<String> arrayOfString = new ArrayList<String>();
   private @Valid List<List<Long>> arrayArrayOfInteger = new ArrayList<List<Long>>();

samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Capitalization.java

@@ -1,5 +1,6 @@
 package io.swagger.model;
 
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -8,7 +9,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class Capitalization   {
+public class Capitalization  implements Serializable {
   
   private @Valid String smallCamel = null;
   private @Valid String capitalCamel = null;

samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Cat.java

@@ -1,6 +1,7 @@
 package io.swagger.model;
 
 import io.swagger.model.Animal;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -9,7 +10,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class Cat extends Animal  {
+public class Cat extends Animal implements Serializable {
   
   private @Valid Boolean declawed = null;
 

samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Category.java

@@ -1,5 +1,6 @@
 package io.swagger.model;
 
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -8,7 +9,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class Category   {
+public class Category  implements Serializable {
   
   private @Valid Long id = null;
   private @Valid String name = null;

samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/ClassModel.java

@@ -1,6 +1,7 @@
 package io.swagger.model;
 
 import io.swagger.annotations.ApiModel;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -12,7 +13,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 @ApiModel(description = "Model for testing model with \"_class\" property")
 
-public class ClassModel   {
+public class ClassModel  implements Serializable {
   
   private @Valid String propertyClass = null;
 

samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Client.java

@@ -1,5 +1,6 @@
 package io.swagger.model;
 
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -8,7 +9,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class Client   {
+public class Client  implements Serializable {
   
   private @Valid String client = null;
 

samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Dog.java

@@ -1,6 +1,7 @@
 package io.swagger.model;
 
 import io.swagger.model.Animal;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -9,7 +10,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class Dog extends Animal  {
+public class Dog extends Animal implements Serializable {
   
   private @Valid String breed = null;
 

samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/EnumArrays.java

@@ -2,6 +2,7 @@ package io.swagger.model;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -10,7 +11,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class EnumArrays   {
+public class EnumArrays  implements Serializable {
   
 
 public enum JustSymbolEnum {

samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/EnumClass.java

@@ -1,5 +1,6 @@
 package io.swagger.model;
 
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 

samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/EnumTest.java

@@ -1,6 +1,7 @@
 package io.swagger.model;
 
 import io.swagger.model.OuterEnum;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -9,7 +10,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class EnumTest   {
+public class EnumTest  implements Serializable {
   
 
 public enum EnumStringEnum {

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

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 import java.util.UUID;
 import org.joda.time.LocalDate;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -12,7 +13,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class FormatTest   {
+public class FormatTest  implements Serializable {
   
   private @Valid Integer integer = null;
   private @Valid Integer int32 = null;

samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/HasOnlyReadOnly.java

@@ -1,5 +1,6 @@
 package io.swagger.model;
 
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -8,7 +9,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class HasOnlyReadOnly   {
+public class HasOnlyReadOnly  implements Serializable {
   
   private @Valid String bar = null;
   private @Valid String foo = null;

samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/MapTest.java

@@ -3,6 +3,7 @@ package io.swagger.model;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -11,7 +12,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class MapTest   {
+public class MapTest  implements Serializable {
   
   private @Valid Map<String, Map<String, String>> mapMapOfString = new HashMap<String, Map<String, String>>();
 

samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -6,6 +6,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -14,7 +15,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class MixedPropertiesAndAdditionalPropertiesClass   {
+public class MixedPropertiesAndAdditionalPropertiesClass  implements Serializable {
   
   private @Valid UUID uuid = null;
   private @Valid Date dateTime = null;

samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Model200Response.java

@@ -1,6 +1,7 @@
 package io.swagger.model;
 
 import io.swagger.annotations.ApiModel;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -12,7 +13,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 @ApiModel(description = "Model for testing model name starting with number")
 
-public class Model200Response   {
+public class Model200Response  implements Serializable {
   
   private @Valid Integer name = null;
   private @Valid String propertyClass = null;

samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/ModelApiResponse.java

@@ -1,5 +1,6 @@
 package io.swagger.model;
 
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -8,7 +9,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class ModelApiResponse   {
+public class ModelApiResponse  implements Serializable {
   
   private @Valid Integer code = null;
   private @Valid String type = null;

samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/ModelReturn.java

@@ -1,6 +1,7 @@
 package io.swagger.model;
 
 import io.swagger.annotations.ApiModel;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -12,7 +13,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 @ApiModel(description = "Model for testing reserved words")
 
-public class ModelReturn   {
+public class ModelReturn  implements Serializable {
   
   private @Valid Integer _return = null;
 

samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Name.java

@@ -1,6 +1,7 @@
 package io.swagger.model;
 
 import io.swagger.annotations.ApiModel;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -12,7 +13,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 @ApiModel(description = "Model for testing model name same as property name")
 
-public class Name   {
+public class Name  implements Serializable {
   
   private @Valid Integer name = null;
   private @Valid Integer snakeCase = null;

samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/NumberOnly.java

@@ -1,6 +1,7 @@
 package io.swagger.model;
 
 import java.math.BigDecimal;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -9,7 +10,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class NumberOnly   {
+public class NumberOnly  implements Serializable {
   
   private @Valid BigDecimal justNumber = null;
 

samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Order.java

@@ -1,6 +1,7 @@
 package io.swagger.model;
 
 import java.util.Date;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -9,7 +10,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class Order   {
+public class Order  implements Serializable {
   
   private @Valid Long id = null;
   private @Valid Long petId = null;

samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/OuterComposite.java

@@ -1,6 +1,7 @@
 package io.swagger.model;
 
 import java.math.BigDecimal;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -9,7 +10,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class OuterComposite   {
+public class OuterComposite  implements Serializable {
   
   private @Valid BigDecimal myNumber = null;
   private @Valid String myString = null;

samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/OuterEnum.java

@@ -1,5 +1,6 @@
 package io.swagger.model;
 
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 

samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Pet.java

@@ -4,6 +4,7 @@ import io.swagger.model.Category;
 import io.swagger.model.Tag;
 import java.util.ArrayList;
 import java.util.List;
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -12,7 +13,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class Pet   {
+public class Pet  implements Serializable {
   
   private @Valid Long id = null;
   private @Valid Category category = null;

samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/ReadOnlyFirst.java

@@ -1,5 +1,6 @@
 package io.swagger.model;
 
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -8,7 +9,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class ReadOnlyFirst   {
+public class ReadOnlyFirst  implements Serializable {
   
   private @Valid String bar = null;
   private @Valid String baz = null;

samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/SpecialModelName.java

@@ -1,5 +1,6 @@
 package io.swagger.model;
 
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -8,7 +9,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class SpecialModelName   {
+public class SpecialModelName  implements Serializable {
   
   private @Valid Long specialPropertyName = null;
 

samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Tag.java

@@ -1,5 +1,6 @@
 package io.swagger.model;
 
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -8,7 +9,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class Tag   {
+public class Tag  implements Serializable {
   
   private @Valid Long id = null;
   private @Valid String name = null;

samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/User.java

@@ -1,5 +1,6 @@
 package io.swagger.model;
 
+import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -8,7 +9,7 @@ import io.swagger.annotations.*;
 import java.util.Objects;
 
 
-public class User   {
+public class User  implements Serializable {
   
   private @Valid Long id = null;
   private @Valid String username = null;

samples/server/petstore/jaxrs-spec/swagger.json

@@ -108,8 +108,8 @@
           "type" : "array",
           "items" : {
             "type" : "string",
-            "default" : "available",
-            "enum" : [ "available", "pending", "sold" ]
+            "enum" : [ "available", "pending", "sold" ],
+            "default" : "available"
           },
           "collectionFormat" : "csv"
         } ],
@@ -680,8 +680,8 @@
           "type" : "array",
           "items" : {
             "type" : "string",
-            "default" : "$",
-            "enum" : [ ">", "$" ]
+            "enum" : [ ">", "$" ],
+            "default" : "$"
           }
         }, {
           "name" : "enum_form_string",
@@ -699,8 +699,8 @@
           "type" : "array",
           "items" : {
             "type" : "string",
-            "default" : "$",
-            "enum" : [ ">", "$" ]
+            "enum" : [ ">", "$" ],
+            "default" : "$"
           }
         }, {
           "name" : "enum_header_string",
@@ -718,8 +718,8 @@
           "type" : "array",
           "items" : {
             "type" : "string",
-            "default" : "$",
-            "enum" : [ ">", "$" ]
+            "enum" : [ ">", "$" ],
+            "default" : "$"
           }
         }, {
           "name" : "enum_query_string",