diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java
index f7053bd900c..ce2c5a61180 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java
@@ -855,35 +855,35 @@ public class JavaClientCodegen extends AbstractJavaCodegen
                     }
                 }
             }
+        }
 
-            // add implements for serializable/parcelable to all models
-            for (Object _mo : models) {
-                Map<String, Object> mo = (Map<String, Object>) _mo;
-                CodegenModel cm = (CodegenModel) mo.get("model");
+        // add implements for serializable/parcelable to all models
+        for (Object _mo : models) {
+            Map<String, Object> mo = (Map<String, Object>) _mo;
+            CodegenModel cm = (CodegenModel) mo.get("model");
 
-                cm.getVendorExtensions().putIfAbsent("x-implements", new ArrayList<String>());
-                if (JERSEY2.equals(getLibrary()) || NATIVE.equals(getLibrary())) {
-                    cm.getVendorExtensions().put("x-implements", new ArrayList<String>());
+            cm.getVendorExtensions().putIfAbsent("x-implements", new ArrayList<String>());
+            if (JERSEY2.equals(getLibrary()) || NATIVE.equals(getLibrary())) {
+                cm.getVendorExtensions().put("x-implements", new ArrayList<String>());
 
-                    if (cm.oneOf != null && !cm.oneOf.isEmpty() && cm.oneOf.contains("ModelNull")) {
-                        // if oneOf contains "null" type
-                        cm.isNullable = true;
-                        cm.oneOf.remove("ModelNull");
-                    }
-
-                    if (cm.anyOf != null && !cm.anyOf.isEmpty() && cm.anyOf.contains("ModelNull")) {
-                        // if anyOf contains "null" type
-                        cm.isNullable = true;
-                        cm.anyOf.remove("ModelNull");
-                    }
+                if (cm.oneOf != null && !cm.oneOf.isEmpty() && cm.oneOf.contains("ModelNull")) {
+                    // if oneOf contains "null" type
+                    cm.isNullable = true;
+                    cm.oneOf.remove("ModelNull");
                 }
-                if (this.parcelableModel) {
-                    ((ArrayList<String>) cm.getVendorExtensions().get("x-implements")).add("Parcelable");
-                }
-                if (this.serializableModel) {
-                    ((ArrayList<String>) cm.getVendorExtensions().get("x-implements")).add("Serializable");
+
+                if (cm.anyOf != null && !cm.anyOf.isEmpty() && cm.anyOf.contains("ModelNull")) {
+                    // if anyOf contains "null" type
+                    cm.isNullable = true;
+                    cm.anyOf.remove("ModelNull");
                 }
             }
+            if (this.parcelableModel) {
+                ((ArrayList<String>) cm.getVendorExtensions().get("x-implements")).add("Parcelable");
+            }
+            if (this.serializableModel) {
+                ((ArrayList<String>) cm.getVendorExtensions().get("x-implements")).add("Serializable");
+            }
         }
 
         return objs;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesAnyType.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesAnyType.md
index 87b468bb7ca..34c14b52bf2 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesAnyType.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesAnyType.md
@@ -9,4 +9,8 @@ Name | Type | Description | Notes
 **name** | **String** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesArray.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesArray.md
index cb7fe9b3903..6a791da7106 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesArray.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesArray.md
@@ -9,4 +9,8 @@ Name | Type | Description | Notes
 **name** | **String** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesBoolean.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesBoolean.md
index 6b53e7ba73a..930bfd1a5ac 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesBoolean.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesBoolean.md
@@ -9,4 +9,8 @@ Name | Type | Description | Notes
 **name** | **String** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesClass.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesClass.md
index f9e189355cf..e3b04c897ed 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesClass.md
@@ -19,4 +19,8 @@ Name | Type | Description | Notes
 **anytype3** | **Object** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesInteger.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesInteger.md
index d2ed7fb1a46..7629f5f50c8 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesInteger.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesInteger.md
@@ -9,4 +9,8 @@ Name | Type | Description | Notes
 **name** | **String** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesNumber.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesNumber.md
index 53f6e81e717..6a745f35b63 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesNumber.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesNumber.md
@@ -9,4 +9,8 @@ Name | Type | Description | Notes
 **name** | **String** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesObject.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesObject.md
index 98ac8d2e5fe..060b7bdd6c0 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesObject.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesObject.md
@@ -9,4 +9,8 @@ Name | Type | Description | Notes
 **name** | **String** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesString.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesString.md
index d7970cdfe19..5b0385e52a0 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesString.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesString.md
@@ -9,4 +9,8 @@ Name | Type | Description | Notes
 **name** | **String** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Animal.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Animal.md
index c8e18ae55e4..cd162bd797d 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Animal.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Animal.md
@@ -10,4 +10,8 @@ Name | Type | Description | Notes
 **color** | **String** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ArrayOfArrayOfNumberOnly.md
index e1a0e54c0b5..e6071b7ac6a 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ArrayOfArrayOfNumberOnly.md
@@ -9,4 +9,8 @@ Name | Type | Description | Notes
 **arrayArrayNumber** | **List&lt;List&lt;BigDecimal&gt;&gt;** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ArrayOfNumberOnly.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ArrayOfNumberOnly.md
index 25670a603c4..103babddf1b 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ArrayOfNumberOnly.md
@@ -9,4 +9,8 @@ Name | Type | Description | Notes
 **arrayNumber** | **List&lt;BigDecimal&gt;** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ArrayTest.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ArrayTest.md
index 7c6f6245ac8..1b79b1e97df 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ArrayTest.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ArrayTest.md
@@ -11,4 +11,8 @@ Name | Type | Description | Notes
 **arrayArrayOfModel** | **List&lt;List&lt;ReadOnlyFirst&gt;&gt;** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/BigCat.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/BigCat.md
index 8a075304abf..eec91a45802 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/BigCat.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/BigCat.md
@@ -20,4 +20,8 @@ LEOPARDS | &quot;leopards&quot;
 JAGUARS | &quot;jaguars&quot;
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/BigCatAllOf.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/BigCatAllOf.md
index 21177dbf089..d4c713b3e96 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/BigCatAllOf.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/BigCatAllOf.md
@@ -20,4 +20,8 @@ LEOPARDS | &quot;leopards&quot;
 JAGUARS | &quot;jaguars&quot;
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Capitalization.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Capitalization.md
index 7b73c40b554..d7b56a6b99c 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Capitalization.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Capitalization.md
@@ -14,4 +14,8 @@ Name | Type | Description | Notes
 **ATT_NAME** | **String** | Name of the pet  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Cat.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Cat.md
index 39c2f864df8..7c35c8fdba5 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Cat.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Cat.md
@@ -9,4 +9,8 @@ Name | Type | Description | Notes
 **declawed** | **Boolean** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/CatAllOf.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/CatAllOf.md
index 1098fd900c5..c8b10048700 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/CatAllOf.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/CatAllOf.md
@@ -9,4 +9,8 @@ Name | Type | Description | Notes
 **declawed** | **Boolean** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Category.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Category.md
index 613ea9f7ee2..eaa76f6bb22 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Category.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Category.md
@@ -10,4 +10,8 @@ Name | Type | Description | Notes
 **name** | **String** |  | 
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ClassModel.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ClassModel.md
index d5453c20133..ede422e87c2 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ClassModel.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ClassModel.md
@@ -10,4 +10,8 @@ Name | Type | Description | Notes
 **propertyClass** | **String** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Client.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Client.md
index 228df492383..149537224cc 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Client.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Client.md
@@ -9,4 +9,8 @@ Name | Type | Description | Notes
 **client** | **String** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Dog.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Dog.md
index 73cedf2bc91..ffb0e9d2dc0 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Dog.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Dog.md
@@ -9,4 +9,8 @@ Name | Type | Description | Notes
 **breed** | **String** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/DogAllOf.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/DogAllOf.md
index cbeb9e9a22d..1ed266a241d 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/DogAllOf.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/DogAllOf.md
@@ -9,4 +9,8 @@ Name | Type | Description | Notes
 **breed** | **String** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/EnumArrays.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/EnumArrays.md
index 869b7a6c066..f1193deea42 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/EnumArrays.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/EnumArrays.md
@@ -28,4 +28,8 @@ FISH | &quot;fish&quot;
 CRAB | &quot;crab&quot;
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/EnumTest.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/EnumTest.md
index e066d77e5b0..5b0880f6c25 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/EnumTest.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/EnumTest.md
@@ -51,4 +51,8 @@ NUMBER_1_DOT_1 | 1.1
 NUMBER_MINUS_1_DOT_2 | -1.2
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FileSchemaTestClass.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FileSchemaTestClass.md
index 3a95e27d7c0..69ba61e421b 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FileSchemaTestClass.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FileSchemaTestClass.md
@@ -10,4 +10,8 @@ Name | Type | Description | Notes
 **files** | [**List&lt;java.io.File&gt;**](java.io.File.md) |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FormatTest.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FormatTest.md
index 60fa4300013..ea86e5d595c 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FormatTest.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FormatTest.md
@@ -22,4 +22,8 @@ Name | Type | Description | Notes
 **bigDecimal** | **BigDecimal** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/HasOnlyReadOnly.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/HasOnlyReadOnly.md
index 4795b40ef65..b79bfb108f5 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/HasOnlyReadOnly.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/HasOnlyReadOnly.md
@@ -10,4 +10,8 @@ Name | Type | Description | Notes
 **foo** | **String** |  |  [optional] [readonly]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/MapTest.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/MapTest.md
index 9c3aeb6495c..575e33afaaf 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/MapTest.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/MapTest.md
@@ -21,4 +21,8 @@ UPPER | &quot;UPPER&quot;
 LOWER | &quot;lower&quot;
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 52d10b2cc7a..68afad173e8 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -11,4 +11,8 @@ Name | Type | Description | Notes
 **map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Model200Response.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Model200Response.md
index f9928d70622..9ba2d6a0f9c 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Model200Response.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Model200Response.md
@@ -11,4 +11,8 @@ Name | Type | Description | Notes
 **propertyClass** | **String** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ModelApiResponse.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ModelApiResponse.md
index 14fb7f1ed27..02b3abc589e 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ModelApiResponse.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ModelApiResponse.md
@@ -11,4 +11,8 @@ Name | Type | Description | Notes
 **message** | **String** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ModelReturn.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ModelReturn.md
index 5005d4b7239..44ef6c4dfcb 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ModelReturn.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ModelReturn.md
@@ -10,4 +10,8 @@ Name | Type | Description | Notes
 **_return** | **Integer** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Name.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Name.md
index b815a0b4c99..d439eec4bb6 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Name.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Name.md
@@ -13,4 +13,8 @@ Name | Type | Description | Notes
 **_123number** | **Integer** |  |  [optional] [readonly]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/NumberOnly.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/NumberOnly.md
index 4b9d048546c..982360b302c 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/NumberOnly.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/NumberOnly.md
@@ -9,4 +9,8 @@ Name | Type | Description | Notes
 **justNumber** | **BigDecimal** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Order.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Order.md
index 30782d6ae77..3a50641dde8 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Order.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Order.md
@@ -24,4 +24,8 @@ APPROVED | &quot;approved&quot;
 DELIVERED | &quot;delivered&quot;
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/OuterComposite.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/OuterComposite.md
index 594951145a3..f539125ebe3 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/OuterComposite.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/OuterComposite.md
@@ -11,4 +11,8 @@ Name | Type | Description | Notes
 **myBoolean** | **Boolean** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Pet.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Pet.md
index bdcdad6b3e6..932bd08f0c5 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Pet.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Pet.md
@@ -24,4 +24,8 @@ PENDING | &quot;pending&quot;
 SOLD | &quot;sold&quot;
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ReadOnlyFirst.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ReadOnlyFirst.md
index a692499dc66..5702a47fb52 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ReadOnlyFirst.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ReadOnlyFirst.md
@@ -10,4 +10,8 @@ Name | Type | Description | Notes
 **baz** | **String** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/SpecialModelName.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/SpecialModelName.md
index 934b8f0f25d..ec66e930bdf 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/SpecialModelName.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/SpecialModelName.md
@@ -9,4 +9,8 @@ Name | Type | Description | Notes
 **$specialPropertyName** | **Long** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Tag.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Tag.md
index f24eba7d222..0bb43f42f24 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Tag.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Tag.md
@@ -10,4 +10,8 @@ Name | Type | Description | Notes
 **name** | **String** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/TypeHolderDefault.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/TypeHolderDefault.md
index e28c7a9df58..5c4a6f50d15 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/TypeHolderDefault.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/TypeHolderDefault.md
@@ -13,4 +13,8 @@ Name | Type | Description | Notes
 **arrayItem** | **List&lt;Integer&gt;** |  | 
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/TypeHolderExample.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/TypeHolderExample.md
index 96f0d4bebf4..76de8235c8a 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/TypeHolderExample.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/TypeHolderExample.md
@@ -14,4 +14,8 @@ Name | Type | Description | Notes
 **arrayItem** | **List&lt;Integer&gt;** |  | 
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/User.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/User.md
index c4ea94b7fc1..76046312d5d 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/User.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/User.md
@@ -16,4 +16,8 @@ Name | Type | Description | Notes
 **userStatus** | **Integer** | User Status |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/XmlItem.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/XmlItem.md
index 096fdc7b09a..06b218877b2 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/XmlItem.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/XmlItem.md
@@ -37,4 +37,8 @@ Name | Type | Description | Notes
 **prefixNsWrappedArray** | **List&lt;Integer&gt;** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 500c70c324c..a13fc98ec82 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -32,7 +32,7 @@ import android.os.Parcel;
  * AdditionalPropertiesAnyType
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
+public class AdditionalPropertiesAnyType extends HashMap<String, Object> implements Parcelable {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
   private String name;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index cc89ddd2ac6..d784e0ca721 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -33,7 +33,7 @@ import android.os.Parcel;
  * AdditionalPropertiesArray
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class AdditionalPropertiesArray extends HashMap<String, List> {
+public class AdditionalPropertiesArray extends HashMap<String, List> implements Parcelable {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
   private String name;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index fa580c5be82..e44d751debb 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -32,7 +32,7 @@ import android.os.Parcel;
  * AdditionalPropertiesBoolean
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
+public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> implements Parcelable {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
   private String name;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 95a60c8d07c..8de35356fdd 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -34,7 +34,7 @@ import android.os.Parcel;
  * AdditionalPropertiesClass
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class AdditionalPropertiesClass {
+public class AdditionalPropertiesClass implements Parcelable {
   public static final String SERIALIZED_NAME_MAP_STRING = "map_string";
   @SerializedName(SERIALIZED_NAME_MAP_STRING)
   private Map<String, String> mapString = null;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index a2c86e65a21..fdbe11cac79 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -32,7 +32,7 @@ import android.os.Parcel;
  * AdditionalPropertiesInteger
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
+public class AdditionalPropertiesInteger extends HashMap<String, Integer> implements Parcelable {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
   private String name;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index f9df8bbb0ce..f8cab5ec5b6 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -33,7 +33,7 @@ import android.os.Parcel;
  * AdditionalPropertiesNumber
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
+public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> implements Parcelable {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
   private String name;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 9fed1ee5313..56c71a6a9ed 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -32,7 +32,7 @@ import android.os.Parcel;
  * AdditionalPropertiesObject
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class AdditionalPropertiesObject extends HashMap<String, Map> {
+public class AdditionalPropertiesObject extends HashMap<String, Map> implements Parcelable {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
   private String name;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index b0b59b28b1c..390a9ebd743 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -32,7 +32,7 @@ import android.os.Parcel;
  * AdditionalPropertiesString
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class AdditionalPropertiesString extends HashMap<String, String> {
+public class AdditionalPropertiesString extends HashMap<String, String> implements Parcelable {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
   private String name;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Animal.java
index 1ce96ba982a..c4d1f9b70a1 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Animal.java
@@ -33,7 +33,7 @@ import android.os.Parcel;
  * Animal
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class Animal {
+public class Animal implements Parcelable {
   public static final String SERIALIZED_NAME_CLASS_NAME = "className";
   @SerializedName(SERIALIZED_NAME_CLASS_NAME)
   protected String className;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 18d1d5c0feb..130c21c2bed 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -33,7 +33,7 @@ import android.os.Parcel;
  * ArrayOfArrayOfNumberOnly
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class ArrayOfArrayOfNumberOnly {
+public class ArrayOfArrayOfNumberOnly implements Parcelable {
   public static final String SERIALIZED_NAME_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
   @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_NUMBER)
   private List<List<BigDecimal>> arrayArrayNumber = null;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 522be04febc..30853ddef9c 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -33,7 +33,7 @@ import android.os.Parcel;
  * ArrayOfNumberOnly
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class ArrayOfNumberOnly {
+public class ArrayOfNumberOnly implements Parcelable {
   public static final String SERIALIZED_NAME_ARRAY_NUMBER = "ArrayNumber";
   @SerializedName(SERIALIZED_NAME_ARRAY_NUMBER)
   private List<BigDecimal> arrayNumber = null;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayTest.java
index 81d699bb0ee..02e3c16dc07 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -33,7 +33,7 @@ import android.os.Parcel;
  * ArrayTest
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class ArrayTest {
+public class ArrayTest implements Parcelable {
   public static final String SERIALIZED_NAME_ARRAY_OF_STRING = "array_of_string";
   @SerializedName(SERIALIZED_NAME_ARRAY_OF_STRING)
   private List<String> arrayOfString = null;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/BigCat.java
index 2dba2d3dcf3..b3bfe4db44c 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/BigCat.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/BigCat.java
@@ -32,7 +32,7 @@ import android.os.Parcel;
  * BigCat
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class BigCat extends Cat {
+public class BigCat extends Cat implements Parcelable {
   /**
    * Gets or Sets kind
    */
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/BigCatAllOf.java
index 01c3dc8eb8e..c3f3dc8a3b3 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/BigCatAllOf.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/BigCatAllOf.java
@@ -30,7 +30,7 @@ import android.os.Parcel;
  * BigCatAllOf
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class BigCatAllOf {
+public class BigCatAllOf implements Parcelable {
   /**
    * Gets or Sets kind
    */
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Capitalization.java
index 92162a57b3d..bfe3ff75cb5 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -30,7 +30,7 @@ import android.os.Parcel;
  * Capitalization
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class Capitalization {
+public class Capitalization implements Parcelable {
   public static final String SERIALIZED_NAME_SMALL_CAMEL = "smallCamel";
   @SerializedName(SERIALIZED_NAME_SMALL_CAMEL)
   private String smallCamel;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Cat.java
index 19b4eea504a..d6b5706842e 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Cat.java
@@ -33,7 +33,7 @@ import android.os.Parcel;
  * Cat
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class Cat extends Animal {
+public class Cat extends Animal implements Parcelable {
   public static final String SERIALIZED_NAME_DECLAWED = "declawed";
   @SerializedName(SERIALIZED_NAME_DECLAWED)
   private Boolean declawed;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/CatAllOf.java
index 0f2d9b4bcc8..f6bf94ab8bb 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -30,7 +30,7 @@ import android.os.Parcel;
  * CatAllOf
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class CatAllOf {
+public class CatAllOf implements Parcelable {
   public static final String SERIALIZED_NAME_DECLAWED = "declawed";
   @SerializedName(SERIALIZED_NAME_DECLAWED)
   private Boolean declawed;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Category.java
index 8f6dbc06f4f..ff45f7a9f74 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Category.java
@@ -30,7 +30,7 @@ import android.os.Parcel;
  * Category
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class Category {
+public class Category implements Parcelable {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
   private Long id;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ClassModel.java
index 40b621a3b1e..3da89295c1d 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -31,7 +31,7 @@ import android.os.Parcel;
  */
 @ApiModel(description = "Model for testing model with \"_class\" property")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class ClassModel {
+public class ClassModel implements Parcelable {
   public static final String SERIALIZED_NAME_PROPERTY_CLASS = "_class";
   @SerializedName(SERIALIZED_NAME_PROPERTY_CLASS)
   private String propertyClass;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Client.java
index fb62051922b..b3dcf5f42fc 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Client.java
@@ -30,7 +30,7 @@ import android.os.Parcel;
  * Client
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class Client {
+public class Client implements Parcelable {
   public static final String SERIALIZED_NAME_CLIENT = "client";
   @SerializedName(SERIALIZED_NAME_CLIENT)
   private String client;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Dog.java
index 3e9bd60bd0c..fee3a8d69ba 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Dog.java
@@ -32,7 +32,7 @@ import android.os.Parcel;
  * Dog
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class Dog extends Animal {
+public class Dog extends Animal implements Parcelable {
   public static final String SERIALIZED_NAME_BREED = "breed";
   @SerializedName(SERIALIZED_NAME_BREED)
   private String breed;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/DogAllOf.java
index 105f23c212c..67827960399 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -30,7 +30,7 @@ import android.os.Parcel;
  * DogAllOf
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class DogAllOf {
+public class DogAllOf implements Parcelable {
   public static final String SERIALIZED_NAME_BREED = "breed";
   @SerializedName(SERIALIZED_NAME_BREED)
   private String breed;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumArrays.java
index 9cd622349b1..868faf2ecd4 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -32,7 +32,7 @@ import android.os.Parcel;
  * EnumArrays
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class EnumArrays {
+public class EnumArrays implements Parcelable {
   /**
    * Gets or Sets justSymbol
    */
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java
index 8d67cd0c12a..6d4158f0d1a 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -31,7 +31,7 @@ import android.os.Parcel;
  * EnumTest
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class EnumTest {
+public class EnumTest implements Parcelable {
   /**
    * Gets or Sets enumString
    */
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 17d2bc90ce2..ec96d3a7a7b 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -32,7 +32,7 @@ import android.os.Parcel;
  * FileSchemaTestClass
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class FileSchemaTestClass {
+public class FileSchemaTestClass implements Parcelable {
   public static final String SERIALIZED_NAME_FILE = "file";
   @SerializedName(SERIALIZED_NAME_FILE)
   private java.io.File file;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FormatTest.java
index 575b8ba5d9b..6386fce4e3a 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -35,7 +35,7 @@ import android.os.Parcel;
  * FormatTest
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class FormatTest {
+public class FormatTest implements Parcelable {
   public static final String SERIALIZED_NAME_INTEGER = "integer";
   @SerializedName(SERIALIZED_NAME_INTEGER)
   private Integer integer;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 2c83f5debb5..dd1898652d6 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -30,7 +30,7 @@ import android.os.Parcel;
  * HasOnlyReadOnly
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class HasOnlyReadOnly {
+public class HasOnlyReadOnly implements Parcelable {
   public static final String SERIALIZED_NAME_BAR = "bar";
   @SerializedName(SERIALIZED_NAME_BAR)
   private String bar;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MapTest.java
index e3b394e269c..bcba119dd25 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MapTest.java
@@ -33,7 +33,7 @@ import android.os.Parcel;
  * MapTest
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class MapTest {
+public class MapTest implements Parcelable {
   public static final String SERIALIZED_NAME_MAP_MAP_OF_STRING = "map_map_of_string";
   @SerializedName(SERIALIZED_NAME_MAP_MAP_OF_STRING)
   private Map<String, Map<String, String>> mapMapOfString = null;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index bf7d7f9c8b6..008238543f8 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -36,7 +36,7 @@ import android.os.Parcel;
  * MixedPropertiesAndAdditionalPropertiesClass
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class MixedPropertiesAndAdditionalPropertiesClass {
+public class MixedPropertiesAndAdditionalPropertiesClass implements Parcelable {
   public static final String SERIALIZED_NAME_UUID = "uuid";
   @SerializedName(SERIALIZED_NAME_UUID)
   private UUID uuid;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Model200Response.java
index feffa9b3f70..9757756ee7d 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -31,7 +31,7 @@ import android.os.Parcel;
  */
 @ApiModel(description = "Model for testing model name starting with number")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class Model200Response {
+public class Model200Response implements Parcelable {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
   private Integer name;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 27c1e73ead0..991a0d9def4 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -30,7 +30,7 @@ import android.os.Parcel;
  * ModelApiResponse
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class ModelApiResponse {
+public class ModelApiResponse implements Parcelable {
   public static final String SERIALIZED_NAME_CODE = "code";
   @SerializedName(SERIALIZED_NAME_CODE)
   private Integer code;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelReturn.java
index e8f006b882b..92ceace88ea 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -31,7 +31,7 @@ import android.os.Parcel;
  */
 @ApiModel(description = "Model for testing reserved words")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class ModelReturn {
+public class ModelReturn implements Parcelable {
   public static final String SERIALIZED_NAME_RETURN = "return";
   @SerializedName(SERIALIZED_NAME_RETURN)
   private Integer _return;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Name.java
index 7c45b68af7c..f9df55d20d6 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Name.java
@@ -31,7 +31,7 @@ import android.os.Parcel;
  */
 @ApiModel(description = "Model for testing model name same as property name")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class Name {
+public class Name implements Parcelable {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)
   private Integer name;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/NumberOnly.java
index 5420a2aabeb..9a19233a42c 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -31,7 +31,7 @@ import android.os.Parcel;
  * NumberOnly
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class NumberOnly {
+public class NumberOnly implements Parcelable {
   public static final String SERIALIZED_NAME_JUST_NUMBER = "JustNumber";
   @SerializedName(SERIALIZED_NAME_JUST_NUMBER)
   private BigDecimal justNumber;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Order.java
index 3a8ab2a1702..667e83cb197 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Order.java
@@ -31,7 +31,7 @@ import android.os.Parcel;
  * Order
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class Order {
+public class Order implements Parcelable {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
   private Long id;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/OuterComposite.java
index 69bf96b3537..190d73706de 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -31,7 +31,7 @@ import android.os.Parcel;
  * OuterComposite
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class OuterComposite {
+public class OuterComposite implements Parcelable {
   public static final String SERIALIZED_NAME_MY_NUMBER = "my_number";
   @SerializedName(SERIALIZED_NAME_MY_NUMBER)
   private BigDecimal myNumber;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Pet.java
index b10d8d054ce..a0cdfdab75e 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Pet.java
@@ -36,7 +36,7 @@ import android.os.Parcel;
  * Pet
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class Pet {
+public class Pet implements Parcelable {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
   private Long id;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 41d96314ef8..fc9f51316ab 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -30,7 +30,7 @@ import android.os.Parcel;
  * ReadOnlyFirst
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class ReadOnlyFirst {
+public class ReadOnlyFirst implements Parcelable {
   public static final String SERIALIZED_NAME_BAR = "bar";
   @SerializedName(SERIALIZED_NAME_BAR)
   private String bar;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/SpecialModelName.java
index a65e7868fa2..e3d068f4c1f 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -30,7 +30,7 @@ import android.os.Parcel;
  * SpecialModelName
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class SpecialModelName {
+public class SpecialModelName implements Parcelable {
   public static final String SERIALIZED_NAME_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
   @SerializedName(SERIALIZED_NAME_$_SPECIAL_PROPERTY_NAME)
   private Long $specialPropertyName;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Tag.java
index 98ae4043029..60fefc6701f 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Tag.java
@@ -30,7 +30,7 @@ import android.os.Parcel;
  * Tag
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class Tag {
+public class Tag implements Parcelable {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
   private Long id;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index c2fa377d0d9..4c29c6ab1ef 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -33,7 +33,7 @@ import android.os.Parcel;
  * TypeHolderDefault
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class TypeHolderDefault {
+public class TypeHolderDefault implements Parcelable {
   public static final String SERIALIZED_NAME_STRING_ITEM = "string_item";
   @SerializedName(SERIALIZED_NAME_STRING_ITEM)
   private String stringItem = "what";
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index bf4a2d5a6cb..d18c289e067 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -33,7 +33,7 @@ import android.os.Parcel;
  * TypeHolderExample
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class TypeHolderExample {
+public class TypeHolderExample implements Parcelable {
   public static final String SERIALIZED_NAME_STRING_ITEM = "string_item";
   @SerializedName(SERIALIZED_NAME_STRING_ITEM)
   private String stringItem;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/User.java
index 6ba6e2adeb1..69ab1d83945 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/User.java
@@ -30,7 +30,7 @@ import android.os.Parcel;
  * User
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class User {
+public class User implements Parcelable {
   public static final String SERIALIZED_NAME_ID = "id";
   @SerializedName(SERIALIZED_NAME_ID)
   private Long id;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/XmlItem.java
index 7bcdd44ecc6..13887553ba2 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -33,7 +33,7 @@ import android.os.Parcel;
  * XmlItem
  */
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class XmlItem {
+public class XmlItem implements Parcelable {
   public static final String SERIALIZED_NAME_ATTRIBUTE_STRING = "attribute_string";
   @SerializedName(SERIALIZED_NAME_ATTRIBUTE_STRING)
   private String attributeString;