remove if and string cast

Author: shortcuts

templates/java/libraries/okhttp-gson/api.mustache

@@ -125,12 +125,10 @@ public class {{classname}} extends ApiClient {
             queryParams.addAll(this.parameterToPair("{{baseName}}", {{paramName}}));
           {{/x-is-custom-request}}
           {{#x-is-custom-request}}
-            if (parameters instanceof Map) {
-              Map<String, Object> mapParameters = (Map<String, Object>) parameters;
+            Map<String, Object> mapParameters = (Map<String, Object>) parameters;
 
-              for (Map.Entry<String, Object> parameter : mapParameters.entrySet()) {
-                queryParams.addAll(this.parameterToPair(parameter.getKey(), parameter.getValue().toString()));
-              } 
+            for (Map.Entry<String, Object> parameter : mapParameters.entrySet()) {
+              queryParams.addAll(this.parameterToPair(parameter.getKey(), parameter.getValue().toString()));
             }
           {{/x-is-custom-request}}
         }

templates/javascript/api-single.mustache

@@ -220,7 +220,7 @@ export function create{{capitalizedApiName}}Api(options: CreateClientOptions{{#h
       {{/allParams}}
 
       const requestPath = '{{{path}}}'{{#vendorExtensions}}{{#pathParams}}.replace(
-      {{=<% %>=}}'{<%baseName%>}'<%={{ }}=%>,{{#x-is-custom-request}}String({{paramName}}){{/x-is-custom-request}}{{^x-is-custom-request}}encodeURIComponent(String({{paramName}})){{/x-is-custom-request}}
+      {{=<% %>=}}'{<%baseName%>}'<%={{ }}=%>,{{#x-is-custom-request}}{{paramName}}{{/x-is-custom-request}}{{^x-is-custom-request}}encodeURIComponent({{paramName}}){{/x-is-custom-request}}
       ){{/pathParams}}{{/vendorExtensions}};
       const headers: Headers = {};
       const queryParameters: QueryParameters = {{#vendorExtensions.x-is-custom-request}}parameters || {{/vendorExtensions.x-is-custom-request}}{};