Skip to content

Commit 836a6c9

Browse files
millotpmillotp
committed
scala
1 parent 22f9f62 commit 836a6c9

File tree

8 files changed

+23
-56
lines changed

8 files changed

+23
-56
lines changed

‎generators/src/main/java/com/algolia/codegen/cts/tests/TestsClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public void run(Map<String, CodegenModel> models, Map<String, CodegenOperation>
104104
stepOut.put("method", step.method);
105105

106106
if (step.method != null && CUSTOM_METHODS.contains(step.method)) {
107-
stepOut.put("isCustom", true);
107+
stepOut.put("isCustomRequest", true);
108108
}
109109
paramsType.enhanceParameters(step.parameters, stepOut, ope);
110110

‎generators/src/main/java/com/algolia/codegen/cts/tests/TestsRequest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,14 +193,12 @@ public void run(Map<String, CodegenModel> models, Map<String, CodegenOperation>
193193
Map<String, Object> queryParameters = new HashMap<>();
194194
paramsType.enhanceParameters(req.requestOptions.queryParameters, queryParameters);
195195
requestOptions.put("queryParameters", queryParameters);
196-
requestOptions.put("hasQueryParameters", !queryParameters.isEmpty());
197196
}
198197
if (req.requestOptions.headers != null) {
199198
Map<String, Object> headers = new HashMap<>();
200199
// convert the headers to an acceptable type
201200
paramsType.enhanceParameters(new HashMap<String, Object>(req.requestOptions.headers), headers);
202201
requestOptions.put("headers", headers);
203-
requestOptions.put("hasHeaders", !headers.isEmpty());
204202
}
205203
test.put("requestOptions", requestOptions);
206204
}

