[Erlang] erlang client: properly handle optional parameters

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ErlangClientCodegen.java

@@ -163,10 +163,12 @@ public void execute(Template.Fragment fragment, Writer writer) throws IOExceptio
     public String qsEncode(Object o) {
         String r = new String();
         CodegenParameter q = (CodegenParameter) o;
-        if (q.isListContainer) {
-            r += "[{<<\"" + q.baseName + "\">>, X} || X <- " + q.paramName + "]";
-        } else {
-            r += "{<<\"" + q.baseName + "\">>, " + q.paramName + "}";
+        if (q.required) {
+            if (q.isListContainer) {
+                r += "[{<<\"" + q.baseName + "\">>, X} || X <- " + q.paramName + "]";
+            } else {
+                r += "{<<\"" + q.baseName + "\">>, " + q.paramName + "}";
+            }
         }
         return r;
     }
@@ -257,7 +259,7 @@ public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
         Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
         List<CodegenOperation> os = (List<CodegenOperation>) operations.get("operation");
         List<ExtendedCodegenOperation> newOs = new ArrayList<ExtendedCodegenOperation>();
-        Pattern pattern = Pattern.compile("(.*)\\{([^\\}]+)\\}(.*)");
+        Pattern pattern = Pattern.compile("\\{([^\\}]+)\\}");
         for (CodegenOperation o : os) {
             // force http method to lower case
             o.httpMethod = o.httpMethod.toLowerCase();
@@ -270,10 +272,12 @@ public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
             Matcher matcher = pattern.matcher(o.path);
             StringBuffer buffer = new StringBuffer();
             while (matcher.find()) {
-                String pathTemplateName = matcher.group(2);
-                matcher.appendReplacement(buffer, "$1" + "\", " + camelize(pathTemplateName) + ", \"" + "$3");
+                String pathTemplateName = matcher.group(1);
+                matcher.appendReplacement(buffer, "\", " + camelize(pathTemplateName) + ", \"");
                 pathTemplateNames.add(pathTemplateName);
             }
+            matcher.appendTail(buffer);
+
             ExtendedCodegenOperation eco = new ExtendedCodegenOperation(o);
             if (buffer.toString().isEmpty()) {
                 eco.setReplacedPathName(o.path);
@@ -295,8 +299,26 @@ public void setPackageVersion(String packageVersion) {
         this.packageVersion = packageVersion;
     }
 
-    String length(Object o) {
-        return Integer.toString((((ExtendedCodegenOperation) o).allParams).size());
+    String length(Object os) {
+        int l = 1;
+        for (CodegenParameter o : ((ExtendedCodegenOperation) os).allParams) {
+            CodegenParameter q = (CodegenParameter) o;
+            if (q.required)
+                l++;
+        }
+
+        return Integer.toString(l);
+    }
+
+    int lengthRequired(List<CodegenParameter> allParams) {
+        int l = 0;
+        for (CodegenParameter o : allParams) {
+            CodegenParameter q = (CodegenParameter) o;
+            if (q.required || q.isBodyParam)
+                l++;
+        }
+
+        return l;
     }
 
     @Override
@@ -313,6 +335,8 @@ public String escapeUnsafeCharacters(String input) {
     class ExtendedCodegenOperation extends CodegenOperation {
         private List<String> pathTemplateNames = new ArrayList<String>();
         private String replacedPathName;
+        String arityRequired;
+        String arityOptional;
 
         public ExtendedCodegenOperation(CodegenOperation o) {
             super();
@@ -355,6 +379,8 @@ public ExtendedCodegenOperation(CodegenOperation o) {
             this.produces = o.produces;
             this.bodyParam = o.bodyParam;
             this.allParams = o.allParams;
+            this.arityRequired = Integer.toString(lengthRequired(o.allParams));
+            this.arityOptional = Integer.toString(lengthRequired(o.allParams)+1);
             this.bodyParams = o.bodyParams;
             this.pathParams = o.pathParams;
             this.queryParams = o.queryParams;

modules/swagger-codegen/src/main/resources/erlang-client/api.mustache

@@ -1,23 +1,27 @@
 -module({{classname}}_api).
 
 -export([{{#operations}}{{#operation}}{{^-first}},
-         {{/-first}}{{operationId}}/{{#length}}{{allParams}}{{/length}}{{/operation}}{{/operations}}]).
+         {{/-first}}{{operationId}}/{{arityRequired}}, {{operationId}}/{{arityOptional}}{{/operation}}{{/operations}}]).
 
 -define(BASE_URL, <<"{{{basePath}}}">>).
 
 {{#operations}}
     {{#operation}}
-%% @doc {{summary}}
+%% @doc {{{summary}}}
 {{^notes.isEmpty}}
-%% {{notes}}
+%% {{{notes}}}
 {{/notes.isEmpty}}
--spec {{operationId}}({{#allParams}}{{^-first}}, {{/-first}}{{dataType}}{{/allParams}}) -> {{#returnType}}{ok, list(), {{returnType}}} | {error, string()}{{/returnType}}{{^returnType}}ok | {error, integer()}{{/returnType}}.
-{{operationId}}({{#allParams}}{{^-first}}, {{/-first}}{{paramName}}{{/allParams}}) ->
+-spec {{operationId}}({{#allParams}}{{#required}}{{^-first}}, {{/-first}}{{{dataType}}}{{/required}}{{/allParams}}{{^bodyParams.isEmpty}}{{#bodyParams}}, term(){{/bodyParams}}{{/bodyParams.isEmpty}}) -> {{#returnType}}{ok, list(), {{{returnType}}}} | {error, string()}{{/returnType}}{{^returnType}}ok | {error, integer()}{{/returnType}}.
+{{operationId}}({{#allParams}}{{#required}}{{^-first}}, {{/-first}}{{paramName}}{{/required}}{{/allParams}}{{^bodyParams.isEmpty}}{{#bodyParams}}, {{paramName}}{{/bodyParams}}{{/bodyParams.isEmpty}}) ->
+    {{operationId}}({{#allParams}}{{#required}}{{paramName}}, {{/required}}{{/allParams}}{{^bodyParams.isEmpty}}{{#bodyParams}}{{paramName}}, {{/bodyParams}}{{/bodyParams.isEmpty}}#{}).
+
+-spec {{operationId}}({{#allParams}}{{#required}}{{{dataType}}}, {{/required}}{{/allParams}}{{^bodyParams.isEmpty}}{{#bodyParams}}term(), {{/bodyParams}}{{/bodyParams.isEmpty}}maps:map()) -> {{#returnType}}{ok, list(), {{{returnType}}}} | {error, string()}{{/returnType}}{{^returnType}}ok | {error, integer()}{{/returnType}}.
+{{operationId}}({{#allParams}}{{#required}}{{paramName}}, {{/required}}{{/allParams}}{{^bodyParams.isEmpty}}{{#bodyParams}}{{paramName}}{{/bodyParams}}, {{/bodyParams.isEmpty}}_Optional) ->
     Method = {{httpMethod}},
     Path = ["{{{replacedPathName}}}"],
-    QS = {{#queryParams.isEmpty}}[]{{/queryParams.isEmpty}}{{^queryParams.isEmpty}}lists:flatten([{{#queryParams}}{{^-first}}, {{/-first}}{{#qsEncode}}{{this}}{{/qsEncode}}{{/queryParams}}]){{/queryParams.isEmpty}},
-    Headers = [{{^headerParams.isEmpty}}{{#headerParams}}{{^-first}}, {{/-first}}{<<"{{baseName}}">>, {{paramName}}}{{/headerParams}}{{/headerParams.isEmpty}}],
-    Body1 = {{^formParams.isEmpty}}{form, [{{#formParams}}{{^-first}}, {{/-first}}{<<"{{baseName}}">>, {{paramName}}}{{/formParams}}]}{{/formParams.isEmpty}}{{#formParams.isEmpty}}{{#bodyParams.isEmpty}}[]{{/bodyParams.isEmpty}}{{^bodyParams.isEmpty}}{{#bodyParams}}{{paramName}}{{/bodyParams}}{{/bodyParams.isEmpty}}{{/formParams.isEmpty}},
+    QS = {{#queryParams.isEmpty}}[]{{/queryParams.isEmpty}}{{^queryParams.isEmpty}}lists:flatten([{{#queryParams}}{{#required}}{{^-first}}, {{/-first}}{{#qsEncode}}{{this}}{{/qsEncode}}{{/required}}{{/queryParams}}])++[{X, maps:get(X, _Optional)} || X <- [{{#queryParams}}{{^required}}{{^-first}}, {{/-first}}'{{baseName}}'{{/required}}{{/queryParams}}], maps:is_key(X, _Optional)]{{/queryParams.isEmpty}},
+    Headers = {{#headerParams.isEmpty}}[]{{/headerParams.isEmpty}}{{^headerParams.isEmpty}}[{{#headerParams}}{{#required}}{{^-first}}, {{/-first}}{<<"{{baseName}}">>, {{paramName}}}{{/required}}{{/headerParams}}]++[{X, maps:get(X, _Optional)} || X <- [{{#headerParams}}{{^required}}{{^-first}}, {{/-first}}'{{baseName}}'{{/required}}{{/headerParams}}], maps:is_key(X, _Optional)]{{/headerParams.isEmpty}},
+    Body1 = {{^formParams.isEmpty}}{form, [{{#formParams}}{{#required}}{{^-first}}, {{/-first}}{<<"{{baseName}}">>, {{paramName}}}{{/required}}{{/formParams}}]++[{X, maps:get(X, _Optional)} || X <- [{{#formParams}}{{^required}}{{^-first}}, {{/-first}}'{{baseName}}'{{/required}}{{/formParams}}], maps:is_key(X, _Optional)]}{{/formParams.isEmpty}}{{#formParams.isEmpty}}{{#bodyParams.isEmpty}}[]{{/bodyParams.isEmpty}}{{^bodyParams.isEmpty}}{{#bodyParams}}{{paramName}}{{/bodyParams}}{{/bodyParams.isEmpty}}{{/formParams.isEmpty}},
     Opts = [],
     Url = hackney_url:make_url(?BASE_URL, Path, QS),
 
@@ -26,8 +30,8 @@
         {{#responses}}
 {{#isDefault}}
         {ok, {{code}}, RespHeaders, ClientRef} ->
-            {ok, Body} = hackney:body(ClientRef),
-            {ok, RespHeaders, jsx:decode(Body, [returns_maps, {labels, attempt_atom}])}{{#hasMore}}; {{/hasMore}}
+            {ok, ResponseBody} = hackney:body(ClientRef),
+            {ok, RespHeaders, jsx:decode(ResponseBody, [return_maps])}{{#hasMore}}; {{/hasMore}}
 {{/isDefault}}
 {{^isDefault}}
         {ok, {{code}}, _RespHeaders, _ClientRef} ->

modules/swagger-codegen/src/main/resources/erlang-client/model.mustache

@@ -2,9 +2,9 @@
 {{#model}}
 -module({{classname}}).
 
--export_type([{{classname}}/0,
-              encode/1,
-              decode/1]).
+-export([encode/1]).
+
+-export_type([{{classname}}/0]).
 
 -type {{classname}}() ::
     #{ {{#vars}}'{{name}}' {{#required}}:={{/required}}{{^required}}=>{{/required}} {{{datatype}}}{{#hasMore}},
@@ -16,6 +16,6 @@ encode(#{ {{#vars}}'{{name}}' := {{{nameInCamelCase}}}{{#hasMore}},
         }) ->
     #{ {{#vars}}'{{baseName}}' => {{{nameInCamelCase}}}{{#hasMore}},
        {{/hasMore}}{{/vars}}
-     }
+     }.
 {{/model}}
 {{/models}}

samples/client/petstore/erlang-client/src/swagger_api_response.erl

@@ -1,8 +1,8 @@
 -module(swagger_api_response).
 
--export_type([swagger_api_response/0,
-              encode/1,
-              decode/1]).
+-export([encode/1]).
+
+-export_type([swagger_api_response/0]).
 
 -type swagger_api_response() ::
     #{ 'code' => integer(),
@@ -17,4 +17,4 @@ encode(#{ 'code' := Code,
     #{ 'code' => Code,
        'type' => Type,
        'message' => Message
-     }
+     }.

samples/client/petstore/erlang-client/src/swagger_category.erl

@@ -1,8 +1,8 @@
 -module(swagger_category).
 
--export_type([swagger_category/0,
-              encode/1,
-              decode/1]).
+-export([encode/1]).
+
+-export_type([swagger_category/0]).
 
 -type swagger_category() ::
     #{ 'id' => integer(),
@@ -14,4 +14,4 @@ encode(#{ 'id' := Id,
         }) ->
     #{ 'id' => Id,
        'name' => Name
-     }
+     }.

samples/client/petstore/erlang-client/src/swagger_order.erl

@@ -1,8 +1,8 @@
 -module(swagger_order).
 
--export_type([swagger_order/0,
-              encode/1,
-              decode/1]).
+-export([encode/1]).
+
+-export_type([swagger_order/0]).
 
 -type swagger_order() ::
     #{ 'id' => integer(),
@@ -26,4 +26,4 @@ encode(#{ 'id' := Id,
        'shipDate' => ShipDate,
        'status' => Status,
        'complete' => Complete
-     }
+     }.

samples/client/petstore/erlang-client/src/swagger_pet.erl

@@ -1,8 +1,8 @@
 -module(swagger_pet).
 
--export_type([swagger_pet/0,
-              encode/1,
-              decode/1]).
+-export([encode/1]).
+
+-export_type([swagger_pet/0]).
 
 -type swagger_pet() ::
     #{ 'id' => integer(),
@@ -26,4 +26,4 @@ encode(#{ 'id' := Id,
        'photoUrls' => PhotoUrls,
        'tags' => Tags,
        'status' => Status
-     }
+     }.