Skip to content

Commit c854391

Browse files
committed
fix: java
1 parent c46de3b commit c854391

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

templates/java/tests/client/client.mustache

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,21 @@ class {{client}}ClientTests {
4242
}
4343

4444
{{client}} createClient() {
45-
return new {{client}}("appId", "apiKey", {{#hasRegionalHost}}"{{defaultRegion}}", {{/hasRegionalHost}}withEchoRequester());
45+
return new {{client}}("appId", "apiKey", {{#hasRegionalHost}}"{{defaultRegion}}", {{/hasRegionalHost}}withEchoRequester(null));
4646
}
4747

48-
private ClientOptions withEchoRequester() {
49-
return ClientOptions.builder().setRequesterConfig(requester -> requester.addInterceptor(echo)).build();
48+
private ClientOptions withEchoRequester(Integer writeTimeout) {
49+
if (writeTimeout != null) {
50+
return ClientOptions.builder().setRequesterConfig(requester -> requester.addInterceptor(echo)).build();
51+
}
52+
53+
return ClientOptions.builder().setRequesterConfig(requester -> requester.addInterceptor(echo)).setWriteTimeout(Duration.ofMillis(writeTimeout)).build();
5054
}
5155

5256
private ClientOptions withCustomHosts(List<Host> hosts, boolean gzipEncoding) {
5357
return ClientOptions.builder().setHosts(hosts).setCompressionType(gzipEncoding ? CompressionType.GZIP : CompressionType.NONE).build();
5458
}
5559

56-
private ClientOptions withCustomWriteTimeout(Integer writeTimeout) {
57-
return ClientOptions.builder().setWriteTimeout(Duration.ofMillis(writeTimeout)).build();
58-
}
59-
6060
{{#blocksClient}}
6161
{{> tests/client/tests}}
6262
{{/blocksClient}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
{{^autoCreateClient}}{{client}} client = {{/autoCreateClient}}new {{client}}("{{parametersWithDataTypeMap.appId.value}}","{{parametersWithDataTypeMap.apiKey.value}}"{{#hasRegionalHost}}{{#parametersWithDataTypeMap.region}},"{{parametersWithDataTypeMap.region.value}}"{{/parametersWithDataTypeMap.region}}{{/hasRegionalHost}}{{#useEchoRequester}},withEchoRequester(){{/useEchoRequester}}{{#hasCustomHosts}},withCustomHosts(Arrays.asList({{#customHosts}}new Host("true".equals(System.getenv("CI")) ? "localhost" : "host.docker.internal", EnumSet.of(CallType.READ, CallType.WRITE), "http", {{port}}){{^-last}},{{/-last}}{{/customHosts}}), {{gzipEncoding}}){{/hasCustomHosts}}{{#hasCustomWriteTimeout}}, withCustomWriteTimeout({{writeTimeout}}){{/hasCustomWriteTimeout}});
1+
{{^autoCreateClient}}{{client}} client = {{/autoCreateClient}}new {{client}}("{{parametersWithDataTypeMap.appId.value}}","{{parametersWithDataTypeMap.apiKey.value}}"{{#hasRegionalHost}}{{#parametersWithDataTypeMap.region}},"{{parametersWithDataTypeMap.region.value}}"{{/parametersWithDataTypeMap.region}}{{/hasRegionalHost}}{{#useEchoRequester}},withEchoRequester({{#hasCustomWriteTimeout}}{{writeTimeout}}{{/hasCustomWriteTimeout}}{{^hasCustomWriteTimeout}}null{{/hasCustomWriteTimeout}}){{/useEchoRequester}}{{#hasCustomHosts}},withCustomHosts(Arrays.asList({{#customHosts}}new Host("true".equals(System.getenv("CI")) ? "localhost" : "host.docker.internal", EnumSet.of(CallType.READ, CallType.WRITE), "http", {{port}}){{^-last}},{{/-last}}{{/customHosts}}), {{gzipEncoding}}){{/hasCustomHosts}});
22
{{#hasTransformationRegion}}client.setTransformationRegion("{{{transformationRegion}}}");{{/hasTransformationRegion}}

0 commit comments

Comments
 (0)