fix: java request timeout config now works with idempotency headers (#…

…3231)

generators/java/sdk/CHANGELOG.md

@@ -5,6 +5,10 @@ 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.6] - 2024-03-20
+
+- Fix: the SDK now generates RequestOptions functions for timeouts with IdempotentRequestOptions correctly, previously timeout functions were only taking in regular RequestOptions. This also addresses a JavaPoet issue where fields were being initialized twice across RequestOptions and IdempotentRequestOptions classes, preventing the SDK from generating at all.
+
 ## [0.8.5] - 2024-03-18
 
 - Feat: add in publishing config that allows for signing published artifacts, this is required for publishing to Maven Central.

generators/java/sdk/VERSION

@@ -1 +1 @@
-0.8.5
+0.8.6

generators/java/sdk/src/main/java/com/fern/java/client/generators/ClientOptionsGenerator.java

@@ -148,8 +148,31 @@ public GeneratedClientOptions generateFile() {
                 .addMethod(environmentGetter)
                 .addMethod(headersFromRequestOptions);
 
+        TypeName requestOptionsClassName = clientGeneratorContext.getPoetClassNameFactory().getRequestOptionsClassName();
         if (headersFromIdempotentRequestOptions.isPresent()) {
             clientOptionsBuilder.addMethod(headersFromIdempotentRequestOptions.get());
+            MethodSpec httpClientWithTimeoutGetter = MethodSpec.methodBuilder("httpClientWithTimeout")
+                    .addModifiers(Modifier.PUBLIC)
+                    .addParameter(
+                            clientGeneratorContext.getPoetClassNameFactory().getIdempotentRequestOptionsClassName(),
+                            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 this.$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();
+            clientOptionsBuilder.addMethod(httpClientWithTimeoutGetter);
         }
 
         MethodSpec httpClientWithTimeoutGetter = MethodSpec.methodBuilder("httpClientWithTimeout")

generators/java/sdk/src/main/java/com/fern/java/client/generators/RequestOptionsGenerator.java

@@ -57,16 +57,6 @@ public final class RequestOptionsGenerator extends AbstractFileGenerator {
                     Modifier.FINAL)
             .build();
 
-    private static final FieldSpec.Builder TIMEOUT_FIELD_BUILDER = FieldSpec.builder(
-                    ParameterizedTypeName.get(ClassName.get(Optional.class), TypeName.get(Integer.class)),
-                    "timeout",
-                    Modifier.PRIVATE);
-
-    private static final FieldSpec.Builder TIMEOUT_TIME_UNIT_FIELD_BUILDER = FieldSpec.builder(
-            ParameterizedTypeName.get(TimeUnit.class),
-            "timeoutTimeUnit",
-            Modifier.PRIVATE);
-
     private final List<HttpHeader> additionalHeaders;
     private final ClassName builderClassName;
 
@@ -116,26 +106,36 @@ public GeneratedJavaFile generateFile() {
             fields.add(headerHandler.visitHeader(httpHeader));
         }
 
+        FieldSpec.Builder timeoutFieldBuilder = FieldSpec.builder(
+                ParameterizedTypeName.get(ClassName.get(Optional.class), TypeName.get(Integer.class)),
+                "timeout",
+                Modifier.PRIVATE);
+
+        FieldSpec.Builder timeoutTimeUnitFieldBuilder = FieldSpec.builder(
+                ParameterizedTypeName.get(TimeUnit.class),
+                "timeoutTimeUnit",
+                Modifier.PRIVATE);
+
         // Add in the other (static) fields for request options
         createRequestOptionField(
                 "getTimeout",
-                TIMEOUT_FIELD_BUILDER,
+                timeoutFieldBuilder,
                 "null",
                 requestOptionsTypeSpec,
                 builderTypeSpec,
                 fields
         );
         createRequestOptionField(
                 "getTimeoutTimeUnit",
-                TIMEOUT_TIME_UNIT_FIELD_BUILDER,
+                timeoutTimeUnitFieldBuilder,
                 "TimeUnit.SECONDS",
                 requestOptionsTypeSpec,
                 builderTypeSpec,
                 fields
         );
 
-        FieldSpec timeoutField = TIMEOUT_FIELD_BUILDER.build();
-        FieldSpec timeUnitField = TIMEOUT_TIME_UNIT_FIELD_BUILDER.build();
+        FieldSpec timeoutField = timeoutFieldBuilder.build();
+        FieldSpec timeUnitField = timeoutTimeUnitFieldBuilder.build();
         builderTypeSpec.addMethod(MethodSpec.methodBuilder(timeoutField.name)
                 .addModifiers(Modifier.PUBLIC)
                 .addParameter(Integer.class, timeoutField.name)