Skip to content

Commit c087a73

Browse files
jarryDkjarryDk
committed
[Java] Fix content for enum with restclient (#19973)
1 parent da21a99 commit c087a73

File tree

16 files changed

+120
-78
lines changed
  • samples/client
    • echo_api/java
      • okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client
      • okhttp-gson/src/main/java/org/openapitools/client
    • others/java
      • okhttp-gson-oneOf-array/src/main/java/org/openapitools/client
      • okhttp-gson-oneOf/src/main/java/org/openapitools/client
      • okhttp-gson-streaming/src/main/java/org/openapitools/client
      • restclient-enum-in-multipart/.openapi-generator
    • petstore/java
      • okhttp-gson-3.1-duplicated-operationid/src/main/java/org/openapitools/client
      • okhttp-gson-3.1/src/main/java/org/openapitools/client
      • okhttp-gson-awsv4signature/src/main/java/org/openapitools/client
      • okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client
      • okhttp-gson-group-parameter/src/main/java/org/openapitools/client
      • okhttp-gson-nullable-required/src/main/java/org/openapitools/client
      • okhttp-gson-parcelableModel/src/main/java/org/openapitools/client
      • okhttp-gson-swagger1/src/main/java/org/openapitools/client
      • okhttp-gson-swagger2/src/main/java/org/openapitools/client
      • okhttp-gson/src/main/java/org/openapitools/client

16 files changed

+120
-78
lines changed

‎samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/ApiClient.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1547,13 +1547,16 @@ protected void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String
15471547
RequestBody requestBody;
15481548
if (obj instanceof String) {
15491549
requestBody = RequestBody.create((String) obj, MediaType.parse("text/plain"));
1550-
} else if (obj == null){
1551-
requestBody = RequestBody.create(obj, MediaType.parse("application/json"));
1552-
} else if (obj.getClass().getEnumConstants() != null) {
1553-
requestBody = RequestBody.create(obj.toString(), MediaType.parse("text/plain"));
15541550
} else {
1555-
requestBody = RequestBody.create(JSON.serialize(obj), MediaType.parse("application/json"));
1551+
String content;
1552+
if (obj != null) {
1553+
content = JSON.serialize(obj);
1554+
} else {
1555+
content = null;
1556+
}
1557+
requestBody = RequestBody.create(content, MediaType.parse("application/json"));
15561558
}
1559+
15571560
Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + key + "\"");
15581561
mpBuilder.addPart(partHeaders, requestBody);
15591562
}

‎samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/ApiClient.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1477,13 +1477,16 @@ protected void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String
14771477
RequestBody requestBody;
14781478
if (obj instanceof String) {
14791479
requestBody = RequestBody.create((String) obj, MediaType.parse("text/plain"));
1480-
} else if (obj == null){
1481-
requestBody = RequestBody.create(obj, MediaType.parse("application/json"));
1482-
} else if (obj.getClass().getEnumConstants() != null) {
1483-
requestBody = RequestBody.create(obj.toString(), MediaType.parse("text/plain"));
14841480
} else {
1485-
requestBody = RequestBody.create(JSON.serialize(obj), MediaType.parse("application/json"));
1481+
String content;
1482+
if (obj != null) {
1483+
content = JSON.serialize(obj);
1484+
} else {
1485+
content = null;
1486+
}
1487+
requestBody = RequestBody.create(content, MediaType.parse("application/json"));
14861488
}
1489+
14871490
Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + key + "\"");
14881491
mpBuilder.addPart(partHeaders, requestBody);
14891492
}

‎samples/client/others/java/okhttp-gson-oneOf-array/src/main/java/org/openapitools/client/ApiClient.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1451,13 +1451,16 @@ protected void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String
14511451
RequestBody requestBody;
14521452
if (obj instanceof String) {
14531453
requestBody = RequestBody.create((String) obj, MediaType.parse("text/plain"));
1454-
} else if (obj == null){
1455-
requestBody = RequestBody.create(obj, MediaType.parse("application/json"));
1456-
} else if (obj.getClass().getEnumConstants() != null) {
1457-
requestBody = RequestBody.create(obj.toString(), MediaType.parse("text/plain"));
14581454
} else {
1459-
requestBody = RequestBody.create(JSON.serialize(obj), MediaType.parse("application/json"));
1455+
String content;
1456+
if (obj != null) {
1457+
content = JSON.serialize(obj);
1458+
} else {
1459+
content = null;
1460+
}
1461+
requestBody = RequestBody.create(content, MediaType.parse("application/json"));
14601462
}
1463+
14611464
Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + key + "\"");
14621465
mpBuilder.addPart(partHeaders, requestBody);
14631466
}

