From 50837b2e835653c87ce540cb1ae71edca36a267a Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 2 May 2018 20:27:06 +0800 Subject: [PATCH] update elm petstore with oas2 (#291) --- bin/elm-petstore.sh | 2 +- .../codegen/languages/ElmClientCodegen.java | 12 +++++------- .../client/petstore/elm/.openapi-generator/VERSION | 2 +- samples/client/petstore/elm/README.md | 3 +-- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/bin/elm-petstore.sh b/bin/elm-petstore.sh index 81133c1ab34..4a25b5e263d 100755 --- a/bin/elm-petstore.sh +++ b/bin/elm-petstore.sh @@ -27,6 +27,6 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="$@ generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -l elm -o samples/client/petstore/elm" +ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -l elm -o samples/client/petstore/elm $@" java $JAVA_OPTS -jar $executable $ags diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java index 80a4e047fa0..e7bb13b30a5 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java @@ -456,15 +456,15 @@ public class ElmClientCodegen extends DefaultCodegen implements CodegenConfig { @Override public String getSchemaType(Schema p) { - String swaggerType = super.getSchemaType(p); + String openAPIType = super.getSchemaType(p); String type; - if (typeMapping.containsKey(swaggerType)) { - type = typeMapping.get(swaggerType); + if (typeMapping.containsKey(openAPIType)) { + type = typeMapping.get(openAPIType); if (languageSpecificPrimitives.contains(type)) { return type; } } else - type = swaggerType; + type = openAPIType; return toModelName(type); } @@ -504,10 +504,8 @@ public class ElmClientCodegen extends DefaultCodegen implements CodegenConfig { } @Override - public CodegenParameter fromParameter(Parameter param, Set imports) { - final CodegenParameter parameter = super.fromParameter(param, imports); + public void postProcessParameter(CodegenParameter parameter) { addEncoderAndDecoder(parameter.vendorExtensions, parameter.dataType, parameter.isPrimitiveType); - return parameter; } private void addEncoderAndDecoder(Map vendorExtensions, String dataType, Boolean isPrimitiveType) { diff --git a/samples/client/petstore/elm/.openapi-generator/VERSION b/samples/client/petstore/elm/.openapi-generator/VERSION index 855ff9501eb..096bf47efe3 100644 --- a/samples/client/petstore/elm/.openapi-generator/VERSION +++ b/samples/client/petstore/elm/.openapi-generator/VERSION @@ -1 +1 @@ -2.4.0-SNAPSHOT \ No newline at end of file +3.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/elm/README.md b/samples/client/petstore/elm/README.md index e7b5b81c333..bb46f25fb29 100644 --- a/samples/client/petstore/elm/README.md +++ b/samples/client/petstore/elm/README.md @@ -7,5 +7,4 @@ This API client was generated by the [swagger-codegen](https://github.com/swagge - API version: 1.0.0 - Package version: -- Build date: 2018-02-25T14:13:54.595+01:00 -- Build package: io.swagger.codegen.languages.ElmClientCodegen +- Build package: org.openapitools.codegen.languages.ElmClientCodegen