This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch issue/sonar-fixes in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-mcp-server-contributions.git
commit 15e7e74753a2eb6c3178348685e775c35150bc1f Author: Robert Munteanu <[email protected]> AuthorDate: Wed May 20 10:34:32 2026 +0200 chore: sonar fixes --- .../sling/mcp/server/impl/contribs/LogToolContribution.java | 12 ++++++------ .../impl/contribs/log/StructuredLogBufferAppender.java | 2 +- .../impl/contribs/log/StructuredLogBufferAppenderTest.java | 1 - 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/apache/sling/mcp/server/impl/contribs/LogToolContribution.java b/src/main/java/org/apache/sling/mcp/server/impl/contribs/LogToolContribution.java index 169ad35..517f9e1 100644 --- a/src/main/java/org/apache/sling/mcp/server/impl/contribs/LogToolContribution.java +++ b/src/main/java/org/apache/sling/mcp/server/impl/contribs/LogToolContribution.java @@ -43,14 +43,15 @@ import org.osgi.service.component.annotations.Reference; @Component public class LogToolContribution implements McpServerContribution { + private static final int DEFAULT_MAX_LOGS = 200; + @Reference private StructuredLogBuffer structuredLogBuffer; @Reference private McpJsonMapperSupplier jsonMapper; - private static final int DEFAULT_MAX_LOGS = 200; - private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); + private final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); @Override public List<SyncToolSpecification> getSyncToolSpecification() { @@ -98,9 +99,8 @@ public class LogToolContribution implements McpServerContribution { // Parse parameters int maxEntries = DEFAULT_MAX_LOGS; - if (maxEntriesObj instanceof Number) { - maxEntries = ((Number) maxEntriesObj).intValue(); - maxEntries = Math.min(maxEntries, 1000); // Cap at 1000 + if (maxEntriesObj instanceof Number maxEntriesNumber) { + maxEntries = Math.min(maxEntriesNumber.intValue(), 1000); // Cap at 1000 } String minLogLevel = structuredLogBuffer.getHighestLogLevelName(); @@ -170,7 +170,7 @@ public class LogToolContribution implements McpServerContribution { private void formatLogEntry(LogSnapshot entry, int index, StringBuilder result) { result.append("[").append(index).append("] "); - result.append(DATE_FORMAT.format(new Date(entry.timeMillis()))); + result.append(dateFormat.format(new Date(entry.timeMillis()))); result.append(" [").append(entry.level()).append("] "); result.append("[") .append(entry.loggerName() != null ? entry.loggerName() : "(unknown logger)") diff --git a/src/main/java/org/apache/sling/mcp/server/impl/contribs/log/StructuredLogBufferAppender.java b/src/main/java/org/apache/sling/mcp/server/impl/contribs/log/StructuredLogBufferAppender.java index 2122531..9263d12 100644 --- a/src/main/java/org/apache/sling/mcp/server/impl/contribs/log/StructuredLogBufferAppender.java +++ b/src/main/java/org/apache/sling/mcp/server/impl/contribs/log/StructuredLogBufferAppender.java @@ -144,7 +144,7 @@ public class StructuredLogBufferAppender extends AppenderBase<ILoggingEvent> { try { Object overridingMessage = GET_OVERRIDING_MESSAGE.invoke(throwableProxy); - return overridingMessage instanceof String ? (String) overridingMessage : null; + return overridingMessage instanceof String msg ? msg : null; } catch (Throwable e) { return null; } diff --git a/src/test/java/org/apache/sling/mcp/server/impl/contribs/log/StructuredLogBufferAppenderTest.java b/src/test/java/org/apache/sling/mcp/server/impl/contribs/log/StructuredLogBufferAppenderTest.java index aa81263..7d05a5e 100644 --- a/src/test/java/org/apache/sling/mcp/server/impl/contribs/log/StructuredLogBufferAppenderTest.java +++ b/src/test/java/org/apache/sling/mcp/server/impl/contribs/log/StructuredLogBufferAppenderTest.java @@ -62,7 +62,6 @@ class StructuredLogBufferAppenderTest { StructuredLogBufferImpl buffer = new StructuredLogBufferImpl(5); StructuredLogBufferAppender appender = new StructuredLogBufferAppender(buffer); - LoggerContext context = new LoggerContext(); LoggingEvent event = new LoggingEvent(); event.setLoggerName("invalid.logger"); event.setThreadName("invalid-thread");
