From e217a96c3e9aa1a75b012c9ab073ad505bf454bd Mon Sep 17 00:00:00 2001
From: Marvin Lindner <marvin.lindner@sap.com>
Date: Wed, 27 May 2026 12:04:35 +0200
Subject: [PATCH] fix: use idiomatic patterns for error messages and stream
 collection

- Replace string concatenation in ServiceException messages with SLF4J-style
  {} placeholders in AICoreSetupHandler (3 locations)
- Replace Collectors.toList() with .toList() in AbstractCrudHandler
- Replace new ArrayList<>() with List.of() for null case
- Remove unused imports (ArrayList, Collectors)

Closes #32
---
 .../cds/feature/aicore/core/AICoreSetupHandler.java    | 10 +++++++---
 .../aicore/core/handler/AbstractCrudHandler.java       |  6 ++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/cds-feature-ai-core/src/main/java/com/sap/cds/feature/aicore/core/AICoreSetupHandler.java b/cds-feature-ai-core/src/main/java/com/sap/cds/feature/aicore/core/AICoreSetupHandler.java
index e605e15..fddd340 100644
--- a/cds-feature-ai-core/src/main/java/com/sap/cds/feature/aicore/core/AICoreSetupHandler.java
+++ b/cds-feature-ai-core/src/main/java/com/sap/cds/feature/aicore/core/AICoreSetupHandler.java
@@ -41,7 +41,8 @@ public void afterSubscribe(SubscribeEventContext context) {
     } catch (Exception e) {
       throw new ServiceException(
           ErrorStatuses.SERVER_ERROR,
-          "Failed to create AI Core resources for tenant: " + tenantId,
+          "Failed to create AI Core resources for tenant: {}",
+          tenantId,
           e);
     }
   }
@@ -79,7 +80,9 @@ private void deleteResourceGroupForTenant(String tenantId) {
       }
       throw new ServiceException(
           ErrorStatuses.SERVER_ERROR,
-          "Failed to delete AI Core resource group " + resourceGroupId + " for tenant " + tenantId,
+          "Failed to delete AI Core resource group {} for tenant {}",
+          resourceGroupId,
+          tenantId,
           e);
     }
   }
@@ -103,7 +106,8 @@ private String resolveResourceGroupId(String tenantId) {
     } catch (OpenApiRequestException e) {
       throw new ServiceException(
           ErrorStatuses.SERVER_ERROR,
-          "Failed to look up AI Core resource group for tenant " + tenantId,
+          "Failed to look up AI Core resource group for tenant {}",
+          tenantId,
           e);
     }
     List<BckndResourceGroup> resources = result.getResources();
diff --git a/cds-feature-ai-core/src/main/java/com/sap/cds/feature/aicore/core/handler/AbstractCrudHandler.java b/cds-feature-ai-core/src/main/java/com/sap/cds/feature/aicore/core/handler/AbstractCrudHandler.java
index 3793e76..47f3858 100644
--- a/cds-feature-ai-core/src/main/java/com/sap/cds/feature/aicore/core/handler/AbstractCrudHandler.java
+++ b/cds-feature-ai-core/src/main/java/com/sap/cds/feature/aicore/core/handler/AbstractCrudHandler.java
@@ -5,12 +5,10 @@
 
 import com.sap.cds.feature.aicore.core.AICoreServiceImpl;
 import com.sap.cds.services.handler.EventHandler;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
-import java.util.stream.Collectors;
 
 abstract class AbstractCrudHandler implements EventHandler {
 
@@ -34,7 +32,7 @@ protected static Map<String, Object> merge(Map<String, Object> keys, Map<String,
   }
 
   protected static <T, R> List<R> mapResources(List<T> resources, Function<T, R> mapper) {
-    if (resources == null) return new ArrayList<>();
-    return resources.stream().map(mapper).collect(Collectors.toList());
+    if (resources == null) return List.of();
+    return resources.stream().map(mapper).toList();
   }
 }