loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-12-09 12:46:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

#5712 put @JsonValue to appropriate place in generated enum, add TypeAdapter for Gson enums, enhance tests (#5713)

Browse Source
This commit is contained in:
sdoeringNew
2017-06-02 10:03:32 +02:00
committed by wing328
parent 71d1d05b98
commit ffc0d32b9c
252 changed files with 2523 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/EnumArrays.java
View File

@@ -41,12 +41,12 @@ public class EnumArrays {
this.value = value;
}
@JsonValue
public String getValue() {
return value;
}
@Override
@JsonValue
public String toString() {
return String.valueOf(value);
}
@@ -79,12 +79,12 @@ public class EnumArrays {
this.value = value;
}
@JsonValue
public String getValue() {
return value;
}
@Override
@JsonValue
public String toString() {
return String.valueOf(value);
}

2
samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/EnumClass.java
View File

@@ -35,12 +35,12 @@ public enum EnumClass {
this.value = value;
}
@JsonValue
public String getValue() {
return value;
}
@Override
@JsonValue
public String toString() {
return String.valueOf(value);
}

6
samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/EnumTest.java
View File

@@ -42,12 +42,12 @@ public class EnumTest {
this.value = value;
}
@JsonValue
public String getValue() {
return value;
}
@Override
@JsonValue
public String toString() {
return String.valueOf(value);
}
@@ -80,12 +80,12 @@ public class EnumTest {
this.value = value;
}
@JsonValue
public Integer getValue() {
return value;
}
@Override
@JsonValue
public String toString() {
return String.valueOf(value);
}
@@ -118,12 +118,12 @@ public class EnumTest {
this.value = value;
}
@JsonValue
public Double getValue() {
return value;
}
@Override
@JsonValue
public String toString() {
return String.valueOf(value);
}

2
samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/MapTest.java
View File

@@ -45,12 +45,12 @@ public class MapTest {
this.value = value;
}
@JsonValue
public String getValue() {
return value;
}
@Override
@JsonValue
public String toString() {
return String.valueOf(value);
}

2
samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Order.java
View File

@@ -54,12 +54,12 @@ public class Order {
this.value = value;
}
@JsonValue
public String getValue() {
return value;
}
@Override
@JsonValue
public String toString() {
return String.valueOf(value);
}

2
samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/OuterEnum.java
View File

@@ -35,12 +35,12 @@ public enum OuterEnum {
this.value = value;
}
@JsonValue
public String getValue() {
return value;
}
@Override
@JsonValue
public String toString() {
return String.valueOf(value);
}

2
samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Pet.java
View File

@@ -60,12 +60,12 @@ public class Pet {
this.value = value;
}
@JsonValue
public String getValue() {
return value;
}
@Override
@JsonValue
public String toString() {
return String.valueOf(value);
}

28
samples/client/petstore/java/resttemplate/src/test/java/io/swagger/client/model/EnumValueTest.java
View File

@@ -1,19 +1,17 @@
package io.swagger.client.model;
import java.io.StringWriter;
import java.io.PrintWriter;
import java.util.HashMap;
import java.util.ArrayList;
import java.util.Map;
import java.util.List;
import org.junit.Test;
import org.junit.*;
import static org.junit.Assert.*;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectWriter;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.databind.SerializationFeature.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
public class EnumValueTest {
@Test
public void testEnumClass() {
assertEquals(EnumClass._ABC.toString(), "_abc");
@@ -30,13 +28,19 @@ public class EnumValueTest {
enumTest.setEnumNumber(EnumTest.EnumNumberEnum.NUMBER_1_DOT_1);
assertEquals(EnumTest.EnumStringEnum.UPPER.toString(), "UPPER");
assertEquals(EnumTest.EnumStringEnum.UPPER.getValue(), "UPPER");
assertEquals(EnumTest.EnumStringEnum.LOWER.toString(), "lower");
assertEquals(EnumTest.EnumStringEnum.LOWER.getValue(), "lower");
assertEquals(EnumTest.EnumIntegerEnum.NUMBER_1.toString(), "1");
assertTrue(EnumTest.EnumIntegerEnum.NUMBER_1.getValue() == 1);
assertEquals(EnumTest.EnumIntegerEnum.NUMBER_MINUS_1.toString(), "-1");
assertTrue(EnumTest.EnumIntegerEnum.NUMBER_MINUS_1.getValue() == -1);
assertEquals(EnumTest.EnumNumberEnum.NUMBER_1_DOT_1.toString(), "1.1");
assertTrue(EnumTest.EnumNumberEnum.NUMBER_1_DOT_1.getValue() == 1.1);
assertEquals(EnumTest.EnumNumberEnum.NUMBER_MINUS_1_DOT_2.toString(), "-1.2");
assertTrue(EnumTest.EnumNumberEnum.NUMBER_MINUS_1_DOT_2.getValue() == -1.2);
try {
// test serialization (object => json)
@@ -44,7 +48,7 @@ public class EnumValueTest {
mapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
ObjectWriter ow = mapper.writer();
String json = ow.writeValueAsString(enumTest);
assertEquals(json, "{\"enum_string\":\"lower\",\"enum_integer\":\"1\",\"enum_number\":\"1.1\",\"outerEnum\":null}");
assertEquals(json, "{\"enum_string\":\"lower\",\"enum_integer\":1,\"enum_number\":1.1,\"outerEnum\":null}");
// test deserialization (json => object)
EnumTest fromString = mapper.readValue(json, EnumTest.class);
@@ -55,7 +59,5 @@ public class EnumValueTest {
} catch (Exception e) {
fail("Exception thrown during serialization/deserialzation of JSON: " + e.getMessage());
}
}
}