Fix NPE in Elm path parameter (#4116)

* fix NPE in elm path parameter

* replace paramName with baseName

* install elm format in circleci

* switch to /usr/bin/env

CI/circle_parallel.sh

@@ -21,6 +21,9 @@ elif [ "$NODE_INDEX" = "2" ]; then
     echo "Running node $NODE_INDEX to test ensure-up-to-date"
     java -version
 
+    # install elm-format
+    npm install -g elm-format
+
     ./bin/utils/ensure-up-to-date
   fi
 #elif [ "$NODE_INDEX" = "3" ]; then

bin/elm-0.18-petstore.sh

@@ -26,7 +26,7 @@ then
 fi
 
 # auto format elm code using elm-format
-export ELM_POST_PROCESS_FILE="/usr/local/bin/elm-format --elm-version=0.18 --yes"
+export ELM_POST_PROCESS_FILE="/usr/bin/env elm-format --elm-version=0.18 --yes"
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"

bin/elm-petstore.sh

@@ -26,7 +26,7 @@ then
 fi
 
 # auto format elm code using elm-format
-export ELM_POST_PROCESS_FILE="/usr/local/bin/elm-format --elm-version=0.19 --yes"
+export ELM_POST_PROCESS_FILE="/usr/bin/env elm-format --elm-version=0.19 --yes"
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"

bin/utils/ensure-up-to-date

@@ -68,7 +68,7 @@ declare -a scripts=(
 "./bin/dart-petstore.sh"
 "./bin/dart2-petstore.sh"
 "./bin/java-play-framework-petstore-server-all.sh"
-#"./bin/elm-petstore-all.sh"
+"./bin/elm-petstore-all.sh"
 "./bin/meta-codegen.sh"
 # OTHERS
 "./bin/utils/export_docs_generators.sh"

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java

@@ -437,18 +437,18 @@ public class ElmClientCodegen extends DefaultCodegen implements CodegenConfig {
         final Set<String> dependencies = new HashSet<>();
 
         for (CodegenOperation op : ops) {
-            if (ElmVersion.ELM_018.equals(elmVersion)) {
+            if (ElmVersion.ELM_018.equals(elmVersion)) { // elm 0.18
                 String path = op.path;
                 for (CodegenParameter param : op.pathParams) {
                     final String var = paramToString("params", param, false, null);
-                    path = path.replace("{" + param.paramName + "}", "\" ++ " + var + " ++ \"");
+                    path = path.replace("{" + param.baseName + "}", "\" ++ " + var + " ++ \"");
                 }
                 op.path = ("\"" + path + "\"").replaceAll(" \\+\\+ \"\"", "");
-            } else {
+            } else { // elm 0.19 or later
                 final List<Object> pathParams = Arrays.asList(op.path.substring(1).split("/")).stream()
                         .map(str -> {
                             if (str.startsWith("{") && str.endsWith("}")) {
-                          return op.pathParams.stream().filter(p -> str.equals("{" + p.paramName + "}")).findFirst().orElse(null);
+                                return op.pathParams.stream().filter(p -> str.equals("{" + p.baseName + "}")).findFirst().orElse(null);
                             } else {
                                 return "\"" + str + "\"";
                             }

samples/client/petstore/elm-0.18/.openapi-generator/VERSION

@@ -1 +1 @@
-4.1.3-SNAPSHOT
+4.2.0-SNAPSHOT

samples/client/petstore/elm-0.18/src/Data/ApiResponse.elm

@@ -21,9 +21,9 @@ import Json.Encode as Encode
 {-| Describes the result of uploading an image resource
 -}
 type alias ApiResponse =
-    { code : Maybe (Int)
+    { code : Maybe Int
-    , type_ : Maybe (String)
+    , type_ : Maybe String
-    , message : Maybe (String)
+    , message : Maybe String
     }
 
 
@@ -35,22 +35,15 @@ decoder =
         |> optional "message" (Decode.nullable Decode.string) Nothing
 
 
-
 encode : ApiResponse -> Encode.Value
 encode model =
     Encode.object
         [ ( "code", Maybe.withDefault Encode.null (Maybe.map Encode.int model.code) )
         , ( "type", Maybe.withDefault Encode.null (Maybe.map Encode.string model.type_) )
         , ( "message", Maybe.withDefault Encode.null (Maybe.map Encode.string model.message) )
-
         ]
 
 
-
 toString : ApiResponse -> String
 toString =
     Encode.encode 0 << encode
-
-
-
-

samples/client/petstore/elm-0.18/src/Data/Category.elm

@@ -21,8 +21,8 @@ import Json.Encode as Encode
 {-| A category for a pet
 -}
 type alias Category =
-    { id : Maybe (Int)
+    { id : Maybe Int
-    , name : Maybe (String)
+    , name : Maybe String
     }
 
 
@@ -33,21 +33,14 @@ decoder =
         |> optional "name" (Decode.nullable Decode.string) Nothing
 
 
-
 encode : Category -> Encode.Value
 encode model =
     Encode.object
         [ ( "id", Maybe.withDefault Encode.null (Maybe.map Encode.int model.id) )
         , ( "name", Maybe.withDefault Encode.null (Maybe.map Encode.string model.name) )
-
         ]
 
 
-
 toString : Category -> String
 toString =
     Encode.encode 0 << encode
-
-
-
-

samples/client/petstore/elm-0.18/src/Data/Order_.elm

@@ -22,12 +22,12 @@ import Json.Encode as Encode
 {-| An order for a pets from the pet store
 -}
 type alias Order_ =
-    { id : Maybe (Int)
+    { id : Maybe Int
-    , petId : Maybe (Int)
+    , petId : Maybe Int
-    , quantity : Maybe (Int)
+    , quantity : Maybe Int
-    , shipDate : Maybe (DateTime)
+    , shipDate : Maybe DateTime
-    , status : Maybe (Status)
+    , status : Maybe Status
-    , complete : Maybe (Bool)
+    , complete : Maybe Bool
     }
 
 
@@ -37,7 +37,6 @@ type Status
     | Delivered
 
 
-
 decoder : Decoder Order_
 decoder =
     decode Order_
@@ -49,7 +48,6 @@ decoder =
         |> optional "complete" (Decode.nullable Decode.bool) (Just False)
 
 
-
 encode : Order_ -> Encode.Value
 encode model =
     Encode.object
@@ -59,18 +57,14 @@ encode model =
         , ( "shipDate", Maybe.withDefault Encode.null (Maybe.map DateTime.encode model.shipDate) )
         , ( "status", Maybe.withDefault Encode.null (Maybe.map encodeStatus model.status) )
         , ( "complete", Maybe.withDefault Encode.null (Maybe.map Encode.bool model.complete) )
-
         ]
 
 
-
 toString : Order_ -> String
 toString =
     Encode.encode 0 << encode
 
 
-
-
 statusDecoder : Decoder Status
 statusDecoder =
     Decode.string
@@ -91,7 +85,6 @@ statusDecoder =
             )
 
 
-
 encodeStatus : Status -> Encode.Value
 encodeStatus model =
     case model of
@@ -103,7 +96,3 @@ encodeStatus model =
 
         Delivered ->
             Encode.string "delivered"
-
-
-
-

samples/client/petstore/elm-0.18/src/Data/Pet.elm

@@ -23,12 +23,12 @@ import Json.Encode as Encode
 {-| A pet for sale in the pet store
 -}
 type alias Pet =
-    { id : Maybe (Int)
+    { id : Maybe Int
-    , category : Maybe (Category)
+    , category : Maybe Category
     , name : String
-    , photoUrls : (List String)
+    , photoUrls : List String
-    , tags : Maybe ((List Tag))
+    , tags : Maybe (List Tag)
-    , status : Maybe (Status)
+    , status : Maybe Status
     }
 
 
@@ -38,7 +38,6 @@ type Status
     | Sold
 
 
-
 decoder : Decoder Pet
 decoder =
     decode Pet
@@ -50,7 +49,6 @@ decoder =
         |> optional "status" (Decode.nullable statusDecoder) Nothing
 
 
-
 encode : Pet -> Encode.Value
 encode model =
     Encode.object
@@ -60,18 +58,14 @@ encode model =
         , ( "photoUrls", (Encode.list << List.map Encode.string) model.photoUrls )
         , ( "tags", Maybe.withDefault Encode.null (Maybe.map (Encode.list << List.map Tag.encode) model.tags) )
         , ( "status", Maybe.withDefault Encode.null (Maybe.map encodeStatus model.status) )
-
         ]
 
 
-
 toString : Pet -> String
 toString =
     Encode.encode 0 << encode
 
 
-
-
 statusDecoder : Decoder Status
 statusDecoder =
     Decode.string
@@ -92,7 +86,6 @@ statusDecoder =
             )
 
 
-
 encodeStatus : Status -> Encode.Value
 encodeStatus model =
     case model of
@@ -104,7 +97,3 @@ encodeStatus model =
 
         Sold ->
             Encode.string "sold"
-
-
-
-

samples/client/petstore/elm-0.18/src/Data/Tag.elm

@@ -21,8 +21,8 @@ import Json.Encode as Encode
 {-| A tag for a pet
 -}
 type alias Tag =
-    { id : Maybe (Int)
+    { id : Maybe Int
-    , name : Maybe (String)
+    , name : Maybe String
     }
 
 
@@ -33,21 +33,14 @@ decoder =
         |> optional "name" (Decode.nullable Decode.string) Nothing
 
 
-
 encode : Tag -> Encode.Value
 encode model =
     Encode.object
         [ ( "id", Maybe.withDefault Encode.null (Maybe.map Encode.int model.id) )
         , ( "name", Maybe.withDefault Encode.null (Maybe.map Encode.string model.name) )
-
         ]
 
 
-
 toString : Tag -> String
 toString =
     Encode.encode 0 << encode
-
-
-
-

samples/client/petstore/elm-0.18/src/Data/User.elm

@@ -21,14 +21,14 @@ import Json.Encode as Encode
 {-| A User who is purchasing from the pet store
 -}
 type alias User =
-    { id : Maybe (Int)
+    { id : Maybe Int
-    , username : Maybe (String)
+    , username : Maybe String
-    , firstName : Maybe (String)
+    , firstName : Maybe String
-    , lastName : Maybe (String)
+    , lastName : Maybe String
-    , email : Maybe (String)
+    , email : Maybe String
-    , password : Maybe (String)
+    , password : Maybe String
-    , phone : Maybe (String)
+    , phone : Maybe String
-    , userStatus : Maybe (Int)
+    , userStatus : Maybe Int
     }
 
 
@@ -45,7 +45,6 @@ decoder =
         |> optional "userStatus" (Decode.nullable Decode.int) Nothing
 
 
-
 encode : User -> Encode.Value
 encode model =
     Encode.object
@@ -57,15 +56,9 @@ encode model =
         , ( "password", Maybe.withDefault Encode.null (Maybe.map Encode.string model.password) )
         , ( "phone", Maybe.withDefault Encode.null (Maybe.map Encode.string model.phone) )
         , ( "userStatus", Maybe.withDefault Encode.null (Maybe.map Encode.int model.userStatus) )
-
         ]
 
 
-
 toString : User -> String
 toString =
     Encode.encode 0 << encode
-
-
-
-

samples/client/petstore/elm-0.18/src/Request/Pet.elm

@@ -12,8 +12,8 @@
 
 module Request.Pet exposing (addPet, deletePet, findPetsByStatus, findPetsByTags, getPetById, updatePet, updatePetWithForm, uploadFile)
 
-import Data.Pet as Pet exposing (Pet)
 import Data.ApiResponse as ApiResponse exposing (ApiResponse)
+import Data.Pet as Pet exposing (Pet)
 import Dict
 import Http
 import Json.Decode as Decode

samples/client/petstore/elm/.openapi-generator/VERSION

@@ -1 +1 @@
-4.1.3-SNAPSHOT
+4.2.0-SNAPSHOT

samples/client/petstore/elm/src/Data/ApiResponse.elm

@@ -21,9 +21,9 @@ import Json.Encode as Encode
 {-| Describes the result of uploading an image resource
 -}
 type alias ApiResponse =
-    { code : Maybe (Int)
+    { code : Maybe Int
-    , type_ : Maybe (String)
+    , type_ : Maybe String
-    , message : Maybe (String)
+    , message : Maybe String
     }
 
 
@@ -35,22 +35,15 @@ decoder =
         |> optional "message" (Decode.nullable Decode.string) Nothing
 
 
-
 encode : ApiResponse -> Encode.Value
 encode model =
     Encode.object
         [ ( "code", Maybe.withDefault Encode.null (Maybe.map Encode.int model.code) )
         , ( "type", Maybe.withDefault Encode.null (Maybe.map Encode.string model.type_) )
         , ( "message", Maybe.withDefault Encode.null (Maybe.map Encode.string model.message) )
-
         ]
 
 
-
 toString : ApiResponse -> String
 toString =
     Encode.encode 0 << encode
-
-
-
-

samples/client/petstore/elm/src/Data/Category.elm

@@ -21,8 +21,8 @@ import Json.Encode as Encode
 {-| A category for a pet
 -}
 type alias Category =
-    { id : Maybe (Int)
+    { id : Maybe Int
-    , name : Maybe (String)
+    , name : Maybe String
     }
 
 
@@ -33,21 +33,14 @@ decoder =
         |> optional "name" (Decode.nullable Decode.string) Nothing
 
 
-
 encode : Category -> Encode.Value
 encode model =
     Encode.object
         [ ( "id", Maybe.withDefault Encode.null (Maybe.map Encode.int model.id) )
         , ( "name", Maybe.withDefault Encode.null (Maybe.map Encode.string model.name) )
-
         ]
 
 
-
 toString : Category -> String
 toString =
     Encode.encode 0 << encode
-
-
-
-

samples/client/petstore/elm/src/Data/Order_.elm

@@ -22,12 +22,12 @@ import Json.Encode as Encode
 {-| An order for a pets from the pet store
 -}
 type alias Order_ =
-    { id : Maybe (Int)
+    { id : Maybe Int
-    , petId : Maybe (Int)
+    , petId : Maybe Int
-    , quantity : Maybe (Int)
+    , quantity : Maybe Int
-    , shipDate : Maybe (DateTime)
+    , shipDate : Maybe DateTime
-    , status : Maybe (Status)
+    , status : Maybe Status
-    , complete : Maybe (Bool)
+    , complete : Maybe Bool
     }
 
 
@@ -37,7 +37,6 @@ type Status
     | Delivered
 
 
-
 decoder : Decoder Order_
 decoder =
     Decode.succeed Order_
@@ -49,7 +48,6 @@ decoder =
         |> optional "complete" (Decode.nullable Decode.bool) (Just False)
 
 
-
 encode : Order_ -> Encode.Value
 encode model =
     Encode.object
@@ -59,18 +57,14 @@ encode model =
         , ( "shipDate", Maybe.withDefault Encode.null (Maybe.map DateTime.encode model.shipDate) )
         , ( "status", Maybe.withDefault Encode.null (Maybe.map encodeStatus model.status) )
         , ( "complete", Maybe.withDefault Encode.null (Maybe.map Encode.bool model.complete) )
-
         ]
 
 
-
 toString : Order_ -> String
 toString =
     Encode.encode 0 << encode
 
 
-
-
 statusDecoder : Decoder Status
 statusDecoder =
     Decode.string
@@ -91,7 +85,6 @@ statusDecoder =
             )
 
 
-
 encodeStatus : Status -> Encode.Value
 encodeStatus model =
     case model of
@@ -103,7 +96,3 @@ encodeStatus model =
 
         Delivered ->
             Encode.string "delivered"
-
-
-
-

samples/client/petstore/elm/src/Data/Pet.elm

@@ -23,12 +23,12 @@ import Json.Encode as Encode
 {-| A pet for sale in the pet store
 -}
 type alias Pet =
-    { id : Maybe (Int)
+    { id : Maybe Int
-    , category : Maybe (Category)
+    , category : Maybe Category
     , name : String
-    , photoUrls : (List String)
+    , photoUrls : List String
-    , tags : Maybe ((List Tag))
+    , tags : Maybe (List Tag)
-    , status : Maybe (Status)
+    , status : Maybe Status
     }
 
 
@@ -38,7 +38,6 @@ type Status
     | Sold
 
 
-
 decoder : Decoder Pet
 decoder =
     Decode.succeed Pet
@@ -50,28 +49,23 @@ decoder =
         |> optional "status" (Decode.nullable statusDecoder) Nothing
 
 
-
 encode : Pet -> Encode.Value
 encode model =
     Encode.object
         [ ( "id", Maybe.withDefault Encode.null (Maybe.map Encode.int model.id) )
         , ( "category", Maybe.withDefault Encode.null (Maybe.map Category.encode model.category) )
         , ( "name", Encode.string model.name )
-        , ( "photoUrls", (Encode.list Encode.string) model.photoUrls )
+        , ( "photoUrls", Encode.list Encode.string model.photoUrls )
         , ( "tags", Maybe.withDefault Encode.null (Maybe.map (Encode.list Tag.encode) model.tags) )
         , ( "status", Maybe.withDefault Encode.null (Maybe.map encodeStatus model.status) )
-
         ]
 
 
-
 toString : Pet -> String
 toString =
     Encode.encode 0 << encode
 
 
-
-
 statusDecoder : Decoder Status
 statusDecoder =
     Decode.string
@@ -92,7 +86,6 @@ statusDecoder =
             )
 
 
-
 encodeStatus : Status -> Encode.Value
 encodeStatus model =
     case model of
@@ -104,7 +97,3 @@ encodeStatus model =
 
         Sold ->
             Encode.string "sold"
-
-
-
-

samples/client/petstore/elm/src/Data/Tag.elm

@@ -21,8 +21,8 @@ import Json.Encode as Encode
 {-| A tag for a pet
 -}
 type alias Tag =
-    { id : Maybe (Int)
+    { id : Maybe Int
-    , name : Maybe (String)
+    , name : Maybe String
     }
 
 
@@ -33,21 +33,14 @@ decoder =
         |> optional "name" (Decode.nullable Decode.string) Nothing
 
 
-
 encode : Tag -> Encode.Value
 encode model =
     Encode.object
         [ ( "id", Maybe.withDefault Encode.null (Maybe.map Encode.int model.id) )
         , ( "name", Maybe.withDefault Encode.null (Maybe.map Encode.string model.name) )
-
         ]
 
 
-
 toString : Tag -> String
 toString =
     Encode.encode 0 << encode
-
-
-
-

samples/client/petstore/elm/src/Data/User.elm

@@ -21,14 +21,14 @@ import Json.Encode as Encode
 {-| A User who is purchasing from the pet store
 -}
 type alias User =
-    { id : Maybe (Int)
+    { id : Maybe Int
-    , username : Maybe (String)
+    , username : Maybe String
-    , firstName : Maybe (String)
+    , firstName : Maybe String
-    , lastName : Maybe (String)
+    , lastName : Maybe String
-    , email : Maybe (String)
+    , email : Maybe String
-    , password : Maybe (String)
+    , password : Maybe String
-    , phone : Maybe (String)
+    , phone : Maybe String
-    , userStatus : Maybe (Int)
+    , userStatus : Maybe Int
     }
 
 
@@ -45,7 +45,6 @@ decoder =
         |> optional "userStatus" (Decode.nullable Decode.int) Nothing
 
 
-
 encode : User -> Encode.Value
 encode model =
     Encode.object
@@ -57,15 +56,9 @@ encode model =
         , ( "password", Maybe.withDefault Encode.null (Maybe.map Encode.string model.password) )
         , ( "phone", Maybe.withDefault Encode.null (Maybe.map Encode.string model.phone) )
         , ( "userStatus", Maybe.withDefault Encode.null (Maybe.map Encode.int model.userStatus) )
-
         ]
 
 
-
 toString : User -> String
 toString =
     Encode.encode 0 << encode
-
-
-
-

samples/client/petstore/elm/src/Request/Pet.elm

@@ -10,10 +10,10 @@
 -}
 
 
-module Request.Pet exposing (addPet, deletePet, findPetsByStatus, Status(..), findPetsByTags, getPetById, updatePet, updatePetWithForm, uploadFile)
+module Request.Pet exposing (Status(..), addPet, deletePet, findPetsByStatus, findPetsByTags, getPetById, updatePet, updatePetWithForm, uploadFile)
 
-import Data.Pet as Pet exposing (Pet)
 import Data.ApiResponse as ApiResponse exposing (ApiResponse)
+import Data.Pet as Pet exposing (Pet)
 import Dict
 import Http
 import Json.Decode as Decode
@@ -25,6 +25,7 @@ type Status
     | Pending
     | Sold
 
+
 stringifyStatus : Status -> String
 stringifyStatus value =
     case value of
@@ -38,9 +39,6 @@ stringifyStatus value =
             "sold"
 
 
-
-
-
 basePath : String
 basePath =
     "http://petstore.swagger.io/v2"
@@ -48,19 +46,16 @@ basePath =
 
 addPet :
     { onSend : Result Http.Error () -> msg
-
-
     , body : Pet
-
-
     }
     -> Cmd msg
 addPet params =
     Http.request
         { method = "POST"
         , headers = List.filterMap identity []
-        , url = Url.crossOrigin basePath
+        , url =
-            ["pet"]
+            Url.crossOrigin basePath
+                [ "pet" ]
                 (List.filterMap identity [])
         , body = Http.jsonBody <| Pet.encode params.body
         , expect = Http.expectWhatever params.onSend
@@ -70,22 +65,20 @@ addPet params =
 
 
 deletePet :
-    { apiKey : Maybe (String)
+    { apiKey : Maybe String
-    } -> 
+    }
+    ->
         { onSend : Result Http.Error () -> msg
-
-
-
         , petId : Int
-
         }
     -> Cmd msg
 deletePet headers params =
     Http.request
         { method = "DELETE"
-        , headers = List.filterMap identity [Maybe.map (Http.header "api_key" << identity) headers.apiKey]
+        , headers = List.filterMap identity [ Maybe.map (Http.header "api_key" << identity) headers.apiKey ]
-        , url = Url.crossOrigin basePath
+        , url =
-            ["pet", String.fromInt params.petId]
+            Url.crossOrigin basePath
+                [ "pet", String.fromInt params.petId ]
                 (List.filterMap identity [])
         , body = Http.emptyBody
         , expect = Http.expectWhatever params.onSend
@@ -98,10 +91,6 @@ deletePet headers params =
 -}
 findPetsByStatus :
     { onSend : Result Http.Error (List Pet) -> msg
-
-
-
-
     , status : List Status
     }
     -> Cmd msg
@@ -109,9 +98,10 @@ findPetsByStatus params =
     Http.request
         { method = "GET"
         , headers = List.filterMap identity []
-        , url = Url.crossOrigin basePath
+        , url =
-            ["pet", "findByStatus"]
+            Url.crossOrigin basePath
-            (List.filterMap identity [(Just << Url.string "status" << String.join "," << List.map stringifyStatus) params.status])
+                [ "pet", "findByStatus" ]
+                (List.filterMap identity [ (Just << Url.string "status" << String.join "," << List.map stringifyStatus) params.status ])
         , body = Http.emptyBody
         , expect = Http.expectJson params.onSend (Decode.list Pet.decoder)
         , timeout = Just 30000
@@ -123,10 +113,6 @@ findPetsByStatus params =
 -}
 findPetsByTags :
     { onSend : Result Http.Error (List Pet) -> msg
-
-
-
-
     , tags : List String
     }
     -> Cmd msg
@@ -134,9 +120,10 @@ findPetsByTags params =
     Http.request
         { method = "GET"
         , headers = List.filterMap identity []
-        , url = Url.crossOrigin basePath
+        , url =
-            ["pet", "findByTags"]
+            Url.crossOrigin basePath
-            (List.filterMap identity [(Just << Url.string "tags" << String.join "," << List.map identity) params.tags])
+                [ "pet", "findByTags" ]
+                (List.filterMap identity [ (Just << Url.string "tags" << String.join "," << List.map identity) params.tags ])
         , body = Http.emptyBody
         , expect = Http.expectJson params.onSend (Decode.list Pet.decoder)
         , timeout = Just 30000
@@ -148,19 +135,16 @@ findPetsByTags params =
 -}
 getPetById :
     { onSend : Result Http.Error Pet -> msg
-
-
-
     , petId : Int
-
     }
     -> Cmd msg
 getPetById params =
     Http.request
         { method = "GET"
         , headers = List.filterMap identity []
-        , url = Url.crossOrigin basePath
+        , url =
-            ["pet", String.fromInt params.petId]
+            Url.crossOrigin basePath
+                [ "pet", String.fromInt params.petId ]
                 (List.filterMap identity [])
         , body = Http.emptyBody
         , expect = Http.expectJson params.onSend Pet.decoder
@@ -171,19 +155,16 @@ getPetById params =
 
 updatePet :
     { onSend : Result Http.Error () -> msg
-
-
     , body : Pet
-
-
     }
     -> Cmd msg
 updatePet params =
     Http.request
         { method = "PUT"
         , headers = List.filterMap identity []
-        , url = Url.crossOrigin basePath
+        , url =
-            ["pet"]
+            Url.crossOrigin basePath
+                [ "pet" ]
                 (List.filterMap identity [])
         , body = Http.jsonBody <| Pet.encode params.body
         , expect = Http.expectWhatever params.onSend
@@ -194,19 +175,16 @@ updatePet params =
 
 updatePetWithForm :
     { onSend : Result Http.Error () -> msg
-
-
-
     , petId : Int
-
     }
     -> Cmd msg
 updatePetWithForm params =
     Http.request
         { method = "POST"
         , headers = List.filterMap identity []
-        , url = Url.crossOrigin basePath
+        , url =
-            ["pet", String.fromInt params.petId]
+            Url.crossOrigin basePath
+                [ "pet", String.fromInt params.petId ]
                 (List.filterMap identity [])
         , body = Http.emptyBody
         , expect = Http.expectWhatever params.onSend
@@ -217,19 +195,16 @@ updatePetWithForm params =
 
 uploadFile :
     { onSend : Result Http.Error ApiResponse -> msg
-
-
-
     , petId : Int
-
     }
     -> Cmd msg
 uploadFile params =
     Http.request
         { method = "POST"
         , headers = List.filterMap identity []
-        , url = Url.crossOrigin basePath
+        , url =
-            ["pet", String.fromInt params.petId, "uploadImage"]
+            Url.crossOrigin basePath
+                [ "pet", String.fromInt params.petId, "uploadImage" ]
                 (List.filterMap identity [])
         , body = Http.emptyBody
         , expect = Http.expectJson params.onSend ApiResponse.decoder

samples/client/petstore/elm/src/Request/Store.elm

@@ -19,8 +19,6 @@ import Json.Decode as Decode
 import Url.Builder as Url
 
 
-
-
 basePath : String
 basePath =
     "http://petstore.swagger.io/v2"
@@ -30,19 +28,16 @@ basePath =
 -}
 deleteOrder :
     { onSend : Result Http.Error () -> msg
-
-
-
     , orderId : String
-
     }
     -> Cmd msg
 deleteOrder params =
     Http.request
         { method = "DELETE"
         , headers = List.filterMap identity []
-        , url = Url.crossOrigin basePath
+        , url =
-            ["store", "order", identity params.orderId]
+            Url.crossOrigin basePath
+                [ "store", "order", identity params.orderId ]
                 (List.filterMap identity [])
         , body = Http.emptyBody
         , expect = Http.expectWhatever params.onSend
@@ -55,19 +50,15 @@ deleteOrder params =
 -}
 getInventory :
     { onSend : Result Http.Error (Dict.Dict String Int) -> msg
-
-
-
-
-
     }
     -> Cmd msg
 getInventory params =
     Http.request
         { method = "GET"
         , headers = List.filterMap identity []
-        , url = Url.crossOrigin basePath
+        , url =
-            ["store", "inventory"]
+            Url.crossOrigin basePath
+                [ "store", "inventory" ]
                 (List.filterMap identity [])
         , body = Http.emptyBody
         , expect = Http.expectJson params.onSend (Decode.dict Decode.int)
@@ -80,19 +71,16 @@ getInventory params =
 -}
 getOrderById :
     { onSend : Result Http.Error Order_ -> msg
-
-
-
     , orderId : Int
-
     }
     -> Cmd msg
 getOrderById params =
     Http.request
         { method = "GET"
         , headers = List.filterMap identity []
-        , url = Url.crossOrigin basePath
+        , url =
-            ["store", "order", String.fromInt params.orderId]
+            Url.crossOrigin basePath
+                [ "store", "order", String.fromInt params.orderId ]
                 (List.filterMap identity [])
         , body = Http.emptyBody
         , expect = Http.expectJson params.onSend Order_.decoder
@@ -103,19 +91,16 @@ getOrderById params =
 
 placeOrder :
     { onSend : Result Http.Error Order_ -> msg
-
-
     , body : Order_
-
-
     }
     -> Cmd msg
 placeOrder params =
     Http.request
         { method = "POST"
         , headers = List.filterMap identity []
-        , url = Url.crossOrigin basePath
+        , url =
-            ["store", "order"]
+            Url.crossOrigin basePath
+                [ "store", "order" ]
                 (List.filterMap identity [])
         , body = Http.jsonBody <| Order_.encode params.body
         , expect = Http.expectJson params.onSend Order_.decoder

samples/client/petstore/elm/src/Request/User.elm

@@ -19,8 +19,6 @@ import Json.Decode as Decode
 import Url.Builder as Url
 
 
-
-
 basePath : String
 basePath =
     "http://petstore.swagger.io/v2"
@@ -30,19 +28,16 @@ basePath =
 -}
 createUser :
     { onSend : Result Http.Error () -> msg
-
-
     , body : User
-
-
     }
     -> Cmd msg
 createUser params =
     Http.request
         { method = "POST"
         , headers = List.filterMap identity []
-        , url = Url.crossOrigin basePath
+        , url =
-            ["user"]
+            Url.crossOrigin basePath
+                [ "user" ]
                 (List.filterMap identity [])
         , body = Http.jsonBody <| User.encode params.body
         , expect = Http.expectWhatever params.onSend
@@ -53,19 +48,16 @@ createUser params =
 
 createUsersWithArrayInput :
     { onSend : Result Http.Error () -> msg
-
-
     , body : User
-
-
     }
     -> Cmd msg
 createUsersWithArrayInput params =
     Http.request
         { method = "POST"
         , headers = List.filterMap identity []
-        , url = Url.crossOrigin basePath
+        , url =
-            ["user", "createWithArray"]
+            Url.crossOrigin basePath
+                [ "user", "createWithArray" ]
                 (List.filterMap identity [])
         , body = Http.jsonBody <| User.encode params.body
         , expect = Http.expectWhatever params.onSend
@@ -76,19 +68,16 @@ createUsersWithArrayInput params =
 
 createUsersWithListInput :
     { onSend : Result Http.Error () -> msg
-
-
     , body : User
-
-
     }
     -> Cmd msg
 createUsersWithListInput params =
     Http.request
         { method = "POST"
         , headers = List.filterMap identity []
-        , url = Url.crossOrigin basePath
+        , url =
-            ["user", "createWithList"]
+            Url.crossOrigin basePath
+                [ "user", "createWithList" ]
                 (List.filterMap identity [])
         , body = Http.jsonBody <| User.encode params.body
         , expect = Http.expectWhatever params.onSend
@@ -101,19 +90,16 @@ createUsersWithListInput params =
 -}
 deleteUser :
     { onSend : Result Http.Error () -> msg
-
-
-
     , username : String
-
     }
     -> Cmd msg
 deleteUser params =
     Http.request
         { method = "DELETE"
         , headers = List.filterMap identity []
-        , url = Url.crossOrigin basePath
+        , url =
-            ["user", identity params.username]
+            Url.crossOrigin basePath
+                [ "user", identity params.username ]
                 (List.filterMap identity [])
         , body = Http.emptyBody
         , expect = Http.expectWhatever params.onSend
@@ -124,19 +110,16 @@ deleteUser params =
 
 getUserByName :
     { onSend : Result Http.Error User -> msg
-
-
-
     , username : String
-
     }
     -> Cmd msg
 getUserByName params =
     Http.request
         { method = "GET"
         , headers = List.filterMap identity []
-        , url = Url.crossOrigin basePath
+        , url =
-            ["user", identity params.username]
+            Url.crossOrigin basePath
+                [ "user", identity params.username ]
                 (List.filterMap identity [])
         , body = Http.emptyBody
         , expect = Http.expectJson params.onSend User.decoder
@@ -147,20 +130,18 @@ getUserByName params =
 
 loginUser :
     { onSend : Result Http.Error String -> msg
-
+    , username : String
-
+    , password : String
-
-
-    , username : String    , password : String
     }
     -> Cmd msg
 loginUser params =
     Http.request
         { method = "GET"
         , headers = List.filterMap identity []
-        , url = Url.crossOrigin basePath
+        , url =
-            ["user", "login"]
+            Url.crossOrigin basePath
-            (List.filterMap identity [(Just << Url.string "username" << identity) params.username, (Just << Url.string "password" << identity) params.password])
+                [ "user", "login" ]
+                (List.filterMap identity [ (Just << Url.string "username" << identity) params.username, (Just << Url.string "password" << identity) params.password ])
         , body = Http.emptyBody
         , expect = Http.expectJson params.onSend Decode.string
         , timeout = Just 30000
@@ -170,19 +151,15 @@ loginUser params =
 
 logoutUser :
     { onSend : Result Http.Error () -> msg
-
-
-
-
-
     }
     -> Cmd msg
 logoutUser params =
     Http.request
         { method = "GET"
         , headers = List.filterMap identity []
-        , url = Url.crossOrigin basePath
+        , url =
-            ["user", "logout"]
+            Url.crossOrigin basePath
+                [ "user", "logout" ]
                 (List.filterMap identity [])
         , body = Http.emptyBody
         , expect = Http.expectWhatever params.onSend
@@ -195,19 +172,17 @@ logoutUser params =
 -}
 updateUser :
     { onSend : Result Http.Error () -> msg
-
-
     , body : User
     , username : String
-
     }
     -> Cmd msg
 updateUser params =
     Http.request
         { method = "PUT"
         , headers = List.filterMap identity []
-        , url = Url.crossOrigin basePath
+        , url =
-            ["user", identity params.username]
+            Url.crossOrigin basePath
+                [ "user", identity params.username ]
                 (List.filterMap identity [])
         , body = Http.jsonBody <| User.encode params.body
         , expect = Http.expectWhatever params.onSend