loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[JAVA] Use specified data type in enum's fromValue instead of string (#2347)

Browse Source 
* Use specified data type in enum's fromValue instead of string

* updated samples

* update samples

* remoe String.valueOf
This commit is contained in:
Lukáš Vasek
2019-03-27 15:10:02 +01:00
committed by William Cheng
parent 74fbd3454b
commit a079f70fb2
326 changed files with 1529 additions and 1529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumArrays.java
View File

@@ -55,13 +55,13 @@ public class EnumArrays {
return String.valueOf(value);
}
public static JustSymbolEnum fromValue(String text) {
public static JustSymbolEnum fromValue(String value) {
for (JustSymbolEnum b : JustSymbolEnum.values()) {
if (String.valueOf(b.value).equals(text)) {
if (b.value.equals(value)) {
return b;
}
}
throw new IllegalArgumentException("Unexpected value '" + text + "'");
throw new IllegalArgumentException("Unexpected value '" + value + "'");
}
public static class Adapter extends TypeAdapter<JustSymbolEnum> {
@@ -73,7 +73,7 @@ public class EnumArrays {
@Override
public JustSymbolEnum read(final JsonReader jsonReader) throws IOException {
String value = jsonReader.nextString();
return JustSymbolEnum.fromValue(String.valueOf(value));
return JustSymbolEnum.fromValue(value);
}
}
}
@@ -106,13 +106,13 @@ public class EnumArrays {
return String.valueOf(value);
}
public static ArrayEnumEnum fromValue(String text) {
public static ArrayEnumEnum fromValue(String value) {
for (ArrayEnumEnum b : ArrayEnumEnum.values()) {
if (String.valueOf(b.value).equals(text)) {
if (b.value.equals(value)) {
return b;
}
}
throw new IllegalArgumentException("Unexpected value '" + text + "'");
throw new IllegalArgumentException("Unexpected value '" + value + "'");
}
public static class Adapter extends TypeAdapter<ArrayEnumEnum> {
@@ -124,7 +124,7 @@ public class EnumArrays {
@Override
public ArrayEnumEnum read(final JsonReader jsonReader) throws IOException {
String value = jsonReader.nextString();
return ArrayEnumEnum.fromValue(String.valueOf(value));
return ArrayEnumEnum.fromValue(value);
}
}
}

8
samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumClass.java
View File

@@ -50,13 +50,13 @@ public enum EnumClass {
return String.valueOf(value);
}
public static EnumClass fromValue(String text) {
public static EnumClass fromValue(String value) {
for (EnumClass b : EnumClass.values()) {
if (String.valueOf(b.value).equals(text)) {
if (b.value.equals(value)) {
return b;
}
}
throw new IllegalArgumentException("Unexpected value '" + text + "'");
throw new IllegalArgumentException("Unexpected value '" + value + "'");
}
public static class Adapter extends TypeAdapter<EnumClass> {
@@ -68,7 +68,7 @@ public enum EnumClass {
@Override
public EnumClass read(final JsonReader jsonReader) throws IOException {
String value = jsonReader.nextString();
return EnumClass.fromValue(String.valueOf(value));
return EnumClass.fromValue(value);
}
}
}

32
samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumTest.java
View File

@@ -56,13 +56,13 @@ public class EnumTest {
return String.valueOf(value);
}
public static EnumStringEnum fromValue(String text) {
public static EnumStringEnum fromValue(String value) {
for (EnumStringEnum b : EnumStringEnum.values()) {
if (String.valueOf(b.value).equals(text)) {
if (b.value.equals(value)) {
return b;
}
}
throw new IllegalArgumentException("Unexpected value '" + text + "'");
throw new IllegalArgumentException("Unexpected value '" + value + "'");
}
public static class Adapter extends TypeAdapter<EnumStringEnum> {
@@ -74,7 +74,7 @@ public class EnumTest {
@Override
public EnumStringEnum read(final JsonReader jsonReader) throws IOException {
String value = jsonReader.nextString();
return EnumStringEnum.fromValue(String.valueOf(value));
return EnumStringEnum.fromValue(value);
}
}
}
@@ -109,13 +109,13 @@ public class EnumTest {
return String.valueOf(value);
}
public static EnumStringRequiredEnum fromValue(String text) {
public static EnumStringRequiredEnum fromValue(String value) {
for (EnumStringRequiredEnum b : EnumStringRequiredEnum.values()) {
if (String.valueOf(b.value).equals(text)) {
if (b.value.equals(value)) {
return b;
}
}
throw new IllegalArgumentException("Unexpected value '" + text + "'");
throw new IllegalArgumentException("Unexpected value '" + value + "'");
}
public static class Adapter extends TypeAdapter<EnumStringRequiredEnum> {
@@ -127,7 +127,7 @@ public class EnumTest {
@Override
public EnumStringRequiredEnum read(final JsonReader jsonReader) throws IOException {
String value = jsonReader.nextString();
return EnumStringRequiredEnum.fromValue(String.valueOf(value));
return EnumStringRequiredEnum.fromValue(value);
}
}
}
@@ -160,13 +160,13 @@ public class EnumTest {
return String.valueOf(value);
}
public static EnumIntegerEnum fromValue(String text) {
public static EnumIntegerEnum fromValue(Integer value) {
for (EnumIntegerEnum b : EnumIntegerEnum.values()) {
if (String.valueOf(b.value).equals(text)) {
if (b.value.equals(value)) {
return b;
}
}
throw new IllegalArgumentException("Unexpected value '" + text + "'");
throw new IllegalArgumentException("Unexpected value '" + value + "'");
}
public static class Adapter extends TypeAdapter<EnumIntegerEnum> {
@@ -178,7 +178,7 @@ public class EnumTest {
@Override
public EnumIntegerEnum read(final JsonReader jsonReader) throws IOException {
Integer value = jsonReader.nextInt();
return EnumIntegerEnum.fromValue(String.valueOf(value));
return EnumIntegerEnum.fromValue(value);
}
}
}
@@ -211,13 +211,13 @@ public class EnumTest {
return String.valueOf(value);
}
public static EnumNumberEnum fromValue(String text) {
public static EnumNumberEnum fromValue(Double value) {
for (EnumNumberEnum b : EnumNumberEnum.values()) {
if (String.valueOf(b.value).equals(text)) {
if (b.value.equals(value)) {
return b;
}
}
throw new IllegalArgumentException("Unexpected value '" + text + "'");
throw new IllegalArgumentException("Unexpected value '" + value + "'");
}
public static class Adapter extends TypeAdapter<EnumNumberEnum> {
@@ -229,7 +229,7 @@ public class EnumTest {
@Override
public EnumNumberEnum read(final JsonReader jsonReader) throws IOException {
Double value = jsonReader.nextDouble();
return EnumNumberEnum.fromValue(String.valueOf(value));
return EnumNumberEnum.fromValue(value);
}
}
}

8
samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MapTest.java
View File

@@ -60,13 +60,13 @@ public class MapTest {
return String.valueOf(value);
}
public static InnerEnum fromValue(String text) {
public static InnerEnum fromValue(String value) {
for (InnerEnum b : InnerEnum.values()) {
if (String.valueOf(b.value).equals(text)) {
if (b.value.equals(value)) {
return b;
}
}
throw new IllegalArgumentException("Unexpected value '" + text + "'");
throw new IllegalArgumentException("Unexpected value '" + value + "'");
}
public static class Adapter extends TypeAdapter<InnerEnum> {
@@ -78,7 +78,7 @@ public class MapTest {
@Override
public InnerEnum read(final JsonReader jsonReader) throws IOException {
String value = jsonReader.nextString();
return InnerEnum.fromValue(String.valueOf(value));
return InnerEnum.fromValue(value);
}
}
}

8
samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java
View File

@@ -72,13 +72,13 @@ public class Order {
return String.valueOf(value);
}
public static StatusEnum fromValue(String text) {
public static StatusEnum fromValue(String value) {
for (StatusEnum b : StatusEnum.values()) {
if (String.valueOf(b.value).equals(text)) {
if (b.value.equals(value)) {
return b;
}
}
throw new IllegalArgumentException("Unexpected value '" + text + "'");
throw new IllegalArgumentException("Unexpected value '" + value + "'");
}
public static class Adapter extends TypeAdapter<StatusEnum> {
@@ -90,7 +90,7 @@ public class Order {
@Override
public StatusEnum read(final JsonReader jsonReader) throws IOException {
String value = jsonReader.nextString();
return StatusEnum.fromValue(String.valueOf(value));
return StatusEnum.fromValue(value);
}
}
}

8
samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterEnum.java
View File

@@ -50,13 +50,13 @@ public enum OuterEnum {
return String.valueOf(value);
}
public static OuterEnum fromValue(String text) {
public static OuterEnum fromValue(String value) {
for (OuterEnum b : OuterEnum.values()) {
if (String.valueOf(b.value).equals(text)) {
if (b.value.equals(value)) {
return b;
}
}
throw new IllegalArgumentException("Unexpected value '" + text + "'");
throw new IllegalArgumentException("Unexpected value '" + value + "'");
}
public static class Adapter extends TypeAdapter<OuterEnum> {
@@ -68,7 +68,7 @@ public enum OuterEnum {
@Override
public OuterEnum read(final JsonReader jsonReader) throws IOException {
String value = jsonReader.nextString();
return OuterEnum.fromValue(String.valueOf(value));
return OuterEnum.fromValue(value);
}
}
}

8
samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java
View File

@@ -79,13 +79,13 @@ public class Pet {
return String.valueOf(value);
}
public static StatusEnum fromValue(String text) {
public static StatusEnum fromValue(String value) {
for (StatusEnum b : StatusEnum.values()) {
if (String.valueOf(b.value).equals(text)) {
if (b.value.equals(value)) {
return b;
}
}
throw new IllegalArgumentException("Unexpected value '" + text + "'");
throw new IllegalArgumentException("Unexpected value '" + value + "'");
}
public static class Adapter extends TypeAdapter<StatusEnum> {
@@ -97,7 +97,7 @@ public class Pet {
@Override
public StatusEnum read(final JsonReader jsonReader) throws IOException {
String value = jsonReader.nextString();
return StatusEnum.fromValue(String.valueOf(value));
return StatusEnum.fromValue(value);
}
}
}