debug tests

Author: everly-gif

templates/kotlin/base/macros/methodNeedsSecurityParameters.twig

@@ -1,10 +1,10 @@
-{% import 'kotlin/base/macros/resultType.twig' as result%}
+{% import 'kotlin/base/utils.twig' as utils%}
         return client.call(
             "{{ method.method | caseUpper }}",
             path,
             headers,
             params,
-            responseType = {{ result.resultType(sdk.namespace, method) }}::class.java,
+            responseType = {{ utils.resultType(sdk.namespace, method) }}::class.java,
 {% if method.responseModel %}
             converter,
 {% endif %}

templates/kotlin/base/macros/resultType.twig

@@ -1,6 +1,7 @@
+{% import 'kotlin/base/utils.twig' as utils%}
         return client.call(
             "{{ method.method | caseUpper }}",
             path,
             params = params,
-            responseType = {{ result.resultType(sdk.namespace, method) }}::class.java
+            responseType = {{ utils.resultType(sdk.namespace, method) }}::class.java
         )

templates/kotlin/base/requests/api.twig

@@ -1,4 +1,10 @@
 {% macro parameter(parameter) %}{{ parameter.name | caseCamel }}: {{ parameter.type | typeName }}{% if not parameter.required %}? = null{% endif %}{% endmacro %}
 {% macro method_parameters(parameters, consumes) %}
 {% if parameters.all|length > 0 %}{% for parameter in parameters.all | filter((param) => not param.isGlobal) %}{{ '\n\t\t' }}{{ _self.parameter(parameter) }}{% if not loop.last %}{{ ',' }}{% endif %}{% endfor %}{% if 'multipart/form-data' in consumes %}, onProgress: ((UploadProgress) -> Unit)? = null{% endif %}{% endif %}
+{% endmacro %}
+{% macro methodNeedsSecurityParameters(method) %}
+{% if (method.type == "webAuth" or method.type == "location") and method.security|length > 0 %}{{ true }}{% else %}{{false}}{% endif %}
+{% endmacro %}
+{% macro resultType(namespace, method) %}
+{% if method.type == "webAuth" %}Bool{% elseif method.type == "location" %}ByteArray{% elseif not method.responseModel or method.responseModel == 'any' %}Any{% else %}{{ namespace | caseDot}}.models.{{method.responseModel | caseUcfirst}}{% endif %}
 {% endmacro %}

templates/kotlin/base/requests/location.twig

@@ -1,6 +1,4 @@
-{% import 'kotlin/base/macros/parameter.twig' as parameters %}
-{% import 'kotlin/base/macros/methodNeedsSecurityParameters.twig' as securityParameters %}
-{% import 'kotlin/base/macros/resultType.twig' as result %}
+{% import 'kotlin/base/utils.twig' as utils %}
 package {{ sdk.namespace | caseDot }}.services
 import {{ sdk.namespace | caseDot }}.Client
 import {{ sdk.namespace | caseDot }}.models.*
@@ -55,10 +53,10 @@ class {{ service.name | caseUcfirst }} : Service {
 
         val params = mutableMapOf<String, Any?>(
 {% for parameter in method.parameters.query | merge(method.parameters.body) %}
-            "{{ parameter.name }}" to {{ parameter.name | caseCamel }}{% if not loop.last or securityParameters.methodNeedsSecurityParameters(method) %},{% endif %}
+            "{{ parameter.name }}" to {{ parameter.name | caseCamel }}{% if not loop.last or utils.methodNeedsSecurityParameters(method) %},{% endif %}
 
 {% endfor %}
-{% if securityParameters.methodNeedsSecurityParameters(method) %}
+{% if utils.methodNeedsSecurityParameters(method) %}
 {% for node in method.security %}
 {% for key,header in node|keys %}
             "{{header|caseLower}}" to client.config["{{header|caseLower}}"]{% if not loop.last %},{% endif %}
@@ -115,11 +113,11 @@ class {{ service.name | caseUcfirst }} : Service {
 {{ method.headers|map((header, key) => "            \"#{key}\" to \"#{header}\"")|join(',\n')|raw }}
         )
 {% if method.responseModel %}
-        val converter: (Map<String, Any>) -> {{ result.resultType(sdk.namespace, method) }} = {
+        val converter: (Map<String, Any>) -> {{ utils.resultType(sdk.namespace, method) }} = {
 {% if method.responseModel == 'any' %}
             it
 {% else %}
-            {{ result.resultType(sdk.namespace, method) }}.from(map = it)
+            {{ utils.resultType(sdk.namespace, method) }}.from(map = it)
 {% endif %}
         }
 {% endif %}