‎samples/client/others/java/okhttp-gson-oneOf/src/main/java/org/openapitools/client/ApiClient.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1451,13 +1451,16 @@ protected void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String
14511451
RequestBody requestBody;
14521452
if (obj instanceof String) {
14531453
requestBody = RequestBody.create((String) obj, MediaType.parse("text/plain"));
1454-
} else if (obj == null){
1455-
requestBody = RequestBody.create(obj, MediaType.parse("application/json"));
1456-
} else if (obj.getClass().getEnumConstants() != null) {
1457-
requestBody = RequestBody.create(obj.toString(), MediaType.parse("text/plain"));
14581454
} else {
1459-
requestBody = RequestBody.create(JSON.serialize(obj), MediaType.parse("application/json"));
1455+
String content;
1456+
if (obj != null) {
1457+
content = JSON.serialize(obj);
1458+
} else {
1459+
content = null;
1460+
}
1461+
requestBody = RequestBody.create(content, MediaType.parse("application/json"));
14601462
}
1463+
14611464
Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + key + "\"");
14621465
mpBuilder.addPart(partHeaders, requestBody);
14631466
}

‎samples/client/others/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/ApiClient.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1474,13 +1474,16 @@ protected void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String
14741474
RequestBody requestBody;
14751475
if (obj instanceof String) {
14761476
requestBody = RequestBody.create((String) obj, MediaType.parse("text/plain"));
1477-
} else if (obj == null){
1478-
requestBody = RequestBody.create(obj, MediaType.parse("application/json"));
1479-
} else if (obj.getClass().getEnumConstants() != null) {
1480-
requestBody = RequestBody.create(obj.toString(), MediaType.parse("text/plain"));
14811477
} else {
1482-
requestBody = RequestBody.create(JSON.serialize(obj), MediaType.parse("application/json"));
1478+
String content;
1479+
if (obj != null) {
1480+
content = JSON.serialize(obj);
1481+
} else {
1482+
content = null;
1483+
}
1484+
requestBody = RequestBody.create(content, MediaType.parse("application/json"));
14831485
}
1486+
14841487
Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + key + "\"");
14851488
mpBuilder.addPart(partHeaders, requestBody);
14861489
}

‎samples/client/others/java/restclient-enum-in-multipart/.openapi-generator/FILES

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,3 @@ src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
3434
src/main/java/org/openapitools/client/model/DataChannel.java
3535
src/main/java/org/openapitools/client/model/DataDirection.java
3636
src/main/java/org/openapitools/client/model/InlineObject.java
37-
src/test/java/org/openapitools/client/model/DataChannelTest.java
38-
src/test/java/org/openapitools/client/model/DataDirectionTest.java
39-
src/test/java/org/openapitools/client/model/InlineObjectTest.java

‎samples/client/petstore/java/okhttp-gson-3.1-duplicated-operationid/src/main/java/org/openapitools/client/ApiClient.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1547,13 +1547,16 @@ protected void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String
15471547
RequestBody requestBody;
15481548
if (obj instanceof String) {
15491549
requestBody = RequestBody.create((String) obj, MediaType.parse("text/plain"));
1550-
} else if (obj == null){
1551-
requestBody = RequestBody.create(obj, MediaType.parse("application/json"));
1552-
} else if (obj.getClass().getEnumConstants() != null) {
1553-
requestBody = RequestBody.create(obj.toString(), MediaType.parse("text/plain"));
15541550
} else {
1555-
requestBody = RequestBody.create(JSON.serialize(obj), MediaType.parse("application/json"));
1551+
String content;
1552+
if (obj != null) {
1553+
content = JSON.serialize(obj);
1554+
} else {
1555+
content = null;
1556+
}
1557+
requestBody = RequestBody.create(content, MediaType.parse("application/json"));
15561558
}
1559+
15571560
Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + key + "\"");
15581561
mpBuilder.addPart(partHeaders, requestBody);
15591562
}

