Skip to content

Commit 0068932

Browse files
authored
fix Parcelable option (#8513)
1 parent 030b75b commit 0068932

89 files changed

Lines changed: 243 additions & 67 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -855,35 +855,35 @@ public Map<String, Object> postProcessModels(Map<String, Object> objs) {
855855
}
856856
}
857857
}
858+
}
858859

859-
// add implements for serializable/parcelable to all models
860-
for (Object _mo : models) {
861-
Map<String, Object> mo = (Map<String, Object>) _mo;
862-
CodegenModel cm = (CodegenModel) mo.get("model");
863-
864-
cm.getVendorExtensions().putIfAbsent("x-implements", new ArrayList<String>());
865-
if (JERSEY2.equals(getLibrary()) || NATIVE.equals(getLibrary())) {
866-
cm.getVendorExtensions().put("x-implements", new ArrayList<String>());
860+
// add implements for serializable/parcelable to all models
861+
for (Object _mo : models) {
862+
Map<String, Object> mo = (Map<String, Object>) _mo;
863+
CodegenModel cm = (CodegenModel) mo.get("model");
867864

868-
if (cm.oneOf != null && !cm.oneOf.isEmpty() && cm.oneOf.contains("ModelNull")) {
869-
// if oneOf contains "null" type
870-
cm.isNullable = true;
871-
cm.oneOf.remove("ModelNull");
872-
}
865+
cm.getVendorExtensions().putIfAbsent("x-implements", new ArrayList<String>());
866+
if (JERSEY2.equals(getLibrary()) || NATIVE.equals(getLibrary())) {
867+
cm.getVendorExtensions().put("x-implements", new ArrayList<String>());
873868

874-
if (cm.anyOf != null && !cm.anyOf.isEmpty() && cm.anyOf.contains("ModelNull")) {
875-
// if anyOf contains "null" type
876-
cm.isNullable = true;
877-
cm.anyOf.remove("ModelNull");
878-
}
879-
}
880-
if (this.parcelableModel) {
881-
((ArrayList<String>) cm.getVendorExtensions().get("x-implements")).add("Parcelable");
869+
if (cm.oneOf != null && !cm.oneOf.isEmpty() && cm.oneOf.contains("ModelNull")) {
870+
// if oneOf contains "null" type
871+
cm.isNullable = true;
872+
cm.oneOf.remove("ModelNull");
882873
}
883-
if (this.serializableModel) {
884-
((ArrayList<String>) cm.getVendorExtensions().get("x-implements")).add("Serializable");
874+
875+
if (cm.anyOf != null && !cm.anyOf.isEmpty() && cm.anyOf.contains("ModelNull")) {
876+
// if anyOf contains "null" type
877+
cm.isNullable = true;
878+
cm.anyOf.remove("ModelNull");
885879
}
886880
}
881+
if (this.parcelableModel) {
882+
((ArrayList<String>) cm.getVendorExtensions().get("x-implements")).add("Parcelable");
883+
}
884+
if (this.serializableModel) {
885+
((ArrayList<String>) cm.getVendorExtensions().get("x-implements")).add("Serializable");
886+
}
887887
}
888888

889889
return objs;

samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesAnyType.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,8 @@ Name | Type | Description | Notes
99
**name** | **String** | | [optional]
1010

1111

12+
## Implemented Interfaces
13+
14+
* Parcelable
15+
1216

samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesArray.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,8 @@ Name | Type | Description | Notes
99
**name** | **String** | | [optional]
1010

1111

12+
## Implemented Interfaces
13+
14+
* Parcelable
15+
1216

samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesBoolean.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,8 @@ Name | Type | Description | Notes
99
**name** | **String** | | [optional]
1010

1111

12+
## Implemented Interfaces
13+
14+
* Parcelable
15+
1216

samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesClass.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,8 @@ Name | Type | Description | Notes
1919
**anytype3** | **Object** | | [optional]
2020

2121

22+
## Implemented Interfaces
23+
24+
* Parcelable
25+
2226

samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesInteger.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,8 @@ Name | Type | Description | Notes
99
**name** | **String** | | [optional]
1010

1111

12+
## Implemented Interfaces
13+
14+
* Parcelable
15+
1216

samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesNumber.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,8 @@ Name | Type | Description | Notes
99
**name** | **String** | | [optional]
1010

1111

12+
## Implemented Interfaces
13+
14+
* Parcelable
15+
1216

samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesObject.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,8 @@ Name | Type | Description | Notes
99
**name** | **String** | | [optional]
1010

1111

12+
## Implemented Interfaces
13+
14+
* Parcelable
15+
1216

samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesString.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,8 @@ Name | Type | Description | Notes
99
**name** | **String** | | [optional]
1010

1111

12+
## Implemented Interfaces
13+
14+
* Parcelable
15+
1216

samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Animal.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,8 @@ Name | Type | Description | Notes
1010
**color** | **String** | | [optional]
1111

1212

13+
## Implemented Interfaces
14+
15+
* Parcelable
16+
1317

0 commit comments

Comments
 (0)