Skip to content

chore: Fix couple of code smells #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timon-gaebelein merged 1 commit into from
Dec 5, 2025
Merged

chore: Fix couple of code smells #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions ...ature-console/src/main/java/com/sap/cds/feature/console/info/collectors/LogCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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);
}
}

}
7 changes: 3 additions & 4 deletions ...sole/src/test/java/com/sap/cds/feature/console/info/collectors/InfoCollectorTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<>();
Expand All @@ -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());
Expand All @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion ...e-console/src/test/java/com/sap/cds/feature/console/info/collectors/LogCollectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<>();
Expand Down
Loading