‎samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/ApiClient.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1547,13 +1547,16 @@ protected void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String
15471547
RequestBody requestBody;
15481548
if (obj instanceof String) {
15491549
requestBody = RequestBody.create((String) obj, MediaType.parse("text/plain"));
1550-
} else if (obj == null){
1551-
requestBody = RequestBody.create(obj, MediaType.parse("application/json"));
1552-
} else if (obj.getClass().getEnumConstants() != null) {
1553-
requestBody = RequestBody.create(obj.toString(), MediaType.parse("text/plain"));
15541550
} else {
1555-
requestBody = RequestBody.create(JSON.serialize(obj), MediaType.parse("application/json"));
1551+
String content;
1552+
if (obj != null) {
1553+
content = JSON.serialize(obj);
1554+
} else {
1555+
content = null;
1556+
}
1557+
requestBody = RequestBody.create(content, MediaType.parse("application/json"));
15561558
}
1559+
15571560
Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + key + "\"");
15581561
mpBuilder.addPart(partHeaders, requestBody);
15591562
}

‎samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/ApiClient.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1567,13 +1567,16 @@ protected void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String
15671567
RequestBody requestBody;
15681568
if (obj instanceof String) {
15691569
requestBody = RequestBody.create((String) obj, MediaType.parse("text/plain"));
1570-
} else if (obj == null){
1571-
requestBody = RequestBody.create(obj, MediaType.parse("application/json"));
1572-
} else if (obj.getClass().getEnumConstants() != null) {
1573-
requestBody = RequestBody.create(obj.toString(), MediaType.parse("text/plain"));
15741570
} else {
1575-
requestBody = RequestBody.create(JSON.serialize(obj), MediaType.parse("application/json"));
1571+
String content;
1572+
if (obj != null) {
1573+
content = JSON.serialize(obj);
1574+
} else {
1575+
content = null;
1576+
}
1577+
requestBody = RequestBody.create(content, MediaType.parse("application/json"));
15761578
}
1579+
15771580
Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + key + "\"");
15781581
mpBuilder.addPart(partHeaders, requestBody);
15791582
}

‎samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/ApiClient.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1552,13 +1552,16 @@ protected void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String
15521552
RequestBody requestBody;
15531553
if (obj instanceof String) {
15541554
requestBody = RequestBody.create((String) obj, MediaType.parse("text/plain"));
1555-
} else if (obj == null){
1556-
requestBody = RequestBody.create(obj, MediaType.parse("application/json"));
1557-
} else if (obj.getClass().getEnumConstants() != null) {
1558-
requestBody = RequestBody.create(obj.toString(), MediaType.parse("text/plain"));
15591555
} else {
1560-
requestBody = RequestBody.create(JSON.serialize(obj), MediaType.parse("application/json"));
1556+
String content;
1557+
if (obj != null) {
1558+
content = JSON.serialize(obj);
1559+
} else {
1560+
content = null;
1561+
}
1562+
requestBody = RequestBody.create(content, MediaType.parse("application/json"));
15611563
}
1564+
15621565
Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + key + "\"");
15631566
mpBuilder.addPart(partHeaders, requestBody);
15641567
}

‎samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/ApiClient.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1547,13 +1547,16 @@ protected void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String
15471547
RequestBody requestBody;
15481548
if (obj instanceof String) {
15491549
requestBody = RequestBody.create((String) obj, MediaType.parse("text/plain"));
1550-
} else if (obj == null){
1551-
requestBody = RequestBody.create(obj, MediaType.parse("application/json"));
1552-
} else if (obj.getClass().getEnumConstants() != null) {
1553-
requestBody = RequestBody.create(obj.toString(), MediaType.parse("text/plain"));
15541550
} else {
1555-
requestBody = RequestBody.create(JSON.serialize(obj), MediaType.parse("application/json"));
1551+
String content;
1552+
if (obj != null) {
1553+
content = JSON.serialize(obj);
1554+
} else {
1555+
content = null;
1556+
}
1557+
requestBody = RequestBody.create(content, MediaType.parse("application/json"));
15561558
}
1559+
15571560
Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + key + "\"");
15581561
mpBuilder.addPart(partHeaders, requestBody);
15591562
}

‎samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/ApiClient.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1550,13 +1550,16 @@ protected void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String
15501550
RequestBody requestBody;
15511551
if (obj instanceof String) {
15521552
requestBody = RequestBody.create((String) obj, MediaType.parse("text/plain"));
1553-
} else if (obj == null){
1554-
requestBody = RequestBody.create(obj, MediaType.parse("application/json"));
1555-
} else if (obj.getClass().getEnumConstants() != null) {
1556-
requestBody = RequestBody.create(obj.toString(), MediaType.parse("text/plain"));
15571553
} else {
1558-
requestBody = RequestBody.create(JSON.serialize(obj), MediaType.parse("application/json"));
1554+
String content;
1555+
if (obj != null) {
1556+
content = JSON.serialize(obj);
1557+
} else {
1558+
content = null;
1559+
}
1560+
requestBody = RequestBody.create(content, MediaType.parse("application/json"));
15591561
}
1562+
15601563
Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + key + "\"");
15611564
mpBuilder.addPart(partHeaders, requestBody);
15621565
}

