Minor code reduction

Author: a-d

core/pom.xml

@@ -31,7 +31,7 @@
   <properties>
     <project.rootdir>${project.basedir}/../</project.rootdir>
     <coverage.complexity>60%</coverage.complexity>
-    <coverage.line>70%</coverage.line>
+    <coverage.line>69%</coverage.line>
     <coverage.instruction>68%</coverage.instruction>
     <coverage.branch>52%</coverage.branch>
     <coverage.method>73%</coverage.method>

core/src/main/java/com/sap/ai/sdk/core/commons/ClientError.java

@@ -1,7 +1,7 @@
 package com.sap.ai.sdk.core.commons;
 
 import com.google.common.annotations.Beta;
-import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * Generic class that contains a JSON error response.
@@ -16,6 +16,6 @@ public interface ClientError {
    *
    * @return The error message
    */
-  @Nonnull
+  @Nullable
   String getMessage();
 }

core/src/main/java/com/sap/ai/sdk/core/commons/ClientResponseHandler.java

@@ -8,6 +8,7 @@
 import io.vavr.control.Try;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.util.Objects;
 import java.util.function.BiFunction;
 import javax.annotation.Nonnull;
 import lombok.RequiredArgsConstructor;
@@ -131,9 +132,8 @@ public void parseErrorAndThrow(
       throw baseException;
     }
 
-    throw exceptionType.apply(
-        "%s and error message: '%s'"
-            .formatted(baseException.getMessage(), maybeError.get().getMessage()),
-        null);
+    val error = Objects.requireNonNullElse(maybeError.get().getMessage(), "");
+    val message = "%s and error message: '%s'".formatted(baseException.getMessage(), error);
+    throw exceptionType.apply(message, baseException);
   }
 }

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

@@ -3,12 +3,12 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.annotations.Beta;
 import com.sap.ai.sdk.core.commons.ClientError;
-import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
+import lombok.experimental.Delegate;
 
 /** OpenAI error. */
 @Accessors(chain = true)
@@ -19,12 +19,6 @@ public class OpenAiError implements ClientError {
   /** The error object. */
   @JsonProperty("error")
   @Getter(onMethod_ = @Nullable)
+  @Delegate(types = {ClientError.class})
   private OpenAiErrorBase error;
-
-  @Nonnull
-  @Override
-  public String getMessage() {
-    final String message = error.getMessage();
-    return message == null ? "" : message;
-  }
 }

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

@@ -1,9 +1,22 @@
 package com.sap.ai.sdk.orchestration;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.google.common.annotations.Beta;
 import com.sap.ai.sdk.core.commons.ClientError;
 import com.sap.ai.sdk.orchestration.model.ErrorResponse;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Value;
+import lombok.experimental.Delegate;
 
-/** Orchestration error response. */
-// CHECKSTYLE:OFF
-public class OrchestrationError extends ErrorResponse implements ClientError {}
-// CHECKSTYLE:ON
+/**
+ * Orchestration error response.
+ * @since 1.1.0
+ */
+@AllArgsConstructor(onConstructor = @__({@JsonCreator}), access = AccessLevel.PROTECTED)
+@Value
+@Beta
+public class OrchestrationError implements ClientError {
+  @Delegate(types = {ClientError.class})
+  ErrorResponse originalResponse;
+}