guides: support verbatim variables (#3871)

millotp · web-flow · commit 233cf76c4c49 · 2024-10-03T10:47:31.000+02:00
diff --git a/generators/src/main/java/com/algolia/codegen/cts/lambda/DynamicSnippetLambda.java b/generators/src/main/java/com/algolia/codegen/cts/lambda/DynamicSnippetLambda.java
@@ -76,6 +76,6 @@ public void execute(Template.Fragment fragment, Writer writer) throws IOExceptio
     Map<String, Object> context = (Map<String, Object>) fragment.context();
     snippet.addMethodCall(context, paramsType, operation);
 
-    writer.write(adaptor.compileTemplate(executor, context, "tests/client/method.mustache"));
+    writer.write(adaptor.compileTemplate(executor, context, "tests/method.mustache"));
   }
 }
diff --git a/generators/src/main/java/com/algolia/codegen/cts/manager/CSharpCTSManager.java b/generators/src/main/java/com/algolia/codegen/cts/manager/CSharpCTSManager.java
@@ -29,10 +29,13 @@ public void addTestsSupportingFiles(List<SupportingFile> supportingFiles) {
   @Override
   public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles, String output) {
     supportingFiles.add(new SupportingFile("snippets/src.csproj.mustache", output + "/csharp/src/src.csproj"));
-    supportingFiles.add(new SupportingFile("snippets/Program.mustache", output + "/csharp/src/Program.cs"));
     supportingFiles.add(new SupportingFile("snippets/.gitignore.mustache", output + "/csharp/.gitignore"));
     supportingFiles.add(new SupportingFile("snippets/Algolia.mustache", output + "/csharp/Algolia.sln"));
     supportingFiles.add(new SupportingFile("snippets/dotnet-tools.mustache", output + "/csharp/.config/dotnet-tools.json"));
+
+    if (output.equals("snippets")) {
+      supportingFiles.add(new SupportingFile("snippets/Program.mustache", output + "/csharp/src/Program.cs"));
+    }
   }
 
   @Override
diff --git a/generators/src/main/java/com/algolia/codegen/cts/manager/JavaCTSManager.java b/generators/src/main/java/com/algolia/codegen/cts/manager/JavaCTSManager.java
@@ -38,7 +38,7 @@ public void addTestsSupportingFiles(List<SupportingFile> supportingFiles) {
 
   @Override
   public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles, String output) {
-    supportingFiles.add(new SupportingFile("tests/build.mustache", output + "/java", "build.gradle"));
+    supportingFiles.add(new SupportingFile("snippets/build.mustache", output + "/java", "build.gradle"));
     supportingFiles.add(new SupportingFile("snippets/settings.mustache", output + "/java", "settings.gradle"));
   }
 
diff --git a/generators/src/main/java/com/algolia/codegen/cts/tests/ParametersWithDataType.java b/generators/src/main/java/com/algolia/codegen/cts/tests/ParametersWithDataType.java
@@ -95,12 +95,16 @@ public void enhanceParameters(Map<String, Object> parameters, Map<String, Object
     }
 
     // Give the stringified version to mustache, for js
-    bundle.put("parameters", Json.mapper().writeValueAsString(parameters));
+    bundle.put("parameters", toJSONWithVar(parameters));
     bundle.put("parametersWithDataType", parametersWithDataType);
     // Also provide a map version for those who know which keys to look for
     bundle.put("parametersWithDataTypeMap", parametersWithDataTypeMap);
   }
 
