fix, java: Address NPE for RequestOptions with new timeout feature (#…

…3053)
fern-api · Feb 25, 2024 · 881e55c · 881e55c
1 parent fdd7a6a
commit 881e55c
Show file tree

Hide file tree

Showing 134 changed files with 394 additions and 280 deletions.
diff --git a/generators/java/sdk/VERSION b/generators/java/sdk/VERSION
@@ -1 +1 @@
-0.8.3
+0.8.4
diff --git a/...rators/java/sdk/src/main/java/com/fern/java/client/generators/ClientOptionsGenerator.java b/...rators/java/sdk/src/main/java/com/fern/java/client/generators/ClientOptionsGenerator.java
@@ -158,8 +158,11 @@ public GeneratedClientOptions generateFile() {
                         clientGeneratorContext.getPoetClassNameFactory().getRequestOptionsClassName(),
                         REQUEST_OPTIONS_PARAMETER_NAME)
                 .returns(OKHTTP_CLIENT_FIELD.type)
+                .beginControlFlow("if ($L == null)", REQUEST_OPTIONS_PARAMETER_NAME)
+                .addStatement("return this.$L", OKHTTP_CLIENT_FIELD.name)
+                .endControlFlow()
                 .addStatement(
-                        "return $L.newBuilder().callTimeout($N.getTimeout().get(), $N.getTimeoutTimeUnit())" +
+                        "return this.$L.newBuilder().callTimeout($N.getTimeout().get(), $N.getTimeoutTimeUnit())" +
                                 ".connectTimeout(0, $T.SECONDS)" +
                                 ".writeTimeout(0, $T.SECONDS)" +
                                 ".readTimeout(0, $T.SECONDS).build()",

diff --git a/...va/sdk/src/main/java/com/fern/java/client/generators/endpoint/AbstractEndpointWriter.java b/...va/sdk/src/main/java/com/fern/java/client/generators/endpoint/AbstractEndpointWriter.java
@@ -288,7 +288,7 @@ public final CodeBlock getResponseParserCodeBlock() {
                         defaultedClientName,
                         clientOptionsField,
                         generatedClientOptions.httpClient())
-                .beginControlFlow("if ($L.getTimeout().isPresent())", REQUEST_OPTIONS_PARAMETER_NAME)
+                .beginControlFlow("if ($L != null && $L.getTimeout().isPresent())", REQUEST_OPTIONS_PARAMETER_NAME, REQUEST_OPTIONS_PARAMETER_NAME)
                 // Set the client's callTimeout if requestOptions overrides it has one
                 .addStatement(
                         "$L = $N.$N($L)",

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
diff --git a/...ava-sdk/api-wide-base-path/src/main/java/com/seed/apiWideBasePath/core/ClientOptions.java b/...ava-sdk/api-wide-base-path/src/main/java/com/seed/apiWideBasePath/core/ClientOptions.java
diff --git a/...ide-base-path/src/main/java/com/seed/apiWideBasePath/resources/service/ServiceClient.java b/...ide-base-path/src/main/java/com/seed/apiWideBasePath/resources/service/ServiceClient.java
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
diff --git a/...k/audiences/src/main/java/com/seed/audiences/resources/foldera/service/ServiceClient.java b/...k/audiences/src/main/java/com/seed/audiences/resources/foldera/service/ServiceClient.java
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
diff --git a/...ronment-variables/src/main/java/com/seed/authEnvironmentVariables/core/ClientOptions.java b/...ronment-variables/src/main/java/com/seed/authEnvironmentVariables/core/ClientOptions.java
diff --git a/...bles/src/main/java/com/seed/authEnvironmentVariables/resources/service/ServiceClient.java b/...bles/src/main/java/com/seed/authEnvironmentVariables/resources/service/ServiceClient.java
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
diff --git a/...-sdk/basic-auth/src/main/java/com/seed/basicAuth/resources/basicauth/BasicAuthClient.java b/...-sdk/basic-auth/src/main/java/com/seed/basicAuth/resources/basicauth/BasicAuthClient.java
diff --git a/...nt-variable/src/main/java/com/seed/bearerTokenEnvironmentVariable/core/ClientOptions.java b/...nt-variable/src/main/java/com/seed/bearerTokenEnvironmentVariable/core/ClientOptions.java
diff --git a/...rc/main/java/com/seed/bearerTokenEnvironmentVariable/resources/service/ServiceClient.java b/...rc/main/java/com/seed/bearerTokenEnvironmentVariable/resources/service/ServiceClient.java
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
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
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
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
diff --git a/.../custom-auth/src/main/java/com/seed/customAuth/resources/customauth/CustomAuthClient.java b/.../custom-auth/src/main/java/com/seed/customAuth/resources/customauth/CustomAuthClient.java
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
diff --git a/...in/java/com/seed/errorProperty/resources/propertybasederror/PropertyBasedErrorClient.java b/...in/java/com/seed/errorProperty/resources/propertybasederror/PropertyBasedErrorClient.java
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
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
diff --git a/...es/src/main/java/com/seed/examples/resources/file/notification/service/ServiceClient.java b/...es/src/main/java/com/seed/examples/resources/file/notification/service/ServiceClient.java
diff --git a/...va-sdk/examples/src/main/java/com/seed/examples/resources/file/service/ServiceClient.java b/...va-sdk/examples/src/main/java/com/seed/examples/resources/file/service/ServiceClient.java
diff --git a/...-sdk/examples/src/main/java/com/seed/examples/resources/health/service/ServiceClient.java b/...-sdk/examples/src/main/java/com/seed/examples/resources/health/service/ServiceClient.java
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
diff --git a/...dk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/core/ClientOptions.java b/...dk/exhaustive/custom-dependency/src/main/java/com/seed/exhaustive/core/ClientOptions.java