Merge branch 'develop_2.0' of github.com:wordnik/swagger-codegen into develop_2.0

This commit is contained in:
Tony Tam 2014-10-01 22:13:50 -07:00
commit bc99361100
2 changed files with 4 additions and 2 deletions

View File

@ -45,7 +45,8 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi
"Double", "Double",
"Integer", "Integer",
"Long", "Long",
"Float") "Float",
"Object")
); );
instantiationTypes.put("array", "ArrayList"); instantiationTypes.put("array", "ArrayList");
instantiationTypes.put("map", "HashMap"); instantiationTypes.put("map", "HashMap");

View File

@ -43,7 +43,8 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
"Double", "Double",
"Integer", "Integer",
"Long", "Long",
"Float") "Float",
"Object")
); );
instantiationTypes.put("array", "ArrayList"); instantiationTypes.put("array", "ArrayList");
instantiationTypes.put("map", "HashMap"); instantiationTypes.put("map", "HashMap");