loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-12-06 07:16:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Java][Microprofile] JSON enum processing fix (#6700)

Browse Source 
* When withXml=false we shouldn't add the jaxb imports

When users are just dealing with json and set withXml=false jaxb (Java Api XML binding) imports are not needed.

* Updated the microprodile-rest-client samples

* Removed cxf-rt-rs-extension-providers dependency

* Fix processing of enum values

* Remove unwanted changes

* Remove spaces
This commit is contained in:
Ravisankar-Challa
2020-06-21 21:02:44 +10:00
committed by GitHub
parent efafc58170
commit 4bb5afdefb
6 changed files with 24 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/client/petstore/java/microprofile-rest-client/pom.xml
View File

@@ -77,13 +77,11 @@
<version>1.3.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
<version>3.2.6</version>
</dependency>
<dependency>
<groupId>javax.json.bind</groupId>
<artifactId>javax.json.bind-api</artifactId>

17
samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Order.java
View File

@@ -50,11 +50,11 @@ public class Order {
private Date shipDate;
@JsonbTypeSerializer(StatusEnum.Serializer.class)
@JsonbTypeDeserializer(StatusEnum.Deserializer.class)
public enum StatusEnum {
@JsonbTypeSerializer(StatusEnum.Serializer.class)
@JsonbTypeDeserializer(StatusEnum.Deserializer.class)
public enum StatusEnum {
PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));
PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));
String value;
@@ -90,7 +90,7 @@ PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERE
generator.write(obj.value);
}
}
}
}
/**
* Order Status
@@ -188,11 +188,8 @@ PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERE
* @return status
**/
@JsonbProperty("status")
public String getStatus() {
if (status == null) {
return null;
}
return status.value();
public StatusEnum getStatus() {
return status;
}
/**

17
samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Pet.java
View File

@@ -55,11 +55,11 @@ public class Pet {
private List<Tag> tags = null;
@JsonbTypeSerializer(StatusEnum.Serializer.class)
@JsonbTypeDeserializer(StatusEnum.Deserializer.class)
public enum StatusEnum {
@JsonbTypeSerializer(StatusEnum.Serializer.class)
@JsonbTypeDeserializer(StatusEnum.Deserializer.class)
public enum StatusEnum {
AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));
AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));
String value;
@@ -95,7 +95,7 @@ AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD
generator.write(obj.value);
}
}
}
}
/**
* pet status in the store
@@ -222,11 +222,8 @@ AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD
* @return status
**/
@JsonbProperty("status")
public String getStatus() {
if (status == null) {
return null;
}
return status.value();
public StatusEnum getStatus() {
return status;
}
/**