+  private String toJSONWithVar(Map<String, Object> parameters) throws JsonProcessingException {
+    return Json.mapper().writeValueAsString(parameters).replaceAll("\"\\$var: (.*?)\"", "$1");
+  }
+
   private Map<String, Object> traverseParams(
     String paramName,
     Object param,
@@ -154,6 +158,10 @@ private Map<String, Object> traverseParams(
 
     if (param == null) {
       handleNull(spec, testOutput);
+    } else if (param instanceof String && ((String) param).startsWith("$var: ")) {
+      // bypass for verbatim variables used in the guides, we don't need to do any validation
+      testOutput.put("isVerbatim", true);
+      testOutput.put("value", ((String) param).substring(6));
     } else if (spec.getIsArray()) {
       handleArray(paramName, param, testOutput, spec, depth);
     } else if (spec.getIsEnum()) {
@@ -196,6 +204,10 @@ private Map<String, Object> traverseParamsWithoutSpec(String paramName, Object p
 
     if (param == null) {
       handleNull(null, testOutput);
+    } else if (param instanceof String && ((String) param).startsWith("$var: ")) {
+      // bypass for verbatim variables used in the guides, we don't need to do any validation
+      testOutput.put("isVerbatim", true);
+      testOutput.put("value", ((String) param).substring(6));
     } else if (param instanceof List) {
       handleArray(paramName, param, testOutput, null, depth);
     } else if (param instanceof Map) {
diff --git a/generators/src/main/java/com/algolia/codegen/cts/tests/Snippet.java b/generators/src/main/java/com/algolia/codegen/cts/tests/Snippet.java
@@ -13,7 +13,6 @@ public class Snippet {
 
   public String testName;
   public boolean isSnippet;
-  public boolean ignoreResponse;
 
   public String method;
   public Map<String, Object> parameters;
@@ -34,7 +33,6 @@ public String toString() {
     sb.append("class Request {\n");
     sb.append("    testName: ").append(testName).append("\n");
     sb.append("    isSnippet").append(isSnippet).append("\n");
-    sb.append("    ignoreResponse").append(ignoreResponse).append("\n");
     sb.append("    method: ").append(method).append("\n");
     sb.append("    parameters: ").append(parameters).append("\n");
     sb.append("    requestOptions: ").append(requestOptions).append("\n");
@@ -75,13 +73,10 @@ public void addMethodCall(Map<String, Object> context, ParametersWithDataType pa
 
       // Determines whether the endpoint is expected to return a response payload deserialized
       // and therefore a variable to store it into.
-      if (!ignoreResponse) {
-        context.put("hasResponse", true);
-
-        for (CodegenResponse response : ope.responses) {
-          if (response.code.equals("204")) {
-            context.put("hasResponse", false);
-          }
+      context.put("hasResponse", true);
+      for (CodegenResponse response : ope.responses) {
+        if (response.code.equals("204")) {
+          context.put("hasResponse", false);
         }
       }
 
diff --git a/generators/src/main/java/com/algolia/codegen/cts/tests/TestsRequest.java b/generators/src/main/java/com/algolia/codegen/cts/tests/TestsRequest.java
@@ -82,6 +82,7 @@ public void run(Map<String, CodegenModel> models, Map<String, CodegenOperation>
     ParametersWithDataType paramsType = new ParametersWithDataType(models, language, client, false);
 
     bundle.put("e2eApiKey", client.equals("monitoring") ? "MONITORING_API_KEY" : "ALGOLIA_ADMIN_KEY");
+    bundle.put("useEchoRequester", true);
 
     for (Map.Entry<String, CodegenOperation> entry : operations.entrySet()) {
       String operationId = entry.getKey();
diff --git a/scripts/buildLanguages.ts b/scripts/buildLanguages.ts
@@ -24,7 +24,7 @@ async function buildLanguage(language: Language, gens: Generator[], buildType: B
       }
       break;
     case 'go':
-      await run('go build ./...', { cwd, language });
+      await run('go build -o /dev/null ./...', { cwd, language });
       break;
     case 'javascript':
       await run('YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install', { cwd, language });
@@ -42,7 +42,10 @@ async function buildLanguage(language: Language, gens: Generator[], buildType: B
       break;
     case 'java':
     case 'kotlin':
-      await run(`./gradle/gradlew -p ${cwd} assemble`, { language });
+      await run(
+        `./gradle/gradlew -p ${cwd} ${buildType === 'client' || buildType === 'playground' ? 'assemble' : 'build'}`,
+        { language },
+      );
       break;
     case 'php':
       // await runComposerInstall();
diff --git a/templates/csharp/tests/generateInnerParams.mustache b/templates/csharp/tests/generateInnerParams.mustache
@@ -1,6 +1,9 @@
 {{#isNull}}
   null
 {{/isNull}}
+{{#isVerbatim}}
+  {{{value}}}
+{{/isVerbatim}}
 {{#isString}}
   "{{#lambda.escapeQuotes}}{{#lambda.escapeSlash}}{{{value}}}{{/lambda.escapeSlash}}{{/lambda.escapeQuotes}}"
 {{/isString}}
diff --git a/templates/dart/tests/param_value.mustache b/templates/dart/tests/param_value.mustache
@@ -1,4 +1,5 @@
 {{#isNull}}empty(){{/isNull}}
+{{#isVerbatim}}{{{value}}}{{/isVerbatim}}
 {{#isString}}"{{#lambda.escapeDollar}}{{{value}}}{{/lambda.escapeDollar}}"{{/isString}}
 {{#isNumber}}{{{value}}}{{/isNumber}}
 {{#isBoolean}}{{{value}}}{{/isBoolean}}
diff --git a/templates/go/tests/generateInnerParams.mustache b/templates/go/tests/generateInnerParams.mustache
@@ -1,3 +1,3 @@
-{{#isHelper}}{{#goFunctionalParam}}{{clientPrefix}}.With{{#lambda.pascalcase}}{{key}}{{/lambda.pascalcase}}({{/goFunctionalParam}}{{/isHelper}}{{#isNull}}{{#inClientTest}}tests.ZeroValue[{{#isNullObject}}*{{clientPrefix}}.{{/isNullObject}}{{objectName}}](){{/inClientTest}}{{^inClientTest}}nil{{/inClientTest}}{{/isNull}}{{#isString}}"{{{value}}}"{{/isString}}{{#isInteger}}{{{value}}}{{/isInteger}}{{#isLong}}{{{value}}}{{/isLong}}{{#isDouble}}{{{value}}}{{/isDouble}}{{#isBoolean}}{{{value}}}{{/isBoolean}}{{#isEnum}}{{clientPrefix}}.{{objectName}}("{{{value}}}"){{/isEnum}}{{#isArray}}
+{{#isVerbatim}}{{{value}}}{{/isVerbatim}}{{#isHelper}}{{#goFunctionalParam}}{{clientPrefix}}.With{{#lambda.pascalcase}}{{key}}{{/lambda.pascalcase}}({{/goFunctionalParam}}{{/isHelper}}{{#isNull}}{{#inClientTest}}tests.ZeroValue[{{#isNullObject}}*{{clientPrefix}}.{{/isNullObject}}{{objectName}}](){{/inClientTest}}{{^inClientTest}}nil{{/inClientTest}}{{/isNull}}{{#isString}}"{{{value}}}"{{/isString}}{{#isInteger}}{{{value}}}{{/isInteger}}{{#isLong}}{{{value}}}{{/isLong}}{{#isDouble}}{{{value}}}{{/isDouble}}{{#isBoolean}}{{{value}}}{{/isBoolean}}{{#isEnum}}{{clientPrefix}}.{{objectName}}("{{{value}}}"){{/isEnum}}{{#isArray}}
 {{> tests/arrayType}}{{^value.isEmpty}}{ {{#value}}{{#isObject}}*{{/isObject}}{{#oneOfModel}}{{^isObject}}*{{/isObject}}{{/oneOfModel}}{{> tests/generateParams}},{{/value}} }{{/value.isEmpty}}{{/isArray}}{{#isObject}}
 {{clientPrefix}}.NewEmpty{{objectName}}(){{#value}}{{#isAdditionalProperty}}.SetAdditionalProperty("{{{key}}}", {{> tests/generateParams}}){{/isAdditionalProperty}}{{^isAdditionalProperty}}.Set{{#lambda.pascalcase}}{{{key}}}{{/lambda.pascalcase}}({{> tests/generateParams}}){{/isAdditionalProperty}}{{/value}}{{/isObject}}{{#isFreeFormObject}}{{#isAnyType}}map[string]any{ {{#value}}{{#entrySet}}"{{{key}}}": "{{{value}}}",{{/entrySet}}{{/value}} }{{/isAnyType}}{{^isAnyType}}{{> tests/mapType}}{ {{#value}}"{{{key}}}": {{#oneOfModel}}{{^isObject}}*{{/isObject}}{{/oneOfModel}}{{#isObject}}*{{/isObject}}{{> tests/generateParams}},{{/value}} }{{/isAnyType}}{{/isFreeFormObject}}{{#isHelper}}{{#goFunctionalParam}}){{/goFunctionalParam}}{{/isHelper}}
diff --git a/templates/java/snippets/build.mustache b/templates/java/snippets/build.mustache
@@ -0,0 +1,22 @@
+plugins {
+    id 'java-library'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testImplementation 'com.algolia:algoliasearch:{{packageVersion}}'
+}
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+        vendor = JvmVendorSpec.ADOPTIUM
+    }
+}
+
+tasks.withType(JavaCompile) {
+    options.encoding = 'UTF-8'
+}
diff --git a/templates/java/snippets/method.mustache b/templates/java/snippets/method.mustache
@@ -4,13 +4,15 @@ package com.algolia.methods.snippets;
 {{> snippets/import}}
 // IMPORT<
 
+import java.util.*;
+
 class Snippet{{client}} {
   {{#blocksRequests}}
   {{#snippets}}
   // Snippet for the {{method}} method.
   //
   // {{{description}}}
-  void snippetFor{{#lambda.pascalcase}}{{method}}{{/lambda.pascalcase}}{{testIndex}}() {
+  void snippetFor{{#lambda.pascalcase}}{{method}}{{/lambda.pascalcase}}{{testIndex}}() throws Exception {
     // >SEPARATOR {{method}} {{testName}}
     // Initialize the client
     {{> snippets/init}}
diff --git a/templates/java/tests/build.mustache b/templates/java/tests/build.mustache
@@ -33,4 +33,4 @@ test() {
 		events "passed", "skipped", "failed"
         showStandardStreams = true
 	}
-}
+}
diff --git a/templates/javascript/guides/search/saveObjectsMovies.mustache b/templates/javascript/guides/search/saveObjectsMovies.mustache
@@ -5,7 +5,7 @@
 // Fetch and index objects in Algolia
 const processRecords = async () => {
   const datasetRequest = await fetch('https://dashboard.algolia.com/sample_datasets/movie.json');
-  const objects = await datasetRequest.json();
+  const movies = await datasetRequest.json();
   return {{#dynamicSnippet}}saveObjectsMovies{{/dynamicSnippet}}
 };
 
diff --git a/templates/kotlin/tests/param_value.mustache b/templates/kotlin/tests/param_value.mustache
@@ -1 +1 @@
-{{#isNull}}empty(){{/isNull}}{{#isString}}{{#oneOfModel}}{{{parentClassName}}}.of("{{{value}}}"){{/oneOfModel}}{{^oneOfModel}}"{{#lambda.escapeQuotes}}{{#lambda.escapeSlash}}{{{value}}}{{/lambda.escapeSlash}}{{/lambda.escapeQuotes}}"{{/oneOfModel}}{{/isString}}{{#isInteger}}{{#oneOfModel}}{{{parentClassName}}}.of({{{value}}}){{/oneOfModel}}{{^oneOfModel}}{{{value}}}{{/oneOfModel}}{{/isInteger}}{{#isLong}}{{#oneOfModel}}{{{parentClassName}}}.of({{{value}}}L){{/oneOfModel}}{{^oneOfModel}}{{{value}}}L{{/oneOfModel}}{{/isLong}}{{#isDouble}}{{#oneOfModel}}{{{parentClassName}}}.of({{{value}}}){{/oneOfModel}}{{^oneOfModel}}{{{value}}}{{/oneOfModel}}{{/isDouble}}{{#isBoolean}}{{#oneOfModel}}{{{parentClassName}}}.of({{{value}}}){{/oneOfModel}}{{^oneOfModel}}{{{value}}}{{/oneOfModel}}{{/isBoolean}}{{#isEnum}}{{{objectName}}}.entries.first { it.value == "{{{value}}}" }{{/isEnum}}{{#isArray}}{{> tests/param_list}}{{/isArray}}{{#isObject}}{{> tests/param_object}}{{/isObject}}{{#isFreeFormObject}}{{#isSimpleObject}}{{> tests/param_json_object}}{{/isSimpleObject}}{{^isSimpleObject}}{{#isAnyType}}{{> tests/param_json_any}}{{/isAnyType}}{{^isAnyType}}{{> tests/param_map}}{{/isAnyType}}{{/isSimpleObject}}{{/isFreeFormObject}}
+{{#isNull}}empty(){{/isNull}}{{#isVerbatim}}{{{value}}}{{/isVerbatim}}{{#isString}}{{#oneOfModel}}{{{parentClassName}}}.of("{{{value}}}"){{/oneOfModel}}{{^oneOfModel}}"{{#lambda.escapeQuotes}}{{#lambda.escapeSlash}}{{{value}}}{{/lambda.escapeSlash}}{{/lambda.escapeQuotes}}"{{/oneOfModel}}{{/isString}}{{#isInteger}}{{#oneOfModel}}{{{parentClassName}}}.of({{{value}}}){{/oneOfModel}}{{^oneOfModel}}{{{value}}}{{/oneOfModel}}{{/isInteger}}{{#isLong}}{{#oneOfModel}}{{{parentClassName}}}.of({{{value}}}L){{/oneOfModel}}{{^oneOfModel}}{{{value}}}L{{/oneOfModel}}{{/isLong}}{{#isDouble}}{{#oneOfModel}}{{{parentClassName}}}.of({{{value}}}){{/oneOfModel}}{{^oneOfModel}}{{{value}}}{{/oneOfModel}}{{/isDouble}}{{#isBoolean}}{{#oneOfModel}}{{{parentClassName}}}.of({{{value}}}){{/oneOfModel}}{{^oneOfModel}}{{{value}}}{{/oneOfModel}}{{/isBoolean}}{{#isEnum}}{{{objectName}}}.entries.first { it.value == "{{{value}}}" }{{/isEnum}}{{#isArray}}{{> tests/param_list}}{{/isArray}}{{#isObject}}{{> tests/param_object}}{{/isObject}}{{#isFreeFormObject}}{{#isSimpleObject}}{{> tests/param_json_object}}{{/isSimpleObject}}{{^isSimpleObject}}{{#isAnyType}}{{> tests/param_json_any}}{{/isAnyType}}{{^isAnyType}}{{> tests/param_map}}{{/isAnyType}}{{/isSimpleObject}}{{/isFreeFormObject}}
diff --git a/templates/php/tests/generateParams.mustache b/templates/php/tests/generateParams.mustache
@@ -2,6 +2,9 @@
 {{#isNull}}
   null,
 {{/isNull}}
+{{#isVerbatim}}
+  {{{value}}}
+{{/isVerbatim}}
 {{#isString}}
   "{{#lambda.escapeSlash}}{{{value}}}{{/lambda.escapeSlash}}",
 {{/isString}}
diff --git a/templates/python/tests/client/method.mustache b/templates/python/tests/client/method.mustache
@@ -1 +1 @@
-{{^isError}}{{#hasResponse}}_req = {{/hasResponse}}{{/isError}}{{^isSyncClient}}await {{/isSyncClient}}_client.{{#lambda.snakecase}}{{{method}}}{{/lambda.snakecase}}{{#useEchoRequester}}_with_http_info{{/useEchoRequester}}({{#parametersWithDataType}}{{> tests/generateParams}}{{/parametersWithDataType}}{{#hasRequestOptions}} request_options={ {{#requestOptions.headers.parameters}}"headers":loads("""{{{.}}}"""),{{/requestOptions.headers.parameters}}{{#requestOptions.queryParameters.parameters}}"query_parameters":loads("""{{{.}}}"""),{{/requestOptions.queryParameters.parameters}} }{{/hasRequestOptions}})
+{{^isError}}{{#hasResponse}}_req = {{/hasResponse}}{{/isError}}{{> tests/method}}
diff --git a/templates/python/tests/generateInnerParams.mustache b/templates/python/tests/generateInnerParams.mustache
@@ -1 +1 @@
-{{#isNull}} None {{/isNull}} {{#isString}} "{{#lambda.escapeSlash}}{{{value}}}{{/lambda.escapeSlash}}" {{/isString}} {{#isInteger}} {{{value}}} {{/isInteger}} {{#isLong}} {{{value}}} {{/isLong}} {{#isDouble}} {{{value}}} {{/isDouble}} {{#isBoolean}} {{#lambda.titlecase}}{{{value}}}{{/lambda.titlecase}} {{/isBoolean}} {{#isEnum}} "{{{value}}}" {{/isEnum}} {{#isArray}} [ {{#value}}{{> tests/generateParams}}{{/value}} ] {{/isArray}} {{#isObject}} { {{#value}}{{> tests/generateParams}}{{/value}} } {{/isObject}} {{#isFreeFormObject}} {{#isAnyType}} { {{#value}}{{#entrySet}}"{{{key}}}":"{{{value}}}"{{^-last}},{{/-last}}{{/entrySet}}{{/value}} } {{/isAnyType}} {{^isAnyType}} { {{#value}}{{> tests/generateParams}}{{/value}} } {{/isAnyType}} {{/isFreeFormObject}}
+{{#isNull}} None {{/isNull}}{{#isVerbatim}}{{{value}}}{{/isVerbatim}}{{#isString}} "{{#lambda.escapeSlash}}{{{value}}}{{/lambda.escapeSlash}}" {{/isString}} {{#isInteger}} {{{value}}} {{/isInteger}} {{#isLong}} {{{value}}} {{/isLong}} {{#isDouble}} {{{value}}} {{/isDouble}} {{#isBoolean}} {{#lambda.titlecase}}{{{value}}}{{/lambda.titlecase}} {{/isBoolean}} {{#isEnum}} "{{{value}}}" {{/isEnum}} {{#isArray}} [ {{#value}}{{> tests/generateParams}}{{/value}} ] {{/isArray}} {{#isObject}} { {{#value}}{{> tests/generateParams}}{{/value}} } {{/isObject}} {{#isFreeFormObject}} {{#isAnyType}} { {{#value}}{{#entrySet}}"{{{key}}}":"{{{value}}}"{{^-last}},{{/-last}}{{/entrySet}}{{/value}} } {{/isAnyType}} {{^isAnyType}} { {{#value}}{{> tests/generateParams}}{{/value}} } {{/isAnyType}} {{/isFreeFormObject}}
diff --git a/templates/python/tests/method.mustache b/templates/python/tests/method.mustache
@@ -0,0 +1 @@
+{{^isSyncClient}}await {{/isSyncClient}}_client.{{#lambda.snakecase}}{{{method}}}{{/lambda.snakecase}}{{#useEchoRequester}}_with_http_info{{/useEchoRequester}}({{#parametersWithDataType}}{{> tests/generateParams}}{{/parametersWithDataType}}{{#hasRequestOptions}} request_options={ {{#requestOptions.headers.parameters}}"headers":loads("""{{{.}}}"""),{{/requestOptions.headers.parameters}}{{#requestOptions.queryParameters.parameters}}"query_parameters":loads("""{{{.}}}"""),{{/requestOptions.queryParameters.parameters}} }{{/hasRequestOptions}})
diff --git a/templates/ruby/snippets/method.mustache b/templates/ruby/snippets/method.mustache
@@ -14,8 +14,8 @@ def snippet_for_{{#lambda.snakecase}}{{method}}{{/lambda.snakecase}}{{testIndex}
   {{> snippets/init}}
 
   # Call the API
-  {{#hasResponse}}response = {{/hasResponse}}client.{{#lambda.snakecase}}{{method}}{{/lambda.snakecase}}({{#parametersWithDataType}}{{> tests/generateParams}}{{/parametersWithDataType}}{{#hasRequestOptions}}{ {{#requestOptions.headers.parameters}}:header_params => JSON.parse('{{{.}}}', :symbolize_names => true),{{/requestOptions.headers.parameters}}{{#requestOptions.queryParameters.parameters}}:query_params => JSON.parse('{{{.}}}', :symbolize_names => true){{/requestOptions.queryParameters.parameters}} }{{/hasRequestOptions}})
-  
+  {{#hasResponse}}response = {{/hasResponse}}{{> tests/method}}
+
   # >LOG
   {{#hasResponse}}
   # use the class directly
diff --git a/templates/ruby/tests/client/method.mustache b/templates/ruby/tests/client/method.mustache
@@ -1 +1 @@
-{{^isError}}{{#hasResponse}}req = {{/hasResponse}}{{/isError}}client.{{#lambda.snakecase}}{{method}}{{/lambda.snakecase}}{{#useEchoRequester}}_with_http_info{{/useEchoRequester}}{{#returnsBoolean}}?{{/returnsBoolean}}({{#parametersWithDataType}}{{> tests/generateParams}}{{/parametersWithDataType}}{{#hasRequestOptions}}{ {{#requestOptions.headers.parameters}}:header_params => JSON.parse('{{{.}}}', :symbolize_names => true),{{/requestOptions.headers.parameters}}{{#requestOptions.queryParameters.parameters}}:query_params => JSON.parse('{{{.}}}', :symbolize_names => true){{/requestOptions.queryParameters.parameters}} }{{/hasRequestOptions}})
+{{^isError}}{{#hasResponse}}req = {{/hasResponse}}{{/isError}}{{> tests/method}}
diff --git a/templates/ruby/tests/e2e/e2e.mustache b/templates/ruby/tests/e2e/e2e.mustache
@@ -20,7 +20,7 @@ class Test{{#lambda.pascalcase}}{{{client}}}{{/lambda.pascalcase}}E2E < Test::Un
   {{#tests}}
   # {{{testName}}}
   def test_{{#lambda.snakecase}}{{method}}{{/lambda.snakecase}}{{testIndex}}
-    res = @client.{{#lambda.snakecase}}{{method}}{{/lambda.snakecase}}_with_http_info({{#parametersWithDataType}}{{> tests/generateParams}}{{/parametersWithDataType}}{{#hasRequestOptions}}{ {{#requestOptions.headers.parameters}}:header_params => JSON.parse('{{{.}}}', :symbolize_names => true),{{/requestOptions.headers.parameters}}{{#requestOptions.queryParameters.parameters}}:query_params => JSON.parse('{{{.}}}', :symbolize_names => true){{/requestOptions.queryParameters.parameters}} }{{/hasRequestOptions}})
+    res = @{{> tests/method}}
 
     {{#response}}
     {{#statusCode}}
diff --git a/templates/ruby/tests/generateInnerParams.mustache b/templates/ruby/tests/generateInnerParams.mustache
@@ -1 +1 @@
-{{#isNull}}nil {{/isNull}}{{#isString}}"{{{value}}}" {{/isString}}{{#isInteger}}{{{value}}} {{/isInteger}}{{#isLong}}{{{value}}} {{/isLong}}{{#isDouble}}{{{value}}} {{/isDouble}}{{#isBoolean}}{{{value}}} {{/isBoolean}} {{#isEnum}}'{{{value}}}' {{/isEnum}}{{#isArray}} [ {{#value}}{{> tests/generateParams}}{{/value}} ] {{/isArray}}{{#isObject}} {{{objectName}}}.new({{#value}}{{> tests/generateParams}}{{/value}}) {{/isObject}}{{#isFreeFormObject}} {{#isAnyType}} { {{#value}}{{#entrySet}}'{{{key}}}':"{{{value}}}"{{^-last}},{{/-last}}{{/entrySet}}{{/value}} } {{/isAnyType}} {{^isAnyType}} { {{#value}}{{> tests/generateParams}}{{/value}} } {{/isAnyType}} {{/isFreeFormObject}}
+{{#isNull}}nil {{/isNull}}{{#isVerbatim}}{{{value}}}{{/isVerbatim}}{{#isString}}"{{{value}}}" {{/isString}}{{#isInteger}}{{{value}}} {{/isInteger}}{{#isLong}}{{{value}}} {{/isLong}}{{#isDouble}}{{{value}}} {{/isDouble}}{{#isBoolean}}{{{value}}} {{/isBoolean}} {{#isEnum}}'{{{value}}}' {{/isEnum}}{{#isArray}} [ {{#value}}{{> tests/generateParams}}{{/value}} ] {{/isArray}}{{#isObject}} {{{objectName}}}.new({{#value}}{{> tests/generateParams}}{{/value}}) {{/isObject}}{{#isFreeFormObject}} {{#isAnyType}} { {{#value}}{{#entrySet}}'{{{key}}}':"{{{value}}}"{{^-last}},{{/-last}}{{/entrySet}}{{/value}} } {{/isAnyType}} {{^isAnyType}} { {{#value}}{{> tests/generateParams}}{{/value}} } {{/isAnyType}} {{/isFreeFormObject}}
diff --git a/templates/ruby/tests/method.mustache b/templates/ruby/tests/method.mustache
diff --git a/templates/ruby/tests/requests/requests.mustache b/templates/ruby/tests/requests/requests.mustache
diff --git a/templates/scala/tests/param_value.mustache b/templates/scala/tests/param_value.mustache
diff --git a/templates/swift/tests/paramValue.mustache b/templates/swift/tests/paramValue.mustache
diff --git a/tests/CTS/guides/search.json b/tests/CTS/guides/search.json

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,6 @@ public void execute(Template.Fragment fragment, Writer writer) throws IOExceptio`
`76`	`76`	`Map<String, Object> context = (Map<String, Object>) fragment.context();`
`77`	`77`	`snippet.addMethodCall(context, paramsType, operation);`
`78`	`78`
`79`		`- writer.write(adaptor.compileTemplate(executor, context, "tests/client/method.mustache"));`
	`79`	`+ writer.write(adaptor.compileTemplate(executor, context, "tests/method.mustache"));`
`80`	`80`	`}`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public void addTestsSupportingFiles(List<SupportingFile> supportingFiles) {`
`38`	`38`
`39`	`39`	`@Override`
`40`	`40`	`public void addSnippetsSupportingFiles(List<SupportingFile> supportingFiles, String output) {`
`41`		`- supportingFiles.add(new SupportingFile("tests/build.mustache", output + "/java", "build.gradle"));`
	`41`	`+ supportingFiles.add(new SupportingFile("snippets/build.mustache", output + "/java", "build.gradle"));`
`42`	`42`	`supportingFiles.add(new SupportingFile("snippets/settings.mustache", output + "/java", "settings.gradle"));`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{{#isNull}}empty(){{/isNull}}`
	`2`	`+{{#isVerbatim}}{{{value}}}{{/isVerbatim}}`
`2`	`3`	`{{#isString}}"{{#lambda.escapeDollar}}{{{value}}}{{/lambda.escapeDollar}}"{{/isString}}`
`3`	`4`	`{{#isNumber}}{{{value}}}{{/isNumber}}`
`4`	`5`	`{{#isBoolean}}{{{value}}}{{/isBoolean}}`