Skip to content

Commit b4d280f

Browse files
committed
updated cxf-client sample
1 parent e0115f6 commit b4d280f

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.0-SNAPSHOT
1+
3.0.1-SNAPSHOT

samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Category.java

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

1517
/**
1618
* A category for a pet

samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/ModelApiResponse.java

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

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

samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Order.java

Lines changed: 21 additions & 22 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
* An order for a pets from the pet store
@@ -30,38 +32,35 @@ public class Order {
3032

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

4040
private String value;
4141

42-
StatusEnum (String v) {
43-
value = v;
42+
StatusEnum(String value) {
43+
this.value = value;
4444
}
45-
46-
public String value() {
47-
return value;
45+
@JsonValue
46+
public String getValue() {
47+
return value;
4848
}
4949

5050
@Override
5151
public String toString() {
52-
return String.valueOf(value);
52+
return String.valueOf(value);
5353
}
54-
55-
public static StatusEnum fromValue(String v) {
56-
for (StatusEnum b : StatusEnum.values()) {
57-
if (String.valueOf(b.value).equals(v)) {
58-
return b;
59-
}
54+
@JsonCreator
55+
public static StatusEnum fromValue(String text) {
56+
for (StatusEnum b : StatusEnum.values()) {
57+
if (String.valueOf(b.value).equals(text)) {
58+
return b;
6059
}
61-
return null;
60+
}
61+
return null;
6262
}
63-
}
64-
63+
}
6564
@Schema(description = "Order Status")
6665
/**
6766
* Order Status
@@ -151,7 +150,7 @@ public String getStatus() {
151150
if (status == null) {
152151
return null;
153152
}
154-
return status.value();
153+
return status.getValue();
155154
}
156155

157156
public void setStatus(StatusEnum status) {

samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Pet.java

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

1921
/**
2022
* A pet for sale in the pet store
@@ -36,38 +38,35 @@ public class Pet {
3638

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

4646
private String value;
4747

48-
StatusEnum (String v) {
49-
value = v;
48+
StatusEnum(String value) {
49+
this.value = value;
5050
}
51-
52-
public String value() {
53-
return value;
51+
@JsonValue
52+
public String getValue() {
53+
return value;
5454
}
5555

5656
@Override
5757
public String toString() {
58-
return String.valueOf(value);
58+
return String.valueOf(value);
5959
}
60-
61-
public static StatusEnum fromValue(String v) {
62-
for (StatusEnum b : StatusEnum.values()) {
63-
if (String.valueOf(b.value).equals(v)) {
64-
return b;
65-
}
60+
@JsonCreator
61+
public static StatusEnum fromValue(String text) {
62+
for (StatusEnum b : StatusEnum.values()) {
63+
if (String.valueOf(b.value).equals(text)) {
64+
return b;
6665
}
67-
return null;
66+
}
67+
return null;
6868
}
69-
}
70-
69+
}
7170
@Schema(description = "pet status in the store")
7271
/**
7372
* pet status in the store
@@ -182,7 +181,7 @@ public String getStatus() {
182181
if (status == null) {
183182
return null;
184183
}
185-
return status.value();
184+
return status.getValue();
186185
}
187186

188187
public void setStatus(StatusEnum status) {

samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Tag.java

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

1517
/**
1618
* A tag for a pet

samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/User.java

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

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

0 commit comments

Comments
 (0)