Skip to content

Commit 6008884

Browse files
committed
feat(generator): handle custom request escaping
1 parent 90d8258 commit 6008884

File tree

5 files changed

+8
-18
lines changed

5 files changed

+8
-18
lines changed

clients/algoliasearch-client-javascript/bundlesize.config.json

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,6 @@
3535
{
3636
"path": "packages/recommend/dist/recommend.umd.browser.js",
3737
"maxSize": "3.80KB"
38-
},
39-
{
40-
"path": "packages/client-common/dist/client-common.esm.node.js",
41-
"maxSize": "5.25KB"
42-
},
43-
{
44-
"path": "packages/requester-browser-xhr/dist/requester-browser-xhr.esm.node.js",
45-
"maxSize": "900B"
46-
},
47-
{
48-
"path": "packages/requester-node-http/dist/requester-node-http.esm.node.js",
49-
"maxSize": "1.15KB"
5038
}
5139
]
5240
}

generators/src/main/java/com/algolia/codegen/cts/AlgoliaCtsGenerator.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,12 +163,16 @@ public Map<String, Object> postProcessSupportingFileData(Map<String, Object> obj
163163
private Map<String, Request[]> loadCTS() throws JsonParseException, JsonMappingException, IOException, CTSException {
164164
TreeMap<String, Request[]> cts = new TreeMap<>();
165165
File dir = new File("tests/CTS/methods/requests/" + client);
166+
File commonTestDir = new File("tests/CTS/methods/requests/common");
166167
if (!dir.exists()) {
167168
throw new CTSException("CTS not found at " + dir.getAbsolutePath(), true);
168169
}
169170
for (File f : dir.listFiles()) {
170171
cts.put(f.getName().replace(".json", ""), Json.mapper().readValue(f, Request[].class));
171172
}
173+
for (File f : commonTestDir.listFiles()) {
174+
cts.put(f.getName().replace(".json", ""), Json.mapper().readValue(f, Request[].class));
175+
}
172176
return cts;
173177
}
174178

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public class {{classname}} extends ApiClient {
112112

113113
// create path and map variables
114114
String requestPath = "{{{path}}}"{{#pathParams}}
115-
.replaceAll("\\{" + "{{baseName}}" + "\\}", this.escapeString({{{paramName}}}.toString())){{/pathParams}};
115+
.replaceAll("\\{" + "{{baseName}}" + "\\}", {{#vendorExtensions.x-is-custom-request}}{{{paramName}}}.toString()){{/vendorExtensions.x-is-custom-request}}{{^vendorExtensions.x-is-custom-request}}this.escapeString({{{paramName}}}.toString())){{/vendorExtensions.x-is-custom-request}}{{/pathParams}};
116116

117117
{{javaUtilPrefix}}List<Pair> queryParams = new {{javaUtilPrefix}}ArrayList<Pair>();
118118
{{javaUtilPrefix}}Map<String, String> headers = new {{javaUtilPrefix}}HashMap<String, String>();

templates/javascript/api-single.mustache

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,8 @@ export function create{{capitalizedApiName}}Api(options: CreateClientOptions{{#h
203203
requestOptions?: RequestOptions
204204
) : Promise<{{{returnType}}}> {
205205
const requestPath = '{{{path}}}'{{#pathParams}}.replace(
206-
{{=<% %>=}}
207-
'{<%baseName%>}',
208-
<%={{ }}=%>
209-
encodeURIComponent(String({{paramName}}))
206+
{{=<% %>=}}'{<%baseName%>}',<%={{ }}=%>
207+
{{#vendorExtensions.x-is-custom-request}}String({{paramName}}){{/vendorExtensions.x-is-custom-request}}{{^vendorExtensions.x-is-custom-request}}encodeURIComponent(String({{paramName}})){{/vendorExtensions.x-is-custom-request}}
210208
){{/pathParams}};
211209
const headers: Headers = {};
212210
const queryParameters: QueryParameters = {};

templates/php/api.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ use {{invokerPackage}}\RetryStrategy\ClusterHosts;
241241
if (${{paramName}} !== null) {
242242
$resourcePath = str_replace(
243243
'{' . '{{baseName}}' . '}',
244-
ObjectSerializer::toPathValue(${{paramName}}),
244+
{{#vendorExtensions.x-is-custom-request}}{{paramName}}{{/vendorExtensions.x-is-custom-request}}{{^vendorExtensions.x-is-custom-request}}ObjectSerializer::toPathValue(${{paramName}}){{/vendorExtensions.x-is-custom-request}},
245245
$resourcePath
246246
);
247247
}

0 commit comments

Comments
 (0)