diff --git a/generators/java/sdk/CHANGELOG.md b/generators/java/sdk/CHANGELOG.md index d49ac68c236..fe39481d4df 100644 --- a/generators/java/sdk/CHANGELOG.md +++ b/generators/java/sdk/CHANGELOG.md @@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.8.4] - 2024-02-23 +- Improvement: The timeout specified on the RequestOptions object now sets the timeout on the entire call, not just the read timeout of the request. + As a refresher, a timeout can be added per request like so: + ```java + RequestOptions ro = RequestOptions.builder().timeout(90).build(); // Creates a timeout of 90 seconds for the request + // You could also specify the timeunit, similar to as if you were using OkHttp directly + // RequestOptions ro = RequestOptions.builder().timeout(2, TimeUnit.MINUTES).build(); + client.films.list(ro); + ``` ## [0.8.3] - 2024-02-23 - Fix: The SDK generator now always creates a valid name for union discriminator wrapper classes. diff --git a/generators/java/sdk/src/main/java/com/fern/java/client/GeneratedClientOptions.java b/generators/java/sdk/src/main/java/com/fern/java/client/GeneratedClientOptions.java index 6adaeafbb82..416fdb8d630 100644 --- a/generators/java/sdk/src/main/java/com/fern/java/client/GeneratedClientOptions.java +++ b/generators/java/sdk/src/main/java/com/fern/java/client/GeneratedClientOptions.java @@ -32,6 +32,8 @@ public abstract class GeneratedClientOptions extends AbstractGeneratedJavaFile { public abstract MethodSpec httpClient(); + public abstract MethodSpec httpClientWithTimeout(); + public abstract Map variableGetters(); public abstract ClassName builderClassName(); diff --git a/generators/java/sdk/src/main/java/com/fern/java/client/generators/ClientOptionsGenerator.java b/generators/java/sdk/src/main/java/com/fern/java/client/generators/ClientOptionsGenerator.java index 38c57206143..462d07e647e 100644 --- a/generators/java/sdk/src/main/java/com/fern/java/client/generators/ClientOptionsGenerator.java +++ b/generators/java/sdk/src/main/java/com/fern/java/client/generators/ClientOptionsGenerator.java @@ -39,6 +39,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import java.util.stream.Collectors; import javax.lang.model.element.Modifier; @@ -151,8 +152,29 @@ public GeneratedClientOptions generateFile() { clientOptionsBuilder.addMethod(headersFromIdempotentRequestOptions.get()); } + MethodSpec httpClientWithTimeoutGetter = MethodSpec.methodBuilder("httpClientWithTimeout") + .addModifiers(Modifier.PUBLIC) + .addParameter( + clientGeneratorContext.getPoetClassNameFactory().getRequestOptionsClassName(), + REQUEST_OPTIONS_PARAMETER_NAME) + .returns(OKHTTP_CLIENT_FIELD.type) + .addStatement( + "return $L.newBuilder().callTimeout($N.getTimeout().get(), $N.getTimeoutTimeUnit())" + + ".connectTimeout(0, $T.SECONDS)" + + ".writeTimeout(0, $T.SECONDS)" + + ".readTimeout(0, $T.SECONDS).build()", + OKHTTP_CLIENT_FIELD.name, + REQUEST_OPTIONS_PARAMETER_NAME, + REQUEST_OPTIONS_PARAMETER_NAME, + TimeUnit.class, + TimeUnit.class, + TimeUnit.class) + .build(); + + TypeSpec clientOptions = clientOptionsBuilder .addMethod(httpClientGetter) + .addMethod(httpClientWithTimeoutGetter) .addMethods(variableGetters.values()) .addMethod(MethodSpec.methodBuilder("builder") .addModifiers(Modifier.PUBLIC, Modifier.STATIC) @@ -163,11 +185,13 @@ public GeneratedClientOptions generateFile() { .build(); JavaFile environmentsFile = JavaFile.builder(className.packageName(), clientOptions).build(); + return GeneratedClientOptions.builder() .className(className) .javaFile(environmentsFile) .environment(environmentGetter) .httpClient(httpClientGetter) + .httpClientWithTimeout(httpClientWithTimeoutGetter) .builderClassName(builderClassName) .putAllVariableGetters(variableGetters) .build(); diff --git a/generators/java/sdk/src/main/java/com/fern/java/client/generators/endpoint/AbstractEndpointWriter.java b/generators/java/sdk/src/main/java/com/fern/java/client/generators/endpoint/AbstractEndpointWriter.java index 1a2408bfd96..6d8cce36e9d 100644 --- a/generators/java/sdk/src/main/java/com/fern/java/client/generators/endpoint/AbstractEndpointWriter.java +++ b/generators/java/sdk/src/main/java/com/fern/java/client/generators/endpoint/AbstractEndpointWriter.java @@ -77,6 +77,7 @@ import java.util.Map; import java.util.Optional; import java.util.Set; +import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import java.util.stream.Stream; import javax.lang.model.element.Modifier; @@ -288,12 +289,12 @@ public final CodeBlock getResponseParserCodeBlock() { clientOptionsField, generatedClientOptions.httpClient()) .beginControlFlow("if ($L.getTimeout().isPresent())", REQUEST_OPTIONS_PARAMETER_NAME) - // Set the client's readTimeout if requestOptions overrides it has one + // Set the client's callTimeout if requestOptions overrides it has one .addStatement( - "$L = $L.newBuilder().readTimeout($N.getTimeout().get(), $N.getTimeoutTimeUnit()).build()", + "$L = $N.$N($L)", defaultedClientName, - defaultedClientName, - REQUEST_OPTIONS_PARAMETER_NAME, + clientOptionsField, + generatedClientOptions.httpClientWithTimeout(), REQUEST_OPTIONS_PARAMETER_NAME) .endControlFlow() .addStatement( diff --git a/seed/java-sdk/alias/src/main/java/com/seed/alias/core/ClientOptions.java b/seed/java-sdk/alias/src/main/java/com/seed/alias/core/ClientOptions.java index fc5ea148913..d2e5473f563 100644 --- a/seed/java-sdk/alias/src/main/java/com/seed/alias/core/ClientOptions.java +++ b/seed/java-sdk/alias/src/main/java/com/seed/alias/core/ClientOptions.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import okhttp3.OkHttpClient; @@ -50,6 +51,16 @@ public OkHttpClient httpClient() { return this.httpClient; } + public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) { + return httpClient + .newBuilder() + .callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) + .connectTimeout(0, TimeUnit.SECONDS) + .writeTimeout(0, TimeUnit.SECONDS) + .readTimeout(0, TimeUnit.SECONDS) + .build(); + } + public static Builder builder() { return new Builder(); } diff --git a/seed/java-sdk/api-wide-base-path/src/main/java/com/seed/apiWideBasePath/core/ClientOptions.java b/seed/java-sdk/api-wide-base-path/src/main/java/com/seed/apiWideBasePath/core/ClientOptions.java index 19b4fc75318..ab2e91b3fd9 100644 --- a/seed/java-sdk/api-wide-base-path/src/main/java/com/seed/apiWideBasePath/core/ClientOptions.java +++ b/seed/java-sdk/api-wide-base-path/src/main/java/com/seed/apiWideBasePath/core/ClientOptions.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import okhttp3.OkHttpClient; @@ -50,6 +51,16 @@ public OkHttpClient httpClient() { return this.httpClient; } + public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) { + return httpClient + .newBuilder() + .callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) + .connectTimeout(0, TimeUnit.SECONDS) + .writeTimeout(0, TimeUnit.SECONDS) + .readTimeout(0, TimeUnit.SECONDS) + .build(); + } + public static Builder builder() { return new Builder(); } diff --git a/seed/java-sdk/api-wide-base-path/src/main/java/com/seed/apiWideBasePath/resources/service/ServiceClient.java b/seed/java-sdk/api-wide-base-path/src/main/java/com/seed/apiWideBasePath/resources/service/ServiceClient.java index d3ed37ebe60..87139f5edee 100644 --- a/seed/java-sdk/api-wide-base-path/src/main/java/com/seed/apiWideBasePath/resources/service/ServiceClient.java +++ b/seed/java-sdk/api-wide-base-path/src/main/java/com/seed/apiWideBasePath/resources/service/ServiceClient.java @@ -40,9 +40,7 @@ public void post(String serviceParam, int endpointParam, RequestOptions requestO try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/audiences/src/main/java/com/seed/audiences/core/ClientOptions.java b/seed/java-sdk/audiences/src/main/java/com/seed/audiences/core/ClientOptions.java index 418ecfea972..7af86eb150f 100644 --- a/seed/java-sdk/audiences/src/main/java/com/seed/audiences/core/ClientOptions.java +++ b/seed/java-sdk/audiences/src/main/java/com/seed/audiences/core/ClientOptions.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import okhttp3.OkHttpClient; @@ -50,6 +51,16 @@ public OkHttpClient httpClient() { return this.httpClient; } + public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) { + return httpClient + .newBuilder() + .callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) + .connectTimeout(0, TimeUnit.SECONDS) + .writeTimeout(0, TimeUnit.SECONDS) + .readTimeout(0, TimeUnit.SECONDS) + .build(); + } + public static Builder builder() { return new Builder(); } diff --git a/seed/java-sdk/audiences/src/main/java/com/seed/audiences/resources/foldera/service/ServiceClient.java b/seed/java-sdk/audiences/src/main/java/com/seed/audiences/resources/foldera/service/ServiceClient.java index db4a8e1ce57..26a8d9980f1 100644 --- a/seed/java-sdk/audiences/src/main/java/com/seed/audiences/resources/foldera/service/ServiceClient.java +++ b/seed/java-sdk/audiences/src/main/java/com/seed/audiences/resources/foldera/service/ServiceClient.java @@ -38,9 +38,7 @@ public Response getDirectThread(RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } okhttp3.Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/audiences/src/main/java/com/seed/audiences/resources/foo/FooClient.java b/seed/java-sdk/audiences/src/main/java/com/seed/audiences/resources/foo/FooClient.java index 4ff2afa4b53..c828c50bcd8 100644 --- a/seed/java-sdk/audiences/src/main/java/com/seed/audiences/resources/foo/FooClient.java +++ b/seed/java-sdk/audiences/src/main/java/com/seed/audiences/resources/foo/FooClient.java @@ -62,9 +62,7 @@ public ImportingType find(FindRequest request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/auth-environment-variables/src/main/java/com/seed/authEnvironmentVariables/core/ClientOptions.java b/seed/java-sdk/auth-environment-variables/src/main/java/com/seed/authEnvironmentVariables/core/ClientOptions.java index 6ad1cd25e81..4ff6365051b 100644 --- a/seed/java-sdk/auth-environment-variables/src/main/java/com/seed/authEnvironmentVariables/core/ClientOptions.java +++ b/seed/java-sdk/auth-environment-variables/src/main/java/com/seed/authEnvironmentVariables/core/ClientOptions.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import okhttp3.OkHttpClient; @@ -50,6 +51,16 @@ public OkHttpClient httpClient() { return this.httpClient; } + public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) { + return httpClient + .newBuilder() + .callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) + .connectTimeout(0, TimeUnit.SECONDS) + .writeTimeout(0, TimeUnit.SECONDS) + .readTimeout(0, TimeUnit.SECONDS) + .build(); + } + public static Builder builder() { return new Builder(); } diff --git a/seed/java-sdk/auth-environment-variables/src/main/java/com/seed/authEnvironmentVariables/resources/service/ServiceClient.java b/seed/java-sdk/auth-environment-variables/src/main/java/com/seed/authEnvironmentVariables/resources/service/ServiceClient.java index 4370d9164ce..1b26868875c 100644 --- a/seed/java-sdk/auth-environment-variables/src/main/java/com/seed/authEnvironmentVariables/resources/service/ServiceClient.java +++ b/seed/java-sdk/auth-environment-variables/src/main/java/com/seed/authEnvironmentVariables/resources/service/ServiceClient.java @@ -45,9 +45,7 @@ public String getWithApiKey(RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/basic-auth/src/main/java/com/seed/basicAuth/core/ClientOptions.java b/seed/java-sdk/basic-auth/src/main/java/com/seed/basicAuth/core/ClientOptions.java index 050cc038a73..6a6cfb8c946 100644 --- a/seed/java-sdk/basic-auth/src/main/java/com/seed/basicAuth/core/ClientOptions.java +++ b/seed/java-sdk/basic-auth/src/main/java/com/seed/basicAuth/core/ClientOptions.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import okhttp3.OkHttpClient; @@ -50,6 +51,16 @@ public OkHttpClient httpClient() { return this.httpClient; } + public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) { + return httpClient + .newBuilder() + .callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) + .connectTimeout(0, TimeUnit.SECONDS) + .writeTimeout(0, TimeUnit.SECONDS) + .readTimeout(0, TimeUnit.SECONDS) + .build(); + } + public static Builder builder() { return new Builder(); } diff --git a/seed/java-sdk/basic-auth/src/main/java/com/seed/basicAuth/resources/basicauth/BasicAuthClient.java b/seed/java-sdk/basic-auth/src/main/java/com/seed/basicAuth/resources/basicauth/BasicAuthClient.java index 216e68ff47a..7364039adef 100644 --- a/seed/java-sdk/basic-auth/src/main/java/com/seed/basicAuth/resources/basicauth/BasicAuthClient.java +++ b/seed/java-sdk/basic-auth/src/main/java/com/seed/basicAuth/resources/basicauth/BasicAuthClient.java @@ -47,9 +47,7 @@ public boolean getWithBasicAuth(RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -94,9 +92,7 @@ public boolean postWithBasicAuth(Object request, RequestOptions requestOptions) try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/bearer-token-environment-variable/src/main/java/com/seed/bearerTokenEnvironmentVariable/core/ClientOptions.java b/seed/java-sdk/bearer-token-environment-variable/src/main/java/com/seed/bearerTokenEnvironmentVariable/core/ClientOptions.java index 35972830bc5..25652b90acf 100644 --- a/seed/java-sdk/bearer-token-environment-variable/src/main/java/com/seed/bearerTokenEnvironmentVariable/core/ClientOptions.java +++ b/seed/java-sdk/bearer-token-environment-variable/src/main/java/com/seed/bearerTokenEnvironmentVariable/core/ClientOptions.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import okhttp3.OkHttpClient; @@ -50,6 +51,16 @@ public OkHttpClient httpClient() { return this.httpClient; } + public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) { + return httpClient + .newBuilder() + .callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) + .connectTimeout(0, TimeUnit.SECONDS) + .writeTimeout(0, TimeUnit.SECONDS) + .readTimeout(0, TimeUnit.SECONDS) + .build(); + } + public static Builder builder() { return new Builder(); } diff --git a/seed/java-sdk/bearer-token-environment-variable/src/main/java/com/seed/bearerTokenEnvironmentVariable/resources/service/ServiceClient.java b/seed/java-sdk/bearer-token-environment-variable/src/main/java/com/seed/bearerTokenEnvironmentVariable/resources/service/ServiceClient.java index df7b0bbed1c..f6c2f30f9c8 100644 --- a/seed/java-sdk/bearer-token-environment-variable/src/main/java/com/seed/bearerTokenEnvironmentVariable/resources/service/ServiceClient.java +++ b/seed/java-sdk/bearer-token-environment-variable/src/main/java/com/seed/bearerTokenEnvironmentVariable/resources/service/ServiceClient.java @@ -45,9 +45,7 @@ public String getWithBearerToken(RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/bytes/src/main/java/com/seed/bytes/core/ClientOptions.java b/seed/java-sdk/bytes/src/main/java/com/seed/bytes/core/ClientOptions.java index 08ba504bbcc..3bc639c4d41 100644 --- a/seed/java-sdk/bytes/src/main/java/com/seed/bytes/core/ClientOptions.java +++ b/seed/java-sdk/bytes/src/main/java/com/seed/bytes/core/ClientOptions.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import okhttp3.OkHttpClient; @@ -50,6 +51,16 @@ public OkHttpClient httpClient() { return this.httpClient; } + public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) { + return httpClient + .newBuilder() + .callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) + .connectTimeout(0, TimeUnit.SECONDS) + .writeTimeout(0, TimeUnit.SECONDS) + .readTimeout(0, TimeUnit.SECONDS) + .build(); + } + public static Builder builder() { return new Builder(); } diff --git a/seed/java-sdk/bytes/src/main/java/com/seed/bytes/resources/service/ServiceClient.java b/seed/java-sdk/bytes/src/main/java/com/seed/bytes/resources/service/ServiceClient.java index 5bf2d48f837..f878b3e2395 100644 --- a/seed/java-sdk/bytes/src/main/java/com/seed/bytes/resources/service/ServiceClient.java +++ b/seed/java-sdk/bytes/src/main/java/com/seed/bytes/resources/service/ServiceClient.java @@ -41,9 +41,7 @@ public void upload(byte[] request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/circular-references/src/main/java/com/seed/api/core/ClientOptions.java b/seed/java-sdk/circular-references/src/main/java/com/seed/api/core/ClientOptions.java index 354aeec7720..87efc2a205c 100644 --- a/seed/java-sdk/circular-references/src/main/java/com/seed/api/core/ClientOptions.java +++ b/seed/java-sdk/circular-references/src/main/java/com/seed/api/core/ClientOptions.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import okhttp3.OkHttpClient; @@ -50,6 +51,16 @@ public OkHttpClient httpClient() { return this.httpClient; } + public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) { + return httpClient + .newBuilder() + .callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) + .connectTimeout(0, TimeUnit.SECONDS) + .writeTimeout(0, TimeUnit.SECONDS) + .readTimeout(0, TimeUnit.SECONDS) + .build(); + } + public static Builder builder() { return new Builder(); } diff --git a/seed/java-sdk/custom-auth/src/main/java/com/seed/customAuth/core/ClientOptions.java b/seed/java-sdk/custom-auth/src/main/java/com/seed/customAuth/core/ClientOptions.java index 04ff5060ad9..e52cfad5460 100644 --- a/seed/java-sdk/custom-auth/src/main/java/com/seed/customAuth/core/ClientOptions.java +++ b/seed/java-sdk/custom-auth/src/main/java/com/seed/customAuth/core/ClientOptions.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import okhttp3.OkHttpClient; @@ -50,6 +51,16 @@ public OkHttpClient httpClient() { return this.httpClient; } + public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) { + return httpClient + .newBuilder() + .callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) + .connectTimeout(0, TimeUnit.SECONDS) + .writeTimeout(0, TimeUnit.SECONDS) + .readTimeout(0, TimeUnit.SECONDS) + .build(); + } + public static Builder builder() { return new Builder(); } diff --git a/seed/java-sdk/custom-auth/src/main/java/com/seed/customAuth/resources/customauth/CustomAuthClient.java b/seed/java-sdk/custom-auth/src/main/java/com/seed/customAuth/resources/customauth/CustomAuthClient.java index 6fe97408d20..106a4b916b9 100644 --- a/seed/java-sdk/custom-auth/src/main/java/com/seed/customAuth/resources/customauth/CustomAuthClient.java +++ b/seed/java-sdk/custom-auth/src/main/java/com/seed/customAuth/resources/customauth/CustomAuthClient.java @@ -47,9 +47,7 @@ public boolean getWithCustomAuth(RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -94,9 +92,7 @@ public boolean postWithCustomAuth(Object request, RequestOptions requestOptions) try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/error-property/src/main/java/com/seed/errorProperty/core/ClientOptions.java b/seed/java-sdk/error-property/src/main/java/com/seed/errorProperty/core/ClientOptions.java index b4c16a6a277..dc6c74e6c30 100644 --- a/seed/java-sdk/error-property/src/main/java/com/seed/errorProperty/core/ClientOptions.java +++ b/seed/java-sdk/error-property/src/main/java/com/seed/errorProperty/core/ClientOptions.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import okhttp3.OkHttpClient; @@ -50,6 +51,16 @@ public OkHttpClient httpClient() { return this.httpClient; } + public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) { + return httpClient + .newBuilder() + .callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) + .connectTimeout(0, TimeUnit.SECONDS) + .writeTimeout(0, TimeUnit.SECONDS) + .readTimeout(0, TimeUnit.SECONDS) + .build(); + } + public static Builder builder() { return new Builder(); } diff --git a/seed/java-sdk/error-property/src/main/java/com/seed/errorProperty/resources/propertybasederror/PropertyBasedErrorClient.java b/seed/java-sdk/error-property/src/main/java/com/seed/errorProperty/resources/propertybasederror/PropertyBasedErrorClient.java index 0296372f870..3a3a30d0b8c 100644 --- a/seed/java-sdk/error-property/src/main/java/com/seed/errorProperty/resources/propertybasederror/PropertyBasedErrorClient.java +++ b/seed/java-sdk/error-property/src/main/java/com/seed/errorProperty/resources/propertybasederror/PropertyBasedErrorClient.java @@ -45,9 +45,7 @@ public String throwError(RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/examples/src/main/java/com/seed/examples/SeedExamplesClient.java b/seed/java-sdk/examples/src/main/java/com/seed/examples/SeedExamplesClient.java index e056be7ea50..a96ce71e2d3 100644 --- a/seed/java-sdk/examples/src/main/java/com/seed/examples/SeedExamplesClient.java +++ b/seed/java-sdk/examples/src/main/java/com/seed/examples/SeedExamplesClient.java @@ -61,9 +61,7 @@ public String echo(String request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/examples/src/main/java/com/seed/examples/core/ClientOptions.java b/seed/java-sdk/examples/src/main/java/com/seed/examples/core/ClientOptions.java index 56d5ec069b1..bc9f06b108c 100644 --- a/seed/java-sdk/examples/src/main/java/com/seed/examples/core/ClientOptions.java +++ b/seed/java-sdk/examples/src/main/java/com/seed/examples/core/ClientOptions.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import okhttp3.OkHttpClient; @@ -50,6 +51,16 @@ public OkHttpClient httpClient() { return this.httpClient; } + public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) { + return httpClient + .newBuilder() + .callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) + .connectTimeout(0, TimeUnit.SECONDS) + .writeTimeout(0, TimeUnit.SECONDS) + .readTimeout(0, TimeUnit.SECONDS) + .build(); + } + public static Builder builder() { return new Builder(); } diff --git a/seed/java-sdk/examples/src/main/java/com/seed/examples/resources/file/notification/service/ServiceClient.java b/seed/java-sdk/examples/src/main/java/com/seed/examples/resources/file/notification/service/ServiceClient.java index c12421105e3..a34b1b7615f 100644 --- a/seed/java-sdk/examples/src/main/java/com/seed/examples/resources/file/notification/service/ServiceClient.java +++ b/seed/java-sdk/examples/src/main/java/com/seed/examples/resources/file/notification/service/ServiceClient.java @@ -41,9 +41,7 @@ public Exception getException(String notificationId, RequestOptions requestOptio try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/examples/src/main/java/com/seed/examples/resources/file/service/ServiceClient.java b/seed/java-sdk/examples/src/main/java/com/seed/examples/resources/file/service/ServiceClient.java index bc7c0e8b8ff..a8bb7ac0bef 100644 --- a/seed/java-sdk/examples/src/main/java/com/seed/examples/resources/file/service/ServiceClient.java +++ b/seed/java-sdk/examples/src/main/java/com/seed/examples/resources/file/service/ServiceClient.java @@ -56,9 +56,7 @@ public File getFile(String filename, GetFileRequest request, RequestOptions requ try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/examples/src/main/java/com/seed/examples/resources/health/service/ServiceClient.java b/seed/java-sdk/examples/src/main/java/com/seed/examples/resources/health/service/ServiceClient.java index 8330dd63f7b..d9df03917e0 100644 --- a/seed/java-sdk/examples/src/main/java/com/seed/examples/resources/health/service/ServiceClient.java +++ b/seed/java-sdk/examples/src/main/java/com/seed/examples/resources/health/service/ServiceClient.java @@ -45,9 +45,7 @@ public void check(String id, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -85,9 +83,7 @@ public boolean ping(RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/examples/src/main/java/com/seed/examples/resources/service/ServiceClient.java b/seed/java-sdk/examples/src/main/java/com/seed/examples/resources/service/ServiceClient.java index adfc011715a..839163e058b 100644 --- a/seed/java-sdk/examples/src/main/java/com/seed/examples/resources/service/ServiceClient.java +++ b/seed/java-sdk/examples/src/main/java/com/seed/examples/resources/service/ServiceClient.java @@ -45,9 +45,7 @@ public Movie getMovie(String movieId, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -86,9 +84,7 @@ public String createMovie(Movie request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -126,9 +122,7 @@ public Metadata getMetadata(GetMetadataRequest request, RequestOptions requestOp try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/core/ClientOptions.java b/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/core/ClientOptions.java index bfe71940791..102eb571fa4 100644 --- a/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/core/ClientOptions.java +++ b/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/core/ClientOptions.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import okhttp3.OkHttpClient; @@ -50,6 +51,16 @@ public OkHttpClient httpClient() { return this.httpClient; } + public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) { + return httpClient + .newBuilder() + .callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) + .connectTimeout(0, TimeUnit.SECONDS) + .writeTimeout(0, TimeUnit.SECONDS) + .readTimeout(0, TimeUnit.SECONDS) + .build(); + } + public static Builder builder() { return new Builder(); } diff --git a/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/endpoints/container/ContainerClient.java b/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/endpoints/container/ContainerClient.java index ab7394eee86..1fad7898cc9 100644 --- a/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/endpoints/container/ContainerClient.java +++ b/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/endpoints/container/ContainerClient.java @@ -55,9 +55,7 @@ public List getAndReturnListOfPrimitives(List request, RequestOp try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -99,9 +97,7 @@ public List getAndReturnListOfObjects( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -142,9 +138,7 @@ public Set getAndReturnSetOfPrimitives(Set request, RequestOptio try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -186,9 +180,7 @@ public Set getAndReturnSetOfObjects( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -229,9 +221,7 @@ public Map getAndReturnMapPrimToPrim(Map request try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -274,9 +264,7 @@ public Map getAndReturnMapOfPrimToObject( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -325,9 +313,7 @@ public Optional getAndReturnOptional( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/endpoints/enum_/EnumClient.java b/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/endpoints/enum_/EnumClient.java index 67f22ff0da6..a0c5abb448e 100644 --- a/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/endpoints/enum_/EnumClient.java +++ b/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/endpoints/enum_/EnumClient.java @@ -49,9 +49,7 @@ public WeatherReport getAndReturnEnum(WeatherReport request, RequestOptions requ try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/endpoints/httpmethods/HttpMethodsClient.java b/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/endpoints/httpmethods/HttpMethodsClient.java index 00285499213..128c987edbf 100644 --- a/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/endpoints/httpmethods/HttpMethodsClient.java +++ b/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/endpoints/httpmethods/HttpMethodsClient.java @@ -44,9 +44,7 @@ public String testGet(String id, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -85,9 +83,7 @@ public ObjectWithOptionalField testPost(ObjectWithRequiredField request, Request try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -127,9 +123,7 @@ public ObjectWithOptionalField testPut(String id, ObjectWithRequiredField reques try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -174,9 +168,7 @@ public ObjectWithOptionalField testPatch( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -209,9 +201,7 @@ public boolean testDelete(String id, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/endpoints/object/ObjectClient.java b/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/endpoints/object/ObjectClient.java index 9f612eaf1d2..81f416fe29d 100644 --- a/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/endpoints/object/ObjectClient.java +++ b/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/endpoints/object/ObjectClient.java @@ -60,9 +60,7 @@ public ObjectWithOptionalField getAndReturnWithOptionalField( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -103,9 +101,7 @@ public ObjectWithRequiredField getAndReturnWithRequiredField( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -145,9 +141,7 @@ public ObjectWithMapOfMap getAndReturnWithMapOfMap(ObjectWithMapOfMap request, R try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -193,9 +187,7 @@ public NestedObjectWithOptionalField getAndReturnNestedWithOptionalField( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -237,9 +229,7 @@ public NestedObjectWithRequiredField getAndReturnNestedWithRequiredField( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -282,9 +272,7 @@ public NestedObjectWithRequiredField getAndReturnNestedWithRequiredFieldAsList( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/endpoints/params/ParamsClient.java b/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/endpoints/params/ParamsClient.java index 87aa296af3c..cd310181b64 100644 --- a/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/endpoints/params/ParamsClient.java +++ b/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/endpoints/params/ParamsClient.java @@ -52,9 +52,7 @@ public String getWithPath(String param, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -92,9 +90,7 @@ public void getWithQuery(GetWithQuery request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -132,9 +128,7 @@ public void getWithAllowMultipleQuery(GetWithMultipleQuery request, RequestOptio try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -173,9 +167,7 @@ public void getWithPathAndQuery(String param, GetWithPathAndQuery request, Reque try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -222,9 +214,7 @@ public String modifyWithPath(String param, String request, RequestOptions reques try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/endpoints/primitive/PrimitiveClient.java b/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/endpoints/primitive/PrimitiveClient.java index 1df7ef0160a..c2240ae9e51 100644 --- a/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/endpoints/primitive/PrimitiveClient.java +++ b/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/endpoints/primitive/PrimitiveClient.java @@ -51,9 +51,7 @@ public String getAndReturnString(String request, RequestOptions requestOptions) try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -93,9 +91,7 @@ public int getAndReturnInt(int request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -135,9 +131,7 @@ public long getAndReturnLong(long request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -177,9 +171,7 @@ public double getAndReturnDouble(double request, RequestOptions requestOptions) try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -219,9 +211,7 @@ public boolean getAndReturnBool(boolean request, RequestOptions requestOptions) try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -261,9 +251,7 @@ public OffsetDateTime getAndReturnDatetime(OffsetDateTime request, RequestOption try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -303,9 +291,7 @@ public String getAndReturnDate(String request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -345,9 +331,7 @@ public UUID getAndReturnUuid(UUID request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -387,9 +371,7 @@ public byte[] getAndReturnBase64(byte[] request, RequestOptions requestOptions) try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/endpoints/union/UnionClient.java b/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/endpoints/union/UnionClient.java index b97bc5e412e..1510a9a6b69 100644 --- a/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/endpoints/union/UnionClient.java +++ b/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/endpoints/union/UnionClient.java @@ -49,9 +49,7 @@ public Animal getAndReturnUnion(Animal request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/inlinedrequests/InlinedRequestsClient.java b/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/inlinedrequests/InlinedRequestsClient.java index 143861b2eef..e7d3f26f0f4 100644 --- a/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/inlinedrequests/InlinedRequestsClient.java +++ b/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/inlinedrequests/InlinedRequestsClient.java @@ -58,9 +58,7 @@ public ObjectWithOptionalField postWithObjectBodyandResponse( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/noauth/NoAuthClient.java b/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/noauth/NoAuthClient.java index 1338c54d154..efb15ca6698 100644 --- a/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/noauth/NoAuthClient.java +++ b/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/noauth/NoAuthClient.java @@ -54,9 +54,7 @@ public boolean postWithNoAuth(Object request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/noreqbody/NoReqBodyClient.java b/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/noreqbody/NoReqBodyClient.java index a2be45418dc..fc9417dec9b 100644 --- a/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/noreqbody/NoReqBodyClient.java +++ b/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/noreqbody/NoReqBodyClient.java @@ -41,9 +41,7 @@ public ObjectWithOptionalField getWithNoRequestBody(RequestOptions requestOption try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -75,9 +73,7 @@ public String postWithNoRequestBody(RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/reqwithheaders/ReqWithHeadersClient.java b/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/reqwithheaders/ReqWithHeadersClient.java index 7179ba1fcfd..b8a6dfcabb2 100644 --- a/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/reqwithheaders/ReqWithHeadersClient.java +++ b/seed/java-sdk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/resources/reqwithheaders/ReqWithHeadersClient.java @@ -52,9 +52,7 @@ public void getWithCustomHeader(ReqWithHeaders request, RequestOptions requestOp try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/core/ClientOptions.java b/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/core/ClientOptions.java index bfe71940791..102eb571fa4 100644 --- a/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/core/ClientOptions.java +++ b/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/core/ClientOptions.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import okhttp3.OkHttpClient; @@ -50,6 +51,16 @@ public OkHttpClient httpClient() { return this.httpClient; } + public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) { + return httpClient + .newBuilder() + .callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) + .connectTimeout(0, TimeUnit.SECONDS) + .writeTimeout(0, TimeUnit.SECONDS) + .readTimeout(0, TimeUnit.SECONDS) + .build(); + } + public static Builder builder() { return new Builder(); } diff --git a/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/endpoints/container/ContainerClient.java b/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/endpoints/container/ContainerClient.java index ab7394eee86..1fad7898cc9 100644 --- a/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/endpoints/container/ContainerClient.java +++ b/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/endpoints/container/ContainerClient.java @@ -55,9 +55,7 @@ public List getAndReturnListOfPrimitives(List request, RequestOp try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -99,9 +97,7 @@ public List getAndReturnListOfObjects( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -142,9 +138,7 @@ public Set getAndReturnSetOfPrimitives(Set request, RequestOptio try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -186,9 +180,7 @@ public Set getAndReturnSetOfObjects( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -229,9 +221,7 @@ public Map getAndReturnMapPrimToPrim(Map request try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -274,9 +264,7 @@ public Map getAndReturnMapOfPrimToObject( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -325,9 +313,7 @@ public Optional getAndReturnOptional( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/endpoints/enum_/EnumClient.java b/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/endpoints/enum_/EnumClient.java index 67f22ff0da6..a0c5abb448e 100644 --- a/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/endpoints/enum_/EnumClient.java +++ b/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/endpoints/enum_/EnumClient.java @@ -49,9 +49,7 @@ public WeatherReport getAndReturnEnum(WeatherReport request, RequestOptions requ try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/endpoints/httpmethods/HttpMethodsClient.java b/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/endpoints/httpmethods/HttpMethodsClient.java index 00285499213..128c987edbf 100644 --- a/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/endpoints/httpmethods/HttpMethodsClient.java +++ b/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/endpoints/httpmethods/HttpMethodsClient.java @@ -44,9 +44,7 @@ public String testGet(String id, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -85,9 +83,7 @@ public ObjectWithOptionalField testPost(ObjectWithRequiredField request, Request try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -127,9 +123,7 @@ public ObjectWithOptionalField testPut(String id, ObjectWithRequiredField reques try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -174,9 +168,7 @@ public ObjectWithOptionalField testPatch( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -209,9 +201,7 @@ public boolean testDelete(String id, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/endpoints/object/ObjectClient.java b/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/endpoints/object/ObjectClient.java index 9f612eaf1d2..81f416fe29d 100644 --- a/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/endpoints/object/ObjectClient.java +++ b/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/endpoints/object/ObjectClient.java @@ -60,9 +60,7 @@ public ObjectWithOptionalField getAndReturnWithOptionalField( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -103,9 +101,7 @@ public ObjectWithRequiredField getAndReturnWithRequiredField( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -145,9 +141,7 @@ public ObjectWithMapOfMap getAndReturnWithMapOfMap(ObjectWithMapOfMap request, R try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -193,9 +187,7 @@ public NestedObjectWithOptionalField getAndReturnNestedWithOptionalField( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -237,9 +229,7 @@ public NestedObjectWithRequiredField getAndReturnNestedWithRequiredField( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -282,9 +272,7 @@ public NestedObjectWithRequiredField getAndReturnNestedWithRequiredFieldAsList( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/endpoints/params/ParamsClient.java b/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/endpoints/params/ParamsClient.java index 87aa296af3c..cd310181b64 100644 --- a/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/endpoints/params/ParamsClient.java +++ b/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/endpoints/params/ParamsClient.java @@ -52,9 +52,7 @@ public String getWithPath(String param, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -92,9 +90,7 @@ public void getWithQuery(GetWithQuery request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -132,9 +128,7 @@ public void getWithAllowMultipleQuery(GetWithMultipleQuery request, RequestOptio try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -173,9 +167,7 @@ public void getWithPathAndQuery(String param, GetWithPathAndQuery request, Reque try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -222,9 +214,7 @@ public String modifyWithPath(String param, String request, RequestOptions reques try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/endpoints/primitive/PrimitiveClient.java b/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/endpoints/primitive/PrimitiveClient.java index 1df7ef0160a..c2240ae9e51 100644 --- a/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/endpoints/primitive/PrimitiveClient.java +++ b/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/endpoints/primitive/PrimitiveClient.java @@ -51,9 +51,7 @@ public String getAndReturnString(String request, RequestOptions requestOptions) try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -93,9 +91,7 @@ public int getAndReturnInt(int request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -135,9 +131,7 @@ public long getAndReturnLong(long request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -177,9 +171,7 @@ public double getAndReturnDouble(double request, RequestOptions requestOptions) try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -219,9 +211,7 @@ public boolean getAndReturnBool(boolean request, RequestOptions requestOptions) try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -261,9 +251,7 @@ public OffsetDateTime getAndReturnDatetime(OffsetDateTime request, RequestOption try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -303,9 +291,7 @@ public String getAndReturnDate(String request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -345,9 +331,7 @@ public UUID getAndReturnUuid(UUID request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -387,9 +371,7 @@ public byte[] getAndReturnBase64(byte[] request, RequestOptions requestOptions) try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/endpoints/union/UnionClient.java b/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/endpoints/union/UnionClient.java index b97bc5e412e..1510a9a6b69 100644 --- a/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/endpoints/union/UnionClient.java +++ b/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/endpoints/union/UnionClient.java @@ -49,9 +49,7 @@ public Animal getAndReturnUnion(Animal request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/inlinedrequests/InlinedRequestsClient.java b/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/inlinedrequests/InlinedRequestsClient.java index 143861b2eef..e7d3f26f0f4 100644 --- a/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/inlinedrequests/InlinedRequestsClient.java +++ b/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/inlinedrequests/InlinedRequestsClient.java @@ -58,9 +58,7 @@ public ObjectWithOptionalField postWithObjectBodyandResponse( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/noauth/NoAuthClient.java b/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/noauth/NoAuthClient.java index 1338c54d154..efb15ca6698 100644 --- a/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/noauth/NoAuthClient.java +++ b/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/noauth/NoAuthClient.java @@ -54,9 +54,7 @@ public boolean postWithNoAuth(Object request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/noreqbody/NoReqBodyClient.java b/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/noreqbody/NoReqBodyClient.java index a2be45418dc..fc9417dec9b 100644 --- a/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/noreqbody/NoReqBodyClient.java +++ b/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/noreqbody/NoReqBodyClient.java @@ -41,9 +41,7 @@ public ObjectWithOptionalField getWithNoRequestBody(RequestOptions requestOption try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -75,9 +73,7 @@ public String postWithNoRequestBody(RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/reqwithheaders/ReqWithHeadersClient.java b/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/reqwithheaders/ReqWithHeadersClient.java index 7179ba1fcfd..b8a6dfcabb2 100644 --- a/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/reqwithheaders/ReqWithHeadersClient.java +++ b/seed/java-sdk/exhaustive/forward-compatible-enums/src/main/java/com/seed/exhaustive/resources/reqwithheaders/ReqWithHeadersClient.java @@ -52,9 +52,7 @@ public void getWithCustomHeader(ReqWithHeaders request, RequestOptions requestOp try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/local-files/core/ClientOptions.java b/seed/java-sdk/exhaustive/local-files/core/ClientOptions.java index 07ec9d228e4..2aba057c14f 100644 --- a/seed/java-sdk/exhaustive/local-files/core/ClientOptions.java +++ b/seed/java-sdk/exhaustive/local-files/core/ClientOptions.java @@ -7,6 +7,7 @@ import java.lang.String; import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import okhttp3.OkHttpClient; @@ -49,6 +50,10 @@ public OkHttpClient httpClient() { return this.httpClient; } + public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) { + return httpClient.newBuilder().callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).connectTimeout(0, TimeUnit.SECONDS).writeTimeout(0, TimeUnit.SECONDS).readTimeout(0, TimeUnit.SECONDS).build(); + } + public static Builder builder() { return new Builder(); } diff --git a/seed/java-sdk/exhaustive/local-files/resources/endpoints/container/ContainerClient.java b/seed/java-sdk/exhaustive/local-files/resources/endpoints/container/ContainerClient.java index 6bcf4a7f639..dc80964c7c8 100644 --- a/seed/java-sdk/exhaustive/local-files/resources/endpoints/container/ContainerClient.java +++ b/seed/java-sdk/exhaustive/local-files/resources/endpoints/container/ContainerClient.java @@ -60,7 +60,7 @@ public List getAndReturnListOfPrimitives(List request, try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -100,7 +100,7 @@ public List getAndReturnListOfObjects( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -139,7 +139,7 @@ public Set getAndReturnSetOfPrimitives(Set request, try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -179,7 +179,7 @@ public Set getAndReturnSetOfObjects(Set getAndReturnMapPrimToPrim(Map request try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -258,7 +258,7 @@ public Map getAndReturnMapOfPrimToObject( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -305,7 +305,7 @@ public Optional getAndReturnOptional( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/local-files/resources/endpoints/enum_/EnumClient.java b/seed/java-sdk/exhaustive/local-files/resources/endpoints/enum_/EnumClient.java index 405208a63ce..20b0d2afe97 100644 --- a/seed/java-sdk/exhaustive/local-files/resources/endpoints/enum_/EnumClient.java +++ b/seed/java-sdk/exhaustive/local-files/resources/endpoints/enum_/EnumClient.java @@ -53,7 +53,7 @@ public WeatherReport getAndReturnEnum(WeatherReport request, RequestOptions requ try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/local-files/resources/endpoints/httpmethods/HttpMethodsClient.java b/seed/java-sdk/exhaustive/local-files/resources/endpoints/httpmethods/HttpMethodsClient.java index 244bf421d4c..c1b6b995afb 100644 --- a/seed/java-sdk/exhaustive/local-files/resources/endpoints/httpmethods/HttpMethodsClient.java +++ b/seed/java-sdk/exhaustive/local-files/resources/endpoints/httpmethods/HttpMethodsClient.java @@ -49,7 +49,7 @@ public String testGet(String id, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -88,7 +88,7 @@ public ObjectWithOptionalField testPost(ObjectWithRequiredField request, try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -128,7 +128,7 @@ public ObjectWithOptionalField testPut(String id, ObjectWithRequiredField reques try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -172,7 +172,7 @@ public ObjectWithOptionalField testPatch(String id, ObjectWithOptionalField requ try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -204,7 +204,7 @@ public boolean testDelete(String id, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/local-files/resources/endpoints/object/ObjectClient.java b/seed/java-sdk/exhaustive/local-files/resources/endpoints/object/ObjectClient.java index 238a40c93f1..c6e4adaeb3d 100644 --- a/seed/java-sdk/exhaustive/local-files/resources/endpoints/object/ObjectClient.java +++ b/seed/java-sdk/exhaustive/local-files/resources/endpoints/object/ObjectClient.java @@ -63,7 +63,7 @@ public ObjectWithOptionalField getAndReturnWithOptionalField(ObjectWithOptionalF try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -102,7 +102,7 @@ public ObjectWithRequiredField getAndReturnWithRequiredField(ObjectWithRequiredF try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -141,7 +141,7 @@ public ObjectWithMapOfMap getAndReturnWithMapOfMap(ObjectWithMapOfMap request, try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -185,7 +185,7 @@ public NestedObjectWithOptionalField getAndReturnNestedWithOptionalField( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -225,7 +225,7 @@ public NestedObjectWithRequiredField getAndReturnNestedWithRequiredField( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -265,7 +265,7 @@ public NestedObjectWithRequiredField getAndReturnNestedWithRequiredFieldAsList( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/local-files/resources/endpoints/params/ParamsClient.java b/seed/java-sdk/exhaustive/local-files/resources/endpoints/params/ParamsClient.java index e3f0b6cb6b0..aae2c731427 100644 --- a/seed/java-sdk/exhaustive/local-files/resources/endpoints/params/ParamsClient.java +++ b/seed/java-sdk/exhaustive/local-files/resources/endpoints/params/ParamsClient.java @@ -57,7 +57,7 @@ public String getWithPath(String param, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -93,7 +93,7 @@ public void getWithQuery(GetWithQuery request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -130,7 +130,7 @@ public void getWithAllowMultipleQuery(GetWithMultipleQuery request, try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -167,7 +167,7 @@ public void getWithPathAndQuery(String param, GetWithPathAndQuery request, try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -212,7 +212,7 @@ public String modifyWithPath(String param, String request, RequestOptions reques try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/local-files/resources/endpoints/primitive/PrimitiveClient.java b/seed/java-sdk/exhaustive/local-files/resources/endpoints/primitive/PrimitiveClient.java index da46579b608..b8a13e500c3 100644 --- a/seed/java-sdk/exhaustive/local-files/resources/endpoints/primitive/PrimitiveClient.java +++ b/seed/java-sdk/exhaustive/local-files/resources/endpoints/primitive/PrimitiveClient.java @@ -55,7 +55,7 @@ public String getAndReturnString(String request, RequestOptions requestOptions) try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -93,7 +93,7 @@ public int getAndReturnInt(int request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -131,7 +131,7 @@ public long getAndReturnLong(long request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -169,7 +169,7 @@ public double getAndReturnDouble(double request, RequestOptions requestOptions) try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -207,7 +207,7 @@ public boolean getAndReturnBool(boolean request, RequestOptions requestOptions) try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -246,7 +246,7 @@ public OffsetDateTime getAndReturnDatetime(OffsetDateTime request, try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -284,7 +284,7 @@ public String getAndReturnDate(String request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -322,7 +322,7 @@ public UUID getAndReturnUuid(UUID request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -360,7 +360,7 @@ public byte[] getAndReturnBase64(byte[] request, RequestOptions requestOptions) try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/local-files/resources/endpoints/union/UnionClient.java b/seed/java-sdk/exhaustive/local-files/resources/endpoints/union/UnionClient.java index a9dec640fbf..d546b40cd0d 100644 --- a/seed/java-sdk/exhaustive/local-files/resources/endpoints/union/UnionClient.java +++ b/seed/java-sdk/exhaustive/local-files/resources/endpoints/union/UnionClient.java @@ -53,7 +53,7 @@ public Animal getAndReturnUnion(Animal request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/local-files/resources/inlinedrequests/InlinedRequestsClient.java b/seed/java-sdk/exhaustive/local-files/resources/inlinedrequests/InlinedRequestsClient.java index 4d4c7763f62..5cb2523e28a 100644 --- a/seed/java-sdk/exhaustive/local-files/resources/inlinedrequests/InlinedRequestsClient.java +++ b/seed/java-sdk/exhaustive/local-files/resources/inlinedrequests/InlinedRequestsClient.java @@ -61,7 +61,7 @@ public ObjectWithOptionalField postWithObjectBodyandResponse(PostWithObjectBody try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/local-files/resources/noauth/NoAuthClient.java b/seed/java-sdk/exhaustive/local-files/resources/noauth/NoAuthClient.java index 184c7da0cc5..563052e975c 100644 --- a/seed/java-sdk/exhaustive/local-files/resources/noauth/NoAuthClient.java +++ b/seed/java-sdk/exhaustive/local-files/resources/noauth/NoAuthClient.java @@ -58,7 +58,7 @@ public boolean postWithNoAuth(Object request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/local-files/resources/noreqbody/NoReqBodyClient.java b/seed/java-sdk/exhaustive/local-files/resources/noreqbody/NoReqBodyClient.java index cd39e52a02a..a094c8bceab 100644 --- a/seed/java-sdk/exhaustive/local-files/resources/noreqbody/NoReqBodyClient.java +++ b/seed/java-sdk/exhaustive/local-files/resources/noreqbody/NoReqBodyClient.java @@ -45,7 +45,7 @@ public ObjectWithOptionalField getWithNoRequestBody(RequestOptions requestOption try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -76,7 +76,7 @@ public String postWithNoRequestBody(RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/local-files/resources/reqwithheaders/ReqWithHeadersClient.java b/seed/java-sdk/exhaustive/local-files/resources/reqwithheaders/ReqWithHeadersClient.java index 5f2bafebdee..778f2369198 100644 --- a/seed/java-sdk/exhaustive/local-files/resources/reqwithheaders/ReqWithHeadersClient.java +++ b/seed/java-sdk/exhaustive/local-files/resources/reqwithheaders/ReqWithHeadersClient.java @@ -55,7 +55,7 @@ public void getWithCustomHeader(ReqWithHeaders request, RequestOptions requestOp try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder().readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()).build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/core/ClientOptions.java b/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/core/ClientOptions.java index bfe71940791..102eb571fa4 100644 --- a/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/core/ClientOptions.java +++ b/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/core/ClientOptions.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import okhttp3.OkHttpClient; @@ -50,6 +51,16 @@ public OkHttpClient httpClient() { return this.httpClient; } + public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) { + return httpClient + .newBuilder() + .callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) + .connectTimeout(0, TimeUnit.SECONDS) + .writeTimeout(0, TimeUnit.SECONDS) + .readTimeout(0, TimeUnit.SECONDS) + .build(); + } + public static Builder builder() { return new Builder(); } diff --git a/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/endpoints/container/ContainerClient.java b/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/endpoints/container/ContainerClient.java index ab7394eee86..1fad7898cc9 100644 --- a/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/endpoints/container/ContainerClient.java +++ b/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/endpoints/container/ContainerClient.java @@ -55,9 +55,7 @@ public List getAndReturnListOfPrimitives(List request, RequestOp try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -99,9 +97,7 @@ public List getAndReturnListOfObjects( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -142,9 +138,7 @@ public Set getAndReturnSetOfPrimitives(Set request, RequestOptio try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -186,9 +180,7 @@ public Set getAndReturnSetOfObjects( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -229,9 +221,7 @@ public Map getAndReturnMapPrimToPrim(Map request try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -274,9 +264,7 @@ public Map getAndReturnMapOfPrimToObject( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -325,9 +313,7 @@ public Optional getAndReturnOptional( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/endpoints/enum_/EnumClient.java b/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/endpoints/enum_/EnumClient.java index 67f22ff0da6..a0c5abb448e 100644 --- a/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/endpoints/enum_/EnumClient.java +++ b/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/endpoints/enum_/EnumClient.java @@ -49,9 +49,7 @@ public WeatherReport getAndReturnEnum(WeatherReport request, RequestOptions requ try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/endpoints/httpmethods/HttpMethodsClient.java b/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/endpoints/httpmethods/HttpMethodsClient.java index 00285499213..128c987edbf 100644 --- a/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/endpoints/httpmethods/HttpMethodsClient.java +++ b/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/endpoints/httpmethods/HttpMethodsClient.java @@ -44,9 +44,7 @@ public String testGet(String id, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -85,9 +83,7 @@ public ObjectWithOptionalField testPost(ObjectWithRequiredField request, Request try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -127,9 +123,7 @@ public ObjectWithOptionalField testPut(String id, ObjectWithRequiredField reques try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -174,9 +168,7 @@ public ObjectWithOptionalField testPatch( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -209,9 +201,7 @@ public boolean testDelete(String id, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/endpoints/object/ObjectClient.java b/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/endpoints/object/ObjectClient.java index 9f612eaf1d2..81f416fe29d 100644 --- a/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/endpoints/object/ObjectClient.java +++ b/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/endpoints/object/ObjectClient.java @@ -60,9 +60,7 @@ public ObjectWithOptionalField getAndReturnWithOptionalField( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -103,9 +101,7 @@ public ObjectWithRequiredField getAndReturnWithRequiredField( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -145,9 +141,7 @@ public ObjectWithMapOfMap getAndReturnWithMapOfMap(ObjectWithMapOfMap request, R try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -193,9 +187,7 @@ public NestedObjectWithOptionalField getAndReturnNestedWithOptionalField( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -237,9 +229,7 @@ public NestedObjectWithRequiredField getAndReturnNestedWithRequiredField( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -282,9 +272,7 @@ public NestedObjectWithRequiredField getAndReturnNestedWithRequiredFieldAsList( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/endpoints/params/ParamsClient.java b/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/endpoints/params/ParamsClient.java index 87aa296af3c..cd310181b64 100644 --- a/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/endpoints/params/ParamsClient.java +++ b/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/endpoints/params/ParamsClient.java @@ -52,9 +52,7 @@ public String getWithPath(String param, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -92,9 +90,7 @@ public void getWithQuery(GetWithQuery request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -132,9 +128,7 @@ public void getWithAllowMultipleQuery(GetWithMultipleQuery request, RequestOptio try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -173,9 +167,7 @@ public void getWithPathAndQuery(String param, GetWithPathAndQuery request, Reque try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -222,9 +214,7 @@ public String modifyWithPath(String param, String request, RequestOptions reques try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/endpoints/primitive/PrimitiveClient.java b/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/endpoints/primitive/PrimitiveClient.java index 1df7ef0160a..c2240ae9e51 100644 --- a/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/endpoints/primitive/PrimitiveClient.java +++ b/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/endpoints/primitive/PrimitiveClient.java @@ -51,9 +51,7 @@ public String getAndReturnString(String request, RequestOptions requestOptions) try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -93,9 +91,7 @@ public int getAndReturnInt(int request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -135,9 +131,7 @@ public long getAndReturnLong(long request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -177,9 +171,7 @@ public double getAndReturnDouble(double request, RequestOptions requestOptions) try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -219,9 +211,7 @@ public boolean getAndReturnBool(boolean request, RequestOptions requestOptions) try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -261,9 +251,7 @@ public OffsetDateTime getAndReturnDatetime(OffsetDateTime request, RequestOption try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -303,9 +291,7 @@ public String getAndReturnDate(String request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -345,9 +331,7 @@ public UUID getAndReturnUuid(UUID request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -387,9 +371,7 @@ public byte[] getAndReturnBase64(byte[] request, RequestOptions requestOptions) try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/endpoints/union/UnionClient.java b/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/endpoints/union/UnionClient.java index b97bc5e412e..1510a9a6b69 100644 --- a/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/endpoints/union/UnionClient.java +++ b/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/endpoints/union/UnionClient.java @@ -49,9 +49,7 @@ public Animal getAndReturnUnion(Animal request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/inlinedrequests/InlinedRequestsClient.java b/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/inlinedrequests/InlinedRequestsClient.java index 143861b2eef..e7d3f26f0f4 100644 --- a/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/inlinedrequests/InlinedRequestsClient.java +++ b/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/inlinedrequests/InlinedRequestsClient.java @@ -58,9 +58,7 @@ public ObjectWithOptionalField postWithObjectBodyandResponse( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/noauth/NoAuthClient.java b/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/noauth/NoAuthClient.java index 1338c54d154..efb15ca6698 100644 --- a/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/noauth/NoAuthClient.java +++ b/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/noauth/NoAuthClient.java @@ -54,9 +54,7 @@ public boolean postWithNoAuth(Object request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/noreqbody/NoReqBodyClient.java b/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/noreqbody/NoReqBodyClient.java index a2be45418dc..fc9417dec9b 100644 --- a/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/noreqbody/NoReqBodyClient.java +++ b/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/noreqbody/NoReqBodyClient.java @@ -41,9 +41,7 @@ public ObjectWithOptionalField getWithNoRequestBody(RequestOptions requestOption try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -75,9 +73,7 @@ public String postWithNoRequestBody(RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/reqwithheaders/ReqWithHeadersClient.java b/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/reqwithheaders/ReqWithHeadersClient.java index 7179ba1fcfd..b8a6dfcabb2 100644 --- a/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/reqwithheaders/ReqWithHeadersClient.java +++ b/seed/java-sdk/exhaustive/no-custom-config/src/main/java/com/seed/exhaustive/resources/reqwithheaders/ReqWithHeadersClient.java @@ -52,9 +52,7 @@ public void getWithCustomHeader(ReqWithHeaders request, RequestOptions requestOp try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/file-download/src/main/java/com/seed/fileDownload/core/ClientOptions.java b/seed/java-sdk/file-download/src/main/java/com/seed/fileDownload/core/ClientOptions.java index b7b7b4fff0b..16f03cdfd9f 100644 --- a/seed/java-sdk/file-download/src/main/java/com/seed/fileDownload/core/ClientOptions.java +++ b/seed/java-sdk/file-download/src/main/java/com/seed/fileDownload/core/ClientOptions.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import okhttp3.OkHttpClient; @@ -50,6 +51,16 @@ public OkHttpClient httpClient() { return this.httpClient; } + public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) { + return httpClient + .newBuilder() + .callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) + .connectTimeout(0, TimeUnit.SECONDS) + .writeTimeout(0, TimeUnit.SECONDS) + .readTimeout(0, TimeUnit.SECONDS) + .build(); + } + public static Builder builder() { return new Builder(); } diff --git a/seed/java-sdk/file-download/src/main/java/com/seed/fileDownload/resources/service/ServiceClient.java b/seed/java-sdk/file-download/src/main/java/com/seed/fileDownload/resources/service/ServiceClient.java index 13e67e576f0..26075c559f5 100644 --- a/seed/java-sdk/file-download/src/main/java/com/seed/fileDownload/resources/service/ServiceClient.java +++ b/seed/java-sdk/file-download/src/main/java/com/seed/fileDownload/resources/service/ServiceClient.java @@ -40,9 +40,7 @@ public InputStream downloadFile(RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/file-upload/src/main/java/com/seed/fileUpload/core/ClientOptions.java b/seed/java-sdk/file-upload/src/main/java/com/seed/fileUpload/core/ClientOptions.java index b9e7fd19079..5e32e90e8d8 100644 --- a/seed/java-sdk/file-upload/src/main/java/com/seed/fileUpload/core/ClientOptions.java +++ b/seed/java-sdk/file-upload/src/main/java/com/seed/fileUpload/core/ClientOptions.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import okhttp3.OkHttpClient; @@ -50,6 +51,16 @@ public OkHttpClient httpClient() { return this.httpClient; } + public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) { + return httpClient + .newBuilder() + .callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) + .connectTimeout(0, TimeUnit.SECONDS) + .writeTimeout(0, TimeUnit.SECONDS) + .readTimeout(0, TimeUnit.SECONDS) + .build(); + } + public static Builder builder() { return new Builder(); } diff --git a/seed/java-sdk/file-upload/src/main/java/com/seed/fileUpload/resources/service/ServiceClient.java b/seed/java-sdk/file-upload/src/main/java/com/seed/fileUpload/resources/service/ServiceClient.java index 92b4aed16eb..a5fa17bef92 100644 --- a/seed/java-sdk/file-upload/src/main/java/com/seed/fileUpload/resources/service/ServiceClient.java +++ b/seed/java-sdk/file-upload/src/main/java/com/seed/fileUpload/resources/service/ServiceClient.java @@ -99,9 +99,7 @@ public void post( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -140,9 +138,7 @@ public void justFile(File file, JustFileRequet request, RequestOptions requestOp try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -194,9 +190,7 @@ public void justFileWithQueryParams( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/folders/src/main/java/com/seed/api/SeedApiClient.java b/seed/java-sdk/folders/src/main/java/com/seed/api/SeedApiClient.java index 98fa9861a33..f78dc874cf1 100644 --- a/seed/java-sdk/folders/src/main/java/com/seed/api/SeedApiClient.java +++ b/seed/java-sdk/folders/src/main/java/com/seed/api/SeedApiClient.java @@ -48,9 +48,7 @@ public void foo(RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/folders/src/main/java/com/seed/api/core/ClientOptions.java b/seed/java-sdk/folders/src/main/java/com/seed/api/core/ClientOptions.java index 354aeec7720..87efc2a205c 100644 --- a/seed/java-sdk/folders/src/main/java/com/seed/api/core/ClientOptions.java +++ b/seed/java-sdk/folders/src/main/java/com/seed/api/core/ClientOptions.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import okhttp3.OkHttpClient; @@ -50,6 +51,16 @@ public OkHttpClient httpClient() { return this.httpClient; } + public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) { + return httpClient + .newBuilder() + .callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) + .connectTimeout(0, TimeUnit.SECONDS) + .writeTimeout(0, TimeUnit.SECONDS) + .readTimeout(0, TimeUnit.SECONDS) + .build(); + } + public static Builder builder() { return new Builder(); } diff --git a/seed/java-sdk/folders/src/main/java/com/seed/api/resources/folder/FolderClient.java b/seed/java-sdk/folders/src/main/java/com/seed/api/resources/folder/FolderClient.java index 380badd8df6..0b6851ead74 100644 --- a/seed/java-sdk/folders/src/main/java/com/seed/api/resources/folder/FolderClient.java +++ b/seed/java-sdk/folders/src/main/java/com/seed/api/resources/folder/FolderClient.java @@ -44,9 +44,7 @@ public void foo(RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/folders/src/main/java/com/seed/api/resources/folder/service/ServiceClient.java b/seed/java-sdk/folders/src/main/java/com/seed/api/resources/folder/service/ServiceClient.java index da2e55cdd47..176846933d0 100644 --- a/seed/java-sdk/folders/src/main/java/com/seed/api/resources/folder/service/ServiceClient.java +++ b/seed/java-sdk/folders/src/main/java/com/seed/api/resources/folder/service/ServiceClient.java @@ -40,9 +40,7 @@ public void endpoint(RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -81,9 +79,7 @@ public void unknownRequest(Object request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/imdb/src/main/java/com/seed/api/core/ClientOptions.java b/seed/java-sdk/imdb/src/main/java/com/seed/api/core/ClientOptions.java index 354aeec7720..87efc2a205c 100644 --- a/seed/java-sdk/imdb/src/main/java/com/seed/api/core/ClientOptions.java +++ b/seed/java-sdk/imdb/src/main/java/com/seed/api/core/ClientOptions.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import okhttp3.OkHttpClient; @@ -50,6 +51,16 @@ public OkHttpClient httpClient() { return this.httpClient; } + public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) { + return httpClient + .newBuilder() + .callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) + .connectTimeout(0, TimeUnit.SECONDS) + .writeTimeout(0, TimeUnit.SECONDS) + .readTimeout(0, TimeUnit.SECONDS) + .build(); + } + public static Builder builder() { return new Builder(); } diff --git a/seed/java-sdk/imdb/src/main/java/com/seed/api/resources/imdb/ImdbClient.java b/seed/java-sdk/imdb/src/main/java/com/seed/api/resources/imdb/ImdbClient.java index 3011ca9dc07..4baf1695f6e 100644 --- a/seed/java-sdk/imdb/src/main/java/com/seed/api/resources/imdb/ImdbClient.java +++ b/seed/java-sdk/imdb/src/main/java/com/seed/api/resources/imdb/ImdbClient.java @@ -57,9 +57,7 @@ public String createMovie(CreateMovieRequest request, RequestOptions requestOpti try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -92,9 +90,7 @@ public Movie getMovie(String movieId, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/literal/src/main/java/com/seed/literal/core/ClientOptions.java b/seed/java-sdk/literal/src/main/java/com/seed/literal/core/ClientOptions.java index 0adc4078342..92282c2390a 100644 --- a/seed/java-sdk/literal/src/main/java/com/seed/literal/core/ClientOptions.java +++ b/seed/java-sdk/literal/src/main/java/com/seed/literal/core/ClientOptions.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import okhttp3.OkHttpClient; @@ -50,6 +51,16 @@ public OkHttpClient httpClient() { return this.httpClient; } + public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) { + return httpClient + .newBuilder() + .callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) + .connectTimeout(0, TimeUnit.SECONDS) + .writeTimeout(0, TimeUnit.SECONDS) + .readTimeout(0, TimeUnit.SECONDS) + .build(); + } + public static Builder builder() { return new Builder(); } diff --git a/seed/java-sdk/literal/src/main/java/com/seed/literal/resources/headers/HeadersClient.java b/seed/java-sdk/literal/src/main/java/com/seed/literal/resources/headers/HeadersClient.java index ad5056cbe0d..5375d8d8a10 100644 --- a/seed/java-sdk/literal/src/main/java/com/seed/literal/resources/headers/HeadersClient.java +++ b/seed/java-sdk/literal/src/main/java/com/seed/literal/resources/headers/HeadersClient.java @@ -56,9 +56,7 @@ public SendResponse send(SendLiteralsInHeadersRequest request, RequestOptions re try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/literal/src/main/java/com/seed/literal/resources/inlined/InlinedClient.java b/seed/java-sdk/literal/src/main/java/com/seed/literal/resources/inlined/InlinedClient.java index 16a408ff78b..81b5c973942 100644 --- a/seed/java-sdk/literal/src/main/java/com/seed/literal/resources/inlined/InlinedClient.java +++ b/seed/java-sdk/literal/src/main/java/com/seed/literal/resources/inlined/InlinedClient.java @@ -50,9 +50,7 @@ public SendResponse send(SendLiteralsInlinedRequest request, RequestOptions requ try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/literal/src/main/java/com/seed/literal/resources/path/PathClient.java b/seed/java-sdk/literal/src/main/java/com/seed/literal/resources/path/PathClient.java index 2dce40fee47..1e0a4e147e6 100644 --- a/seed/java-sdk/literal/src/main/java/com/seed/literal/resources/path/PathClient.java +++ b/seed/java-sdk/literal/src/main/java/com/seed/literal/resources/path/PathClient.java @@ -42,9 +42,7 @@ public SendResponse send(String id, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/literal/src/main/java/com/seed/literal/resources/query/QueryClient.java b/seed/java-sdk/literal/src/main/java/com/seed/literal/resources/query/QueryClient.java index c54e981917f..fa02c30d95a 100644 --- a/seed/java-sdk/literal/src/main/java/com/seed/literal/resources/query/QueryClient.java +++ b/seed/java-sdk/literal/src/main/java/com/seed/literal/resources/query/QueryClient.java @@ -44,9 +44,7 @@ public SendResponse send(SendLiteralsInQueryRequest request, RequestOptions requ try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/literal/src/main/java/com/seed/literal/resources/reference/ReferenceClient.java b/seed/java-sdk/literal/src/main/java/com/seed/literal/resources/reference/ReferenceClient.java index 9c26374dcbc..00adaf68ec0 100644 --- a/seed/java-sdk/literal/src/main/java/com/seed/literal/resources/reference/ReferenceClient.java +++ b/seed/java-sdk/literal/src/main/java/com/seed/literal/resources/reference/ReferenceClient.java @@ -50,9 +50,7 @@ public SendResponse send(SendRequest request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/multi-url-environment/src/main/java/com/seed/multiUrlEnvironment/core/ClientOptions.java b/seed/java-sdk/multi-url-environment/src/main/java/com/seed/multiUrlEnvironment/core/ClientOptions.java index 7545011609c..ae42c4879cf 100644 --- a/seed/java-sdk/multi-url-environment/src/main/java/com/seed/multiUrlEnvironment/core/ClientOptions.java +++ b/seed/java-sdk/multi-url-environment/src/main/java/com/seed/multiUrlEnvironment/core/ClientOptions.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import okhttp3.OkHttpClient; @@ -50,6 +51,16 @@ public OkHttpClient httpClient() { return this.httpClient; } + public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) { + return httpClient + .newBuilder() + .callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) + .connectTimeout(0, TimeUnit.SECONDS) + .writeTimeout(0, TimeUnit.SECONDS) + .readTimeout(0, TimeUnit.SECONDS) + .build(); + } + public static Builder builder() { return new Builder(); } diff --git a/seed/java-sdk/multi-url-environment/src/main/java/com/seed/multiUrlEnvironment/resources/ec2/Ec2Client.java b/seed/java-sdk/multi-url-environment/src/main/java/com/seed/multiUrlEnvironment/resources/ec2/Ec2Client.java index 67c55118a02..ee3eec82c1b 100644 --- a/seed/java-sdk/multi-url-environment/src/main/java/com/seed/multiUrlEnvironment/resources/ec2/Ec2Client.java +++ b/seed/java-sdk/multi-url-environment/src/main/java/com/seed/multiUrlEnvironment/resources/ec2/Ec2Client.java @@ -50,9 +50,7 @@ public void bootInstance(BootInstanceRequest request, RequestOptions requestOpti try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/multi-url-environment/src/main/java/com/seed/multiUrlEnvironment/resources/s3/S3Client.java b/seed/java-sdk/multi-url-environment/src/main/java/com/seed/multiUrlEnvironment/resources/s3/S3Client.java index 16e8c78bb26..c98bbebdd09 100644 --- a/seed/java-sdk/multi-url-environment/src/main/java/com/seed/multiUrlEnvironment/resources/s3/S3Client.java +++ b/seed/java-sdk/multi-url-environment/src/main/java/com/seed/multiUrlEnvironment/resources/s3/S3Client.java @@ -50,9 +50,7 @@ public String getPresignedUrl(GetPresignedUrlRequest request, RequestOptions req try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/no-environment/src/main/java/com/seed/noEnvironment/core/ClientOptions.java b/seed/java-sdk/no-environment/src/main/java/com/seed/noEnvironment/core/ClientOptions.java index a7cf8cf6b9c..17cd318437d 100644 --- a/seed/java-sdk/no-environment/src/main/java/com/seed/noEnvironment/core/ClientOptions.java +++ b/seed/java-sdk/no-environment/src/main/java/com/seed/noEnvironment/core/ClientOptions.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import okhttp3.OkHttpClient; @@ -50,6 +51,16 @@ public OkHttpClient httpClient() { return this.httpClient; } + public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) { + return httpClient + .newBuilder() + .callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) + .connectTimeout(0, TimeUnit.SECONDS) + .writeTimeout(0, TimeUnit.SECONDS) + .readTimeout(0, TimeUnit.SECONDS) + .build(); + } + public static Builder builder() { return new Builder(); } diff --git a/seed/java-sdk/no-environment/src/main/java/com/seed/noEnvironment/resources/dummy/DummyClient.java b/seed/java-sdk/no-environment/src/main/java/com/seed/noEnvironment/resources/dummy/DummyClient.java index c9b572e5429..c3f8d663086 100644 --- a/seed/java-sdk/no-environment/src/main/java/com/seed/noEnvironment/resources/dummy/DummyClient.java +++ b/seed/java-sdk/no-environment/src/main/java/com/seed/noEnvironment/resources/dummy/DummyClient.java @@ -39,9 +39,7 @@ public String getDummy(RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/object/src/main/java/com/seed/object/core/ClientOptions.java b/seed/java-sdk/object/src/main/java/com/seed/object/core/ClientOptions.java index 4659b535c53..19f9c124162 100644 --- a/seed/java-sdk/object/src/main/java/com/seed/object/core/ClientOptions.java +++ b/seed/java-sdk/object/src/main/java/com/seed/object/core/ClientOptions.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import okhttp3.OkHttpClient; @@ -50,6 +51,16 @@ public OkHttpClient httpClient() { return this.httpClient; } + public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) { + return httpClient + .newBuilder() + .callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) + .connectTimeout(0, TimeUnit.SECONDS) + .writeTimeout(0, TimeUnit.SECONDS) + .readTimeout(0, TimeUnit.SECONDS) + .build(); + } + public static Builder builder() { return new Builder(); } diff --git a/seed/java-sdk/objects-with-imports/src/main/java/com/seed/objectsWithImports/core/ClientOptions.java b/seed/java-sdk/objects-with-imports/src/main/java/com/seed/objectsWithImports/core/ClientOptions.java index 9c7981d012c..692b500c5b0 100644 --- a/seed/java-sdk/objects-with-imports/src/main/java/com/seed/objectsWithImports/core/ClientOptions.java +++ b/seed/java-sdk/objects-with-imports/src/main/java/com/seed/objectsWithImports/core/ClientOptions.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import okhttp3.OkHttpClient; @@ -50,6 +51,16 @@ public OkHttpClient httpClient() { return this.httpClient; } + public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) { + return httpClient + .newBuilder() + .callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) + .connectTimeout(0, TimeUnit.SECONDS) + .writeTimeout(0, TimeUnit.SECONDS) + .readTimeout(0, TimeUnit.SECONDS) + .build(); + } + public static Builder builder() { return new Builder(); } diff --git a/seed/java-sdk/optional/src/main/java/com/seed/objectsWithImports/core/ClientOptions.java b/seed/java-sdk/optional/src/main/java/com/seed/objectsWithImports/core/ClientOptions.java index 9c7981d012c..692b500c5b0 100644 --- a/seed/java-sdk/optional/src/main/java/com/seed/objectsWithImports/core/ClientOptions.java +++ b/seed/java-sdk/optional/src/main/java/com/seed/objectsWithImports/core/ClientOptions.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import okhttp3.OkHttpClient; @@ -50,6 +51,16 @@ public OkHttpClient httpClient() { return this.httpClient; } + public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) { + return httpClient + .newBuilder() + .callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) + .connectTimeout(0, TimeUnit.SECONDS) + .writeTimeout(0, TimeUnit.SECONDS) + .readTimeout(0, TimeUnit.SECONDS) + .build(); + } + public static Builder builder() { return new Builder(); } diff --git a/seed/java-sdk/optional/src/main/java/com/seed/objectsWithImports/resources/optional/OptionalClient.java b/seed/java-sdk/optional/src/main/java/com/seed/objectsWithImports/resources/optional/OptionalClient.java index f52b1abf648..049894a082a 100644 --- a/seed/java-sdk/optional/src/main/java/com/seed/objectsWithImports/resources/optional/OptionalClient.java +++ b/seed/java-sdk/optional/src/main/java/com/seed/objectsWithImports/resources/optional/OptionalClient.java @@ -57,9 +57,7 @@ public String sendOptionalBody(Optional> request, RequestOpt try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/package-yml/src/main/java/com/seed/packageYml/SeedPackageYmlClient.java b/seed/java-sdk/package-yml/src/main/java/com/seed/packageYml/SeedPackageYmlClient.java index 9e3da6cbe12..7f22cf412c4 100644 --- a/seed/java-sdk/package-yml/src/main/java/com/seed/packageYml/SeedPackageYmlClient.java +++ b/seed/java-sdk/package-yml/src/main/java/com/seed/packageYml/SeedPackageYmlClient.java @@ -53,9 +53,7 @@ public String echo(String request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/package-yml/src/main/java/com/seed/packageYml/core/ClientOptions.java b/seed/java-sdk/package-yml/src/main/java/com/seed/packageYml/core/ClientOptions.java index ff2b19e3387..96da93c1d0e 100644 --- a/seed/java-sdk/package-yml/src/main/java/com/seed/packageYml/core/ClientOptions.java +++ b/seed/java-sdk/package-yml/src/main/java/com/seed/packageYml/core/ClientOptions.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import okhttp3.OkHttpClient; @@ -50,6 +51,16 @@ public OkHttpClient httpClient() { return this.httpClient; } + public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) { + return httpClient + .newBuilder() + .callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) + .connectTimeout(0, TimeUnit.SECONDS) + .writeTimeout(0, TimeUnit.SECONDS) + .readTimeout(0, TimeUnit.SECONDS) + .build(); + } + public static Builder builder() { return new Builder(); } diff --git a/seed/java-sdk/package-yml/src/main/java/com/seed/packageYml/resources/service/ServiceClient.java b/seed/java-sdk/package-yml/src/main/java/com/seed/packageYml/resources/service/ServiceClient.java index 6344c7bc724..1653a09bcba 100644 --- a/seed/java-sdk/package-yml/src/main/java/com/seed/packageYml/resources/service/ServiceClient.java +++ b/seed/java-sdk/package-yml/src/main/java/com/seed/packageYml/resources/service/ServiceClient.java @@ -38,9 +38,7 @@ public void nop(String nestedId, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/plain-text/src/main/java/com/seed/plainText/core/ClientOptions.java b/seed/java-sdk/plain-text/src/main/java/com/seed/plainText/core/ClientOptions.java index eb89601093c..6a0317517f8 100644 --- a/seed/java-sdk/plain-text/src/main/java/com/seed/plainText/core/ClientOptions.java +++ b/seed/java-sdk/plain-text/src/main/java/com/seed/plainText/core/ClientOptions.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import okhttp3.OkHttpClient; @@ -50,6 +51,16 @@ public OkHttpClient httpClient() { return this.httpClient; } + public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) { + return httpClient + .newBuilder() + .callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) + .connectTimeout(0, TimeUnit.SECONDS) + .writeTimeout(0, TimeUnit.SECONDS) + .readTimeout(0, TimeUnit.SECONDS) + .build(); + } + public static Builder builder() { return new Builder(); } diff --git a/seed/java-sdk/plain-text/src/main/java/com/seed/plainText/resources/service/ServiceClient.java b/seed/java-sdk/plain-text/src/main/java/com/seed/plainText/resources/service/ServiceClient.java index 8ae22942716..d506a564b04 100644 --- a/seed/java-sdk/plain-text/src/main/java/com/seed/plainText/resources/service/ServiceClient.java +++ b/seed/java-sdk/plain-text/src/main/java/com/seed/plainText/resources/service/ServiceClient.java @@ -40,9 +40,7 @@ public String getText(RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/query-parameters/src/main/java/com/seed/queryParameters/core/ClientOptions.java b/seed/java-sdk/query-parameters/src/main/java/com/seed/queryParameters/core/ClientOptions.java index 1b728910db8..a9b50530601 100644 --- a/seed/java-sdk/query-parameters/src/main/java/com/seed/queryParameters/core/ClientOptions.java +++ b/seed/java-sdk/query-parameters/src/main/java/com/seed/queryParameters/core/ClientOptions.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import okhttp3.OkHttpClient; @@ -50,6 +51,16 @@ public OkHttpClient httpClient() { return this.httpClient; } + public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) { + return httpClient + .newBuilder() + .callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) + .connectTimeout(0, TimeUnit.SECONDS) + .writeTimeout(0, TimeUnit.SECONDS) + .readTimeout(0, TimeUnit.SECONDS) + .build(); + } + public static Builder builder() { return new Builder(); } diff --git a/seed/java-sdk/query-parameters/src/main/java/com/seed/queryParameters/resources/user/UserClient.java b/seed/java-sdk/query-parameters/src/main/java/com/seed/queryParameters/resources/user/UserClient.java index 96119b1d019..89783e0772d 100644 --- a/seed/java-sdk/query-parameters/src/main/java/com/seed/queryParameters/resources/user/UserClient.java +++ b/seed/java-sdk/query-parameters/src/main/java/com/seed/queryParameters/resources/user/UserClient.java @@ -50,9 +50,7 @@ public User getUsername(GetUsersRequest request, RequestOptions requestOptions) try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/reserved-keywords/src/main/java/com/seed/nurseryApi/core/ClientOptions.java b/seed/java-sdk/reserved-keywords/src/main/java/com/seed/nurseryApi/core/ClientOptions.java index 4f1426bbabc..856d6273fd1 100644 --- a/seed/java-sdk/reserved-keywords/src/main/java/com/seed/nurseryApi/core/ClientOptions.java +++ b/seed/java-sdk/reserved-keywords/src/main/java/com/seed/nurseryApi/core/ClientOptions.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import okhttp3.OkHttpClient; @@ -50,6 +51,16 @@ public OkHttpClient httpClient() { return this.httpClient; } + public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) { + return httpClient + .newBuilder() + .callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) + .connectTimeout(0, TimeUnit.SECONDS) + .writeTimeout(0, TimeUnit.SECONDS) + .readTimeout(0, TimeUnit.SECONDS) + .build(); + } + public static Builder builder() { return new Builder(); } diff --git a/seed/java-sdk/reserved-keywords/src/main/java/com/seed/nurseryApi/resources/package_/PackageClient.java b/seed/java-sdk/reserved-keywords/src/main/java/com/seed/nurseryApi/resources/package_/PackageClient.java index f57dc49f382..eea4953173a 100644 --- a/seed/java-sdk/reserved-keywords/src/main/java/com/seed/nurseryApi/resources/package_/PackageClient.java +++ b/seed/java-sdk/reserved-keywords/src/main/java/com/seed/nurseryApi/resources/package_/PackageClient.java @@ -40,9 +40,7 @@ public void test(TestRequest request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/single-url-environment-default/src/main/java/com/seed/singleUrlEnvironmentDefault/core/ClientOptions.java b/seed/java-sdk/single-url-environment-default/src/main/java/com/seed/singleUrlEnvironmentDefault/core/ClientOptions.java index 2529926d639..fb73d7c1594 100644 --- a/seed/java-sdk/single-url-environment-default/src/main/java/com/seed/singleUrlEnvironmentDefault/core/ClientOptions.java +++ b/seed/java-sdk/single-url-environment-default/src/main/java/com/seed/singleUrlEnvironmentDefault/core/ClientOptions.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import okhttp3.OkHttpClient; @@ -50,6 +51,16 @@ public OkHttpClient httpClient() { return this.httpClient; } + public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) { + return httpClient + .newBuilder() + .callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) + .connectTimeout(0, TimeUnit.SECONDS) + .writeTimeout(0, TimeUnit.SECONDS) + .readTimeout(0, TimeUnit.SECONDS) + .build(); + } + public static Builder builder() { return new Builder(); } diff --git a/seed/java-sdk/single-url-environment-default/src/main/java/com/seed/singleUrlEnvironmentDefault/resources/dummy/DummyClient.java b/seed/java-sdk/single-url-environment-default/src/main/java/com/seed/singleUrlEnvironmentDefault/resources/dummy/DummyClient.java index fb9eaa24e77..478d23ab06c 100644 --- a/seed/java-sdk/single-url-environment-default/src/main/java/com/seed/singleUrlEnvironmentDefault/resources/dummy/DummyClient.java +++ b/seed/java-sdk/single-url-environment-default/src/main/java/com/seed/singleUrlEnvironmentDefault/resources/dummy/DummyClient.java @@ -39,9 +39,7 @@ public String getDummy(RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/single-url-environment-no-default/src/main/java/com/seed/singleUrlEnvironmentNoDefault/core/ClientOptions.java b/seed/java-sdk/single-url-environment-no-default/src/main/java/com/seed/singleUrlEnvironmentNoDefault/core/ClientOptions.java index 3bcf071b5b0..08f04d51bdb 100644 --- a/seed/java-sdk/single-url-environment-no-default/src/main/java/com/seed/singleUrlEnvironmentNoDefault/core/ClientOptions.java +++ b/seed/java-sdk/single-url-environment-no-default/src/main/java/com/seed/singleUrlEnvironmentNoDefault/core/ClientOptions.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import okhttp3.OkHttpClient; @@ -50,6 +51,16 @@ public OkHttpClient httpClient() { return this.httpClient; } + public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) { + return httpClient + .newBuilder() + .callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) + .connectTimeout(0, TimeUnit.SECONDS) + .writeTimeout(0, TimeUnit.SECONDS) + .readTimeout(0, TimeUnit.SECONDS) + .build(); + } + public static Builder builder() { return new Builder(); } diff --git a/seed/java-sdk/single-url-environment-no-default/src/main/java/com/seed/singleUrlEnvironmentNoDefault/resources/dummy/DummyClient.java b/seed/java-sdk/single-url-environment-no-default/src/main/java/com/seed/singleUrlEnvironmentNoDefault/resources/dummy/DummyClient.java index 5027a4fbec2..b1d43ce0cec 100644 --- a/seed/java-sdk/single-url-environment-no-default/src/main/java/com/seed/singleUrlEnvironmentNoDefault/resources/dummy/DummyClient.java +++ b/seed/java-sdk/single-url-environment-no-default/src/main/java/com/seed/singleUrlEnvironmentNoDefault/resources/dummy/DummyClient.java @@ -39,9 +39,7 @@ public String getDummy(RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/streaming/src/main/java/com/seed/streaming/core/ClientOptions.java b/seed/java-sdk/streaming/src/main/java/com/seed/streaming/core/ClientOptions.java index 36fda822cc0..52be936de23 100644 --- a/seed/java-sdk/streaming/src/main/java/com/seed/streaming/core/ClientOptions.java +++ b/seed/java-sdk/streaming/src/main/java/com/seed/streaming/core/ClientOptions.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import okhttp3.OkHttpClient; @@ -50,6 +51,16 @@ public OkHttpClient httpClient() { return this.httpClient; } + public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) { + return httpClient + .newBuilder() + .callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) + .connectTimeout(0, TimeUnit.SECONDS) + .writeTimeout(0, TimeUnit.SECONDS) + .readTimeout(0, TimeUnit.SECONDS) + .build(); + } + public static Builder builder() { return new Builder(); } diff --git a/seed/java-sdk/streaming/src/main/java/com/seed/streaming/resources/dummy/DummyClient.java b/seed/java-sdk/streaming/src/main/java/com/seed/streaming/resources/dummy/DummyClient.java index 7c7e7fea910..3614cdf94a1 100644 --- a/seed/java-sdk/streaming/src/main/java/com/seed/streaming/resources/dummy/DummyClient.java +++ b/seed/java-sdk/streaming/src/main/java/com/seed/streaming/resources/dummy/DummyClient.java @@ -51,9 +51,7 @@ public Iterable generateStream(GenerateStreamRequestzs request, try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/trace/src/main/java/com/seed/trace/core/ClientOptions.java b/seed/java-sdk/trace/src/main/java/com/seed/trace/core/ClientOptions.java index 0fb85d7799a..5010cab97be 100644 --- a/seed/java-sdk/trace/src/main/java/com/seed/trace/core/ClientOptions.java +++ b/seed/java-sdk/trace/src/main/java/com/seed/trace/core/ClientOptions.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import okhttp3.OkHttpClient; @@ -50,6 +51,16 @@ public OkHttpClient httpClient() { return this.httpClient; } + public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) { + return httpClient + .newBuilder() + .callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) + .connectTimeout(0, TimeUnit.SECONDS) + .writeTimeout(0, TimeUnit.SECONDS) + .readTimeout(0, TimeUnit.SECONDS) + .build(); + } + public static Builder builder() { return new Builder(); } diff --git a/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/admin/AdminClient.java b/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/admin/AdminClient.java index ff992fa227f..bb313917ad9 100644 --- a/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/admin/AdminClient.java +++ b/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/admin/AdminClient.java @@ -60,9 +60,7 @@ public void updateTestSubmissionStatus( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -104,9 +102,7 @@ public void sendTestSubmissionUpdate( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -148,9 +144,7 @@ public void updateWorkspaceSubmissionStatus( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -192,9 +186,7 @@ public void sendWorkspaceSubmissionUpdate( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -238,9 +230,7 @@ public void storeTracedTestCase( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -284,9 +274,7 @@ public void storeTracedTestCaseV2( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -328,9 +316,7 @@ public void storeTracedWorkspace( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -372,9 +358,7 @@ public void storeTracedWorkspaceV2( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/homepage/HomepageClient.java b/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/homepage/HomepageClient.java index ad42d71aa9a..4735657d11e 100644 --- a/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/homepage/HomepageClient.java +++ b/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/homepage/HomepageClient.java @@ -43,9 +43,7 @@ public List getHomepageProblems(RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -85,9 +83,7 @@ public void setHomepageProblems(List request, RequestOptions requestOpti try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/migration/MigrationClient.java b/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/migration/MigrationClient.java index dbc5d2eb610..d95d2cd971a 100644 --- a/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/migration/MigrationClient.java +++ b/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/migration/MigrationClient.java @@ -46,9 +46,7 @@ public List getAttemptedMigrations( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/playlist/PlaylistClient.java b/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/playlist/PlaylistClient.java index 0c10601852b..1d412f88093 100644 --- a/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/playlist/PlaylistClient.java +++ b/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/playlist/PlaylistClient.java @@ -67,9 +67,7 @@ public Playlist createPlaylist(int serviceParam, CreatePlaylistRequest request, try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -118,9 +116,7 @@ public List getPlaylists(int serviceParam, GetPlaylistsRequest request try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -161,9 +157,7 @@ public Playlist getPlaylist(int serviceParam, String playlistId, RequestOptions try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -225,9 +219,7 @@ public Optional updatePlaylist( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -267,9 +259,7 @@ public void deletePlaylist(int serviceParam, String playlistId, RequestOptions r try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/problem/ProblemClient.java b/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/problem/ProblemClient.java index 273febff964..38f31f285b3 100644 --- a/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/problem/ProblemClient.java +++ b/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/problem/ProblemClient.java @@ -60,9 +60,7 @@ public CreateProblemResponse createProblem(CreateProblemRequest request, Request try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -110,9 +108,7 @@ public UpdateProblemResponse updateProblem( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -151,9 +147,7 @@ public void deleteProblem(String problemId, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -200,9 +194,7 @@ public GetDefaultStarterFilesResponse getDefaultStarterFiles( try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/submission/SubmissionClient.java b/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/submission/SubmissionClient.java index f2b7611a931..a4ca87809a2 100644 --- a/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/submission/SubmissionClient.java +++ b/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/submission/SubmissionClient.java @@ -53,9 +53,7 @@ public ExecutionSessionResponse createExecutionSession(Language language, Reques try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -94,9 +92,7 @@ public Optional getExecutionSession(String sessionId, try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -136,9 +132,7 @@ public void stopExecutionSession(String sessionId, RequestOptions requestOptions try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -171,9 +165,7 @@ public GetExecutionSessionStateResponse getExecutionSessionsState(RequestOptions try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/sysprop/SyspropClient.java b/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/sysprop/SyspropClient.java index 1a3cbe85963..895bf8d36b9 100644 --- a/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/sysprop/SyspropClient.java +++ b/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/sysprop/SyspropClient.java @@ -44,9 +44,7 @@ public void setNumWarmInstances(Language language, int numWarmInstances, Request try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -79,9 +77,7 @@ public Map getNumWarmInstances(RequestOptions requestOptions) try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/v2/V2Client.java b/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/v2/V2Client.java index ccbfa6dc11e..4fa02ad084e 100644 --- a/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/v2/V2Client.java +++ b/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/v2/V2Client.java @@ -47,9 +47,7 @@ public void test(RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/v2/problem/ProblemClient.java b/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/v2/problem/ProblemClient.java index ab47b1b4f34..8b1c0ff060f 100644 --- a/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/v2/problem/ProblemClient.java +++ b/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/v2/problem/ProblemClient.java @@ -50,9 +50,7 @@ public List getLightweightProblems(RequestOptions requ try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -92,9 +90,7 @@ public List getProblems(RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -135,9 +131,7 @@ public ProblemInfoV2 getLatestProblem(String problemId, RequestOptions requestOp try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -179,9 +173,7 @@ public ProblemInfoV2 getProblemVersion(String problemId, int problemVersion, Req try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/v2/v3/problem/ProblemClient.java b/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/v2/v3/problem/ProblemClient.java index 6ef967c0123..9e93dc51e1b 100644 --- a/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/v2/v3/problem/ProblemClient.java +++ b/seed/java-sdk/trace/src/main/java/com/seed/trace/resources/v2/v3/problem/ProblemClient.java @@ -50,9 +50,7 @@ public List getLightweightProblems(RequestOptions requ try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -92,9 +90,7 @@ public List getProblems(RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -135,9 +131,7 @@ public ProblemInfoV2 getLatestProblem(String problemId, RequestOptions requestOp try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { @@ -179,9 +173,7 @@ public ProblemInfoV2 getProblemVersion(String problemId, int problemVersion, Req try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/undiscriminated-unions/src/main/java/com/seed/undiscriminatedUnions/core/ClientOptions.java b/seed/java-sdk/undiscriminated-unions/src/main/java/com/seed/undiscriminatedUnions/core/ClientOptions.java index ba32295920d..e2b715e012c 100644 --- a/seed/java-sdk/undiscriminated-unions/src/main/java/com/seed/undiscriminatedUnions/core/ClientOptions.java +++ b/seed/java-sdk/undiscriminated-unions/src/main/java/com/seed/undiscriminatedUnions/core/ClientOptions.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import okhttp3.OkHttpClient; @@ -50,6 +51,16 @@ public OkHttpClient httpClient() { return this.httpClient; } + public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) { + return httpClient + .newBuilder() + .callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) + .connectTimeout(0, TimeUnit.SECONDS) + .writeTimeout(0, TimeUnit.SECONDS) + .readTimeout(0, TimeUnit.SECONDS) + .build(); + } + public static Builder builder() { return new Builder(); } diff --git a/seed/java-sdk/undiscriminated-unions/src/main/java/com/seed/undiscriminatedUnions/resources/union/UnionClient.java b/seed/java-sdk/undiscriminated-unions/src/main/java/com/seed/undiscriminatedUnions/resources/union/UnionClient.java index 8af1451a8d7..ec440cebfaa 100644 --- a/seed/java-sdk/undiscriminated-unions/src/main/java/com/seed/undiscriminatedUnions/resources/union/UnionClient.java +++ b/seed/java-sdk/undiscriminated-unions/src/main/java/com/seed/undiscriminatedUnions/resources/union/UnionClient.java @@ -48,9 +48,7 @@ public MyUnion get(MyUnion request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/unknown/src/main/java/com/seed/unknownAsAny/core/ClientOptions.java b/seed/java-sdk/unknown/src/main/java/com/seed/unknownAsAny/core/ClientOptions.java index 3f4ea38abad..a394974d3c7 100644 --- a/seed/java-sdk/unknown/src/main/java/com/seed/unknownAsAny/core/ClientOptions.java +++ b/seed/java-sdk/unknown/src/main/java/com/seed/unknownAsAny/core/ClientOptions.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import okhttp3.OkHttpClient; @@ -50,6 +51,16 @@ public OkHttpClient httpClient() { return this.httpClient; } + public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) { + return httpClient + .newBuilder() + .callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) + .connectTimeout(0, TimeUnit.SECONDS) + .writeTimeout(0, TimeUnit.SECONDS) + .readTimeout(0, TimeUnit.SECONDS) + .build(); + } + public static Builder builder() { return new Builder(); } diff --git a/seed/java-sdk/unknown/src/main/java/com/seed/unknownAsAny/resources/unknown/UnknownClient.java b/seed/java-sdk/unknown/src/main/java/com/seed/unknownAsAny/resources/unknown/UnknownClient.java index 42cd1af5f7e..4add219fab9 100644 --- a/seed/java-sdk/unknown/src/main/java/com/seed/unknownAsAny/resources/unknown/UnknownClient.java +++ b/seed/java-sdk/unknown/src/main/java/com/seed/unknownAsAny/resources/unknown/UnknownClient.java @@ -49,9 +49,7 @@ public List post(Object request, RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/variables/src/main/java/com/seed/variables/core/ClientOptions.java b/seed/java-sdk/variables/src/main/java/com/seed/variables/core/ClientOptions.java index a33fe1ffef6..1c600a9d445 100644 --- a/seed/java-sdk/variables/src/main/java/com/seed/variables/core/ClientOptions.java +++ b/seed/java-sdk/variables/src/main/java/com/seed/variables/core/ClientOptions.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import okhttp3.OkHttpClient; @@ -53,6 +54,16 @@ public OkHttpClient httpClient() { return this.httpClient; } + public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) { + return httpClient + .newBuilder() + .callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) + .connectTimeout(0, TimeUnit.SECONDS) + .writeTimeout(0, TimeUnit.SECONDS) + .readTimeout(0, TimeUnit.SECONDS) + .build(); + } + public String rootVariable() { return this.rootVariable; } diff --git a/seed/java-sdk/variables/src/main/java/com/seed/variables/resources/service/ServiceClient.java b/seed/java-sdk/variables/src/main/java/com/seed/variables/resources/service/ServiceClient.java index 27bdf979f67..93ca9871980 100644 --- a/seed/java-sdk/variables/src/main/java/com/seed/variables/resources/service/ServiceClient.java +++ b/seed/java-sdk/variables/src/main/java/com/seed/variables/resources/service/ServiceClient.java @@ -39,9 +39,7 @@ public void post(RequestOptions requestOptions) { try { OkHttpClient client = clientOptions.httpClient(); if (requestOptions.getTimeout().isPresent()) { - client = client.newBuilder() - .readTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) - .build(); + client = clientOptions.httpClientWithTimeout(requestOptions); } Response response = client.newCall(okhttpRequest).execute(); if (response.isSuccessful()) { diff --git a/seed/java-sdk/websocket/src/main/java/com/seed/websocket/core/ClientOptions.java b/seed/java-sdk/websocket/src/main/java/com/seed/websocket/core/ClientOptions.java index a3ab746b385..d584e8d682b 100644 --- a/seed/java-sdk/websocket/src/main/java/com/seed/websocket/core/ClientOptions.java +++ b/seed/java-sdk/websocket/src/main/java/com/seed/websocket/core/ClientOptions.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import okhttp3.OkHttpClient; @@ -50,6 +51,16 @@ public OkHttpClient httpClient() { return this.httpClient; } + public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) { + return httpClient + .newBuilder() + .callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit()) + .connectTimeout(0, TimeUnit.SECONDS) + .writeTimeout(0, TimeUnit.SECONDS) + .readTimeout(0, TimeUnit.SECONDS) + .build(); + } + public static Builder builder() { return new Builder(); }