Skip to content

Commit 9e5c65f

Browse files
authored
Missing @SerializedName annotation on integer-based enums (pinterest#253)
1 parent fbcd34f commit 9e5c65f

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

Examples/Java/Sources/Everything.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
public class Everything {
3030

3131
public enum EverythingCharEnum {
32-
CHAR_CASE_1(-1);
32+
@SerializedName("-1") CHAR_CASE_1(-1);
3333
private final int value;
3434
EverythingCharEnum(int value) {
3535
this.value = value;
@@ -40,8 +40,8 @@ public int getValue() {
4040
}
4141

4242
public enum EverythingIntEnum {
43-
INT_CASE_1(-1),
44-
INT_CASE_2(65536);
43+
@SerializedName("-1") INT_CASE_1(-1),
44+
@SerializedName("65536") INT_CASE_2(65536);
4545
private final int value;
4646
EverythingIntEnum(int value) {
4747
this.value = value;
@@ -52,8 +52,8 @@ public int getValue() {
5252
}
5353

5454
public enum EverythingNsintegerEnum {
55-
NSINTEGER_CASE_1(-1),
56-
NSINTEGER_CASE_2(4294967295);
55+
@SerializedName("-1") NSINTEGER_CASE_1(-1),
56+
@SerializedName("4294967295") NSINTEGER_CASE_2(4294967295);
5757
private final int value;
5858
EverythingNsintegerEnum(int value) {
5959
this.value = value;
@@ -64,7 +64,7 @@ public int getValue() {
6464
}
6565

6666
public enum EverythingNsuintegerEnum {
67-
NSUINTEGER_CASE_2(4294967296);
67+
@SerializedName("4294967296") NSUINTEGER_CASE_2(4294967296);
6868
private final int value;
6969
EverythingNsuintegerEnum(int value) {
7070
this.value = value;
@@ -75,8 +75,8 @@ public int getValue() {
7575
}
7676

7777
public enum EverythingShortEnum {
78-
SHORT_CASE_1(-1),
79-
SHORT_CASE_2(256);
78+
@SerializedName("-1") SHORT_CASE_1(-1),
79+
@SerializedName("256") SHORT_CASE_2(256);
8080
private final int value;
8181
EverythingShortEnum(int value) {
8282
this.value = value;
@@ -91,7 +91,7 @@ public enum EverythingStringEnum {
9191
}
9292

9393
public enum EverythingUnsignedCharEnum {
94-
UNSIGNED_CHAR_CASE_2(255);
94+
@SerializedName("255") UNSIGNED_CHAR_CASE_2(255);
9595
private final int value;
9696
EverythingUnsignedCharEnum(int value) {
9797
this.value = value;
@@ -102,7 +102,7 @@ public int getValue() {
102102
}
103103

104104
public enum EverythingUnsignedIntEnum {
105-
UNSIGNED_INT_CASE_2(65536);
105+
@SerializedName("65536") UNSIGNED_INT_CASE_2(65536);
106106
private final int value;
107107
EverythingUnsignedIntEnum(int value) {
108108
this.value = value;
@@ -113,7 +113,7 @@ public int getValue() {
113113
}
114114

115115
public enum EverythingUnsignedShortEnum {
116-
CHAR_CASE_2(256);
116+
@SerializedName("256") CHAR_CASE_2(256);
117117
private final int value;
118118
EverythingUnsignedShortEnum(int value) {
119119
this.value = value;

Examples/Java/Sources/Pin.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
public class Pin {
2929

3030
public enum PinInStock {
31-
UNKNOWN(-1),
32-
OUT_OF_STOCK(0),
33-
IN_STOCK(1);
31+
@SerializedName("-1") UNKNOWN(-1),
32+
@SerializedName("0") OUT_OF_STOCK(0),
33+
@SerializedName("1") IN_STOCK(1);
3434
private final int value;
3535
PinInStock(int value) {
3636
this.value = value;

Sources/Core/JavaIR.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ public struct JavaIR {
379379
case let .integer(values):
380380
let names = values
381381
.map { ($0.description, $0.defaultValue) }
382-
.map { "\($0.0.uppercased())(\($0.1))" }.joined(separator: ", \n")
382+
.map { "@\(JavaAnnotation.serializedName(name: "\($0.1)").rendered) \($0.0.uppercased())(\($0.1))" }.joined(separator: ", \n")
383383
let enumInitializer = JavaIR.method([], "\(name)(int value)") { [
384384
"this.value = value;",
385385
] }

0 commit comments

Comments
 (0)