From bcc77d4ac4d233759278b77f1d034d7e8088fe36 Mon Sep 17 00:00:00 2001 From: Matthias Wimmer Date: Wed, 1 Jun 2022 14:00:02 +0200 Subject: [PATCH] Fix for #12504: invalid elm code for paths containing UUIDs (#12506) Fixes #12504 --- .../src/main/resources/elm/paramToString.mustache | 2 +- samples/openapi3/client/elm/src/Api/Request/Default.elm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/elm/paramToString.mustache b/modules/openapi-generator/src/main/resources/elm/paramToString.mustache index c887cc0c1ec..9c19c86365c 100644 --- a/modules/openapi-generator/src/main/resources/elm/paramToString.mustache +++ b/modules/openapi-generator/src/main/resources/elm/paramToString.mustache @@ -1 +1 @@ -{{#isArray}}String.join "," << List.map {{#items}}{{>paramToString}}{{/items}}{{/isArray}}{{^isArray}}{{^isEnum}}{{#isString}}identity{{/isString}}{{#isBinary}}identity{{/isBinary}}{{#isByteArray}}identity{{/isByteArray}}{{/isEnum}}{{#isBoolean}}(\val -> if val then "true" else "false"){{/isBoolean}}{{#isDateTime}}Api.Time.dateTimeToString{{/isDateTime}}{{#isDate}}Api.Time.dateToString{{/isDate}}{{#isInteger}}String.fromInt{{/isInteger}}{{#isLong}}String.fromInt{{/isLong}}{{#isNumber}}String.fromFloat{{/isNumber}}{{#isFloat}}String.fromFloat{{/isFloat}}{{#isDouble}}String.fromFloat{{/isDouble}}{{#isEnum}}stringFrom{{^paramName}}Api.Data.{{classname}}{{/paramName}}{{enumName}}{{/isEnum}}{{#isUuid}}Uuid.toString{{/isUuid}}{{/isArray}} \ No newline at end of file +{{#isArray}}String.join "," << List.map {{#items}}{{>paramToString}}{{/items}}{{/isArray}}{{^isArray}}{{^isEnum}}{{^isUuid}}{{#isString}}identity{{/isString}}{{#isBinary}}identity{{/isBinary}}{{#isByteArray}}identity{{/isByteArray}}{{/isUuid}}{{/isEnum}}{{#isBoolean}}(\val -> if val then "true" else "false"){{/isBoolean}}{{#isDateTime}}Api.Time.dateTimeToString{{/isDateTime}}{{#isDate}}Api.Time.dateToString{{/isDate}}{{#isInteger}}String.fromInt{{/isInteger}}{{#isLong}}String.fromInt{{/isLong}}{{#isNumber}}String.fromFloat{{/isNumber}}{{#isFloat}}String.fromFloat{{/isFloat}}{{#isDouble}}String.fromFloat{{/isDouble}}{{#isEnum}}stringFrom{{^paramName}}Api.Data.{{classname}}{{/paramName}}{{enumName}}{{/isEnum}}{{#isUuid}}Uuid.toString{{/isUuid}}{{/isArray}} \ No newline at end of file diff --git a/samples/openapi3/client/elm/src/Api/Request/Default.elm b/samples/openapi3/client/elm/src/Api/Request/Default.elm index 43812738072..23e998284eb 100644 --- a/samples/openapi3/client/elm/src/Api/Request/Default.elm +++ b/samples/openapi3/client/elm/src/Api/Request/Default.elm @@ -186,7 +186,7 @@ uuidGet value_query = "GET" "/uuid" [] - [ ( "value", Maybe.map identityUuid.toString value_query ) ] + [ ( "value", Maybe.map Uuid.toString value_query ) ] [] Nothing Uuid.decoder