Skip to content

Commit bb811db

Browse files
eric-rollieric-rolli
authored
[JavaJaxRs] generate getValue() for enums with the correct type (#21183)
* [JavaJaxRs] enumClass.mustache added getValue() JavaJaxRs enums are missing getValue() method returning the correct data type. * Update InlineObject2.java added getValue() for enums * Update Pet.java added getValue() to enum * Update BigCat.java added getValue for enum * Update EnumArrays.java added getValue() to enum * Update EnumArrays.java added getValue() to enum * Update EnumTest.java added getValue() to enums * Update MapTest.java added getValue() to enum * Update Order.java added getValue() to enum * Update Pet.java added getValue() to enum * Update EnumArrays.java added getValue() to enums * Update EnumTest.java added getValue() to enums * Update MapTest.java added getValue() to enum * Update Order.java added getValue() to enum * Update ParentWithNullable.java added getValue() to enum * Update BigCat.java added getValue() to enum * Update EnumArrays.java added getValue() to enums * Update EnumTest.java added getValue() to enums * Update MapTest.java added getValue() to enum * Update Order.java added getValue() to enum * Update Pet.java added getValue() to enum * Update BigCat.java added getValue() to enum * Update EnumArrays.java added getValue() to enums * Update EnumTest.java added getValue() to enums * Update MapTest.java added getValue() to enum * Update Order.java added getValue() to enum * Update Pet.java added getValue to enum * Update EnumArrays.java added getValue() to enum * Update EnumTest.java added getValue() to enums * Update MapTest.java added getValue() to enum * Update Order.java added getValue() to enum * Update ParentWithNullable.java added getValue() to enum * Update Pet.java added getValue() to enum * Update EnumTest.java getValue() with Integer * Update EnumTest.java
1 parent b55ae3c commit bb811db

File tree

32 files changed

+265
-53
lines changed

32 files changed

+265
-53
lines changed

‎modules/openapi-generator/src/main/resources/JavaJaxRS/enumClass.mustache‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,12 @@
3636
this.value = value;
3737
}
3838

39-
@Override
4039
@JsonValue
40+
public {{{dataType}}} getValue() {
41+
return value;
42+
}
43+
44+
@Override
4145
public String toString() {
4246
return String.valueOf(value);
4347
}

‎samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/BigCat.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,12 @@ public enum KindEnum {
5151
this.value = value;
5252
}
5353

54-
@Override
5554
@JsonValue
55+
public String getValue() {
56+
return value;
57+
}
58+
59+
@Override
5660
public String toString() {
5761
return String.valueOf(value);
5862
}

‎samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumArrays.java‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,12 @@ public enum JustSymbolEnum {
5050
this.value = value;
5151
}
5252

53-
@Override
5453
@JsonValue
54+
public String getValue() {
55+
return value;
56+
}
57+
58+
@Override
5559
public String toString() {
5660
return String.valueOf(value);
5761
}
@@ -85,8 +89,12 @@ public enum ArrayEnumEnum {
8589
this.value = value;
8690
}
8791

88-
@Override
8992
@JsonValue
93+
public String getValue() {
94+
return value;
95+
}
96+
97+
@Override
9098
public String toString() {
9199
return String.valueOf(value);
92100
}

‎samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumTest.java‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,12 @@ public enum EnumStringEnum {
5454
this.value = value;
5555
}
5656

57-
@Override
5857
@JsonValue
58+
public String getValue() {
59+
return value;
60+
}
61+
62+
@Override
5963
public String toString() {
6064
return String.valueOf(value);
6165
}
@@ -91,8 +95,12 @@ public enum EnumStringRequiredEnum {
9195
this.value = value;
9296
}
9397

94-
@Override
9598
@JsonValue
99+
public String getValue() {
100+
return value;
101+
}
102+
103+
@Override
96104
public String toString() {
97105
return String.valueOf(value);
98106
}
@@ -126,8 +134,12 @@ public enum EnumIntegerEnum {
126134
this.value = value;
127135
}
128136

