Skip to content

Commit 7fd842f

Browse files
committed
jaxrs-cxf-petstore-server-non-spring-application sample updated
1 parent 6dc9f91 commit 7fd842f

File tree

7 files changed

+51
-45
lines changed

7 files changed

+51
-45
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.1-SNAPSHOT
1+
3.0.6-SNAPSHOT

samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/model/Category.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
import javax.xml.bind.annotation.XmlEnum;
1313
import javax.xml.bind.annotation.XmlEnumValue;
1414
import com.fasterxml.jackson.annotation.JsonProperty;
15+
import com.fasterxml.jackson.annotation.JsonValue;
16+
import com.fasterxml.jackson.annotation.JsonCreator;
1517

1618
/**
1719
* A category for a pet

samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/model/ModelApiResponse.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
import javax.xml.bind.annotation.XmlEnum;
1313
import javax.xml.bind.annotation.XmlEnumValue;
1414
import com.fasterxml.jackson.annotation.JsonProperty;
15+
import com.fasterxml.jackson.annotation.JsonValue;
16+
import com.fasterxml.jackson.annotation.JsonCreator;
1517

1618
/**
1719
* Describes the result of uploading an image resource

samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/model/Order.java

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
import javax.xml.bind.annotation.XmlEnum;
1414
import javax.xml.bind.annotation.XmlEnumValue;
1515
import com.fasterxml.jackson.annotation.JsonProperty;
16+
import com.fasterxml.jackson.annotation.JsonValue;
17+
import com.fasterxml.jackson.annotation.JsonCreator;
1618

1719
/**
1820
* An order for a pets from the pet store
@@ -31,38 +33,35 @@ public class Order {
3133

3234
@Schema(description = "")
3335
private Date shipDate = null;
34-
@XmlType(name="StatusEnum")
35-
@XmlEnum(String.class)
36-
public enum StatusEnum {
37-
38-
@XmlEnumValue("placed") PLACED(String.valueOf("placed")), @XmlEnumValue("approved") APPROVED(String.valueOf("approved")), @XmlEnumValue("delivered") DELIVERED(String.valueOf("delivered"));
39-
36+
public enum StatusEnum {
37+
PLACED("placed"),
38+
APPROVED("approved"),
39+
DELIVERED("delivered");
4040

4141
private String value;
4242

43-
StatusEnum (String v) {
44-
value = v;
43+
StatusEnum(String value) {
44+
this.value = value;
4545
}
46-
47-
public String value() {
48-
return value;
46+
@JsonValue
47+
public String getValue() {
48+
return value;
4949
}
5050

5151
@Override
5252
public String toString() {
53-
return String.valueOf(value);
53+
return String.valueOf(value);
5454
}
55-
56-
public static StatusEnum fromValue(String v) {
57-
for (StatusEnum b : StatusEnum.values()) {
58-
if (String.valueOf(b.value).equals(v)) {
59-
return b;
60-
}
55+
@JsonCreator
56+
public static StatusEnum fromValue(String text) {
57+
for (StatusEnum b : StatusEnum.values()) {
58+
if (String.valueOf(b.value).equals(text)) {
59+
return b;
6160
}
62-
return null;
61+
}
62+
return null;
6363
}
64-
}
65-
64+
}
6665
@Schema(description = "Order Status")
6766
/**
6867
* Order Status
@@ -152,7 +151,7 @@ public String getStatus() {
152151
if (status == null) {
153152
return null;
154153
}
155-
return status.value();
154+
return status.getValue();
156155
}
157156

158157
public void setStatus(StatusEnum status) {

samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/model/Pet.java

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
import javax.xml.bind.annotation.XmlEnum;
1717
import javax.xml.bind.annotation.XmlEnumValue;
1818
import com.fasterxml.jackson.annotation.JsonProperty;
19+
import com.fasterxml.jackson.annotation.JsonValue;
20+
import com.fasterxml.jackson.annotation.JsonCreator;
1921

2022
/**
2123
* A pet for sale in the pet store
@@ -37,38 +39,35 @@ public class Pet {
3739

3840
@Schema(description = "")
3941
private List<Tag> tags = null;
40-
@XmlType(name="StatusEnum")
41-
@XmlEnum(String.class)
42-
public enum StatusEnum {
43-
44-
@XmlEnumValue("available") AVAILABLE(String.valueOf("available")), @XmlEnumValue("pending") PENDING(String.valueOf("pending")), @XmlEnumValue("sold") SOLD(String.valueOf("sold"));
45-
42+
public enum StatusEnum {
43+
AVAILABLE("available"),
44+
PENDING("pending"),
45+
SOLD("sold");
4646

4747
private String value;
4848

49-
StatusEnum (String v) {
50-
value = v;
49+
StatusEnum(String value) {
50+
this.value = value;
5151
}
52-
53-
public String value() {
54-
return value;
52+
@JsonValue
53+
public String getValue() {
54+
return value;
5555
}
5656

5757
@Override
5858
public String toString() {
59-
return String.valueOf(value);
59+
return String.valueOf(value);
6060
}
61-
62-
public static StatusEnum fromValue(String v) {
63-
for (StatusEnum b : StatusEnum.values()) {
64-
if (String.valueOf(b.value).equals(v)) {
65-
return b;
66-
}
61+
@JsonCreator
62+
public static StatusEnum fromValue(String text) {
63+
for (StatusEnum b : StatusEnum.values()) {
64+
if (String.valueOf(b.value).equals(text)) {
65+
return b;
6766
}
68-
return null;
67+
}
68+
return null;
6969
}
70-
}
71-
70+
}
7271
@Schema(description = "pet status in the store")
7372
/**
7473
* pet status in the store
@@ -185,7 +184,7 @@ public String getStatus() {
185184
if (status == null) {
186185
return null;
187186
}
188-
return status.value();
187+
return status.getValue();
189188
}
190189

191190
public void setStatus(StatusEnum status) {

samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/model/Tag.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
import javax.xml.bind.annotation.XmlEnum;
1313
import javax.xml.bind.annotation.XmlEnumValue;
1414
import com.fasterxml.jackson.annotation.JsonProperty;
15+
import com.fasterxml.jackson.annotation.JsonValue;
16+
import com.fasterxml.jackson.annotation.JsonCreator;
1517

1618
/**
1719
* A tag for a pet

samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/model/User.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
import javax.xml.bind.annotation.XmlEnum;
1313
import javax.xml.bind.annotation.XmlEnumValue;
1414
import com.fasterxml.jackson.annotation.JsonProperty;
15+
import com.fasterxml.jackson.annotation.JsonValue;
16+
import com.fasterxml.jackson.annotation.JsonCreator;
1517

1618
/**
1719
* A User who is purchasing from the pet store

0 commit comments

Comments
 (0)