Merge branch 'main' into Improve-Logging

Author: rpanackal

core/src/main/java/com/sap/ai/sdk/core/AiCoreServiceKeyAccessor.java

@@ -81,6 +81,11 @@ static ServiceBinding createServiceBinding(@Nonnull final String serviceKey)
           new AiCoreCredentialsInvalidException("Missing clientid in service key"));
     }
 
+    if (credentials.get("clientsecret") != null && credentials.get("credential-type") == null) {
+      // add missing "credential-type: binding-secret"
+      credentials.put("credential-type", "binding-secret");
+    }
+
     return new DefaultServiceBindingBuilder()
         .withServiceIdentifier(ServiceIdentifier.AI_CORE)
         .withCredentials(credentials)

core/src/test/java/com/sap/ai/sdk/core/AiCoreServiceKeyAccessorTest.java

@@ -55,4 +55,32 @@ void testMalformedDotenv() {
     assertThatThrownBy(accessor::getServiceBindings)
         .isInstanceOf(ServiceBindingAccessException.class);
   }
+
+  @Test
+  void testServiceBindingCreation() {
+    var serviceKeyWithoutCredentialType =
+        """
+        {
+          "clientid": "",
+          "clientsecret": ""
+        }
+        """;
+    var binding1 = AiCoreServiceKeyAccessor.createServiceBinding(serviceKeyWithoutCredentialType);
+    assertThat(binding1.getCredentials().containsKey("credential-type"))
+        .describedAs("The missing 'credential-type' should have automatically been added")
+        .isTrue();
+    var serviceKeyWithCredentialType =
+        """
+        {
+          "clientid": "",
+          "clientsecret": "",
+          "credential-type": "foo"
+          }
+        }
+        """;
+    var binding2 = AiCoreServiceKeyAccessor.createServiceBinding(serviceKeyWithCredentialType);
+    assertThat(binding2.getCredentials().get("credential-type"))
+        .describedAs("The 'credential-type' field should not get overwritten")
+        .isEqualTo("foo");
+  }
 }

docs/release_notes.md

@@ -16,7 +16,8 @@
 
 ### 📈 Improvements
 
--
+- [Core] If the AI Core credentials used are missing an explicit `credential-type` but `clientid` and `clientsecret` are present then `"credential-type": "binding-secret"` is inferred automatically.
+
 
 ### 🐛 Fixed Issues
 

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

@@ -33,6 +33,11 @@ public class ResponseJsonSchema {
   @Nonnull Map<String, Object> schemaMap;
   @Nonnull String name;
   @Nullable String description;
+
+  /**
+   * ⚠️ Fields of the schema class should be annotated with {@code @JsonProperty(required = true)}
+   * to not fail requests if set to true.
+   */
   @Nullable Boolean strict;
 
   /**
@@ -51,6 +56,9 @@ public static ResponseJsonSchema fromMap(
   /**
    * Create a new instance of {@link ResponseJsonSchema} from a given class.
    *
+   * <p>⚠️ Fields of the schema class should be annotated with {@code @JsonProperty(required =
+   * true)}.
+   *
    * @param classType The class to generate the schema from
    * @return The new instance of {@link ResponseJsonSchema}
    */

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

@@ -16,7 +16,6 @@
 import java.time.format.TextStyle;
 import java.util.Locale;
 import java.util.UUID;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 class GroundingTest {
@@ -52,7 +51,6 @@ void testRepositoriesGetAll() {
   }
 
   @Test
-  @Disabled("Temporary disabled because of an unresolved minor bug") // SAP/ai-sdk-java-backlog#232
   void testCreateDeleteCollection() {
     final var controller = new GroundingController();