‎templates/php/tests/method.mustache

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
$client->{{^hasParams}}{{{method}}}(){{/hasParams}}{{#hasParams}}{{{method}}}({{#parametersWithDataType}}{{> tests/generateParams}}{{/parametersWithDataType}}{{#hasRequestOptions}}[
2-
{{#requestOptions.hasQueryParameters}}
2+
{{#requestOptions.queryParameters.parameters}}
33
'queryParameters' => [
44
{{#requestOptions.queryParameters.parametersWithDataType}}
55
'{{{key}}}' => {{> tests/requests/requestOptionsParams}},
66
{{/requestOptions.queryParameters.parametersWithDataType}}
7-
],{{/requestOptions.hasQueryParameters}}{{#requestOptions.hasHeaders}}
7+
],{{/requestOptions.queryParameters.parameters}}{{#requestOptions.headers.parameters}}
88
'headers' => [
99
{{#requestOptions.headers.parametersWithDataType}}
1010
'{{{key}}}' => '{{{value}}}',
1111
{{/requestOptions.headers.parametersWithDataType}}
12-
]{{/requestOptions.hasHeaders}}
12+
]{{/requestOptions.headers.parameters}}
1313
]{{/hasRequestOptions}}){{/hasParams}}

‎templates/scala/snippets/method.mustache

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,7 @@ class Snippet{{client}} {
2828
val client = {{client}}(appId = "YOUR_APP_ID", apiKey = "YOUR_API_KEY"{{#hasRegionalHost}}, region = {{#fallbackToAliasHost}}Option({{/fallbackToAliasHost}}"YOUR_APP_ID_REGION"{{#fallbackToAliasHost}}){{/fallbackToAliasHost}}{{/hasRegionalHost}})
2929

3030
// Call the API
31-
val response = client.{{method}}{{#isCustomRequest}}[JObject]{{/isCustomRequest}}(
32-
{{#parametersWithDataType}}
33-
{{> tests/request_param}}{{^-last}},{{/-last}}
34-
{{/parametersWithDataType}}
35-
{{#hasRequestOptions}}
36-
, requestOptions = Some(RequestOptions.builder()
37-
{{#requestOptions.queryParameters.parametersWithDataType}}
38-
.withQueryParameter("{{{key}}}", {{> tests/requests/requestOptionsParams}})
39-
{{/requestOptions.queryParameters.parametersWithDataType}}
40-
{{#requestOptions.headers.parametersWithDataType}}
41-
.withHeader("{{{key}}}", "{{{value}}}")
42-
{{/requestOptions.headers.parametersWithDataType}}
43-
.build())
44-
{{/hasRequestOptions}}
45-
)
31+
val response = {{> tests/method}}
4632

4733
// Use the response
4834
val value = Await.result(response, Duration(100, "sec"))

‎templates/scala/tests/client/method.mustache

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
{{^useEchoRequester}}var res = Await.result{{/useEchoRequester}}{{#useEchoRequester}}Await.ready{{/useEchoRequester}}(
2-
client.{{method}}{{#isCustom}}[Any]{{/isCustom}}(
3-
{{#parametersWithDataType}}
4-
{{> tests/request_param}}{{^-last}},{{/-last}}
5-
{{/parametersWithDataType}}
6-
),
2+
{{> tests/method}},
73
Duration.Inf
84
)

‎templates/scala/tests/e2e/e2e.mustache

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,21 +45,7 @@ class {{clientPrefix}}TestE2E extends AnyFunSuite {
4545

4646
test("{{{testName}}}{{testIndex}}") {
4747
val client = testClient()
48-
val future = client.{{method}}{{#isCustomRequest}}[JObject]{{/isCustomRequest}}(
49-
{{#parametersWithDataType}}
50-
{{> tests/request_param}}{{^-last}},{{/-last}}
51-
{{/parametersWithDataType}}
52-
{{#hasRequestOptions}}
53-
, requestOptions = Some(RequestOptions.builder()
54-
{{#requestOptions.queryParameters.parametersWithDataType}}
55-
.withQueryParameter("{{{key}}}", {{> tests/requests/requestOptionsParams}})
56-
{{/requestOptions.queryParameters.parametersWithDataType}}
57-
{{#requestOptions.headers.parametersWithDataType}}
58-
.withHeader("{{{key}}}", "{{{value}}}")
59-
{{/requestOptions.headers.parametersWithDataType}}
60-
.build())
61-
{{/hasRequestOptions}}
62-
)
48+
val future = {{> tests/method}}
6349

6450
val response = Await.result(future, Duration.Inf)
6551
{{#response}}

‎templates/scala/tests/method.mustache

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
client.{{method}}{{#isCustomRequest}}[JObject]{{/isCustomRequest}}(
2+
{{#parametersWithDataType}}
3+
{{> tests/request_param}}{{^-last}},{{/-last}}
4+
{{/parametersWithDataType}}
5+
{{#hasRequestOptions}}
6+
, requestOptions = Some(RequestOptions.builder()
7+
{{#requestOptions.queryParameters.parametersWithDataType}}
8+
.withQueryParameter("{{{key}}}", {{> tests/requests/requestOptionsParams}})
9+
{{/requestOptions.queryParameters.parametersWithDataType}}
10+
{{#requestOptions.headers.parametersWithDataType}}
11+
.withHeader("{{{key}}}", "{{{value}}}")
12+
{{/requestOptions.headers.parametersWithDataType}}
13+
.build())
14+
{{/hasRequestOptions}}
15+
)

‎templates/scala/tests/requests/requests.mustache

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,7 @@ class {{clientPrefix}}Test extends AnyFunSuite {
3939

4040
test("{{{testName}}}{{testIndex}}") {
4141
val (client, echo) = testClient()
42-
val future = client.{{method}}{{#isCustomRequest}}[JObject]{{/isCustomRequest}}(
43-
{{#parametersWithDataType}}
44-
{{> tests/request_param}}{{^-last}},{{/-last}}
45-
{{/parametersWithDataType}}
46-
{{#hasRequestOptions}}
47-
, requestOptions = Some(RequestOptions.builder()
48-
{{#requestOptions.queryParameters.parametersWithDataType}}
49-
.withQueryParameter("{{{key}}}", {{> tests/requests/requestOptionsParams}})
50-
{{/requestOptions.queryParameters.parametersWithDataType}}
51-
{{#requestOptions.headers.parametersWithDataType}}
52-
.withHeader("{{{key}}}", "{{{value}}}")
53-
{{/requestOptions.headers.parametersWithDataType}}
54-
.build())
55-
{{/hasRequestOptions}}
56-
)
42+
val future = {{> tests/method}}
5743

5844
{{#request}}
5945
Await.ready(future, Duration.Inf)

0 commit comments

Comments
 (0)