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

boolean values from JSON are treated as strings (#4229)

Browse Source 
* Change the value types in additionalProperties and dynamicProperties to Object instead of String.
Change methods that insert values to these maps to use Object as the type of the value instead of String.

* Fix run-all-petstore run: use toString instead of casting
This commit is contained in:
Yohana Khoury 2016-12-16 05:56:38 +02:00 committed by wing328
parent 37570882f9
commit 91af8066cd
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java
View File

@ -57,7 +57,7 @@ public class CodegenConfigurator {
private Map<String, String> systemProperties = new HashMap<String, String>(); private Map<String, String> systemProperties = new HashMap<String, String>();
private Map<String, String> instantiationTypes = new HashMap<String, String>(); private Map<String, String> instantiationTypes = new HashMap<String, String>();
private Map<String, String> typeMappings = new HashMap<String, String>(); private Map<String, String> typeMappings = new HashMap<String, String>();
private Map<String, String> additionalProperties = new HashMap<String, String>(); private Map<String, Object> additionalProperties = new HashMap<String, Object>();
private Map<String, String> importMappings = new HashMap<String, String>(); private Map<String, String> importMappings = new HashMap<String, String>();
private Set<String> languageSpecificPrimitives = new HashSet<String>(); private Set<String> languageSpecificPrimitives = new HashSet<String>();
private String gitUserId="GIT_USER_ID"; private String gitUserId="GIT_USER_ID";
@ -65,7 +65,7 @@ public class CodegenConfigurator {
private String releaseNote="Minor update"; private String releaseNote="Minor update";
private String httpUserAgent; private String httpUserAgent;
private final Map<String, String> dynamicProperties = new HashMap<String, String>(); //the map that holds the JsonAnySetter/JsonAnyGetter values private final Map<String, Object> dynamicProperties = new HashMap<String, Object>(); //the map that holds the JsonAnySetter/JsonAnyGetter values
public CodegenConfigurator() { public CodegenConfigurator() {
this.setOutputDir("."); this.setOutputDir(".");
@ -255,16 +255,16 @@ public class CodegenConfigurator {
return this; return this;
} }
public Map<String, String> getAdditionalProperties() { public Map<String, Object> getAdditionalProperties() {
return additionalProperties; return additionalProperties;
} }
public CodegenConfigurator setAdditionalProperties(Map<String, String> additionalProperties) { public CodegenConfigurator setAdditionalProperties(Map<String, Object> additionalProperties) {
this.additionalProperties = additionalProperties; this.additionalProperties = additionalProperties;
return this; return this;
} }
public CodegenConfigurator addAdditionalProperty(String key, String value) { public CodegenConfigurator addAdditionalProperty(String key, Object value) {
this.additionalProperties.put(key, value); this.additionalProperties.put(key, value);
return this; return this;
} }
@ -398,12 +398,12 @@ public class CodegenConfigurator {
@JsonAnySetter @JsonAnySetter
public CodegenConfigurator addDynamicProperty(String name, Object value) { public CodegenConfigurator addDynamicProperty(String name, Object value) {
dynamicProperties.put(name, value.toString()); dynamicProperties.put(name, value);
return this; return this;
} }
@JsonAnyGetter @JsonAnyGetter
public Map<String, String> getDynamicProperties() { public Map<String, Object> getDynamicProperties() {
return dynamicProperties; return dynamicProperties;
} }

2
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java
View File

@ -103,7 +103,7 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp
} }
if (additionalProperties.containsKey(CodegenConstants.SUPPORTS_ES6)) { if (additionalProperties.containsKey(CodegenConstants.SUPPORTS_ES6)) {
setSupportsES6(Boolean.valueOf((String)additionalProperties.get(CodegenConstants.SUPPORTS_ES6))); setSupportsES6(Boolean.valueOf(additionalProperties.get(CodegenConstants.SUPPORTS_ES6).toString()));
additionalProperties.put("supportsES6", getSupportsES6()); additionalProperties.put("supportsES6", getSupportsES6());
} }
} }

12
modules/swagger-codegen/src/test/java/io/swagger/codegen/config/CodegenConfiguratorTest.java
View File

@ -156,12 +156,16 @@ public class CodegenConfiguratorTest {
public void testAdditionalProperties() throws Exception { public void testAdditionalProperties() throws Exception {
configurator.addAdditionalProperty("foo", "bar") configurator.addAdditionalProperty("foo", "bar")
.addAdditionalProperty("hello", "world"); .addAdditionalProperty("hello", "world")
.addAdditionalProperty("supportJava6", false)
.addAdditionalProperty("useRxJava", true);
final ClientOptInput clientOptInput = setupAndRunGenericTest(configurator); final ClientOptInput clientOptInput = setupAndRunGenericTest(configurator);
assertValueInMap(clientOptInput.getConfig().additionalProperties(), "foo", "bar"); assertValueInMap(clientOptInput.getConfig().additionalProperties(), "foo", "bar");
assertValueInMap(clientOptInput.getConfig().additionalProperties(), "hello", "world"); assertValueInMap(clientOptInput.getConfig().additionalProperties(), "hello", "world");
assertValueInMap(clientOptInput.getConfig().additionalProperties(), "supportJava6", false);
assertValueInMap(clientOptInput.getConfig().additionalProperties(), "useRxJava", true);
} }
@Test @Test
@ -241,10 +245,14 @@ public class CodegenConfiguratorTest {
@Test @Test
public void testDynamicProperties() throws Exception { public void testDynamicProperties() throws Exception {
configurator.addDynamicProperty(CodegenConstants.LOCAL_VARIABLE_PREFIX, "_"); configurator.addDynamicProperty(CodegenConstants.LOCAL_VARIABLE_PREFIX, "_");
configurator.addDynamicProperty("supportJava6", false);
configurator.addDynamicProperty("useRxJava", true);
final ClientOptInput clientOptInput = setupAndRunGenericTest(configurator); final ClientOptInput clientOptInput = setupAndRunGenericTest(configurator);
assertValueInMap(clientOptInput.getConfig().additionalProperties(), CodegenConstants.LOCAL_VARIABLE_PREFIX, "_"); assertValueInMap(clientOptInput.getConfig().additionalProperties(), CodegenConstants.LOCAL_VARIABLE_PREFIX, "_");
assertValueInMap(clientOptInput.getConfig().additionalProperties(), "supportJava6", false);
assertValueInMap(clientOptInput.getConfig().additionalProperties(), "useRxJava", true);
} }
@Test @Test
@ -344,7 +352,7 @@ public class CodegenConfiguratorTest {
}}; }};
} }
private static void assertValueInMap(Map<?, ?> map, String propertyKey, String expectedPropertyValue) { private static void assertValueInMap(Map<?, ?> map, String propertyKey, Object expectedPropertyValue) {
assertTrue(map.containsKey(propertyKey)); assertTrue(map.containsKey(propertyKey));
assertEquals(map.get(propertyKey), expectedPropertyValue); assertEquals(map.get(propertyKey), expectedPropertyValue);
} }