refactor(ai-core): migrate AICoreService to RemoteService

cds-feature-ai-core/pom.xml

@@ -44,12 +44,19 @@
     <dependency>
       <groupId>com.sap.cds</groupId>
       <artifactId>cds-services-impl</artifactId>
-      <scope>test</scope>
     </dependency>
   </dependencies>
 
   <build>
     <finalName>${project.artifactId}</finalName>
+    <testResources>
+      <testResource>
+        <directory>src/test/resources</directory>
+      </testResource>
+      <testResource>
+        <directory>src/gen/srv/src/main/resources</directory>
+      </testResource>
+    </testResources>
     <plugins>
       <plugin>
         <groupId>com.sap.cds</groupId>

cds-feature-ai-core/src/main/java/com/sap/cds/feature/aicore/api/AICoreService.java

@@ -3,7 +3,7 @@
  */
 package com.sap.cds.feature.aicore.api;
 
-import com.sap.cds.services.cds.CqnService;
+import com.sap.cds.services.cds.RemoteService;
 import com.sap.cloud.sdk.services.openapi.apache.apiclient.ApiClient;
 
 /**
@@ -25,10 +25,10 @@
  * <p>The implementation is tenant-aware: it reads the current tenant from the {@code
  * RequestContext}. Callers do not need to pass tenant identifiers explicitly.
  */
-public interface AICoreService extends CqnService {
+public interface AICoreService extends RemoteService {
 
   /** Default service name under which an instance is registered in the service catalog. */
-  String DEFAULT_NAME = "AICore";
+  String DEFAULT_NAME = "AICore$Default";
 
   /** Qualified name of the {@code resourceGroups} entity exposed by this service. */
   String RESOURCE_GROUPS = "AICore.resourceGroups";

cds-feature-ai-core/src/main/java/com/sap/cds/feature/aicore/core/AICoreServiceConfiguration.java

@@ -8,7 +8,6 @@
 import com.sap.ai.sdk.core.client.DeploymentApi;
 import com.sap.ai.sdk.core.client.ResourceGroupApi;
 import com.sap.cds.feature.aicore.api.AICoreService;
-import com.sap.cds.feature.aicore.core.handler.AICoreApplicationServiceHandler;
 import com.sap.cds.feature.aicore.core.handler.ActionHandler;
 import com.sap.cds.feature.aicore.core.handler.ConfigurationHandler;
 import com.sap.cds.feature.aicore.core.handler.DeploymentHandler;
@@ -37,19 +36,17 @@ public class AICoreServiceConfiguration implements CdsRuntimeConfiguration {
 
   private static final Logger logger = LoggerFactory.getLogger(AICoreServiceConfiguration.class);
 
+  private static boolean hasAICoreModel(CdsRuntime runtime) {
+    return runtime.getCdsModel().findService("AICore").isPresent();
+  }
+
   private static boolean hasAICoreBinding(CdsRuntime runtime) {
-    boolean hasServiceBinding =
-        runtime
-            .getEnvironment()
-            .getServiceBindings()
-            .filter(b -> ServiceBindingUtils.matches(b, "aicore"))
-            .findFirst()
-            .isPresent();
-    if (hasServiceBinding) {
-      return true;
-    }
-    String envKey = System.getenv("AICORE_SERVICE_KEY");
-    return envKey != null && !envKey.isBlank();
+    return runtime
+        .getEnvironment()
+        .getServiceBindings()
+        .filter(b -> ServiceBindingUtils.matches(b, "aicore"))
+        .findFirst()
+        .isPresent();
   }
 
   /**
@@ -70,6 +67,11 @@ private static boolean detectMultiTenancy(CdsRuntime runtime) {
   public void services(CdsRuntimeConfigurer configurer) {
     CdsRuntime runtime = configurer.getCdsRuntime();
 
+    if (!hasAICoreModel(runtime)) {
+      logger.debug("AICore CDS model not found in runtime model — skipping service registration.");
+      return;
+    }
+
     boolean hasBinding = hasAICoreBinding(runtime);
 
     boolean multiTenancyEnabled = detectMultiTenancy(runtime);
@@ -106,7 +108,6 @@ public void eventHandlers(CdsRuntimeConfigurer configurer) {
       configurer.eventHandler(new DeploymentHandler(service));
       configurer.eventHandler(new ConfigurationHandler(service));
       configurer.eventHandler(new ActionHandler(service));
-      configurer.eventHandler(new AICoreApplicationServiceHandler(service));
       logger.debug("Registered Prod AI-Core Implementation");
 
       if (service.isMultiTenancyEnabled()) {
@@ -115,7 +116,6 @@ public void eventHandlers(CdsRuntimeConfigurer configurer) {
       }
     } else if (registered instanceof MockAICoreServiceImpl mockService) {
       configurer.eventHandler(new MockEntityHandler());
-      configurer.eventHandler(new AICoreApplicationServiceHandler(mockService));
       if (mockService.isMultiTenancyEnabled()) {
         configurer.eventHandler(new MockAICoreSetupHandler(mockService));
         logger.debug("Registered Mock AI-Core Setup Handler for MTX subscribe/unsubscribe.");

cds-feature-ai-core/src/main/java/com/sap/cds/feature/aicore/core/AbstractAICoreService.java

@@ -4,10 +4,10 @@
 package com.sap.cds.feature.aicore.core;
 
 import com.sap.cds.feature.aicore.api.AICoreService;
+import com.sap.cds.services.impl.cds.AbstractCdsDefinedService;
 import com.sap.cds.services.request.RequestContext;
 import com.sap.cds.services.request.UserInfo;
 import com.sap.cds.services.runtime.CdsRuntime;
-import com.sap.cds.services.utils.services.AbstractCqnService;
 import io.github.resilience4j.retry.Retry;
 import java.util.Map;
 
@@ -16,10 +16,14 @@
  * cache access, configuration, and resource group resolution. These methods are not part of the
  * public {@link AICoreService} contract but are shared between the real and mock implementations.
  */
-public abstract class AbstractAICoreService extends AbstractCqnService implements AICoreService {
+public abstract class AbstractAICoreService extends AbstractCdsDefinedService
+    implements AICoreService {
+
+  /** The qualified CDS service definition name. */
+  private static final String CDS_DEFINITION_NAME = "AICore";
 
   protected AbstractAICoreService(String name, CdsRuntime runtime) {
-    super(name, runtime);
+    super(name, CDS_DEFINITION_NAME, runtime);
   }
 
   /** Returns the {@link CdsRuntime} that this service was created with. */