This is an automated email from the ASF dual-hosted git repository. jamesbognar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/juneau.git
commit 4fa746fa2fcf8a3a0af1357f053c4d6576f0b319 Author: James Bognar <[email protected]> AuthorDate: Sun Aug 16 18:49:46 2026 -0400 Fix Eclipse/SonarLint warnings: CachingHttpServletResponse resource suppression, javadoc refs, unused import/field, serialVersionUID, dead debugBodyCap - CachingHttpServletResponse: suppress the @Owning/mandatory-close warning on the tee'd response stream, mirroring the existing CachingHttpServletRequest precedent (the stream is owned by the servlet container, not this wrapper). - CachingHttpServletResponse_Test: drop the unused closed-tracking field in the fake output stream. - DebugMarshalling_Behavior_Test: fix a javadoc brace-parsing error by switching an inline example to <code> instead of {@code}. - McpAuthInterceptor: fix a stale {@link RestRequest#debug()} javadoc reference; debug logging is now client-level. - OidcRelyingPartyBuilder_Test: remove an unused import. - HttpBodies_Test: add a missing serialVersionUID to a Serializable test fixture. - RestResponse: remove the dead write-only debugBodyCap field. --- .../org/apache/juneau/rest/server/DebugMarshalling_Behavior_Test.java | 2 +- .../java/org/apache/juneau/rest/client/mcp/McpAuthInterceptor.java | 3 ++- .../src/main/java/org/apache/juneau/rest/client/RestResponse.java | 2 -- .../src/test/java/org/apache/juneau/http/entity/HttpBodies_Test.java | 2 ++ .../juneau/rest/server/auth/oidc/rp/OidcRelyingPartyBuilder_Test.java | 1 - .../org/apache/juneau/rest/server/util/CachingHttpServletResponse.java | 3 +++ .../juneau/rest/server/util/CachingHttpServletResponse_Test.java | 3 --- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/juneau-integration-tests/src/test/java/org/apache/juneau/rest/server/DebugMarshalling_Behavior_Test.java b/juneau-integration-tests/src/test/java/org/apache/juneau/rest/server/DebugMarshalling_Behavior_Test.java index 2c77f82c7a..8cc1fdb723 100644 --- a/juneau-integration-tests/src/test/java/org/apache/juneau/rest/server/DebugMarshalling_Behavior_Test.java +++ b/juneau-integration-tests/src/test/java/org/apache/juneau/rest/server/DebugMarshalling_Behavior_Test.java @@ -38,7 +38,7 @@ import org.junit.jupiter.api.*; * message is prefixed with the debug traversal stack (e.g. {@code " > [0] root:..."}) and the session collects it * as a warning ({@code "Warnings occurred in session:"}). That prefix/warning is absent when debug is off. * <li><b>Parser buffered-input retention</b> — when marshalling debug is engaged, a malformed-parse failure - * retains and quotes the buffered request content (e.g. {@code "1: {name:"}). When debug is off the message + * retains and quotes the buffered request content (e.g. <code>"1: {name:"</code>). When debug is off the message * instead reads {@code "Use BEAN_debug setting to display content."}. * </ul> * diff --git a/juneau-rest/juneau-rest-client-mcp/src/main/java/org/apache/juneau/rest/client/mcp/McpAuthInterceptor.java b/juneau-rest/juneau-rest-client-mcp/src/main/java/org/apache/juneau/rest/client/mcp/McpAuthInterceptor.java index 485b3958be..ed1e5ec248 100644 --- a/juneau-rest/juneau-rest-client-mcp/src/main/java/org/apache/juneau/rest/client/mcp/McpAuthInterceptor.java +++ b/juneau-rest/juneau-rest-client-mcp/src/main/java/org/apache/juneau/rest/client/mcp/McpAuthInterceptor.java @@ -38,7 +38,8 @@ import org.apache.juneau.rest.client.*; * {@link RestRequest#run()}'s documented interceptor-exception handling aborts the call before it is sent. * * <p> - * <b>Note:</b> when a token is set, {@link RestRequest#debug()} logs the full outgoing request including all + * <b>Note:</b> when a token is set, enabling {@code FINE}/{@code FINEST}-level logging on the client's debug + * logger (see {@link RestClient.Builder#debugLoggerName(String)}) logs the full outgoing request including all * headers, so enabling debug logging on a client using this interceptor will log the {@code Authorization} * header (and therefore the bearer token) in plain text. * diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestResponse.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestResponse.java index 4518aa64a3..d2764d9658 100644 --- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestResponse.java +++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestResponse.java @@ -47,7 +47,6 @@ public final class RestResponse implements Closeable { private final RestClient client; private final RestRequest request; private final Level debugLevel; - private final int debugBodyCap; private final InputStream body; private byte[] cachedContent; private long cachedContentLength = -1; @@ -63,7 +62,6 @@ public final class RestResponse implements Closeable { this.client = client; this.request = request; this.debugLevel = debugLevel; - this.debugBodyCap = debugBodyCap; var originalBody = response.getBody(); if (debugLevel == Level.FINEST && originalBody != null) this.body = new BoundedCaptureInputStream(originalBody, debugBodyCap); diff --git a/juneau-rest/juneau-rest-common/src/test/java/org/apache/juneau/http/entity/HttpBodies_Test.java b/juneau-rest/juneau-rest-common/src/test/java/org/apache/juneau/http/entity/HttpBodies_Test.java index 09842600fd..71e5e65287 100644 --- a/juneau-rest/juneau-rest-common/src/test/java/org/apache/juneau/http/entity/HttpBodies_Test.java +++ b/juneau-rest/juneau-rest-common/src/test/java/org/apache/juneau/http/entity/HttpBodies_Test.java @@ -237,6 +237,8 @@ class HttpBodies_Test extends TestBase { // Hostile File whose getName() returns attacker-controlled text with embedded CR/LF. static class F09_HostileFile extends File { + private static final long serialVersionUID = 1L; + F09_HostileFile() { super("innocuous.txt"); } diff --git a/juneau-rest/juneau-rest-server-auth-oidc-rp/src/test/java/org/apache/juneau/rest/server/auth/oidc/rp/OidcRelyingPartyBuilder_Test.java b/juneau-rest/juneau-rest-server-auth-oidc-rp/src/test/java/org/apache/juneau/rest/server/auth/oidc/rp/OidcRelyingPartyBuilder_Test.java index 48d14adc1a..9b4fb4149a 100644 --- a/juneau-rest/juneau-rest-server-auth-oidc-rp/src/test/java/org/apache/juneau/rest/server/auth/oidc/rp/OidcRelyingPartyBuilder_Test.java +++ b/juneau-rest/juneau-rest-server-auth-oidc-rp/src/test/java/org/apache/juneau/rest/server/auth/oidc/rp/OidcRelyingPartyBuilder_Test.java @@ -23,7 +23,6 @@ import java.time.*; import java.util.*; import org.apache.juneau.*; -import org.apache.juneau.rest.server.auth.oidc.rp.LoginStateStore.PendingLogin; import org.junit.jupiter.api.*; /** diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/server/util/CachingHttpServletResponse.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/server/util/CachingHttpServletResponse.java index e5df6e29b2..61cf1e9243 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/server/util/CachingHttpServletResponse.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/server/util/CachingHttpServletResponse.java @@ -37,6 +37,9 @@ import jakarta.servlet.http.*; * calls that never write anything. * */ +@SuppressWarnings({ + "resource" // The tee'd response stream is owned by the underlying response/servlet container, which closes it when the response completes; closing it here would break response body caching. Eclipse JDT @Owning warning is by design. +}) public class CachingHttpServletResponse extends HttpServletResponseWrapper { /** Default body capture cap, in bytes (8 KB). */ diff --git a/juneau-rest/juneau-rest-server/src/test/java/org/apache/juneau/rest/server/util/CachingHttpServletResponse_Test.java b/juneau-rest/juneau-rest-server/src/test/java/org/apache/juneau/rest/server/util/CachingHttpServletResponse_Test.java index f70b43773e..b95f1f5b6d 100644 --- a/juneau-rest/juneau-rest-server/src/test/java/org/apache/juneau/rest/server/util/CachingHttpServletResponse_Test.java +++ b/juneau-rest/juneau-rest-server/src/test/java/org/apache/juneau/rest/server/util/CachingHttpServletResponse_Test.java @@ -39,14 +39,11 @@ class CachingHttpServletResponse_Test { /** Minimal in-memory ServletOutputStream backed by a ByteArrayOutputStream for testing the tee path. */ private static final class FakeServletOutputStream extends ServletOutputStream { final ByteArrayOutputStream sink = new ByteArrayOutputStream(); - boolean closed; @Override public void write(int b) { sink.write(b); } @Override public void write(byte[] b, int off, int len) { sink.write(b, off, len); } - @Override public void close() { closed = true; } - @Override public boolean isReady() { return true; } @Override public void setWriteListener(WriteListener listener) { /* no-op */ }
