From 65a2d7b7cfa6a19c1cdecd3de901b9c093ff4604 Mon Sep 17 00:00:00 2001
From: timon-gaebelein <timon.gaebelein@sap.com>
Date: Fri, 5 Dec 2025 16:44:41 +0100
Subject: [PATCH] Fix couple of code smells

---
 .../console/info/collectors/LogCollector.java | 19 ++++++++++++-------
 .../collectors/InfoCollectorTestBase.java     |  7 +++----
 .../info/collectors/LogCollectorTest.java     |  2 +-
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/cds-feature-console/src/main/java/com/sap/cds/feature/console/info/collectors/LogCollector.java b/cds-feature-console/src/main/java/com/sap/cds/feature/console/info/collectors/LogCollector.java
index 5610cfd..844ebb6 100644
--- a/cds-feature-console/src/main/java/com/sap/cds/feature/console/info/collectors/LogCollector.java
+++ b/cds-feature-console/src/main/java/com/sap/cds/feature/console/info/collectors/LogCollector.java
@@ -268,13 +268,7 @@ private static Map<String, String[]> getCdsLoggers() {
           Method loggersMethod = c.getDeclaredMethod("loggers");
           if (loggersMethod.getReturnType().equals(String[].class)) {
             for (Object value : c.getEnumConstants()) {
-              try {
-                loggersMethod.setAccessible(true);
-                Object loggers = loggersMethod.invoke(value);
-                result.put(value.toString(), loggers != null ? (String[]) loggers : new String[0]);
-              } catch (Exception e) {
-                logger.error("Cannot access loggers!", e);
-              }
+              addLoggerGroupFromEnumConstant(value, loggersMethod, result);
             }
           }
         } catch (NoSuchMethodException nsme) {
@@ -285,4 +279,15 @@ private static Map<String, String[]> getCdsLoggers() {
     }
     return result;
   }
+
+  private static void addLoggerGroupFromEnumConstant(Object value, Method loggersMethod, Map<String, String[]> result) {
+    try {
+      loggersMethod.setAccessible(true);
+      Object loggers = loggersMethod.invoke(value);
+      result.put(value.toString(), loggers != null ? (String[]) loggers : new String[0]);
+    } catch (Exception e) {
+      logger.error("Cannot access loggers!", e);
+    }
+  }
+
 }
diff --git a/cds-feature-console/src/test/java/com/sap/cds/feature/console/info/collectors/InfoCollectorTestBase.java b/cds-feature-console/src/test/java/com/sap/cds/feature/console/info/collectors/InfoCollectorTestBase.java
index 2049455..f25431c 100644
--- a/cds-feature-console/src/test/java/com/sap/cds/feature/console/info/collectors/InfoCollectorTestBase.java
+++ b/cds-feature-console/src/test/java/com/sap/cds/feature/console/info/collectors/InfoCollectorTestBase.java
@@ -63,8 +63,8 @@ void tearDown() throws Exception {
 
   @ServiceName(RemoteMonitoringService.DEFAULT_NAME)
   static class RemoteMonitoringTestHandler implements EventHandler {
-    public List<InfoEvent> infoEvents;
-    public Map<String, Object> systemData;
+    private final List<InfoEvent> infoEvents;
+    private final Map<String, Object> systemData;
 
     public RemoteMonitoringTestHandler() {
       this.infoEvents = new ArrayList<>();
@@ -75,7 +75,6 @@ public RemoteMonitoringTestHandler() {
     @HandlerOrder(HandlerOrder.BEFORE)
     public void on(InfoEventContext context) {
       InfoEvent infoEvent = context.getInfoEvent();
-      // System.out.println(" - info ev: " + infoEvent.getPath());
       infoEvents.add(infoEvent);
       if ("system".equals(infoEvent.getPath())) {
         systemData.putAll(infoEvent.getData());
@@ -90,7 +89,7 @@ public void resetInfoEventsStore() {
     public List<InfoEvent> getEvents(String path) {
       return infoEvents.stream()
           .filter(ev -> ev.getPath().equals(path))
-          .collect(Collectors.toList());
+          .toList();
     }
 
     public List<InfoEvent> getLogEvents() {
diff --git a/cds-feature-console/src/test/java/com/sap/cds/feature/console/info/collectors/LogCollectorTest.java b/cds-feature-console/src/test/java/com/sap/cds/feature/console/info/collectors/LogCollectorTest.java
index 9fd19ce..b8217f9 100644
--- a/cds-feature-console/src/test/java/com/sap/cds/feature/console/info/collectors/LogCollectorTest.java
+++ b/cds-feature-console/src/test/java/com/sap/cds/feature/console/info/collectors/LogCollectorTest.java
@@ -145,7 +145,7 @@ private void updateLogLevel(Level level, String loggerName) {
     logger.put("level", level != null ? level.toString() : null);
     logger.put("group", Boolean.FALSE);
 
-    List<Map<String, Object>> loggers = new ArrayList<Map<String, Object>>();
+    List<Map<String, Object>> loggers = new ArrayList<>();
     loggers.add(logger);
 
     Map<String, Object> data = new HashMap<>();