‎samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/ApiClient.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1553,13 +1553,16 @@ protected void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String
15531553
RequestBody requestBody;
15541554
if (obj instanceof String) {
15551555
requestBody = RequestBody.create((String) obj, MediaType.parse("text/plain"));
1556-
} else if (obj == null){
1557-
requestBody = RequestBody.create(obj, MediaType.parse("application/json"));
1558-
} else if (obj.getClass().getEnumConstants() != null) {
1559-
requestBody = RequestBody.create(obj.toString(), MediaType.parse("text/plain"));
15601556
} else {
1561-
requestBody = RequestBody.create(JSON.serialize(obj), MediaType.parse("application/json"));
1557+
String content;
1558+
if (obj != null) {
1559+
content = JSON.serialize(obj);
1560+
} else {
1561+
content = null;
1562+
}
1563+
requestBody = RequestBody.create(content, MediaType.parse("application/json"));
15621564
}
1565+
15631566
Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + key + "\"");
15641567
mpBuilder.addPart(partHeaders, requestBody);
15651568
}

‎samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/ApiClient.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1547,13 +1547,16 @@ protected void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String
15471547
RequestBody requestBody;
15481548
if (obj instanceof String) {
15491549
requestBody = RequestBody.create((String) obj, MediaType.parse("text/plain"));
1550-
} else if (obj == null){
1551-
requestBody = RequestBody.create(obj, MediaType.parse("application/json"));
1552-
} else if (obj.getClass().getEnumConstants() != null) {
1553-
requestBody = RequestBody.create(obj.toString(), MediaType.parse("text/plain"));
15541550
} else {
1555-
requestBody = RequestBody.create(JSON.serialize(obj), MediaType.parse("application/json"));
1551+
String content;
1552+
if (obj != null) {
1553+
content = JSON.serialize(obj);
1554+
} else {
1555+
content = null;
1556+
}
1557+
requestBody = RequestBody.create(content, MediaType.parse("application/json"));
15561558
}
1559+
15571560
Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + key + "\"");
15581561
mpBuilder.addPart(partHeaders, requestBody);
15591562
}

‎samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/ApiClient.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1547,13 +1547,16 @@ protected void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String
15471547
RequestBody requestBody;
15481548
if (obj instanceof String) {
15491549
requestBody = RequestBody.create((String) obj, MediaType.parse("text/plain"));
1550-
} else if (obj == null){
1551-
requestBody = RequestBody.create(obj, MediaType.parse("application/json"));
1552-
} else if (obj.getClass().getEnumConstants() != null) {
1553-
requestBody = RequestBody.create(obj.toString(), MediaType.parse("text/plain"));
15541550
} else {
1555-
requestBody = RequestBody.create(JSON.serialize(obj), MediaType.parse("application/json"));
1551+
String content;
1552+
if (obj != null) {
1553+
content = JSON.serialize(obj);
1554+
} else {
1555+
content = null;
1556+
}
1557+
requestBody = RequestBody.create(content, MediaType.parse("application/json"));
15561558
}
1559+
15571560
Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + key + "\"");
15581561
mpBuilder.addPart(partHeaders, requestBody);
15591562
}

‎samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/ApiClient.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1621,13 +1621,16 @@ protected void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String
16211621
RequestBody requestBody;
16221622
if (obj instanceof String) {
16231623
requestBody = RequestBody.create((String) obj, MediaType.parse("text/plain"));
1624-
} else if (obj == null){
1625-
requestBody = RequestBody.create(obj, MediaType.parse("application/json"));
1626-
} else if (obj.getClass().getEnumConstants() != null) {
1627-
requestBody = RequestBody.create(obj.toString(), MediaType.parse("text/plain"));
16281624
} else {
1629-
requestBody = RequestBody.create(JSON.serialize(obj), MediaType.parse("application/json"));
1625+
String content;
1626+
if (obj != null) {
1627+
content = JSON.serialize(obj);
1628+
} else {
1629+
content = null;
1630+
}
1631+
requestBody = RequestBody.create(content, MediaType.parse("application/json"));
16301632
}
1633+
16311634
Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + key + "\"");
16321635
mpBuilder.addPart(partHeaders, requestBody);
16331636
}

0 commit comments

Comments
 (0)