Fix compilation

Author: newtork

core/src/main/java/com/sap/ai/sdk/core/common/ClientException.java

@@ -1,11 +1,10 @@
 package com.sap.ai.sdk.core.common;
 
 import com.google.common.annotations.Beta;
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import lombok.AccessLevel;
 import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
 import lombok.experimental.StandardException;
 import org.apache.hc.core5.http.ClassicHttpRequest;
 import org.apache.hc.core5.http.ClassicHttpResponse;
@@ -25,9 +24,7 @@ public class ClientException extends RuntimeException {
    */
   @Nullable
   @Getter(onMethod_ = @Beta, value = AccessLevel.PUBLIC)
-  @Setter(onMethod_ = @Beta, value = AccessLevel.PUBLIC)
-  @Accessors(chain = true)
-  ClientError clientError;
+  private ClientError clientError;
 
   /**
    * The original HTTP response that caused this exception, if available.
@@ -36,9 +33,7 @@ public class ClientException extends RuntimeException {
    */
   @Nullable
   @Getter(onMethod_ = @Beta, value = AccessLevel.PUBLIC)
-  @Setter(onMethod_ = @Beta, value = AccessLevel.PUBLIC)
-  @Accessors(chain = true)
-  ClassicHttpResponse httpResponse;
+  private ClassicHttpResponse httpResponse;
 
   /**
    * The original HTTP request that caused this exception, if available.
@@ -47,7 +42,52 @@ public class ClientException extends RuntimeException {
    */
   @Nullable
   @Getter(onMethod_ = @Beta, value = AccessLevel.PUBLIC)
-  @Setter(onMethod_ = @Beta, value = AccessLevel.PUBLIC)
-  @Accessors(chain = true)
-  ClassicHttpRequest httpRequest;
+  private ClassicHttpRequest httpRequest;
+
+  /**
+   * Sets the original HTTP request that caused this exception.
+   *
+   * @param clientError the original structured error payload received from the remote service, can
+   *     be null if not available.
+   * @return the current instance of {@link ClientException} with the changed ClientError data
+   * @param <T> the type of the exception, typically a subclass of {@link ClientException}
+   */
+  @SuppressWarnings("unchecked")
+  @Nonnull
+  public <T extends ClientException> T setClientError(@Nullable final ClientError clientError) {
+    this.clientError = clientError;
+    return (T) this;
+  }
+
+  /**
+   * Sets the original HTTP request that caused this exception.
+   *
+   * @param httpResponse the original HTTP response that caused this exception, can be null if not
+   *     available.
+   * @return the current instance of {@link ClientException} with the changed HTTP response
+   * @param <T> the type of the exception, typically a subclass of {@link ClientException}
+   */
+  @SuppressWarnings("unchecked")
+  @Nonnull
+  public <T extends ClientException> T setHttpResponse(
+      @Nullable final ClassicHttpResponse httpResponse) {
+    this.httpResponse = httpResponse;
+    return (T) this;
+  }
+
+  /**
+   * Sets the original HTTP request that caused this exception.
+   *
+   * @param httpRequest the original HTTP request that caused this exception, can be null if not
+   *     available.
+   * @return the current instance of {@link ClientException} with the changed HTTP request
+   * @param <T> the type of the exception, typically a subclass of {@link ClientException}
+   */
+  @SuppressWarnings("unchecked")
+  @Nonnull
+  public <T extends ClientException> T setHttpRequest(
+      @Nullable final ClassicHttpRequest httpRequest) {
+    this.httpRequest = httpRequest;
+    return (T) this;
+  }
 }

core/src/main/java/com/sap/ai/sdk/core/common/ClientExceptionFactory.java

@@ -43,10 +43,14 @@ default E build(@Nonnull final String message) {
    * deserialized into a {@link ClientError} object.
    *
    * @param message A descriptive message for the exception.
-   * @param clientError The structured {@link ClientError} object deserialized from the response, null if not exist.
+   * @param clientError The structured {@link ClientError} object deserialized from the response,
+   *     null if not exist.
    * @param cause An optional cause of the exception, can be null if not applicable.
    * @return An instance of the specified {@link ClientException} type
    */
   @Nonnull
-  E build(@Nonnull final String message, @Nullable final R clientError, @Nullable final Throwable cause);
+  E build(
+      @Nonnull final String message,
+      @Nullable final R clientError,
+      @Nullable final Throwable cause);
 }