129-
@Override
130137
@JsonValue
138+
public Integer getValue() {
139+
return value;
140+
}
141+
142+
@Override
131143
public String toString() {
132144
return String.valueOf(value);
133145
}
@@ -161,8 +173,12 @@ public enum EnumNumberEnum {
161173
this.value = value;
162174
}
163175

164-
@Override
165176
@JsonValue
177+
public Double getValue() {
178+
return value;
179+
}
180+
181+
@Override
166182
public String toString() {
167183
return String.valueOf(value);
168184
}

‎samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MapTest.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,12 @@ public enum InnerEnum {
5555
this.value = value;
5656
}
5757

58-
@Override
5958
@JsonValue
59+
public String getValue() {
60+
return value;
61+
}
62+
63+
@Override
6064
public String toString() {
6165
return String.valueOf(value);
6266
}

‎samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Order.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,12 @@ public enum StatusEnum {
7070
this.value = value;
7171
}
7272

73-
@Override
7473
@JsonValue
74+
public String getValue() {
75+
return value;
76+
}
77+
78+
@Override
7579
public String toString() {
7680
return String.valueOf(value);
7781
}

‎samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Pet.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,12 @@ public enum StatusEnum {
8181
this.value = value;
8282
}
8383

84-
@Override
8584
@JsonValue
85+
public String getValue() {
86+
return value;
87+
}
88+
89+
@Override
8690
public String toString() {
8791
return String.valueOf(value);
8892
}

‎samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumArrays.java‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,12 @@ public enum JustSymbolEnum {
4949
this.value = value;
5050
}
5151

52-
@Override
5352
@JsonValue
53+
public String getValue() {
54+
return value;
55+
}
56+
57+
@Override
5458
public String toString() {
5559
return String.valueOf(value);
5660
}
@@ -84,8 +88,12 @@ public enum ArrayEnumEnum {
8488
this.value = value;
8589
}
8690

87-
@Override
8891
@JsonValue
92+
public String getValue() {
93+
return value;
94+
}
95+
96+
@Override
8997
public String toString() {
9098
return String.valueOf(value);
9199
}

‎samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumTest.java‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,12 @@ public enum EnumStringEnum {
5959
this.value = value;
6060
}
6161

62-
@Override
6362
@JsonValue
63+
public String getValue() {
64+
return value;
65+
}
66+
67+
@Override
6468
public String toString() {
6569
return String.valueOf(value);
6670
}
@@ -96,8 +100,12 @@ public enum EnumStringRequiredEnum {
96100
this.value = value;
97101
}
98102

99-
@Override
100103
@JsonValue
104+
public String getValue() {
105+
return value;
106+
}
107+
108+
@Override
101109
public String toString() {
102110
return String.valueOf(value);
103111
}
@@ -131,8 +139,12 @@ public enum EnumIntegerEnum {
131139
this.value = value;
132140
}
133141

134-
@Override
135142
@JsonValue
143+
public Integer getValue() {
144+
return value;
145+
}
146+
147+
@Override
136148
public String toString() {
137149
return String.valueOf(value);
138150
}
@@ -166,8 +178,12 @@ public enum EnumNumberEnum {
166178
this.value = value;
167179
}
168180

169-
@Override
170181
@JsonValue
182+
public Double getValue() {
183+
return value;
184+
}
185+
186+
@Override
171187
public String toString() {
172188
return String.valueOf(value);
173189
}

‎samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject2.java‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,12 @@ public enum EnumFormStringArrayEnum {
4848
this.value = value;
4949
}
5050

51-
@Override
5251
@JsonValue
52+
public String getValue() {
53+
return value;
54+
}
55+
56+
@Override
5357
public String toString() {
5458
return String.valueOf(value);
5559
}
@@ -85,8 +89,12 @@ public enum EnumFormStringEnum {
8589
this.value = value;
8690
}
8791

88-
@Override
8992
@JsonValue
93+
public String getValue() {
94+
return value;
95+
}
96+
97+
@Override
9098
public String toString() {
9199
return String.valueOf(value);
92100
}

0 commit comments

Comments
 (0)