Migrate from public static factory method to constructor

Author: a-d

grounding/src/main/java/com/sap/ai/sdk/grounding/GroundingClient.java

@@ -6,53 +6,36 @@
 import com.sap.ai.sdk.grounding.api.VectorApi;
 import javax.annotation.Nonnull;
 import lombok.AccessLevel;
+import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import lombok.experimental.Tolerate;
 
 /**
  * Service class for the Grounding APIs.
  *
  * @since 1.3.0
  */
-@RequiredArgsConstructor(access = AccessLevel.PROTECTED)
+@RequiredArgsConstructor(access = AccessLevel.PUBLIC)
+@Getter(value = AccessLevel.PROTECTED)
 public class GroundingClient {
-
-  final AiCoreService aiCoreService;
-  final String basePath;
+  @Nonnull private final AiCoreService service;
+  @Nonnull private final String basePath;
 
   static final String DEFAULT_BASE_PATH = "lm/document-grounding/";
 
-  /**
-   * Create a new instance of the GroundingService.
-   *
-   * @return A new instance of the GroundingService.
-   */
-  @Nonnull
-  public static GroundingClient create() {
-    return create(new AiCoreService());
-  }
-
-  /**
-   * Create a new instance of the GroundingService.
-   *
-   * @param aiCoreService The AiCoreService instance to use.
-   * @return A new instance of the GroundingService.
-   */
-  @Nonnull
-  public static GroundingClient create(@Nonnull final AiCoreService aiCoreService) {
-    return create(aiCoreService, DEFAULT_BASE_PATH);
+  /** Default constructor. */
+  @Tolerate
+  public GroundingClient() {
+    this(new AiCoreService());
   }
 
   /**
-   * Create a new instance of the GroundingService.
+   * Constructor with custom AI Core service instance.
    *
-   * @param aiCoreService The AiCoreService instance to use.
-   * @param basePath The base path to use for the API calls.
-   * @return A new instance of the GroundingService.
+   * @param service The instance of AI Core service
    */
-  @Nonnull
-  public static GroundingClient create(
-      @Nonnull final AiCoreService aiCoreService, @Nonnull final String basePath) {
-    return new GroundingClient(aiCoreService, basePath);
+  public GroundingClient(final @Nonnull AiCoreService service) {
+    this(service, DEFAULT_BASE_PATH);
   }
 
   /**
@@ -62,7 +45,7 @@ public static GroundingClient create(
    */
   @Nonnull
   public PipelinesApi pipelines() {
-    return new PipelinesApi(aiCoreService.getApiClient().setBasePath(basePath));
+    return new PipelinesApi(getService().getApiClient().setBasePath(getBasePath()));
   }
 
   /**
@@ -72,7 +55,7 @@ public PipelinesApi pipelines() {
    */
   @Nonnull
   public VectorApi vector() {
-    return new VectorApi(aiCoreService.getApiClient().setBasePath(basePath));
+    return new VectorApi(getService().getApiClient().setBasePath(getBasePath()));
   }
 
   /**
@@ -82,6 +65,6 @@ public VectorApi vector() {
    */
   @Nonnull
   public RetrievalApi retrieval() {
-    return new RetrievalApi(aiCoreService.getApiClient().setBasePath(basePath));
+    return new RetrievalApi(getService().getApiClient().setBasePath(getBasePath()));
   }
 }

grounding/src/test/java/com/sap/ai/sdk/grounding/GroundingClientTest.java

@@ -33,7 +33,7 @@ public class GroundingClientTest {
 
   @Test
   void testPipelines() {
-    final PipelinesApi api = GroundingClient.create(SERVICE).pipelines();
+    final PipelinesApi api = new GroundingClient(SERVICE).pipelines();
 
     final Pipelines allPipelines = api.getAllPipelines("reosurceGroup");
     assertThat(allPipelines).isNotNull();
@@ -42,7 +42,7 @@ void testPipelines() {
 
   @Test
   void testVector() {
-    final VectorApi api = GroundingClient.create(SERVICE).vector();
+    final VectorApi api = new GroundingClient(SERVICE).vector();
 
     final CollectionsListResponse collections = api.getAllCollections("reosurceGroup");
     assertThat(collections).isNotNull();
@@ -107,7 +107,7 @@ void testVector() {
 
   @Test
   void testRetrieval() {
-    final RetrievalApi api = GroundingClient.create(SERVICE).retrieval();
+    final RetrievalApi api = new GroundingClient(SERVICE).retrieval();
 
     DataRepositories repositories = api.getDataRepositories("reosurceGroup");
     assertThat(repositories).isNotNull();

sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/GroundingController.java

@@ -45,9 +45,9 @@
 @RequestMapping("/grounding")
 class GroundingController {
 
-  private static final PipelinesApi CLIENT_PIPELINES = GroundingClient.create().pipelines();
-  private static final RetrievalApi CLIENT_RETRIEVAL = GroundingClient.create().retrieval();
-  private static final VectorApi CLIENT_VECTOR = GroundingClient.create().vector();
+  private static final PipelinesApi CLIENT_PIPELINES = new GroundingClient().pipelines();
+  private static final RetrievalApi CLIENT_RETRIEVAL = new GroundingClient().retrieval();
+  private static final VectorApi CLIENT_VECTOR = new GroundingClient().vector();
   private static final String RESOURCE_GROUP = "ai-sdk-java-e2e";
 
   /**