core/src/test/java/com/sap/ai/sdk/core/common/ClientResponseHandlerTest.java

@@ -10,15 +10,14 @@
 import com.fasterxml.jackson.core.JsonParseException;
 import java.io.IOException;
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import lombok.Data;
 import lombok.SneakyThrows;
 import lombok.experimental.StandardException;
 import org.apache.hc.core5.http.ContentType;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.io.entity.StringEntity;
 import org.apache.hc.core5.http.message.BasicClassicHttpResponse;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.junit.jupiter.api.Test;
 
 class ClientResponseHandlerTest {
@@ -35,10 +34,13 @@ static class MyError implements ClientError {
   static class MyException extends ClientException {}
 
   static class MyExceptionFactory implements ClientExceptionFactory<MyException, MyError> {
-    @NotNull
+    @Nonnull
     @Override
-    public MyException build(@NotNull String message, @Nullable MyError clientError, @Nullable Throwable cause) {
-      return (MyException) new MyException(message, cause).setClientError(clientError);
+    public MyException build(
+        @Nonnull final String message,
+        @Nullable final MyError clientError,
+        @Nullable final Throwable cause) {
+      return new MyException(message, cause).setClientError(clientError);
     }
   }
 

core/src/test/java/com/sap/ai/sdk/core/common/IterableStreamConverterTest.java

@@ -18,13 +18,12 @@
 import java.nio.charset.StandardCharsets;
 import java.util.concurrent.atomic.AtomicInteger;
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import lombok.SneakyThrows;
 import lombok.experimental.StandardException;
 import org.apache.hc.core5.http.ContentType;
 import org.apache.hc.core5.http.io.entity.InputStreamEntity;
 import org.apache.hc.core5.http.message.BasicClassicHttpResponse;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
@@ -121,10 +120,13 @@ public static class TestClientException extends ClientException {}
   static class TestClientExceptionFactory
       implements ClientExceptionFactory<TestClientException, ClientError> {
 
-    @NotNull
+    @Nonnull
     @Override
-    public TestClientException build(@NotNull String message, @Nullable ClientError clientError, @Nullable Throwable cause) {
-      return (TestClientException) new TestClientException(message, cause).setClientError(clientError);
+    public TestClientException build(
+        @Nonnull final String message,
+        @Nullable final ClientError clientError,
+        @Nullable final Throwable cause) {
+      return new TestClientException(message, cause).setClientError(clientError);
     }
   }
 }

foundation-models/openai/src/main/java/com/sap/ai/sdk/foundationmodels/openai/OpenAiClientException.java

@@ -3,18 +3,13 @@
 import com.google.common.annotations.Beta;
 import com.sap.ai.sdk.core.common.ClientException;
 import com.sap.ai.sdk.foundationmodels.openai.generated.model.ErrorResponse;
-import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import lombok.experimental.StandardException;
 
 /** Generic exception for errors occurring when using OpenAI foundation models. */
 @StandardException
 public class OpenAiClientException extends ClientException {
 
-  OpenAiClientException(@Nonnull final String message, @Nullable final Throwable cause) {
-    super(message, cause);
-  }
-
   /**
    * Retrieves the {@link ErrorResponse} from the OpenAI service, if available.
    *

foundation-models/openai/src/main/java/com/sap/ai/sdk/foundationmodels/openai/OpenAiExceptionFactory.java

@@ -1,6 +1,5 @@
 package com.sap.ai.sdk.foundationmodels.openai;
 
-import com.google.common.annotations.Beta;
 import com.sap.ai.sdk.core.common.ClientExceptionFactory;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -9,7 +8,10 @@ class OpenAiExceptionFactory implements ClientExceptionFactory<OpenAiClientExcep
 
   @Nonnull
   @Override
-  public OpenAiClientException build(@Nonnull String message, @Nullable OpenAiError clientError, @Nullable Throwable cause) {
-    return (OpenAiClientException) new OpenAiClientException(message, cause).setClientError(clientError);
+  public OpenAiClientException build(
+      @Nonnull final String message,
+      @Nullable final OpenAiError clientError,
+      @Nullable final Throwable cause) {
+    return new OpenAiClientException(message, cause).setClientError(clientError);
   }
 }

foundation-models/openai/src/test/java/com/sap/ai/sdk/foundationmodels/openai/BaseOpenAiClientTest.java

@@ -10,6 +10,7 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.serverError;
 import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
@@ -118,8 +119,7 @@ static void assertForErrorHandling(@Nonnull final Runnable request) {
         .describedAs("Server errors should be handled")
         .isInstanceOf(OpenAiClientException.class)
         .hasMessageContaining("500")
-        .extracting(e -> ((OpenAiClientException) e).getHttpResponse())
-        .isNotNull();
+        .satisfies(e -> assertThat(((OpenAiClientException) e).getHttpResponse()).isNotNull());
 
     softly
         .assertThatThrownBy(request::run)

orchestration/src/main/java/com/sap/ai/sdk/orchestration/OrchestrationClientException.java

@@ -4,7 +4,6 @@
 import com.sap.ai.sdk.core.common.ClientException;
 import com.sap.ai.sdk.orchestration.model.ErrorResponse;
 import java.util.Optional;
-import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import lombok.experimental.StandardException;
 

orchestration/src/main/java/com/sap/ai/sdk/orchestration/OrchestrationExceptionFactory.java

@@ -1,6 +1,5 @@
 package com.sap.ai.sdk.orchestration;
 
-import com.google.common.annotations.Beta;
 import com.sap.ai.sdk.core.common.ClientExceptionFactory;
 import com.sap.ai.sdk.orchestration.model.ErrorResponse;
 import com.sap.ai.sdk.orchestration.model.GenericModuleResult;
@@ -16,18 +15,24 @@ class OrchestrationExceptionFactory
 
   @Nonnull
   @Override
-  public OrchestrationClientException build(@Nonnull String message, @Nullable OrchestrationError clientError, @Nullable Throwable cause) {
-      final var inputFilterDetails = extractInputFilterDetails(clientError);
-      if (!inputFilterDetails.isEmpty()) {
-        return (OrchestrationClientException) new OrchestrationFilterException.Input(message,cause).setFilterDetails(inputFilterDetails).setClientError(clientError);
-      }
-    return (OrchestrationClientException) new OrchestrationClientException(message, cause).setClientError(clientError);
+  public OrchestrationClientException build(
+      @Nonnull final String message,
+      @Nullable final OrchestrationError clientError,
+      @Nullable final Throwable cause) {
+    final var inputFilterDetails = extractInputFilterDetails(clientError);
+    if (!inputFilterDetails.isEmpty()) {
+      return new OrchestrationFilterException.Input(message, cause)
+          .setFilterDetails(inputFilterDetails)
+          .setClientError(clientError);
+    }
+    return new OrchestrationClientException(message, cause).setClientError(clientError);
   }
 
   @SuppressWarnings("unchecked")
   @Nonnull
   private Map<String, Object> extractInputFilterDetails(@Nullable final OrchestrationError error) {
-    return Optional.ofNullable(error).map(OrchestrationError::getErrorResponse)
+    return Optional.ofNullable(error)
+        .map(OrchestrationError::getErrorResponse)
         .map(ErrorResponse::getModuleResults)
         .map(ModuleResults::getInputFiltering)
         .map(GenericModuleResult::getData)

orchestration/src/main/java/com/sap/ai/sdk/orchestration/OrchestrationFilterException.java

@@ -24,7 +24,9 @@ public class OrchestrationFilterException extends OrchestrationClientException {
   /** Details about the filters that caused the exception. */
   @Accessors(chain = true)
   @Setter(AccessLevel.PACKAGE)
-  @Getter @Nonnull protected Map<String, Object> filterDetails = Map.of();
+  @Getter
+  @Nonnull
+  protected Map<String, Object> filterDetails = Map.of();
 
   /**
    * Retrieves LlamaGuard 3.8b details from {@code filterDetails}, if present.