Fix merge and update test

Author: a-d

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

@@ -19,10 +19,19 @@ public record OpenAiModel(@Nonnull String name, @Nullable String version) implem
   /** Azure OpenAI dall-e-3 image generate model */
   public static final OpenAiModel DALL_E_3 = new OpenAiModel("dall-e-3", null);
 
-  /** Azure OpenAI GPT-3.5 Turbo chat completions model */
-  public static final OpenAiModel GPT_35_TURBO = new OpenAiModel("gpt-35-turbo", null);
+  /**
+   * Azure OpenAI GPT-3.5 Turbo chat completions model
+   *
+   * @deprecated This model is not usable anymore. It is retired on AI Core since 2024-11-17.
+   */
+  @Deprecated public static final OpenAiModel GPT_35_TURBO = new OpenAiModel("gpt-35-turbo", null);
 
-  /** Azure OpenAI GPT-3.5 Turbo chat completions model */
+  /**
+   * Azure OpenAI GPT-3.5 Turbo chat completions model
+   *
+   * @deprecated This model is not usable anymore. It is retired on AI Core since 2025-02-22.
+   */
+  @Deprecated
   public static final OpenAiModel GPT_35_TURBO_1025 = new OpenAiModel("gpt-35-turbo-0125", null);
 
   /**
@@ -36,8 +45,12 @@ public record OpenAiModel(@Nonnull String name, @Nullable String version) implem
   /** Azure OpenAI GPT-4 chat completions model */
   public static final OpenAiModel GPT_4 = new OpenAiModel("gpt-4", null);
 
-  /** Azure OpenAI GPT-4-32k chat completions model */
-  public static final OpenAiModel GPT_4_32K = new OpenAiModel("gpt-4-32k", null);
+  /**
+   * Azure OpenAI GPT-4-32k chat completions model
+   *
+   * @deprecated This model will not be usable anymore on 2025-05-30.
+   */
+  @Deprecated public static final OpenAiModel GPT_4_32K = new OpenAiModel("gpt-4-32k", null);
 
   /** Azure OpenAI GPT-4o chat completions model */
   public static final OpenAiModel GPT_4O = new OpenAiModel("gpt-4o", null);

sample-code/spring-app/src/test/java/com/sap/ai/sdk/app/controllers/ScenarioTest.java

@@ -9,6 +9,7 @@
 import java.util.HashMap;
 import java.util.Optional;
 import lombok.SneakyThrows;
+import org.assertj.core.api.SoftAssertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
@@ -46,14 +47,17 @@ void openAiModelAvailability() {
 
     // Assert that the declared OpenAI models match the expected list
     assertThat(declaredOpenAiModelList.keySet()).containsAll(availableOpenAiModels.keySet());
+
+    SoftAssertions softly = new SoftAssertions();
     for (var model : availableOpenAiModels.entrySet()) {
       Boolean declaredDeprecated = declaredOpenAiModelList.get(model.getKey());
-      assertThat(declaredDeprecated)
+      softly.assertThat(declaredDeprecated)
           .withFailMessage(
               "%s is deprecated:%s on AI Core but deprecated:%s in AI SDK",
               model.getKey(), model.getValue(), declaredDeprecated)
           .isEqualTo(model.getValue());
     }
+    softly.assertAll();
   }
 
   private static boolean isDeprecated(AiModelBaseData model) {