You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2026/06/03 20:04:09 UTC

(juneau) branch master updated: TODO-999: Sonar fixes, TODO evaluations, test regression fixes

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


The following commit(s) were added to refs/heads/master by this push:
     new 2982fb7456 TODO-999: Sonar fixes, TODO evaluations, test regression fixes
2982fb7456 is described below

commit 2982fb745694a5a145f2c5afdd80f847be7d78ed
Author: James Bognar <ja...@apache.org>
AuthorDate: Wed Jun 3 16:03:57 2026 -0400

    TODO-999: Sonar fixes, TODO evaluations, test regression fixes
    
    - Task 3: S1186 empty bodies annotated (28 files), S1612 lambdas to
      method refs, S1948 transient fields, S5778 suppressed in 56 test
      classes, S3740/S115 suppressed per policy, S125 false positives skipped
    - Hoist duplicate @SuppressWarnings to outer class in 6 session files
    - Evaluate 6 working-notes TODOs: null contracts kept for sparse()
      collections, AnnotationInfo null assertion added, Constants.java
      deferred to TODO-151, JsonSchemaGeneratorSession NPE guard added
    - Fix TraceContextResponseProcessor test expectation (FINISHED not NEXT)
    - Fix f() single-quote format-string breakage in 5 files (10 call sites
      reverted to String.format to preserve single-quote output style)
    - Fix Rest_PredefinedStatusCodes badPath test (string concat in RestContext)
    
    Co-authored-by: Cursor <cu...@cursor.com>
---
 .../org/apache/juneau/bean/atom/AtomBuilder.java   |  1 -
 .../org/apache/juneau/bean/hal/HalResource.java    |  2 +-
 .../juneau/bean/jsonapi/JsonApiDocument.java       |  2 +-
 .../apache/juneau/bean/jsonapi/JsonApiError.java   |  2 +-
 .../juneau/bean/jsonapi/JsonApiErrorSource.java    |  2 +-
 .../juneau/bean/jsonapi/JsonApiRelationship.java   |  2 +-
 .../JsonSchemaPropertyValidatorFactory.java        |  1 +
 .../juneau/bean/jsonschema/JsonSchemaRef.java      |  1 -
 .../org/apache/juneau/bean/mcp/McpException.java   |  2 +-
 .../juneau/bean/rfc7807/ProblemException.java      |  2 +-
 .../junit/bct/PropertyNotFoundException.java       |  4 +--
 .../juneau/commons/bean/BeanConfigContext.java     |  6 +++-
 .../org/apache/juneau/commons/bean/BeanFilter.java |  3 ++
 .../apache/juneau/commons/bean/BeanSession.java    |  6 ++++
 .../juneau/commons/bean/BeanTypeResolver.java      |  6 ++++
 .../apache/juneau/commons/collections/Lists.java   |  2 +-
 .../apache/juneau/commons/collections/Maps.java    |  4 +--
 .../apache/juneau/commons/collections/Sets.java    |  2 +-
 .../juneau/commons/function/ListBeanChannel.java   |  2 +-
 .../juneau/commons/inject/BeanInstantiator.java    |  3 +-
 .../org/apache/juneau/commons/io/LocalDir.java     |  3 ++
 .../juneau/commons/reflect/AnnotationInfo.java     |  3 +-
 .../juneau/commons/reflect/ExecutableInfo.java     |  4 +--
 .../org/apache/juneau/commons/runtime/Args.java    |  3 ++
 .../commons/settings/DotenvPropertySource.java     |  3 ++
 .../commons/svl/functions/BooleanFunctions.java    |  3 ++
 .../commons/svl/functions/JsonFunctions.java       |  3 +-
 .../config/ConfigPropertySourceProvider.java       |  3 ++
 .../juneau/config/format/YamlConfigFormat.java     |  3 ++
 .../juneau/junit5/JuneauBeanStoreExtension.java    |  6 ++++
 .../java/org/apache/juneau/jena/JsonLdParser.java  |  3 ++
 .../org/apache/juneau/jena/JsonLdSerializer.java   |  3 ++
 .../main/java/org/apache/juneau/jena/N3Parser.java |  3 ++
 .../java/org/apache/juneau/jena/N3Serializer.java  |  3 ++
 .../java/org/apache/juneau/jena/NQuadsParser.java  |  3 ++
 .../org/apache/juneau/jena/NQuadsSerializer.java   |  3 ++
 .../java/org/apache/juneau/jena/NTripleParser.java |  3 ++
 .../org/apache/juneau/jena/NTripleSerializer.java  |  3 ++
 .../java/org/apache/juneau/jena/RdfJsonParser.java |  3 ++
 .../org/apache/juneau/jena/RdfJsonSerializer.java  |  3 ++
 .../java/org/apache/juneau/jena/RdfParser.java     |  3 ++
 .../org/apache/juneau/jena/RdfProtoParser.java     |  3 ++
 .../org/apache/juneau/jena/RdfProtoSerializer.java |  3 ++
 .../java/org/apache/juneau/jena/RdfSerializer.java |  3 ++
 .../org/apache/juneau/jena/RdfStreamParser.java    |  3 ++
 .../apache/juneau/jena/RdfStreamSerializer.java    |  3 ++
 .../org/apache/juneau/jena/RdfThriftParser.java    |  3 ++
 .../apache/juneau/jena/RdfThriftSerializer.java    |  3 ++
 .../apache/juneau/jena/RdfXmlAbbrevSerializer.java |  3 ++
 .../java/org/apache/juneau/jena/RdfXmlParser.java  |  3 ++
 .../org/apache/juneau/jena/RdfXmlSerializer.java   |  3 ++
 .../java/org/apache/juneau/jena/TriGParser.java    |  3 ++
 .../org/apache/juneau/jena/TriGSerializer.java     |  3 ++
 .../java/org/apache/juneau/jena/TriXParser.java    |  3 ++
 .../org/apache/juneau/jena/TriXSerializer.java     |  3 ++
 .../java/org/apache/juneau/jena/TurtleParser.java  |  3 ++
 .../org/apache/juneau/jena/TurtleSerializer.java   |  3 ++
 .../src/main/java/org/apache/juneau/Constants.java |  1 -
 .../src/main/java/org/apache/juneau/Context.java   |  3 +-
 .../java/org/apache/juneau/DurationFormat.java     |  3 ++
 .../main/java/org/apache/juneau/EnumFormat.java    |  3 ++
 .../main/java/org/apache/juneau/FloatFormat.java   |  3 ++
 .../main/java/org/apache/juneau/UriResolver.java   |  3 +-
 .../org/apache/juneau/html/HtmlDocSerializer.java  |  3 ++
 .../juneau/html/HtmlDocSerializerSession.java      |  3 ++
 .../org/apache/juneau/html/HtmlSerializer.java     |  3 ++
 .../apache/juneau/html/HtmlSerializerSession.java  |  3 ++
 .../juneau/html/HtmlStrippedDocSerializer.java     |  3 ++
 .../html/HtmlStrippedDocSerializerSession.java     |  3 ++
 .../juneau/html/annotation/HtmlDocConfig.java      |  1 -
 .../org/apache/juneau/httppart/HttpPartSchema.java |  2 +-
 .../org/apache/juneau/internal/DelegateMap.java    |  3 +-
 .../org/apache/juneau/json/JsonParserSession.java  |  4 +++
 .../org/apache/juneau/json/JsonSerializer.java     |  3 ++
 .../apache/juneau/json/JsonSerializerSession.java  |  3 ++
 .../java/org/apache/juneau/jsonl/JsonlParser.java  |  3 ++
 .../org/apache/juneau/jsonl/JsonlSerializer.java   |  3 ++
 .../juneau/jsonschema/JsonSchemaGenerator.java     |  6 ++++
 .../jsonschema/JsonSchemaGeneratorSession.java     | 12 ++++----
 .../org/apache/juneau/markdown/MarkdownParser.java |  3 ++
 .../juneau/markdown/MarkdownParserSession.java     |  3 ++
 .../apache/juneau/markdown/MarkdownSerializer.java |  3 ++
 .../juneau/markdown/MarkdownSerializerSession.java |  3 ++
 .../apache/juneau/parser/InputStreamParser.java    |  6 ++++
 .../juneau/parser/InputStreamParserSession.java    |  3 ++
 .../org/apache/juneau/parser/ParserListener.java   |  5 ++-
 .../org/apache/juneau/parser/ParserSession.java    |  6 ++++
 .../org/apache/juneau/parser/ReaderParser.java     |  3 ++
 .../apache/juneau/parser/ReaderParserSession.java  |  3 ++
 .../juneau/serializer/OutputStreamSerializer.java  |  9 ++++++
 .../serializer/OutputStreamSerializerSession.java  |  3 ++
 .../juneau/serializer/SerializerListener.java      |  3 +-
 .../juneau/serializer/SerializerSession.java       |  6 ++++
 .../apache/juneau/serializer/WriterSerializer.java |  6 ++++
 .../juneau/serializer/WriterSerializerSession.java |  3 ++
 .../org/apache/juneau/swap/AutoNumberSwap.java     |  3 +-
 .../main/java/org/apache/juneau/uon/UonParser.java |  6 ++++
 .../org/apache/juneau/uon/UonParserSession.java    |  3 ++
 .../java/org/apache/juneau/uon/UonSerializer.java  |  3 ++
 .../apache/juneau/uon/UonSerializerSession.java    |  3 ++
 .../urlencoding/UrlEncodingSerializerSession.java  |  1 +
 .../org/apache/juneau/xml/XmlDocSerializer.java    |  3 ++
 .../main/java/org/apache/juneau/xml/XmlParser.java |  6 ++++
 .../org/apache/juneau/xml/XmlParserSession.java    |  4 +++
 .../java/org/apache/juneau/xml/XmlSerializer.java  |  3 ++
 .../apache/juneau/xml/XmlSerializerSession.java    |  3 ++
 .../microservice/jetty/JettyServerComponent.java   |  1 +
 .../tomcat/BasicTomcatServerFactory.java           |  2 +-
 .../microservice/tomcat/TomcatConfiguration.java   |  2 +-
 .../rest/client/classic/remote/RemoteMeta.java     |  3 ++
 .../org/apache/juneau/rest/client/RestRequest.java |  3 +-
 .../juneau/rest/client/remote/RemoteClient.java    |  9 ++++++
 .../java/org/apache/juneau/http/HttpResponses.java |  3 ++
 .../juneau/http/header/CacheControlBuilder.java    |  3 ++
 .../apache/juneau/http/header/HttpDateHeader.java  |  2 +-
 .../juneau/http/header/HttpMediaRangesHeader.java  |  2 +-
 .../juneau/http/header/HttpMediaTypeHeader.java    |  2 +-
 .../juneau/rest/auth/jwt/JwtTokenValidator.java    |  3 ++
 .../micrometer/MicrometerMetricsRecorder.java      |  3 ++
 .../apache/juneau/rest/auth/oauth/OAuthFilter.java |  3 ++
 .../auth/oauth/OAuthIntrospectionValidator.java    |  3 ++
 .../oauth/flow/OAuthAuthorizationCodeFlow.java     |  3 ++
 .../oauth/flow/OAuthClientCredentialsFlow.java     |  3 ++
 .../auth/oauth/flow/OAuthRefreshTokenFlow.java     |  3 ++
 .../auth/oauth/flow/OAuthResourceOwnerFlow.java    |  3 ++
 .../rest/auth/oidc/rp/IdTokenValidatorAdapter.java |  3 ++
 .../juneau/rest/auth/oidc/rp/OidcRelyingParty.java |  3 ++
 .../auth/oidc/rp/SignedCookieSessionStore.java     |  3 ++
 .../juneau/rest/tracing/otel/OtelTracerHook.java   |  3 ++
 .../apache/juneau/rest/reactive/Adaptation.java    |  6 ++++
 .../rest/auth/saml/SamlAssertionValidator.java     |  6 +++-
 .../juneau/rest/auth/saml/SamlAuthFilter.java      |  3 ++
 .../rest/view/thymeleaf/ThymeleafDispatcher.java   |  3 ++
 .../juneau/rest/view/thymeleaf/ThymeleafMixin.java |  3 ++
 .../java/org/apache/juneau/rest/RestContext.java   | 13 +++++---
 .../java/org/apache/juneau/rest/RestOpContext.java |  2 +-
 .../java/org/apache/juneau/rest/RestOpInvoker.java |  3 ++
 .../java/org/apache/juneau/rest/RestRequest.java   |  3 ++
 .../juneau/rest/annotation/RestStartCall.java      |  2 --
 .../apache/juneau/rest/auth/ApiKeyAuthFilter.java  |  3 ++
 .../org/apache/juneau/rest/auth/ApiKeyGuard.java   |  3 ++
 .../apache/juneau/rest/auth/AuthFilterChain.java   |  3 ++
 .../juneau/rest/auth/BearerTokenAuthFilter.java    |  3 ++
 .../juneau/rest/convention/VersionMixin.java       |  3 ++
 .../juneau/rest/convention/VersionProvider.java    |  3 ++
 .../org/apache/juneau/rest/debug/DebugConfig.java  |  2 +-
 .../apache/juneau/rest/filter/RequestIdFilter.java |  3 ++
 .../apache/juneau/rest/guard/RateLimitGuard.java   |  3 ++
 .../rest/openapi/BasicOpenApiProviderSession.java  | 10 +++++-
 .../org/apache/juneau/rest/ops/ErrorMixin.java     |  2 +-
 .../apache/juneau/rest/ops/NavigationMixin.java    |  2 +-
 .../apache/juneau/rest/ops/RouteIndexMixin.java    |  5 ++-
 .../rest/processor/LegacyHttpResponseAdapter.java  |  3 ++
 .../rest/processor/ProblemDetailsProcessor.java    |  3 +-
 .../rest/processor/ResponseProcessorList.java      |  5 ++-
 .../org/apache/juneau/rest/servlet/RestMixin.java  |  3 ++
 .../apache/juneau/rest/servlet/RestResource.java   |  3 ++
 .../apache/juneau/rest/servlet/RestServlet.java    |  5 ++-
 .../a/rttests/RoundTripBeanChannel_Test.java       |  2 +-
 .../juneau/annotation/BeanCtorAnnotation_Test.java |  4 +--
 .../juneau/bean/jsonschema/JsonSchemaMap_Test.java |  5 +--
 .../commons/bean/BeanConfigContext_Test.java       |  1 +
 .../juneau/commons/function/BeanChannel_Test.java  |  3 +-
 .../inject/BasicBeanStore_PushPopOverlay_Test.java |  1 +
 .../juneau/commons/inject/BasicBeanStore_Test.java | 10 +++---
 .../juneau/commons/inject/BeanAnnotation_Test.java |  4 +--
 .../inject/BeanInstantiator_OptionD_Test.java      |  6 ++--
 .../juneau/commons/inject/Conditional_Test.java    | 36 +++++++++++-----------
 .../juneau/commons/inject/Lifecycle_Test.java      |  2 +-
 .../commons/inject/PrimaryAndOrder_Test.java       | 10 +++---
 .../inject/Value_SupplierTypedFieldType_Test.java  |  1 +
 .../apache/juneau/commons/runtime/Args_Test.java   |  3 +-
 .../apache/juneau/commons/svl/ArgCoercer_Test.java |  1 +
 .../juneau/commons/svl/VarFunction_Test.java       |  1 +
 .../java/org/apache/juneau/config/Config_Test.java |  3 +-
 .../apache/juneau/encoders/EncoderSet_Test.java    |  1 +
 .../java/org/apache/juneau/http/Http_Test.java     |  1 +
 .../org/apache/juneau/jena/RdfParser_Test.java     |  1 +
 .../juneau/junit/bct/BasicBeanConverter_Test.java  |  3 +-
 .../junit5/JuneauBeanStoreExtension_Test.java      |  1 +
 .../junit5/testsupport/StubExtensionContext.java   |  4 +--
 .../juneau/microservice/BootTimeBenchmark.java     |  2 +-
 .../microservice/Microservice_Builder_Test.java    |  1 +
 .../org/apache/juneau/parser/ParserSet_Test.java   |  1 +
 .../RestOpContext_HttpMethodResolution_Test.java   | 14 ++++-----
 .../rest/RestOpContext_OpLevelOverrides_Test.java  |  6 ++--
 .../juneau/rest/RestResponse_EtagHelpers_Test.java |  1 +
 .../juneau/rest/VirtualThreadDispatch_Test.java    |  4 +--
 .../juneau/rest/auth/ApiKeyAuthFilter_Test.java    |  1 +
 .../apache/juneau/rest/auth/ApiKeyGuard_Test.java  |  1 +
 .../apache/juneau/rest/auth/AuthResult_Test.java   |  1 +
 .../rest/auth/BearerTokenAuthFilter_Test.java      |  1 +
 .../juneau/rest/auth/BearerTokenGuard_Test.java    |  1 +
 .../juneau/rest/auth/ClaimsPrincipal_Test.java     |  1 +
 .../auth/jwt/JwtTokenValidator_Builder_Test.java   |  1 +
 .../auth/jwt/JwtTokenValidator_Security_Test.java  |  1 +
 .../rest/auth/oauth/BoundedLruTokenCache_Test.java |  1 +
 .../juneau/rest/auth/oauth/OAuthFilter_Test.java   |  1 +
 .../rest/auth/oauth/OAuthFlowBuilder_Test.java     |  1 +
 .../OAuthIntrospectionValidator_Builder_Test.java  |  1 +
 .../juneau/rest/auth/oauth/OAuthToken_Test.java    |  1 +
 .../oauth/OidcDiscoveryClient_Builder_Test.java    |  1 +
 .../rest/auth/oidc/rp/EphemeralStore_Test.java     |  1 +
 .../auth/oidc/rp/IdTokenValidatorAdapter_Test.java |  1 +
 .../oidc/rp/SignedCookieSessionStore_Test.java     |  1 +
 .../saml/SamlAssertionValidator_Builder_Test.java  |  1 +
 .../juneau/rest/auth/saml/SamlAuthFilter_Test.java |  1 +
 .../juneau/rest/client/RemoteClient_Test.java      |  4 +--
 .../rest/client/RestClientFeatures_Test.java       |  3 +-
 .../apache/juneau/rest/client/RestClient_Test.java |  1 +
 ...iDocs_Springboot_MultiOpenApiProvider_Test.java |  1 +
 .../juneau/rest/filter/RequestIdFilter_Test.java   |  1 +
 .../rest/guard/RateLimitGuard_Snapshot_Test.java   |  3 +-
 .../juneau/rest/guard/RateLimitGuard_Test.java     |  1 +
 .../mock2/MockServletRequest_Coverage_Test.java    |  4 +--
 .../TraceContextResponseProcessor_Test.java        |  2 +-
 .../juneau/rest/ops/AdminMixin_AsMixin_Test.java   |  1 +
 .../ops/AdminMixin_RateLimitSnapshot_Test.java     |  2 +-
 .../juneau/rest/ops/EchoMixin_AsMixin_Test.java    |  1 +
 .../JuneauServletRegistrations_Test.java           |  1 +
 .../rest/tracing/otel/OtelTracerHook_Test.java     |  1 +
 .../juneau/rest/validation/BeanValidator_Test.java |  7 +++--
 .../org/apache/juneau/rest/view/View_Test.java     |  1 +
 .../rest/view/freemarker/FreemarkerView_Test.java  |  1 +
 .../apache/juneau/rest/view/jsp/JspView_Test.java  |  1 +
 .../rest/view/mustache/MustacheView_Test.java      |  1 +
 .../rest/view/thymeleaf/ThymeleafView_Test.java    |  1 +
 .../juneau/serializer/SerializerSet_Test.java      |  1 +
 .../test/java/org/apache/juneau/sse/Sse_Test.java  |  4 +--
 .../juneau/transforms/CalendarFormat_Test.java     |  1 +
 .../apache/juneau/transforms/DateFormat_Test.java  |  1 +
 .../juneau/transforms/TemporalFormat_Test.java     |  1 +
 232 files changed, 594 insertions(+), 133 deletions(-)

diff --git a/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/AtomBuilder.java b/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/AtomBuilder.java
index 2ea2e9a9a6..81c36db028 100644
--- a/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/AtomBuilder.java
+++ b/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/AtomBuilder.java
@@ -19,7 +19,6 @@ package org.apache.juneau.bean.atom;
 import java.net.*;
 import java.util.*;
 
-import org.apache.juneau.*;
 
 /**
  * Various useful static methods for creating ATOM elements.
diff --git a/juneau-bean/juneau-bean-hal/src/main/java/org/apache/juneau/bean/hal/HalResource.java b/juneau-bean/juneau-bean-hal/src/main/java/org/apache/juneau/bean/hal/HalResource.java
index ca009c2871..2eb603414e 100644
--- a/juneau-bean/juneau-bean-hal/src/main/java/org/apache/juneau/bean/hal/HalResource.java
+++ b/juneau-bean/juneau-bean-hal/src/main/java/org/apache/juneau/bean/hal/HalResource.java
@@ -78,7 +78,7 @@ public class HalResource {
 	 * Default constructor.
 	 */
 	public HalResource() {
-		// Intentionally empty: required public no-arg constructor for bean creation/decoding.
+		/* intentionally empty — required public no-arg constructor for bean creation/decoding */
 	}
 
 	/**
diff --git a/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiDocument.java b/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiDocument.java
index 86f145311b..6a0fbaf4df 100644
--- a/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiDocument.java
+++ b/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiDocument.java
@@ -65,7 +65,7 @@ public class JsonApiDocument {
 	/**
 	 * Default constructor.
 	 */
-	public JsonApiDocument() {}
+	public JsonApiDocument() { /* intentionally empty */ }
 
 	/**
 	 * Bean property getter:  <property>data</property>.
diff --git a/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiError.java b/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiError.java
index 680454bd43..92031a6de6 100644
--- a/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiError.java
+++ b/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiError.java
@@ -45,7 +45,7 @@ public class JsonApiError {
 	/**
 	 * Default constructor.
 	 */
-	public JsonApiError() {}
+	public JsonApiError() { /* intentionally empty */ }
 
 	/**
 	 * Bean property getter:  <property>id</property>.
diff --git a/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiErrorSource.java b/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiErrorSource.java
index 1a14cc59d7..216a76f94e 100644
--- a/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiErrorSource.java
+++ b/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiErrorSource.java
@@ -37,7 +37,7 @@ public class JsonApiErrorSource {
 	/**
 	 * Default constructor.
 	 */
-	public JsonApiErrorSource() {}
+	public JsonApiErrorSource() { /* intentionally empty */ }
 
 	/**
 	 * Bean property getter:  <property>pointer</property>.
diff --git a/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiRelationship.java b/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiRelationship.java
index 0b6777165e..f023b7a04a 100644
--- a/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiRelationship.java
+++ b/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiRelationship.java
@@ -50,7 +50,7 @@ public class JsonApiRelationship {
 	/**
 	 * Default constructor.
 	 */
-	public JsonApiRelationship() {}
+	public JsonApiRelationship() { /* intentionally empty */ }
 
 	/**
 	 * Bean property getter:  <property>data</property>.
diff --git a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaPropertyValidatorFactory.java b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaPropertyValidatorFactory.java
index b2069a1e6f..0c976226f8 100644
--- a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaPropertyValidatorFactory.java
+++ b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaPropertyValidatorFactory.java
@@ -43,6 +43,7 @@ public final class JsonSchemaPropertyValidatorFactory implements PropertyValidat
 
 	/** Public no-arg constructor required by {@link java.util.ServiceLoader ServiceLoader}. */
 	public JsonSchemaPropertyValidatorFactory() {
+		/* intentionally empty — required public no-arg constructor for ServiceLoader */
 	}
 
 	@Override
diff --git a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaRef.java b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaRef.java
index 57b4edf50d..d557ab8217 100644
--- a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaRef.java
+++ b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaRef.java
@@ -19,7 +19,6 @@ package org.apache.juneau.bean.jsonschema;
 import java.net.*;
 import java.util.*;
 
-import org.apache.juneau.*;
 
 /**
  * Convenience class for representing a schema reference such as <js>"{'$ref':'/url/to/ref'}"</js>.
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/McpException.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/McpException.java
index 5e1841b4a6..3c41cf3366 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/McpException.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/McpException.java
@@ -27,7 +27,7 @@ public class McpException extends RuntimeException {
 	private static final long serialVersionUID = 1L;
 
 	private int code;
-	private Object data;
+	private transient Object data;
 
 	/**
 	 * Constructor.
diff --git a/juneau-bean/juneau-bean-rfc7807/src/main/java/org/apache/juneau/bean/rfc7807/ProblemException.java b/juneau-bean/juneau-bean-rfc7807/src/main/java/org/apache/juneau/bean/rfc7807/ProblemException.java
index f5e5f371d7..63027566bc 100644
--- a/juneau-bean/juneau-bean-rfc7807/src/main/java/org/apache/juneau/bean/rfc7807/ProblemException.java
+++ b/juneau-bean/juneau-bean-rfc7807/src/main/java/org/apache/juneau/bean/rfc7807/ProblemException.java
@@ -43,7 +43,7 @@ public class ProblemException extends RuntimeException {
 
 	private static final long serialVersionUID = 1L;
 
-	private final Problem problem;
+	private final transient Problem problem;
 
 	/**
 	 * Constructor.
diff --git a/juneau-core/juneau-bct/src/main/java/org/apache/juneau/junit/bct/PropertyNotFoundException.java b/juneau-core/juneau-bct/src/main/java/org/apache/juneau/junit/bct/PropertyNotFoundException.java
index d742c3c5fa..e10d58de4e 100644
--- a/juneau-core/juneau-bct/src/main/java/org/apache/juneau/junit/bct/PropertyNotFoundException.java
+++ b/juneau-core/juneau-bct/src/main/java/org/apache/juneau/junit/bct/PropertyNotFoundException.java
@@ -62,7 +62,7 @@ public class PropertyNotFoundException extends RuntimeException {
 	 * @param objectType The type of object on which the property was sought
 	 */
 	public PropertyNotFoundException(String propertyName, Class<?> objectType) {
-		super(f("Property '%s' not found on object of type %s", propertyName, cns(objectType)));
+		super(String.format("Property '%s' not found on object of type %s", propertyName, cns(objectType)));
 	}
 
 	/**
@@ -73,7 +73,7 @@ public class PropertyNotFoundException extends RuntimeException {
 	 * @param cause The underlying cause of the exception
 	 */
 	public PropertyNotFoundException(String propertyName, Class<?> objectType, Throwable cause) {
-		super(f("Property '%s' not found on object of type %s", propertyName, cns(objectType)), cause);
+		super(String.format("Property '%s' not found on object of type %s", propertyName, cns(objectType)), cause);
 	}
 
 	/**
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/bean/BeanConfigContext.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/bean/BeanConfigContext.java
index 5709e96840..83895b9256 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/bean/BeanConfigContext.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/bean/BeanConfigContext.java
@@ -73,7 +73,8 @@ import org.apache.juneau.commons.reflect.*;
  * </ul>
  */
 @SuppressWarnings({
-	"java:S107" // Builder.build() invokes a multi-arg constructor; high cardinality is inherent to a configuration POJO.
+	"java:S107",  // Builder.build() invokes a multi-arg constructor; high cardinality is inherent to a configuration POJO.
+	"java:S1192"  // Duplicate string literals are annotation attribute values and protocol-wire keys; intentional
 })
 public final class BeanConfigContext {
 
@@ -404,6 +405,9 @@ public final class BeanConfigContext {
 	 * @param ci The class info being tested.  Must not be <jk>null</jk>.
 	 * @return <jk>true</jk> if the class is excluded from bean detection.
 	 */
+	@SuppressWarnings({
+		"java:S3776" // Cognitive complexity acceptable for bean-exclusion predicate dispatch
+	})
 	public boolean isNotABean(ClassInfo ci) {
 		assertArgNotNull("ci", ci);
 		if (notABeanPredicate != null)
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/bean/BeanFilter.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/bean/BeanFilter.java
index 228e112383..8416bdae51 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/bean/BeanFilter.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/bean/BeanFilter.java
@@ -40,6 +40,9 @@ public interface BeanFilter {
 	/**
 	 * @return The bean class that this filter applies to, or <jk>null</jk> if this is a non-bean filter.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // ClassInfoTyped<?> wildcard return intentional; callers use it polymorphically without needing the concrete type
+	})
 	ClassInfoTyped<?> getBeanClass();
 
 	/**
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/bean/BeanSession.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/bean/BeanSession.java
index b0353d6fdc..ee2099719d 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/bean/BeanSession.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/bean/BeanSession.java
@@ -89,6 +89,9 @@ public interface BeanSession {
 	 * @param value The JSON-formatted character sequence to parse.  Must not be <jk>null</jk>.
 	 * @return The parsed map.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Map<?,?> wildcard return intentional; the key/value types are determined by the JSON content at runtime
+	})
 	java.util.Map<?,?> parseToMap(CharSequence value);
 
 	/**
@@ -105,6 +108,9 @@ public interface BeanSession {
 	 * @param value The JSON-formatted character sequence to parse.  Must not be <jk>null</jk>.
 	 * @return The parsed collection.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Collection<?> wildcard return intentional; the element type is determined by the JSON content at runtime
+	})
 	java.util.Collection<?> parseToList(CharSequence value);
 
 	/**
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/bean/BeanTypeResolver.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/bean/BeanTypeResolver.java
index 22ff048170..b3eb2439e8 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/bean/BeanTypeResolver.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/bean/BeanTypeResolver.java
@@ -49,6 +49,9 @@ public interface BeanTypeResolver {
 	 * @param typeVarImpls Resolved type-variable substitutions for the enclosing class.
 	 * @return The resolved type-info, or {@code null} if no resolution was possible.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // BeanInfo<?> wildcard return intentional; the concrete bean type is not statically known at this API level
+	})
 	BeanInfo<?> resolveType(AnnotationInfo<BeanProp> lastBeanProp, ClassInfo type, TypeVariables typeVarImpls);
 
 	/**
@@ -57,6 +60,9 @@ public interface BeanTypeResolver {
 	 *
 	 * @return Non-{@code null} type-info for {@code Object.class}.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // BeanInfo<?> wildcard return intentional; used as a polymorphic fallback type for unparameterized collections
+	})
 	BeanInfo<?> objectType();
 
 	/**
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Lists.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Lists.java
index f0a2c9ffd8..3b24c16723 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Lists.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Lists.java
@@ -297,7 +297,7 @@ public class Lists<E> {
 	 * @return The built list, or {@code null} if {@link #sparse()} is set and the list is empty.
 	 */
 	@SuppressWarnings({
-		"java:S1168"     // Intentional null when sparse+empty. TODO - Check current usages and see if empty makes sense.
+		"java:S1168"  // Intentional null when sparse+empty — null is the absent/not-set sentinel used by callers (e.g. OpenAPI bean setters)
 	})
 	public List<E> build() {
 		if (sparse && e(list))
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Maps.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Maps.java
index 1dc4fb3392..bd4708e3dc 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Maps.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Maps.java
@@ -314,8 +314,8 @@ public class Maps<K,V> {
 	 * @return The built map, or {@code null} if {@link #sparse()} is set and the map is empty.
 	 */
 	@SuppressWarnings({
-		"java:S1168",    // Intentional null when sparse+empty. TODO - Evaluate usages and determine if empty maps should be returned.
-		"java:S3776"     // Cognitive complexity acceptable for map builder
+		"java:S1168",  // Intentional null when sparse+empty — null is the absent/not-set sentinel used by callers (e.g. OpenAPI bean setters)
+		"java:S3776"   // Cognitive complexity acceptable for map builder
 	})
 	public Map<K,V> build() {
 
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Sets.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Sets.java
index 51ce1fa373..2b195dfc35 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Sets.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Sets.java
@@ -314,7 +314,7 @@ public class Sets<E> {
 	 * @return The built set, or {@code null} if {@link #sparse()} is set and the set is empty.
 	 */
 	@SuppressWarnings({
-		"java:S1168"     // Intentional null when sparse+empty. TODO - Determine usages and whether empty sets should be returned.
+		"java:S1168"  // Intentional null when sparse+empty — null is the absent/not-set sentinel used by callers (e.g. OpenAPI bean setters)
 	})
 	public Set<E> build() {
 		if (sparse && e(set))
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/ListBeanChannel.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/ListBeanChannel.java
index 4563b49a66..9bc3cf93b4 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/ListBeanChannel.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/ListBeanChannel.java
@@ -58,7 +58,7 @@ public class ListBeanChannel<T> implements BeanChannel<T> {
 	/**
 	 * Constructor.
 	 */
-	public ListBeanChannel() {}
+	public ListBeanChannel() { /* intentionally empty */ }
 
 	@Override
 	public void acceptThrows(T item) {
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/BeanInstantiator.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/BeanInstantiator.java
index be295ea5ff..1e43f2cccc 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/BeanInstantiator.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/BeanInstantiator.java
@@ -2095,7 +2095,8 @@ public class BeanInstantiator<T> {
 	 * 3. Autodetect from static methods or inner classes
 	 */
 	@SuppressWarnings({
-		"unchecked" // Type erasure requires cast to ClassInfo for builder type
+		"unchecked",  // Type erasure requires cast to ClassInfo for builder type
+		"java:S3776"  // Cognitive complexity acceptable for multi-strategy builder-type resolution
 	})
 	private ClassInfo findBuilderType() {
 		log("Finding builder type...");
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/io/LocalDir.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/io/LocalDir.java
index b624b0971b..25036bc362 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/io/LocalDir.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/io/LocalDir.java
@@ -246,6 +246,9 @@ public class LocalDir {
 	 * @throws IllegalArgumentException If the resolved path escapes the configured root (filesystem branch),
 	 *                                  or if the path contains {@code ..} segments (classpath branch).
 	 */
+	@SuppressWarnings({
+		"java:S3776" // Cognitive complexity acceptable for local file path resolution logic
+	})
 	public LocalFile resolve(String path) {
 		assertArgNotNull(ARG_path, path);
 		if (nn(clazz)) {
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/AnnotationInfo.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/AnnotationInfo.java
index 7f068cbead..d1e9980a62 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/AnnotationInfo.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/AnnotationInfo.java
@@ -75,6 +75,7 @@ import org.apache.juneau.commons.collections.*;
 public class AnnotationInfo<T extends Annotation> {
 
 	// Argument name constants for assertArgNotNull
+	private static final String ARG_on = "on";
 	private static final String ARG_a = "a";
 
 	/**
@@ -122,7 +123,7 @@ public class AnnotationInfo<T extends Annotation> {
 	 * @param a The annotation instance.
 	 */
 	AnnotationInfo(Annotatable on, T a) {
-		this.annotatable = on;  // TODO - Shouldn't allow null.  Add an assertion and see if anything breaks.
+		this.annotatable = assertArgNotNull(ARG_on, on);
 		this.a = assertArgNotNull(ARG_a, a);
 		this.rank = findRank(a);
 		this.toString = memoize(this::findToString);
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ExecutableInfo.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ExecutableInfo.java
index 4b9111863f..5c70f8e0d4 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ExecutableInfo.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ExecutableInfo.java
@@ -966,9 +966,9 @@ public abstract class ExecutableInfo extends AccessibleInfo {
 	private void checkIndex(int index) {
 		int pc = getParameterCount();
 		if (pc == 0)
-			throw new IndexOutOfBoundsException(f("Invalid index '%d'.  No parameters.", index));
+			throw new IndexOutOfBoundsException(String.format("Invalid index '%d'.  No parameters.", index));
 		if (index < 0 || index >= pc)
-			throw new IndexOutOfBoundsException(f("Invalid index '%d'.  Parameter count: %d", index, pc));
+			throw new IndexOutOfBoundsException(String.format("Invalid index '%d'.  Parameter count: %d", index, pc));
 	}
 
 	private String findNameFull() {
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/runtime/Args.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/runtime/Args.java
index 50dd78c799..626facc289 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/runtime/Args.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/runtime/Args.java
@@ -328,6 +328,9 @@ public class Args {
 		 * @param argv The arguments.  Can be <jk>null</jk> (treated as an empty argv).
 		 * @return A new immutable {@link Args} instance.
 		 */
+		@SuppressWarnings({
+			"java:S3776" // Cognitive complexity acceptable for argument prefix resolution and parsing logic
+		})
 		public Args build(String[] argv) {
 			var prefixes = resolvePrefixes();
 			var positional = new ArrayList<String>();
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/settings/DotenvPropertySource.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/settings/DotenvPropertySource.java
index cef69bc0b8..2f3485e7bd 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/settings/DotenvPropertySource.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/settings/DotenvPropertySource.java
@@ -61,6 +61,9 @@ public class DotenvPropertySource implements PropertySource {
 	}
 
 	@Override
+	@SuppressWarnings({
+		"java:S3776" // Cognitive complexity acceptable for dotenv property lookup and parsing logic
+	})
 	public PropertyLookupResult get(String name) {
 		var values = map.updateAndGet(existing -> existing != null ? existing : load(path));
 		var value = values.get(name);
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/svl/functions/BooleanFunctions.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/svl/functions/BooleanFunctions.java
index b8b74e0334..7a9a071166 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/svl/functions/BooleanFunctions.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/svl/functions/BooleanFunctions.java
@@ -26,6 +26,9 @@ import org.apache.juneau.commons.svl.*;
  * truthiness table. Comparison functions ({@code lt}, {@code gt}, etc.) compare numerically;
  * {@code eq} / {@code neq} compare strings.
  */
+@SuppressWarnings({
+	"java:S1192" // Duplicate string literals are SVL operator names used in annotation/config keys; intentional
+})
 public final class BooleanFunctions {
 
 	private BooleanFunctions() {}
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/svl/functions/JsonFunctions.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/svl/functions/JsonFunctions.java
index 0a9c230475..2a9f90d852 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/svl/functions/JsonFunctions.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/svl/functions/JsonFunctions.java
@@ -61,7 +61,8 @@ public final class JsonFunctions {
 		}
 
 		@SuppressWarnings({
-			"unchecked" // Cast is safe: type verified by caller context.
+			"unchecked",  // Cast is safe: type verified by caller context.
+			"java:S3776"  // Cognitive complexity acceptable for JSON path navigation dispatch
 		})
 		private static Object navigate(Object root, String path) {
 			if (root == null || path == null) return null;
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/ConfigPropertySourceProvider.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/ConfigPropertySourceProvider.java
index f7b6a2117e..1ea30c3f09 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/ConfigPropertySourceProvider.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/ConfigPropertySourceProvider.java
@@ -118,6 +118,9 @@ public class ConfigPropertySourceProvider implements PropertySourceProvider {
 		private volatile ConfigPropertySource delegate;
 
 		@Override
+		@SuppressWarnings({
+			"java:S3776" // Cognitive complexity acceptable for lazy config property source resolution
+		})
 		public PropertyLookupResult get(String name) {
 
 			// Re-entrant guard: Config.findSystemDefault() walks Settings.get("juneau.configFile"),
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/format/YamlConfigFormat.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/format/YamlConfigFormat.java
index 65115fea9a..199871c484 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/format/YamlConfigFormat.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/format/YamlConfigFormat.java
@@ -43,6 +43,9 @@ public class YamlConfigFormat implements ConfigFormat {
 	}
 
 	@Override /* ConfigFormat */
+	@SuppressWarnings({
+		"java:S3776" // Cognitive complexity acceptable for YAML-to-INI format conversion logic
+	})
 	public String toInternal(String contents) throws IOException {
 		if (contents == null)
 			return "";
diff --git a/juneau-core/juneau-junit5/src/main/java/org/apache/juneau/junit5/JuneauBeanStoreExtension.java b/juneau-core/juneau-junit5/src/main/java/org/apache/juneau/junit5/JuneauBeanStoreExtension.java
index dfeb208ab3..a09141e3f9 100644
--- a/juneau-core/juneau-junit5/src/main/java/org/apache/juneau/junit5/JuneauBeanStoreExtension.java
+++ b/juneau-core/juneau-junit5/src/main/java/org/apache/juneau/junit5/JuneauBeanStoreExtension.java
@@ -420,6 +420,9 @@ public class JuneauBeanStoreExtension implements BeforeAllCallback, AfterAllCall
 	 * Non-static {@code scope = CLASS} declarations are rejected with an {@link ExtensionContextException} &mdash;
 	 * instance state isn't available at {@code beforeAll} time.
 	 */
+	@SuppressWarnings({
+		"java:S3776" // Cognitive complexity acceptable for hierarchical test bean override wiring
+	})
 	private static void populateStaticOverrides(TestBeanStore store, Class<?> testClass, ModeTracker modeTracker) {
 		for (var c : classHierarchy(testClass)) {
 			for (var f : c.getDeclaredFields()) {
@@ -453,6 +456,9 @@ public class JuneauBeanStoreExtension implements BeforeAllCallback, AfterAllCall
 	 * Honors both instance and static members ("behave consistently with
 	 * non-static" for {@code scope = METHOD} on static fields).
 	 */
+	@SuppressWarnings({
+		"java:S3776" // Cognitive complexity acceptable for hierarchical test bean instance override wiring
+	})
 	private static void populateInstanceOverrides(TestBeanStore store, Object testInstance, ModeTracker modeTracker) {
 		var testClass = testInstance.getClass();
 		for (var c : classHierarchy(testClass)) {
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/JsonLdParser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/JsonLdParser.java
index 401a33d1c5..a309e8c8af 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/JsonLdParser.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/JsonLdParser.java
@@ -76,6 +76,9 @@ public class JsonLdParser extends RdfParser {
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static RdfParser.Builder<?> create() {
 		return RdfParser.create().jsonLd();
 	}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/JsonLdSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/JsonLdSerializer.java
index 7c8f43fe1f..a8b75c36ec 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/JsonLdSerializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/JsonLdSerializer.java
@@ -72,6 +72,9 @@ public class JsonLdSerializer extends RdfSerializer {
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static RdfSerializer.Builder<?> create() {
 		return RdfSerializer.create().jsonLd();
 	}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Parser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Parser.java
index 4d29ad9716..6236935e4d 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Parser.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Parser.java
@@ -72,6 +72,9 @@ public class N3Parser extends RdfParser {
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static RdfParser.Builder<?> create() {
 		return RdfParser.create().n3();
 	}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Serializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Serializer.java
index c318fdc043..1f44075dd5 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Serializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Serializer.java
@@ -72,6 +72,9 @@ public class N3Serializer extends RdfSerializer {
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static RdfSerializer.Builder<?> create() {
 		return RdfSerializer.create().n3();
 	}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NQuadsParser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NQuadsParser.java
index f37896ca95..fd9548b211 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NQuadsParser.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NQuadsParser.java
@@ -72,6 +72,9 @@ public class NQuadsParser extends RdfParser {
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static RdfParser.Builder<?> create() {
 		return RdfParser.create().nQuads();
 	}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NQuadsSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NQuadsSerializer.java
index af28a1c849..5b861892a9 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NQuadsSerializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NQuadsSerializer.java
@@ -72,6 +72,9 @@ public class NQuadsSerializer extends RdfSerializer {
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static RdfSerializer.Builder<?> create() {
 		return RdfSerializer.create().nQuads();
 	}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleParser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleParser.java
index 860766712d..19c8d0b81a 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleParser.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleParser.java
@@ -76,6 +76,9 @@ public class NTripleParser extends RdfParser {
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static RdfParser.Builder<?> create() {
 		return RdfParser.create().ntriple();
 	}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleSerializer.java
index 20f7bbb990..b014aa3bf9 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleSerializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleSerializer.java
@@ -72,6 +72,9 @@ public class NTripleSerializer extends RdfSerializer {
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static RdfSerializer.Builder<?> create() {
 		return RdfSerializer.create().ntriple();
 	}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfJsonParser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfJsonParser.java
index d482724650..479b919534 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfJsonParser.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfJsonParser.java
@@ -75,6 +75,9 @@ public class RdfJsonParser extends RdfParser {
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static RdfParser.Builder<?> create() {
 		return RdfParser.create().rdfJson();
 	}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfJsonSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfJsonSerializer.java
index bc2f1729e1..00763990da 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfJsonSerializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfJsonSerializer.java
@@ -70,6 +70,9 @@ public class RdfJsonSerializer extends RdfSerializer {
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static RdfSerializer.Builder<?> create() {
 		return RdfSerializer.create().rdfJson();
 	}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
index 877d3f8546..ed1c6c7657 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
@@ -998,6 +998,9 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static Builder<?> create() {
 		return new DefaultBuilder();
 	}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfProtoParser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfProtoParser.java
index a5ef1dfaa1..9245253a9c 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfProtoParser.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfProtoParser.java
@@ -69,6 +69,9 @@ public class RdfProtoParser extends RdfStreamParser {
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static RdfStreamParser.Builder<?> create() {
 		return RdfStreamParser.create()
 			.language(Constants.LANG_RDFPROTO)
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfProtoSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfProtoSerializer.java
index 941b9665b7..efeb6e30a4 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfProtoSerializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfProtoSerializer.java
@@ -63,6 +63,9 @@ public class RdfProtoSerializer extends RdfStreamSerializer {
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static RdfStreamSerializer.Builder<?> create() {
 		return RdfStreamSerializer.create()
 			.language(Constants.LANG_RDFPROTO)
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
index c52df68bb2..403ab1b45b 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
@@ -1249,6 +1249,9 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static Builder<?> create() {
 		return new DefaultBuilder();
 	}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfStreamParser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfStreamParser.java
index a54d49aaac..cd41dc32c3 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfStreamParser.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfStreamParser.java
@@ -154,6 +154,9 @@ public class RdfStreamParser extends InputStreamParser implements RdfMetaProvide
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static Builder<?> create() {
 		return new DefaultBuilder();
 	}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfStreamSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfStreamSerializer.java
index b742520127..53ecbb8645 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfStreamSerializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfStreamSerializer.java
@@ -159,6 +159,9 @@ public class RdfStreamSerializer extends OutputStreamSerializer implements RdfMe
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static Builder<?> create() {
 		return new DefaultBuilder();
 	}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfThriftParser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfThriftParser.java
index 2a78529fe6..c37dc569ca 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfThriftParser.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfThriftParser.java
@@ -69,6 +69,9 @@ public class RdfThriftParser extends RdfStreamParser {
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static RdfStreamParser.Builder<?> create() {
 		return RdfStreamParser.create()
 			.language(Constants.LANG_RDFTHRIFT)
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfThriftSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfThriftSerializer.java
index ad90e5905f..bea9c6fdaf 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfThriftSerializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfThriftSerializer.java
@@ -63,6 +63,9 @@ public class RdfThriftSerializer extends RdfStreamSerializer {
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static RdfStreamSerializer.Builder<?> create() {
 		return RdfStreamSerializer.create()
 			.language(Constants.LANG_RDFTHRIFT)
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlAbbrevSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlAbbrevSerializer.java
index 6f3df68ae8..4481ec9b64 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlAbbrevSerializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlAbbrevSerializer.java
@@ -82,6 +82,9 @@ public class RdfXmlAbbrevSerializer extends RdfSerializer {
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static RdfSerializer.Builder<?> create() {
 		return RdfSerializer.create().xmlabbrev();
 	}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlParser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlParser.java
index 0c22bbe74c..a869c015ba 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlParser.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlParser.java
@@ -87,6 +87,9 @@ public class RdfXmlParser extends RdfParser {
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static RdfParser.Builder<?> create() {
 		return RdfParser.create().xml();
 	}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlSerializer.java
index e91e76dead..93400026e2 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlSerializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlSerializer.java
@@ -83,6 +83,9 @@ public class RdfXmlSerializer extends RdfSerializer {
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static RdfSerializer.Builder<?> create() {
 		return RdfSerializer.create().xml();
 	}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TriGParser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TriGParser.java
index e483d8daa3..0b6ae1a24d 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TriGParser.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TriGParser.java
@@ -72,6 +72,9 @@ public class TriGParser extends RdfParser {
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static RdfParser.Builder<?> create() {
 		return RdfParser.create().triG();
 	}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TriGSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TriGSerializer.java
index c585bb6a52..b6462b5588 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TriGSerializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TriGSerializer.java
@@ -72,6 +72,9 @@ public class TriGSerializer extends RdfSerializer {
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static RdfSerializer.Builder<?> create() {
 		return RdfSerializer.create().triG();
 	}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TriXParser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TriXParser.java
index 2fbea8887b..5062103f14 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TriXParser.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TriXParser.java
@@ -75,6 +75,9 @@ public class TriXParser extends RdfParser {
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static RdfParser.Builder<?> create() {
 		return RdfParser.create().triX();
 	}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TriXSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TriXSerializer.java
index 70b03a8fa5..2a4fdcd765 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TriXSerializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TriXSerializer.java
@@ -82,6 +82,9 @@ public class TriXSerializer extends RdfSerializer {
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static RdfSerializer.Builder<?> create() {
 		return RdfSerializer.create().triX();
 	}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TurtleParser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TurtleParser.java
index edeb5da123..1bc6836b18 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TurtleParser.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TurtleParser.java
@@ -76,6 +76,9 @@ public class TurtleParser extends RdfParser {
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static RdfParser.Builder<?> create() {
 		return RdfParser.create().turtle();
 	}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TurtleSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TurtleSerializer.java
index b3072e6022..6036e2d2eb 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TurtleSerializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TurtleSerializer.java
@@ -73,6 +73,9 @@ public class TurtleSerializer extends RdfSerializer {
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static RdfSerializer.Builder<?> create() {
 		return RdfSerializer.create().turtle();
 	}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Constants.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Constants.java
index 550699392c..739fca3e84 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Constants.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Constants.java
@@ -34,7 +34,6 @@ public class Constants {
 	 * Sentinel value to indicate that a default value is not specified.
 	 *
 	 * @see org.apache.juneau.commons.Constants#NONE
-	 * TODO - Inline this
 	 */
 	public static final String NONE = org.apache.juneau.commons.Constants.NONE;
 }
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
index 1eab4ce0f8..55f40e1b35 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
@@ -88,7 +88,8 @@ import org.apache.juneau.yaml.annotation.*;
 @SuppressWarnings({
 	"unchecked",
 	"rawtypes",
-	"java:S115" // Constants use UPPER_snakeCase convention
+	"java:S115",  // Constants use UPPER_snakeCase convention
+	"java:S3740"  // Raw Builder types in reflection-based context creation; parameterization is not possible at call sites
 })
 public abstract class Context {
 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/DurationFormat.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/DurationFormat.java
index 05e9238c97..1f4c34fb32 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/DurationFormat.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/DurationFormat.java
@@ -104,6 +104,9 @@ public enum DurationFormat {
 		return Duration.ofSeconds(seconds, nanos);
 	}
 
+	@SuppressWarnings({
+		"java:S3776" // Cognitive complexity acceptable for ISO-8601 duration formatting logic
+	})
 	private static String formatIso8601WithDays(Duration value) {
 		boolean neg = value.isNegative();
 		Duration d = neg ? value.abs() : value;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/EnumFormat.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/EnumFormat.java
index 3255a9a78b..2e34cbb6d6 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/EnumFormat.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/EnumFormat.java
@@ -113,6 +113,9 @@ public enum EnumFormat {
 	 * @return The parsed enum constant, or <jk>null</jk> if {@code value} is <jk>null</jk> or blank.
 	 * @throws IllegalArgumentException If the value does not match any enum constant.
 	 */
+	@SuppressWarnings({
+		"java:S3776" // Cognitive complexity acceptable for enum format parsing dispatch
+	})
 	public static <E extends Enum<E>> E parse(String value, Class<E> enumClass) {
 		if (value == null)
 			return null;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/FloatFormat.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/FloatFormat.java
index b4fb6da663..072a00cb1d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/FloatFormat.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/FloatFormat.java
@@ -74,6 +74,9 @@ import static org.apache.juneau.commons.utils.ThrowableUtils.*;
  * {@code double} / {@code decimal128}; CBOR's tag 22 / 23 / 24 for special floats; MsgPack {@code float64}).
  * This setting only affects text-based serializers.
  */
+@SuppressWarnings({
+	"java:S115" // NaN_AS_* enum constants use the IEEE 754 abbreviation 'NaN' which includes lowercase letters; intentional
+})
 public enum FloatFormat {
 
 	/** Sentinel meaning "no value configured" — falls through to the next-higher precedence level. */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/UriResolver.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/UriResolver.java
index 3b24b5a043..ce861d5ebf 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/UriResolver.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/UriResolver.java
@@ -134,7 +134,8 @@ public class UriResolver {
 	 * @return The same appendable passed in.
 	 */
 	@SuppressWarnings({
-		"java:S3776" // Cognitive complexity acceptable for URI resolution logic
+		"java:S3776", // Cognitive complexity acceptable for URI resolution logic
+		"java:S6541"  // Brain Method acceptable for URI resolution state machine
 	})
 	public Appendable append(Appendable a, Object o) {
 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
index e38f72be3e..145f195072 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
@@ -908,6 +908,9 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static Builder<?> create() {
 		return new DefaultBuilder();
 	}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java
index edb479daaf..2db53cfe3f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java
@@ -93,6 +93,9 @@ public class HtmlDocSerializerSession extends HtmlStrippedDocSerializerSession {
 	 * @param ctx The context creating this session.
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers use it to construct session instances polymorphically
+	})
 	public static Builder<?> create(HtmlDocSerializer ctx) {
 		return new DefaultBuilder(ctx);
 	}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
index 0ed256565d..dba44cd324 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
@@ -737,6 +737,9 @@ public class HtmlSerializer extends XmlSerializer implements HtmlMetaProvider {
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static Builder<?> create() {
 		return new DefaultBuilder();
 	}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
index b1b03f93d2..afe9ada682 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
@@ -213,6 +213,9 @@ public class HtmlSerializerSession extends XmlSerializerSession {
 	 * 	<br>Cannot be <jk>null</jk>.
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers use it to construct session instances polymorphically
+	})
 	public static Builder<?> create(HtmlSerializer ctx) {
 		return new DefaultBuilder(assertArgNotNull(ARG_ctx, ctx));
 	}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java
index 9a344ba92a..75b186d75c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java
@@ -123,6 +123,9 @@ public class HtmlStrippedDocSerializer extends HtmlSerializer {
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static Builder<?> create() {
 		return new DefaultBuilder();
 	}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerSession.java
index 3e99a04651..d377eca98e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerSession.java
@@ -79,6 +79,9 @@ public class HtmlStrippedDocSerializerSession extends HtmlSerializerSession {
 	 * @param ctx The context creating this session.
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers use it to construct session instances polymorphically
+	})
 	public static Builder<?> create(HtmlStrippedDocSerializer ctx) {
 		return new DefaultBuilder(ctx);
 	}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfig.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfig.java
index 637e1ebbe2..f81f587526 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfig.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfig.java
@@ -24,7 +24,6 @@ import java.lang.annotation.*;
 import org.apache.juneau.*;
 import org.apache.juneau.annotation.*;
 import org.apache.juneau.html.*;
-import org.apache.juneau.commons.svl.*;
 
 /**
  * Annotation for specifying config properties defined in {@link HtmlSerializer}, {@link HtmlParser}, and {@link HtmlDocSerializer}.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
index ad5073b894..5168de8dcc 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
@@ -4258,7 +4258,7 @@ public class HttpPartSchema {
 						throw new SchemaValidationException("Duplicate items not allowed.");
 					HttpPartSchema items2 = getItems();
 					if (nn(items2))
-						c.forEach(x -> items2.validateOutput(x));
+						c.forEach(items2::validateOutput);
 				}
 				break;
 			}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DelegateMap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DelegateMap.java
index d6a6f4ea9b..ffc8cc8e4b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DelegateMap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DelegateMap.java
@@ -32,7 +32,8 @@ import org.apache.juneau.commons.bean.*;
  * @serial exclude
  */
 @SuppressWarnings({
-	"rawtypes" // Raw types necessary for generic Map delegation
+	"rawtypes",  // Raw types necessary for generic Map delegation
+	"java:S110"  // Inheritance depth inherited from JsonMap -> MarshalledMap -> LinkedHashMap chain; intentional
 })
 public class DelegateMap<T extends Map> extends JsonMap implements Delegate<T> {
 	private static final long serialVersionUID = 1L;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
index 7640bf2e04..c887109699 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
@@ -47,6 +47,7 @@ import org.apache.juneau.commons.bean.BeanPropertyMeta;
  * </ul>
  */
 @SuppressWarnings({
+	"java:S115",  // PROP_xxx constants use camelCase after prefix intentionally (property keys, not enum-style constants)
 	"java:S125",  // State-machine and parse-path comments (S1: ..., Let o be null) are documentation, not commented-out code
 	"java:S6541", // Brain method acceptable for JSON parser dispatch and state machines
 	"unchecked", // Type erasure requires unchecked casts
@@ -129,6 +130,9 @@ public class JsonParserSession extends ReaderParserSession {
 	 * @param ctx The context creating this session.
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers use it to construct session instances polymorphically
+	})
 	public static Builder<?> create(JsonParser ctx) {
 		return new DefaultBuilder(ctx);
 	}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
index 4d6e860ea9..01a1c688bd 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
@@ -318,6 +318,9 @@ public class JsonSerializer extends WriterSerializer implements JsonMetaProvider
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static Builder<?> create() {
 		return new DefaultBuilder();
 	}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
index 5b12da4b85..01cf985628 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
@@ -129,6 +129,9 @@ public class JsonSerializerSession extends WriterSerializerSession {
 	 * 	<br>Cannot be <jk>null</jk>.
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers use it to construct session instances polymorphically
+	})
 	public static Builder<?> create(JsonSerializer ctx) {
 		return new DefaultBuilder(assertArgNotNull(ARG_ctx, ctx));
 	}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonl/JsonlParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonl/JsonlParser.java
index d35557fade..8e57ce7d95 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonl/JsonlParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonl/JsonlParser.java
@@ -97,6 +97,9 @@ public class JsonlParser extends JsonParser {
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static JsonParser.Builder<?> create() {
 		return JsonParser.create()
 			.consumes("application/jsonl,application/x-ndjson,text/jsonl")
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonl/JsonlSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonl/JsonlSerializer.java
index 03bbe5c2b4..fba69e79aa 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonl/JsonlSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonl/JsonlSerializer.java
@@ -105,6 +105,9 @@ public class JsonlSerializer extends JsonSerializer {
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static JsonSerializer.Builder<?> create() {
 		return JsonSerializer.create()
 			.produces("application/jsonl")
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
index 40b842d5a7..b23c969958 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
@@ -296,6 +296,9 @@ public class JsonSchemaGenerator extends MarshallingTraverseContext implements J
 		 *
 		 * @return The JSON serializer builder.
 		 */
+		@SuppressWarnings({
+			"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+		})
 		public JsonParser.Builder<?> getJsonParserBuilder() { return jsonParserBuilder; }
 
 		/**
@@ -303,6 +306,9 @@ public class JsonSchemaGenerator extends MarshallingTraverseContext implements J
 		 *
 		 * @return The JSON serializer builder.
 		 */
+		@SuppressWarnings({
+			"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+		})
 		public JsonSerializer.Builder<?> getJsonSerializerBuilder() { return jsonSerializerBuilder; }
 
 		@Override /* Overridden from Context.Builder<?> */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
index 02ab85b482..cc6c53d79a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
@@ -270,11 +270,11 @@ public class JsonSchemaGeneratorSession extends MarshallingTraverseSession {
 	}
 
 	@SuppressWarnings({
-		"java:S1168",    // TODO: null when type ignored. Consider returning empty schema instead?
-		"java:S3776", // Cognitive complexity acceptable for schema generation over type categories
-		"java:S6541", // Brain Method — unified getSchema branching over serializers/types is intentional
-		"rawtypes", // Raw types necessary for generic type handling
-		"unchecked", // Type erasure requires unchecked casts
+		"java:S1168",  // Intentional null when type is ignored — signals "no schema" to callers; null is filtered by JsonMap serialization
+		"java:S3776",  // Cognitive complexity acceptable for schema generation over type categories
+		"java:S6541",  // Brain Method — unified getSchema branching over serializers/types is intentional
+		"rawtypes",    // Raw types necessary for generic type handling
+		"unchecked"    // Type erasure requires unchecked casts
 	})
 	private JsonMap getSchema(ClassMeta<?> eType, String attrName, boolean exampleAdded, boolean descriptionAdded, JsonSchemaBeanPropertyMeta jsbpm)
 		throws MarshallingRecursionException, SerializeException {
@@ -410,7 +410,7 @@ public class JsonSchemaGeneratorSession extends MarshallingTraverseSession {
 
 			} else if (tc == MAP) {
 				var om = getSchema(sType.getValueType(), PROP_additionalProperties, exampleAdded, descriptionAdded, null);
-				if (! om.isEmpty())
+				if (om != null && ! om.isEmpty())
 					out.put(PROP_additionalProperties, om);
 
 			}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/markdown/MarkdownParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/markdown/MarkdownParser.java
index 7ea81f2864..eeff5b3631 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/markdown/MarkdownParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/markdown/MarkdownParser.java
@@ -181,6 +181,9 @@ public class MarkdownParser extends ReaderParser implements MarkdownMetaProvider
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static Builder<?> create() {
 		return new DefaultBuilder();
 	}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/markdown/MarkdownParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/markdown/MarkdownParserSession.java
index 6751a34b1b..78e374b47f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/markdown/MarkdownParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/markdown/MarkdownParserSession.java
@@ -105,6 +105,9 @@ public class MarkdownParserSession extends ReaderParserSession {
 	 * @param ctx The context creating this session.
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers use it to construct session instances polymorphically
+	})
 	public static Builder<?> create(MarkdownParser ctx) {
 		return new DefaultBuilder(ctx);
 	}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/markdown/MarkdownSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/markdown/MarkdownSerializer.java
index ab34a67ad7..ead60e0f8a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/markdown/MarkdownSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/markdown/MarkdownSerializer.java
@@ -207,6 +207,9 @@ public class MarkdownSerializer extends WriterSerializer implements MarkdownMeta
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static Builder<?> create() {
 		return new DefaultBuilder();
 	}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/markdown/MarkdownSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/markdown/MarkdownSerializerSession.java
index f3e89ed8ca..be175497f5 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/markdown/MarkdownSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/markdown/MarkdownSerializerSession.java
@@ -104,6 +104,9 @@ public class MarkdownSerializerSession extends WriterSerializerSession {
 	 * 	<br>Cannot be <jk>null</jk>.
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers use it to construct session instances polymorphically
+	})
 	public static Builder<?> create(MarkdownSerializer ctx) {
 		return new DefaultBuilder(assertArgNotNull(ARG_ctx, ctx));
 	}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParser.java
index 00c84e4416..f170fc16e2 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParser.java
@@ -40,6 +40,9 @@ import org.apache.juneau.*;
 
  * </ul>
  */
+@SuppressWarnings({
+	"java:S115" // ARG_xxx constants use camelCase after prefix intentionally (constructor arg name keys, not enum-style constants)
+})
 public class InputStreamParser extends Parser {
 
 	private static final String ARG_copyFrom = "copyFrom";
@@ -114,6 +117,9 @@ public class InputStreamParser extends Parser {
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static Builder<?> create() {
 		return new DefaultBuilder();
 	}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserSession.java
index b2e2c9f956..588240f4d9 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserSession.java
@@ -85,6 +85,9 @@ public class InputStreamParserSession extends ParserSession {
 	 * 	<br>Cannot be <jk>null</jk>.
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers use it to construct session instances polymorphically
+	})
 	public static Builder<?> create(InputStreamParser ctx) {
 		return new DefaultBuilder(assertArgNotNull(ARG_ctx, ctx));
 	}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserListener.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserListener.java
index e967619a45..7e54304b77 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserListener.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserListener.java
@@ -17,7 +17,6 @@
 package org.apache.juneau.parser;
 
 import static org.apache.juneau.commons.utils.ThrowableUtils.*;
-import static org.apache.juneau.commons.utils.Utils.*;
 
 import org.apache.juneau.commons.bean.BeanPropertyMeta;
 
@@ -44,7 +43,7 @@ public class ParserListener {
 	 * @param p The bean property we had an issue on.
 	 */
 	public void onBeanSetterException(ParserSession session, Throwable t, BeanPropertyMeta p) {
-		onError(session, t, f("Could not call setValue() on property '%s' of class '%s', exception = %s", p.getName(), p.getBeanMeta().getBeanInfo(), lm(t)));
+		onError(session, t, String.format("Could not call setValue() on property '%s' of class '%s', exception = %s", p.getName(), p.getBeanMeta().getBeanInfo(), lm(t)));
 	}
 
 	/**
@@ -72,6 +71,6 @@ public class ParserListener {
 	 * @param bean The bean.
 	 */
 	public <T> void onUnknownBeanProperty(ParserSession session, String propertyName, Class<T> beanClass, T bean) {
-		onError(session, null, f("Unknown property '%s' encountered while trying to parse into class '%s' at location %s", propertyName, beanClass, session.getPosition()));
+		onError(session, null, String.format("Unknown property '%s' encountered while trying to parse into class '%s' at location %s", propertyName, beanClass, session.getPosition()));
 	}
 }
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java
index 9a11862089..5c8f4357c9 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java
@@ -220,6 +220,9 @@ public class ParserSession extends MarshallingSession {
 	 * 	<br>Cannot be <jk>null</jk>.
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers use it to construct session instances polymorphically
+	})
 	public static Builder<?> create(Parser ctx) {
 		return new DefaultBuilder(assertArgNotNull(ARG_ctx, ctx));
 	}
@@ -875,6 +878,9 @@ public class ParserSession extends MarshallingSession {
 	 * @throws ParseException Malformed input encountered.
 	 * @throws ExecutableException Exception occurred on invoked constructor/method/field.
 	 */
+	@SuppressWarnings({
+		"java:S3776" // Cognitive complexity acceptable for type-conversion dispatch across all supported target types
+	})
 	protected final <T> T convertAttrToType(Object outer, String s, ClassMeta<T> type) throws ParseException {
 		if (s == null)
 			return null;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParser.java
index 4399186468..c2bbad4f6b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParser.java
@@ -209,6 +209,9 @@ public class ReaderParser extends Parser {
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static Builder<?> create() {
 		return new DefaultBuilder();
 	}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserSession.java
index bf83c6abf1..2d86552337 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserSession.java
@@ -157,6 +157,9 @@ public class ReaderParserSession extends ParserSession {
 	 * 	<br>Cannot be <jk>null</jk>.
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers use it to construct session instances polymorphically
+	})
 	public static Builder<?> create(ReaderParser ctx) {
 		return new DefaultBuilder(assertArgNotNull(ARG_ctx, ctx));
 	}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializer.java
index ade1fc3245..666c360021 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializer.java
@@ -32,6 +32,9 @@ import org.apache.juneau.*;
 
  * </ul>
  */
+@SuppressWarnings({
+	"java:S115" // ARG_xxx constants use camelCase after prefix intentionally (constructor arg name keys, not enum-style constants)
+})
 public class OutputStreamSerializer extends Serializer {
 
 	private static final String ARG_copyFrom = "copyFrom";
@@ -83,6 +86,9 @@ public class OutputStreamSerializer extends Serializer {
 	/**
 	 * Concrete default builder leaf for the non-subclassed {@link OutputStreamSerializer#create()} / {@link OutputStreamSerializer#copy()} path.
 	 */
+	@SuppressWarnings({
+		"java:S110" // Inheritance depth follows the serializer builder chain; intentional layered design
+	})
 	public static final class DefaultBuilder extends Builder<DefaultBuilder> {
 
 		DefaultBuilder() {}
@@ -106,6 +112,9 @@ public class OutputStreamSerializer extends Serializer {
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static Builder<?> create() {
 		return new DefaultBuilder();
 	}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerSession.java
index 2c4896d23c..0520b6d5c5 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerSession.java
@@ -93,6 +93,9 @@ public class OutputStreamSerializerSession extends SerializerSession {
 	 * 	<br>Cannot be <jk>null</jk>.
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers use it to construct session instances polymorphically
+	})
 	public static Builder<?> create(OutputStreamSerializer ctx) {
 		return new DefaultBuilder(assertArgNotNull(ARG_ctx, ctx));
 	}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerListener.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerListener.java
index a3aa4a0d73..12eb34bb7b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerListener.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerListener.java
@@ -17,7 +17,6 @@
 package org.apache.juneau.serializer;
 
 import static org.apache.juneau.commons.utils.ThrowableUtils.*;
-import static org.apache.juneau.commons.utils.Utils.*;
 
 import org.apache.juneau.commons.bean.BeanPropertyMeta;
 
@@ -44,7 +43,7 @@ public class SerializerListener {
 	 * @param p The bean property we had an issue on.
 	 */
 	public void onBeanGetterException(SerializerSession session, Throwable t, BeanPropertyMeta p) {
-		onError(session, t, f("Could not call getValue() on property '%s' of class '%s', exception = %s", p.getName(), p.getBeanMeta().getBeanInfo(), lm(t)));
+		onError(session, t, String.format("Could not call getValue() on property '%s' of class '%s', exception = %s", p.getName(), p.getBeanMeta().getBeanInfo(), lm(t)));
 	}
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
index 52315045a1..2f303a0a69 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
@@ -386,6 +386,9 @@ public class SerializerSession extends MarshallingTraverseSession {
 	 * 	<br>Cannot be <jk>null</jk>.
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers use it to construct session instances polymorphically
+	})
 	public static Builder<?> create(Serializer ctx) {
 		return new DefaultBuilder(assertArgNotNull("ctx", ctx));
 	}
@@ -591,6 +594,9 @@ public class SerializerSession extends MarshallingTraverseSession {
 	 * @param consumer The entry consumer.
 	 * @since 9.2.1
 	 */
+	@SuppressWarnings({
+		"java:S3776" // Cognitive complexity acceptable for streamable-entry dispatch logic
+	})
 	public final void forEachStreamableEntry(Object o, ClassMeta<?> type, Consumer consumer) {
 		if (o == null)
 			return;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
index da3108330b..425f4c4107 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
@@ -392,6 +392,9 @@ public class WriterSerializer extends Serializer {
 	/**
 	 * Concrete default builder leaf for the non-subclassed {@link WriterSerializer#create()} / {@link WriterSerializer#copy()} path.
 	 */
+	@SuppressWarnings({
+		"java:S110" // Inheritance depth follows the serializer builder chain; intentional layered design
+	})
 	public static final class DefaultBuilder extends Builder<DefaultBuilder> {
 
 		DefaultBuilder() {}
@@ -415,6 +418,9 @@ public class WriterSerializer extends Serializer {
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static Builder<?> create() {
 		return new DefaultBuilder();
 	}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerSession.java
index 82fde6ccab..2f1c7b321a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerSession.java
@@ -223,6 +223,9 @@ public class WriterSerializerSession extends SerializerSession {
 	 * 	<br>Cannot be <jk>null</jk>.
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers use it to construct session instances polymorphically
+	})
 	public static Builder<?> create(WriterSerializer ctx) {
 		return new DefaultBuilder(assertArgNotNull(ARG_ctx, ctx));
 	}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoNumberSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoNumberSwap.java
index 5f6819ec2b..47cc884367 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoNumberSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoNumberSwap.java
@@ -204,7 +204,8 @@ public class AutoNumberSwap<T> extends ObjectSwap<T,Number> {
 	private final Class<?> unswapType;
 
 	@SuppressWarnings({
-		"null" // Method info variables are checked for null before use in method body
+		"null",      // Method info variables are checked for null before use in method body
+		"java:S3776" // Cognitive complexity acceptable for auto-number swap constructor dispatch
 	})
 	private AutoNumberSwap(MarshallingContext bc, ClassInfo ci, MethodInfo swapMethod, MethodInfo unswapMethod, ConstructorInfo unswapConstructor) {
 		super(ci.inner(), swapMethod.inner().getReturnType());
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
index 2b77e48243..1952039cc4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
@@ -215,6 +215,9 @@ public class UonParser extends ReaderParser implements HttpPartParser, UonMetaPr
 	/**
 	 * Concrete default builder leaf for the non-subclassed {@link UonParser#create()} / {@link UonParser#copy()} path.
 	 */
+	@SuppressWarnings({
+		"java:S110" // Inheritance depth follows the parser builder chain; intentional layered design
+	})
 	public static final class DefaultBuilder extends Builder<DefaultBuilder> {
 
 		DefaultBuilder() {}
@@ -259,6 +262,9 @@ public class UonParser extends ReaderParser implements HttpPartParser, UonMetaPr
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static Builder<?> create() {
 		return new DefaultBuilder();
 	}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
index b54d76f57b..feaf5d38d4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
@@ -151,6 +151,9 @@ public class UonParserSession extends ReaderParserSession implements HttpPartPar
 	 * @param ctx The context creating this session.
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers use it to construct session instances polymorphically
+	})
 	public static Builder<?> create(UonParser ctx) {
 		return new DefaultBuilder(ctx);
 	}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
index dfb900b427..8770c253eb 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
@@ -468,6 +468,9 @@ public class UonSerializer extends WriterSerializer implements HttpPartSerialize
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static Builder<?> create() {
 		return new DefaultBuilder();
 	}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
index ad1aabbcbe..b0dd26e399 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
@@ -147,6 +147,9 @@ public class UonSerializerSession extends WriterSerializerSession implements Htt
 	 * 	<br>Cannot be <jk>null</jk>.
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers use it to construct session instances polymorphically
+	})
 	public static Builder<?> create(UonSerializer ctx) {
 		return new DefaultBuilder(assertArgNotNull(ARG_ctx, ctx));
 	}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java
index 4f3bfa8223..2f86186ce1 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java
@@ -43,6 +43,7 @@ import org.apache.juneau.commons.bean.BeanPropertyMeta;
  * </ul>
  */
 @SuppressWarnings({
+	"java:S115",  // PROP_xxx constants use camelCase after prefix intentionally (property keys, not enum-style constants)
 	"rawtypes",   // Raw types necessary for generic type handling
 	"unchecked",  // Type erasure requires unchecked casts
 	"resource",   // Resource management handled externally
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlDocSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlDocSerializer.java
index 6491785662..89c7fa897b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlDocSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlDocSerializer.java
@@ -68,6 +68,9 @@ public class XmlDocSerializer extends XmlSerializer {
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static Builder<?> create() {
 		return new DefaultBuilder().type(XmlDocSerializer.class);
 	}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
index 8ee20a28f9..a9b6e60c8d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
@@ -296,6 +296,9 @@ public class XmlParser extends ReaderParser implements XmlMetaProvider {
 	/**
 	 * Concrete default builder leaf for the non-subclassed {@link XmlParser#create()} / {@link XmlParser#copy()} path.
 	 */
+	@SuppressWarnings({
+		"java:S110" // Inheritance depth follows the parser builder chain; intentional layered design
+	})
 	public static final class DefaultBuilder extends Builder<DefaultBuilder> {
 
 		DefaultBuilder() {}
@@ -322,6 +325,9 @@ public class XmlParser extends ReaderParser implements XmlMetaProvider {
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static Builder<?> create() {
 		return new DefaultBuilder();
 	}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserSession.java
index 7307106a83..ebb8fde2cd 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserSession.java
@@ -51,6 +51,7 @@ import org.apache.juneau.commons.bean.BeanPropertyMeta;
  * </ul>
  */
 @SuppressWarnings({
+	"java:S115",  // PROP_xxx constants use camelCase after prefix intentionally (property keys, not enum-style constants)
 	"unchecked", // Type erasure requires unchecked casts
 	"rawtypes", // Raw types necessary for generic type handling
 })
@@ -153,6 +154,9 @@ public class XmlParserSession extends ReaderParserSession {
 	 * @param ctx The context creating this session.
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers use it to construct session instances polymorphically
+	})
 	public static Builder<?> create(XmlParser ctx) {
 		return new DefaultBuilder(ctx);
 	}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
index 2b792268ba..756d83083b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
@@ -608,6 +608,9 @@ public class XmlSerializer extends WriterSerializer implements XmlMetaProvider {
 	 *
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
+	})
 	public static Builder<?> create() {
 		return new DefaultBuilder();
 	}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
index fd9ac3d144..9c02f2b463 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
@@ -246,6 +246,9 @@ public class XmlSerializerSession extends WriterSerializerSession {
 	 * 	<br>Cannot be <jk>null</jk>.
 	 * @return A new builder.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Builder<?> wildcard return intentional; callers use it to construct session instances polymorphically
+	})
 	public static Builder<?> create(XmlSerializer ctx) {
 		return new DefaultBuilder(assertArgNotNull(ARG_ctx, ctx));
 	}
diff --git a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyServerComponent.java b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyServerComponent.java
index ca4a8265e0..083cffb780 100644
--- a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyServerComponent.java
+++ b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyServerComponent.java
@@ -185,6 +185,7 @@ public class JettyServerComponent implements MicroserviceListener {
 	@SuppressWarnings({
 		"java:S3776", // Cognitive complexity acceptable for server creation logic
 		"java:S1141", // Nested try blocks scope checked-exception translation tightly to single call sites
+		"java:S6541", // Brain Method acceptable for server startup wiring logic
 		"resource"    // ms.getBeanStore() is owned by the microservice lifecycle; do not close here.
 	})
 	public void onStart(Microservice ms) {
diff --git a/juneau-microservice/juneau-microservice-tomcat/src/main/java/org/apache/juneau/microservice/tomcat/BasicTomcatServerFactory.java b/juneau-microservice/juneau-microservice-tomcat/src/main/java/org/apache/juneau/microservice/tomcat/BasicTomcatServerFactory.java
index 58eefa019a..2b6edbc1dc 100644
--- a/juneau-microservice/juneau-microservice-tomcat/src/main/java/org/apache/juneau/microservice/tomcat/BasicTomcatServerFactory.java
+++ b/juneau-microservice/juneau-microservice-tomcat/src/main/java/org/apache/juneau/microservice/tomcat/BasicTomcatServerFactory.java
@@ -38,7 +38,7 @@ public class BasicTomcatServerFactory implements TomcatServerFactory {
 	/**
 	 * Constructor.
 	 */
-	public BasicTomcatServerFactory() {}
+	public BasicTomcatServerFactory() { /* intentionally empty */ }
 
 	@Override /* Overridden from TomcatServerFactory */
 	public Tomcat create(File baseDir) throws Exception {
diff --git a/juneau-microservice/juneau-microservice-tomcat/src/main/java/org/apache/juneau/microservice/tomcat/TomcatConfiguration.java b/juneau-microservice/juneau-microservice-tomcat/src/main/java/org/apache/juneau/microservice/tomcat/TomcatConfiguration.java
index 6c5566e241..031a867b41 100644
--- a/juneau-microservice/juneau-microservice-tomcat/src/main/java/org/apache/juneau/microservice/tomcat/TomcatConfiguration.java
+++ b/juneau-microservice/juneau-microservice-tomcat/src/main/java/org/apache/juneau/microservice/tomcat/TomcatConfiguration.java
@@ -68,7 +68,7 @@ public class TomcatConfiguration {
 	/**
 	 * Constructor.
 	 */
-	public TomcatConfiguration() {}
+	public TomcatConfiguration() { /* intentionally empty */ }
 
 	/**
 	 * Contributes the default Tomcat server factory used to build the
diff --git a/juneau-rest/juneau-rest-client-classic/src/main/java/org/apache/juneau/rest/client/classic/remote/RemoteMeta.java b/juneau-rest/juneau-rest-client-classic/src/main/java/org/apache/juneau/rest/client/classic/remote/RemoteMeta.java
index a2d822d325..f3a84e1600 100644
--- a/juneau-rest/juneau-rest-client-classic/src/main/java/org/apache/juneau/rest/client/classic/remote/RemoteMeta.java
+++ b/juneau-rest/juneau-rest-client-classic/src/main/java/org/apache/juneau/rest/client/classic/remote/RemoteMeta.java
@@ -57,6 +57,9 @@ public class RemoteMeta {
 	 *
 	 * @param c The interface class annotated with a {@link org.apache.juneau.http.remote.Remote @Remote} annotation (optional).
 	 */
+	@SuppressWarnings({
+		"java:S3776" // Cognitive complexity acceptable for remote interface metadata construction dispatch
+	})
 	public RemoteMeta(Class<?> c) {
 		var path = "";
 
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
index 2f8294255f..e6ceae9fdb 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
@@ -43,7 +43,8 @@ import org.apache.juneau.http.part.*;
  * @since 9.2.1
  */
 @SuppressWarnings({
-	"resource" // client is not owned here; run() transfers RestResponse ownership to caller
+	"java:S1192", // Duplicate string literals are HTTP header names and REST protocol wire values; intentional
+	"resource"    // client is not owned here; run() transfers RestResponse ownership to caller
 })
 public final class RestRequest {
 
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteClient.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteClient.java
index 34a26801c5..7b09317b0a 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteClient.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteClient.java
@@ -134,6 +134,9 @@ public final class RemoteClient {
 		}
 
 		@Override
+		@SuppressWarnings({
+			"java:S3776" // Cognitive complexity acceptable for remote proxy invocation dispatch
+		})
 		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 			// Handle Object methods directly
 			if (method.getDeclaringClass() == Object.class)
@@ -182,6 +185,9 @@ public final class RemoteClient {
 		 * {@code @Request}.  {@code @Query}/{@code @Header}/{@code @FormData} honor dynamic name/value expansion
 		 * (Map / {@code "*"} / part-list / bean) and parameter-level {@code def()} defaults for {@code null} args.
 		 */
+		@SuppressWarnings({
+			"java:S3776" // Cognitive complexity acceptable for multi-part-type parameter binding dispatch
+		})
 		private void bindParam(RestRequest req, Parameter param, Object arg, boolean soleParam) throws IOException {
 			var path = param.getAnnotation(Path.class);
 			if (path != null) {
@@ -292,6 +298,9 @@ public final class RemoteClient {
 		 * name/value parts.  Map/bean values are part-serialized; {@link PartList}/{@link HttpHeaderList} entries
 		 * are already string-valued and passed through.
 		 */
+		@SuppressWarnings({
+			"java:S3776" // Cognitive complexity acceptable for multi-type argument expansion dispatch
+		})
 		private static void expandPairs(HttpPartType partType, Object arg, BiConsumer<String,String> adder) {
 			if (arg instanceof Map<?,?> m) {
 				m.forEach((k, v) -> { if (k != null && v != null) adder.accept(String.valueOf(k), serializePart(partType, null, v)); });
diff --git a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/HttpResponses.java b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/HttpResponses.java
index fb29235120..04e9122bc2 100644
--- a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/HttpResponses.java
+++ b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/HttpResponses.java
@@ -46,6 +46,9 @@ import org.apache.juneau.http.response.*;
  *
  * @since 9.2.1
  */
+@SuppressWarnings({
+	"java:S1192" // Duplicate string literals are HTTP response reason phrases and status labels; intentional
+})
 public final class HttpResponses {
 
 	private HttpResponses() {}
diff --git a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/CacheControlBuilder.java b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/CacheControlBuilder.java
index 69a119d404..325285d977 100644
--- a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/CacheControlBuilder.java
+++ b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/CacheControlBuilder.java
@@ -49,6 +49,9 @@ import java.util.*;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({
+	"java:S115" // ARG_xxx constants use camelCase after prefix intentionally (constructor arg name keys, not enum-style constants)
+})
 public class CacheControlBuilder {
 
 	private static final String ARG_value = "value";
diff --git a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HttpDateHeader.java b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HttpDateHeader.java
index b2efac0379..6a35787dc5 100644
--- a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HttpDateHeader.java
+++ b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HttpDateHeader.java
@@ -81,7 +81,7 @@ public class HttpDateHeader extends HttpHeaderBean {
 
 	protected HttpDateHeader(String name, Supplier<?> supplier, int lazyMode) {
 		super(name, lazyMode == LAZY_WIRE_STRING
-			? () -> ((Supplier<String>) supplier).get()
+			? ((Supplier<String>) supplier)::get
 			: () -> {
 				var z = ((Supplier<ZonedDateTime>) supplier).get();
 				return z == null ? null : RFC_1123_DATE_TIME.format(z);
diff --git a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HttpMediaRangesHeader.java b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HttpMediaRangesHeader.java
index 5c6109e186..6b35935ae1 100644
--- a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HttpMediaRangesHeader.java
+++ b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HttpMediaRangesHeader.java
@@ -85,7 +85,7 @@ public class HttpMediaRangesHeader extends HttpHeaderBean {
 	 */
 	protected HttpMediaRangesHeader(String name, Supplier<?> supplier, int lazyMode) {
 		super(name, lazyMode == LAZY_WIRE_STRING
-			? () -> ((Supplier<String>) supplier).get()
+			? ((Supplier<String>) supplier)::get
 			: () -> {
 				var m = ((Supplier<MediaRanges>) supplier).get();
 				return m == null ? null : m.toString();
diff --git a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HttpMediaTypeHeader.java b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HttpMediaTypeHeader.java
index 30a0d7006f..d7c663736e 100644
--- a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HttpMediaTypeHeader.java
+++ b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HttpMediaTypeHeader.java
@@ -63,7 +63,7 @@ public class HttpMediaTypeHeader extends HttpHeaderBean {
 
 	protected HttpMediaTypeHeader(String name, Supplier<?> supplier, int lazyMode) {
 		super(name, lazyMode == LAZY_WIRE_STRING
-			? () -> ((Supplier<String>) supplier).get()
+			? ((Supplier<String>) supplier)::get
 			: () -> {
 				var m = ((Supplier<MediaType>) supplier).get();
 				return m == null ? null : m.toString();
diff --git a/juneau-rest/juneau-rest-server-jwt/src/main/java/org/apache/juneau/rest/auth/jwt/JwtTokenValidator.java b/juneau-rest/juneau-rest-server-jwt/src/main/java/org/apache/juneau/rest/auth/jwt/JwtTokenValidator.java
index 883e7fb1ce..3729c3dcee 100644
--- a/juneau-rest/juneau-rest-server-jwt/src/main/java/org/apache/juneau/rest/auth/jwt/JwtTokenValidator.java
+++ b/juneau-rest/juneau-rest-server-jwt/src/main/java/org/apache/juneau/rest/auth/jwt/JwtTokenValidator.java
@@ -101,6 +101,9 @@ import com.nimbusds.jwt.proc.*;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({
+	"java:S1192" // Duplicate string literals are JWT claim names and algorithm identifiers; intentional
+})
 public class JwtTokenValidator implements TokenValidator {
 
 	/** Maximum clock-skew tolerance the builder will accept. */
diff --git a/juneau-rest/juneau-rest-server-micrometer/src/main/java/org/apache/juneau/rest/metrics/micrometer/MicrometerMetricsRecorder.java b/juneau-rest/juneau-rest-server-micrometer/src/main/java/org/apache/juneau/rest/metrics/micrometer/MicrometerMetricsRecorder.java
index 71a73ba404..61404a55a0 100644
--- a/juneau-rest/juneau-rest-server-micrometer/src/main/java/org/apache/juneau/rest/metrics/micrometer/MicrometerMetricsRecorder.java
+++ b/juneau-rest/juneau-rest-server-micrometer/src/main/java/org/apache/juneau/rest/metrics/micrometer/MicrometerMetricsRecorder.java
@@ -97,6 +97,9 @@ import io.micrometer.core.instrument.*;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({
+	"java:S115" // TAG_xxx and ARG_xxx constants use camelCase after prefix intentionally (metric/arg key names, not enum-style constants)
+})
 public class MicrometerMetricsRecorder implements MetricsRecorder {
 
 	/** Default timer name {@code "http.server.requests"} &mdash; matches Spring Boot's convention. */
diff --git a/juneau-rest/juneau-rest-server-oauth/src/main/java/org/apache/juneau/rest/auth/oauth/OAuthFilter.java b/juneau-rest/juneau-rest-server-oauth/src/main/java/org/apache/juneau/rest/auth/oauth/OAuthFilter.java
index d46fa6b327..775ae52479 100644
--- a/juneau-rest/juneau-rest-server-oauth/src/main/java/org/apache/juneau/rest/auth/oauth/OAuthFilter.java
+++ b/juneau-rest/juneau-rest-server-oauth/src/main/java/org/apache/juneau/rest/auth/oauth/OAuthFilter.java
@@ -64,6 +64,9 @@ import jakarta.servlet.http.HttpServletRequest;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({
+	"java:S1192" // Duplicate string literals are OAuth protocol header names and grant type values; intentional
+})
 public class OAuthFilter extends AuthFilter {
 
 	private static final String DEFAULT_ROLES_CLAIM = "scope";
diff --git a/juneau-rest/juneau-rest-server-oauth/src/main/java/org/apache/juneau/rest/auth/oauth/OAuthIntrospectionValidator.java b/juneau-rest/juneau-rest-server-oauth/src/main/java/org/apache/juneau/rest/auth/oauth/OAuthIntrospectionValidator.java
index 624b8ffa3d..be8b6dd339 100644
--- a/juneau-rest/juneau-rest-server-oauth/src/main/java/org/apache/juneau/rest/auth/oauth/OAuthIntrospectionValidator.java
+++ b/juneau-rest/juneau-rest-server-oauth/src/main/java/org/apache/juneau/rest/auth/oauth/OAuthIntrospectionValidator.java
@@ -72,6 +72,9 @@ import com.nimbusds.oauth2.sdk.token.BearerAccessToken;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({
+	"java:S1192" // Duplicate string literals are OAuth introspection response field names; intentional
+})
 public class OAuthIntrospectionValidator implements TokenValidator {
 
 	/** Default cache TTL. */
diff --git a/juneau-rest/juneau-rest-server-oauth/src/main/java/org/apache/juneau/rest/auth/oauth/flow/OAuthAuthorizationCodeFlow.java b/juneau-rest/juneau-rest-server-oauth/src/main/java/org/apache/juneau/rest/auth/oauth/flow/OAuthAuthorizationCodeFlow.java
index a468d0655e..61b1e924a8 100644
--- a/juneau-rest/juneau-rest-server-oauth/src/main/java/org/apache/juneau/rest/auth/oauth/flow/OAuthAuthorizationCodeFlow.java
+++ b/juneau-rest/juneau-rest-server-oauth/src/main/java/org/apache/juneau/rest/auth/oauth/flow/OAuthAuthorizationCodeFlow.java
@@ -69,6 +69,9 @@ import com.nimbusds.openid.connect.sdk.Nonce;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({
+	"java:S1192" // Duplicate string literals are OAuth protocol parameter names (e.g. "code", "grant_type"); intentional
+})
 public class OAuthAuthorizationCodeFlow {
 
 	/**
diff --git a/juneau-rest/juneau-rest-server-oauth/src/main/java/org/apache/juneau/rest/auth/oauth/flow/OAuthClientCredentialsFlow.java b/juneau-rest/juneau-rest-server-oauth/src/main/java/org/apache/juneau/rest/auth/oauth/flow/OAuthClientCredentialsFlow.java
index 6256da24e0..eda708d7b2 100644
--- a/juneau-rest/juneau-rest-server-oauth/src/main/java/org/apache/juneau/rest/auth/oauth/flow/OAuthClientCredentialsFlow.java
+++ b/juneau-rest/juneau-rest-server-oauth/src/main/java/org/apache/juneau/rest/auth/oauth/flow/OAuthClientCredentialsFlow.java
@@ -59,6 +59,9 @@ import com.nimbusds.oauth2.sdk.id.ClientID;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({
+	"java:S1192" // Duplicate string literals are OAuth protocol parameter names (e.g. "grant_type", "client_id"); intentional
+})
 public class OAuthClientCredentialsFlow {
 
 	/**
diff --git a/juneau-rest/juneau-rest-server-oauth/src/main/java/org/apache/juneau/rest/auth/oauth/flow/OAuthRefreshTokenFlow.java b/juneau-rest/juneau-rest-server-oauth/src/main/java/org/apache/juneau/rest/auth/oauth/flow/OAuthRefreshTokenFlow.java
index d2be3699a2..fd08ab8a0b 100644
--- a/juneau-rest/juneau-rest-server-oauth/src/main/java/org/apache/juneau/rest/auth/oauth/flow/OAuthRefreshTokenFlow.java
+++ b/juneau-rest/juneau-rest-server-oauth/src/main/java/org/apache/juneau/rest/auth/oauth/flow/OAuthRefreshTokenFlow.java
@@ -41,6 +41,9 @@ import com.nimbusds.oauth2.sdk.token.RefreshToken;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({
+	"java:S1192" // Duplicate string literals are OAuth protocol parameter names (e.g. "grant_type", "refresh_token"); intentional
+})
 public class OAuthRefreshTokenFlow {
 
 	/**
diff --git a/juneau-rest/juneau-rest-server-oauth/src/main/java/org/apache/juneau/rest/auth/oauth/flow/OAuthResourceOwnerFlow.java b/juneau-rest/juneau-rest-server-oauth/src/main/java/org/apache/juneau/rest/auth/oauth/flow/OAuthResourceOwnerFlow.java
index 474179c4fc..e3240c2726 100644
--- a/juneau-rest/juneau-rest-server-oauth/src/main/java/org/apache/juneau/rest/auth/oauth/flow/OAuthResourceOwnerFlow.java
+++ b/juneau-rest/juneau-rest-server-oauth/src/main/java/org/apache/juneau/rest/auth/oauth/flow/OAuthResourceOwnerFlow.java
@@ -49,6 +49,9 @@ import com.nimbusds.oauth2.sdk.id.ClientID;
  * 	resource-owner password-credentials grant was removed from OAuth 2.1.
  */
 @Deprecated(since = "9.5.0", forRemoval = false)
+@SuppressWarnings({
+	"java:S1192" // Duplicate string literals are OAuth protocol parameter names (e.g. "grant_type", "username"); intentional
+})
 public class OAuthResourceOwnerFlow {
 
 	/**
diff --git a/juneau-rest/juneau-rest-server-oidc-rp/src/main/java/org/apache/juneau/rest/auth/oidc/rp/IdTokenValidatorAdapter.java b/juneau-rest/juneau-rest-server-oidc-rp/src/main/java/org/apache/juneau/rest/auth/oidc/rp/IdTokenValidatorAdapter.java
index d5517a1d85..4d3f764e88 100644
--- a/juneau-rest/juneau-rest-server-oidc-rp/src/main/java/org/apache/juneau/rest/auth/oidc/rp/IdTokenValidatorAdapter.java
+++ b/juneau-rest/juneau-rest-server-oidc-rp/src/main/java/org/apache/juneau/rest/auth/oidc/rp/IdTokenValidatorAdapter.java
@@ -59,6 +59,9 @@ import com.nimbusds.openid.connect.sdk.validators.IDTokenValidator;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({
+	"java:S1192" // Duplicate string literals are OIDC/JWT claim names (e.g. "iss", "aud", "exp"); intentional
+})
 public class IdTokenValidatorAdapter {
 
 	/**
diff --git a/juneau-rest/juneau-rest-server-oidc-rp/src/main/java/org/apache/juneau/rest/auth/oidc/rp/OidcRelyingParty.java b/juneau-rest/juneau-rest-server-oidc-rp/src/main/java/org/apache/juneau/rest/auth/oidc/rp/OidcRelyingParty.java
index 7d6f51e4df..a0b24354d8 100644
--- a/juneau-rest/juneau-rest-server-oidc-rp/src/main/java/org/apache/juneau/rest/auth/oidc/rp/OidcRelyingParty.java
+++ b/juneau-rest/juneau-rest-server-oidc-rp/src/main/java/org/apache/juneau/rest/auth/oidc/rp/OidcRelyingParty.java
@@ -112,6 +112,9 @@ import jakarta.servlet.http.*;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({
+	"java:S1192" // Duplicate string literals are OIDC protocol parameter names and claim names; intentional
+})
 public class OidcRelyingParty {
 
 	private static final String DEFAULT_COOKIE_NAME = "JUNEAU_OIDC_SESSION";
diff --git a/juneau-rest/juneau-rest-server-oidc-rp/src/main/java/org/apache/juneau/rest/auth/oidc/rp/SignedCookieSessionStore.java b/juneau-rest/juneau-rest-server-oidc-rp/src/main/java/org/apache/juneau/rest/auth/oidc/rp/SignedCookieSessionStore.java
index 46f466516e..4a4f65664e 100644
--- a/juneau-rest/juneau-rest-server-oidc-rp/src/main/java/org/apache/juneau/rest/auth/oidc/rp/SignedCookieSessionStore.java
+++ b/juneau-rest/juneau-rest-server-oidc-rp/src/main/java/org/apache/juneau/rest/auth/oidc/rp/SignedCookieSessionStore.java
@@ -53,6 +53,9 @@ import com.nimbusds.jwt.*;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({
+	"java:S1192" // Duplicate string literals are cookie attribute names and session field names; intentional
+})
 public class SignedCookieSessionStore implements SessionStore {
 
 	/** Default maximum serialized cookie size in bytes. */
diff --git a/juneau-rest/juneau-rest-server-otel/src/main/java/org/apache/juneau/rest/tracing/otel/OtelTracerHook.java b/juneau-rest/juneau-rest-server-otel/src/main/java/org/apache/juneau/rest/tracing/otel/OtelTracerHook.java
index 0435eeb2a4..03526db0fb 100644
--- a/juneau-rest/juneau-rest-server-otel/src/main/java/org/apache/juneau/rest/tracing/otel/OtelTracerHook.java
+++ b/juneau-rest/juneau-rest-server-otel/src/main/java/org/apache/juneau/rest/tracing/otel/OtelTracerHook.java
@@ -93,6 +93,9 @@ import io.opentelemetry.context.propagation.*;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({
+	"java:S115" // ARG_xxx constants use camelCase after prefix intentionally (constructor arg name keys, not enum-style constants)
+})
 public class OtelTracerHook implements TracerHook {
 
 	/** Default tracer instrumentation scope name. */
diff --git a/juneau-rest/juneau-rest-server-reactive/src/main/java/org/apache/juneau/rest/reactive/Adaptation.java b/juneau-rest/juneau-rest-server-reactive/src/main/java/org/apache/juneau/rest/reactive/Adaptation.java
index 5042f9e7a0..4efe916a3b 100644
--- a/juneau-rest/juneau-rest-server-reactive/src/main/java/org/apache/juneau/rest/reactive/Adaptation.java
+++ b/juneau-rest/juneau-rest-server-reactive/src/main/java/org/apache/juneau/rest/reactive/Adaptation.java
@@ -80,6 +80,9 @@ public final class Adaptation {
 	 *
 	 * @return The completion stage, or {@code null}.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // CompletionStage<?> wildcard return intentional; callers only need the base stage type for chaining
+	})
 	public CompletionStage<?> single() {
 		return single;
 	}
@@ -89,6 +92,9 @@ public final class Adaptation {
 	 *
 	 * @return The publisher, or {@code null}.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // Publisher<?> wildcard return intentional; callers only need the base publisher type for consumption
+	})
 	public java.util.concurrent.Flow.Publisher<?> stream() {
 		return stream;
 	}
diff --git a/juneau-rest/juneau-rest-server-saml/src/main/java/org/apache/juneau/rest/auth/saml/SamlAssertionValidator.java b/juneau-rest/juneau-rest-server-saml/src/main/java/org/apache/juneau/rest/auth/saml/SamlAssertionValidator.java
index f85926a11d..4f7db0777f 100644
--- a/juneau-rest/juneau-rest-server-saml/src/main/java/org/apache/juneau/rest/auth/saml/SamlAssertionValidator.java
+++ b/juneau-rest/juneau-rest-server-saml/src/main/java/org/apache/juneau/rest/auth/saml/SamlAssertionValidator.java
@@ -106,7 +106,8 @@ import net.shibboleth.shared.resolver.ResolverException;
  * @since 9.5.0
  */
 @SuppressWarnings({
-	"java:S6539" // Monolithic class: validator is a single end-to-end pipeline.
+	"java:S1192", // Duplicate string literals are SAML protocol claim names and JWT-style field keys; intentional
+	"java:S6539"  // Monolithic class: validator is a single end-to-end pipeline.
 })
 public class SamlAssertionValidator {
 
@@ -420,6 +421,9 @@ public class SamlAssertionValidator {
 		return assertions.get(0);
 	}
 
+	@SuppressWarnings({
+		"java:S3776" // Cognitive complexity acceptable for multi-step SAML signature verification
+	})
 	private void verifySignature(Assertion assertion) throws AuthenticationException {
 		var signature = assertion.getSignature();
 		if (signature == null)
diff --git a/juneau-rest/juneau-rest-server-saml/src/main/java/org/apache/juneau/rest/auth/saml/SamlAuthFilter.java b/juneau-rest/juneau-rest-server-saml/src/main/java/org/apache/juneau/rest/auth/saml/SamlAuthFilter.java
index 498e9f60fc..df999133d5 100644
--- a/juneau-rest/juneau-rest-server-saml/src/main/java/org/apache/juneau/rest/auth/saml/SamlAuthFilter.java
+++ b/juneau-rest/juneau-rest-server-saml/src/main/java/org/apache/juneau/rest/auth/saml/SamlAuthFilter.java
@@ -80,6 +80,9 @@ import jakarta.servlet.http.HttpServletRequest;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({
+	"java:S1192" // Duplicate string literals are SAML attribute names and HTTP header values; intentional
+})
 public class SamlAuthFilter extends AuthFilter {
 
 	private static final String DEFAULT_CONSUMER_PATH = "/saml/acs";
diff --git a/juneau-rest/juneau-rest-server-view-thymeleaf/src/main/java/org/apache/juneau/rest/view/thymeleaf/ThymeleafDispatcher.java b/juneau-rest/juneau-rest-server-view-thymeleaf/src/main/java/org/apache/juneau/rest/view/thymeleaf/ThymeleafDispatcher.java
index 90ec1fef4a..4f1ce10c94 100644
--- a/juneau-rest/juneau-rest-server-view-thymeleaf/src/main/java/org/apache/juneau/rest/view/thymeleaf/ThymeleafDispatcher.java
+++ b/juneau-rest/juneau-rest-server-view-thymeleaf/src/main/java/org/apache/juneau/rest/view/thymeleaf/ThymeleafDispatcher.java
@@ -51,6 +51,9 @@ import org.thymeleaf.templateresolver.*;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({
+	"java:S1192" // Duplicate string literals are Thymeleaf template attribute keys; intentional
+})
 public class ThymeleafDispatcher implements RawTemplateDispatcher {
 
 	/** Default base path applied when no {@link Builder#basePath(String)} call has been made. */
diff --git a/juneau-rest/juneau-rest-server-view-thymeleaf/src/main/java/org/apache/juneau/rest/view/thymeleaf/ThymeleafMixin.java b/juneau-rest/juneau-rest-server-view-thymeleaf/src/main/java/org/apache/juneau/rest/view/thymeleaf/ThymeleafMixin.java
index 4eeaee22ae..b5597b776d 100644
--- a/juneau-rest/juneau-rest-server-view-thymeleaf/src/main/java/org/apache/juneau/rest/view/thymeleaf/ThymeleafMixin.java
+++ b/juneau-rest/juneau-rest-server-view-thymeleaf/src/main/java/org/apache/juneau/rest/view/thymeleaf/ThymeleafMixin.java
@@ -136,6 +136,9 @@ import org.thymeleaf.templatemode.*;
 @Rest(
 	responseProcessors={ThymeleafViewRenderer.class}
 )
+@SuppressWarnings({
+	"java:S1192" // Duplicate string literals are Thymeleaf MIME type strings and template attribute keys; intentional
+})
 public class ThymeleafMixin {
 
 	/** Default base path applied when no {@link Builder#basePath(String)} call has been made. */
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
index c98b1592a8..be791c6f60 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
@@ -152,6 +152,8 @@ import jakarta.servlet.http.*;
 	"java:S112",  // RuntimeException used in memoizer lambdas to re-wrap checked exceptions (ServletException/Exception) that Supplier<T> cannot declare
 	"java:S115",  // Constants use UPPER_snakeCase convention (e.g., PROP_allowContentParam)
 	"java:S1200", // Class has many dependencies; acceptable for this core context class
+	"java:S1192", // Duplicate string literals are property key names and REST annotation attribute values; intentional
+	"java:S3776", // Cognitive complexity in field-initializer lambdas (memoizer wiring); cannot annotate at lambda scope
 	"java:S6539", // Monster class; RestContext is intentionally a central hub for REST framework configuration
 	"resource"    // Streams and session objects returned to callers; lifecycle managed by the servlet container or RestCall
 })
@@ -935,6 +937,9 @@ public class RestContext extends Context {
 	 * slot. That single {@code rawConfig} is still registered so user-supplied {@code Config}s flow
 	 * through to {@code @Value} resolution.
 	 */
+	@SuppressWarnings({
+		"java:S3776" // Cognitive complexity acceptable for multi-source REST config property collection
+	})
 	private List<PropertySource> collectRestConfigPropertySources() {
 		var bs = beanStore();
 		var vr = bs.getBean(VarResolver.class, PROP_bootstrapVarResolver).orElseGet(this::getBootstrapVarResolver);
@@ -3099,7 +3104,7 @@ public class RestContext extends Context {
 			try {
 				x.invoke(beanStore, getResource());
 			} catch (Exception e) {
-				getLogger().log(Level.WARNING, unwrap(e), () -> f("Error occurred invoking servlet-destroy method '%s'.", x.getFullName()));
+				getLogger().log(Level.WARNING, unwrap(e), () -> String.format("Error occurred invoking servlet-destroy method '%s'.", x.getFullName()));
 			}
 		}
 		if (!isMixinContext) {
@@ -3107,7 +3112,7 @@ public class RestContext extends Context {
 				try {
 					mctx.destroy();
 				} catch (Exception e) {
-					getLogger().log(Level.WARNING, unwrap(e), () -> f("Error occurred destroying mixin sub-context '%s'.", mctx.getResourceClass().getName()));
+					getLogger().log(Level.WARNING, unwrap(e), () -> String.format("Error occurred destroying mixin sub-context '%s'.", mctx.getResourceClass().getName()));
 				}
 			}
 		}
@@ -4325,7 +4330,7 @@ public class RestContext extends Context {
 			try {
 				x.invoke(session.getBeanStore(), getResource());
 			} catch (Exception e) {
-				getLogger().log(Level.WARNING, unwrap(e), () -> f("Error occurred invoking finish-call method '%s'.", x.getFullName()));
+				getLogger().log(Level.WARNING, unwrap(e), () -> String.format("Error occurred invoking finish-call method '%s'.", x.getFullName()));
 			}
 		}
 	}
@@ -4605,7 +4610,7 @@ public class RestContext extends Context {
 		var pathInfo = session.getPathInfo();
 		var methodUC = session.getMethod();
 		var rc = session.getStatus();
-		var onPath = pathInfo == null ? " on no pathInfo" : f(" on path '%s'", pathInfo);
+		var onPath = pathInfo == null ? " on no pathInfo" : (" on path '" + pathInfo + "'");
 		if (rc == SC_NOT_FOUND)
 			throw new NotFound("Method ''{0}'' not found on resource with matching pattern{1}.", methodUC, onPath);
 		else if (rc == SC_PRECONDITION_FAILED)
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
index 9f8cb382e7..1bc803a7f4 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
@@ -47,7 +47,7 @@ import org.apache.juneau.http.annotation.*;
 import org.apache.juneau.http.annotation.Header;
 import org.apache.juneau.http.header.*;
 import org.apache.juneau.http.part.*;
-import org.apache.juneau.http.response.*;
+import org.apache.juneau.http.response.InternalServerError;
 import org.apache.juneau.httppart.*;
 import org.apache.juneau.httppart.bean.*;
 import org.apache.juneau.jsonschema.*;
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpInvoker.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpInvoker.java
index e929d66a9a..908b58100f 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpInvoker.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpInvoker.java
@@ -106,6 +106,9 @@ public class RestOpInvoker extends MethodInvoker {
 	 * @param opSession The REST call.
 	 * @throws Exception If an error occurred during either parameter resolution or method invocation.
 	 */
+	@SuppressWarnings({
+		"java:S3776" // Cognitive complexity acceptable for REST operation invocation dispatch (virtual-thread + observability paths)
+	})
 	public void invokeOp(RestOpSession opSession) throws Exception {
 		var vtExec = opSession.getContext().isVirtualThreadsEnabled()
 			? opSession.getRestContext().getVirtualThreadExecutor()
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
index 41cffcfa77..569062efc6 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
@@ -456,6 +456,9 @@ public class RestRequest extends HttpServletRequestWrapper {
 	 * 	guard failed).
 	 * @throws IllegalArgumentException If {@code response} is <jk>null</jk>.
 	 */
+	@SuppressWarnings({
+		"java:S3776" // Cognitive complexity acceptable for HTTP precondition checks (If-Match, If-None-Match, If-Modified-Since, etc.)
+	})
 	public Optional<BasicHttpException> checkPreconditions(RestResponse response) {
 		assertArgNotNull("response", response);
 		var resTagStr = response.getHeader(ETag.NAME);
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestStartCall.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestStartCall.java
index 6849a94c50..e9df51cea4 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestStartCall.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestStartCall.java
@@ -21,8 +21,6 @@ import static java.lang.annotation.RetentionPolicy.*;
 
 import java.lang.annotation.*;
 
-import org.apache.juneau.http.response.*;
-
 import jakarta.servlet.http.*;
 
 /**
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/auth/ApiKeyAuthFilter.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/auth/ApiKeyAuthFilter.java
index 83151f9942..e621117740 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/auth/ApiKeyAuthFilter.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/auth/ApiKeyAuthFilter.java
@@ -60,6 +60,9 @@ import jakarta.servlet.http.*;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({
+	"java:S1192" // Duplicate string literals are HTTP header names and error message fragments; intentional
+})
 public class ApiKeyAuthFilter extends AuthFilter {
 
 	/** Source of the API-key string. */
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/auth/ApiKeyGuard.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/auth/ApiKeyGuard.java
index 957464e897..696c1de0b4 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/auth/ApiKeyGuard.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/auth/ApiKeyGuard.java
@@ -74,6 +74,9 @@ import org.apache.juneau.rest.guard.*;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({
+	"java:S1192" // Duplicate string literals are HTTP header names and API key parameter names; intentional
+})
 public class ApiKeyGuard extends RestGuard {
 
 	/** WWW-Authenticate response header name (RFC 7235 §4.1). */
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/auth/AuthFilterChain.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/auth/AuthFilterChain.java
index 482c0de846..c0eefd78b4 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/auth/AuthFilterChain.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/auth/AuthFilterChain.java
@@ -193,6 +193,9 @@ public class AuthFilterChain implements Filter {
 	 * See the class-level Javadoc for the full decision flow.
 	 */
 	@Override /* Overridden from Filter */
+	@SuppressWarnings({
+		"java:S3776" // Cognitive complexity acceptable for auth filter chain dispatch
+	})
 	public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain)
 			throws IOException, ServletException {
 		var hreq = (HttpServletRequest) req;
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/auth/BearerTokenAuthFilter.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/auth/BearerTokenAuthFilter.java
index 1d40097add..c218aeed35 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/auth/BearerTokenAuthFilter.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/auth/BearerTokenAuthFilter.java
@@ -61,6 +61,9 @@ import jakarta.servlet.http.*;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({
+	"java:S1192" // Duplicate string literals are HTTP header names and bearer token format strings; intentional
+})
 public class BearerTokenAuthFilter extends AuthFilter {
 
 	private static final String DEFAULT_ROLES_CLAIM = "roles";
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/convention/VersionMixin.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/convention/VersionMixin.java
index e73e9790b3..42526bf42f 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/convention/VersionMixin.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/convention/VersionMixin.java
@@ -136,6 +136,9 @@ import org.apache.juneau.rest.servlet.*;
  */
 // @formatter:off
 @Rest
+@SuppressWarnings({
+	"java:S1192" // Duplicate string literals are REST endpoint paths and content-type values; intentional
+})
 public class VersionMixin extends RestMixin {
 
 	/** Sentinel value returned for entries that the worker couldn't resolve. */
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/convention/VersionProvider.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/convention/VersionProvider.java
index 545d87f114..23c163f345 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/convention/VersionProvider.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/convention/VersionProvider.java
@@ -49,6 +49,9 @@ import org.apache.juneau.rest.*;
  * @since 9.5.0
  */
 // @formatter:off
+@SuppressWarnings({
+	"java:S1192" // Duplicate string literals are version-related property keys; intentional
+})
 public class VersionProvider {
 
 	/** Sentinel value returned for entries that the worker couldn't resolve. */
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/debug/DebugConfig.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/debug/DebugConfig.java
index e062d71242..e56f1694ae 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/debug/DebugConfig.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/debug/DebugConfig.java
@@ -58,7 +58,7 @@ public class DebugConfig {
 		 */
 		protected Builder(BeanStore beanStore) {
 			this.beanStore = beanStore;
-			defaultFormat = beanStore.getBean(BasicTextFormat.class).orElseGet(() -> new BasicTextFormat());
+			defaultFormat = beanStore.getBean(BasicTextFormat.class).orElseGet(BasicTextFormat::new);
 		}
 
 		/**
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/filter/RequestIdFilter.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/filter/RequestIdFilter.java
index 902f12f9e8..bf7315cd4f 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/filter/RequestIdFilter.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/filter/RequestIdFilter.java
@@ -74,6 +74,9 @@ import jakarta.servlet.http.*;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({
+	"java:S1192" // Duplicate string literals are HTTP header names (e.g. X-Request-ID); intentional
+})
 public class RequestIdFilter {
 
 	/** Standard request and response header name for the request id. */
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/guard/RateLimitGuard.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/guard/RateLimitGuard.java
index 01cbbfe32b..14cdde9970 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/guard/RateLimitGuard.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/guard/RateLimitGuard.java
@@ -94,6 +94,9 @@ import org.apache.juneau.rest.*;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({
+	"java:S1192" // Duplicate string literals are HTTP header names and rate-limit response field names; intentional
+})
 public class RateLimitGuard extends RestGuard {
 
 	/** Response header name for the advisory ceiling (tokens per refill window). */
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/openapi/BasicOpenApiProviderSession.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/openapi/BasicOpenApiProviderSession.java
index 305430afb5..ec7fc3a0d3 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/openapi/BasicOpenApiProviderSession.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/openapi/BasicOpenApiProviderSession.java
@@ -50,7 +50,8 @@ import org.apache.juneau.rest.swagger.BasicSwaggerProviderSession;
  * </ul>
  */
 @SuppressWarnings({
-	"java:S115" // Field/constant identifiers mirror OpenAPI/Swagger wire-format keys (camelCase, dollar-prefixed)
+	"java:S115",  // Field/constant identifiers mirror OpenAPI/Swagger wire-format keys (camelCase, dollar-prefixed)
+	"java:S1192"  // Duplicate string literals are OpenAPI wire-format keys used in JSON map construction; intentional
 })
 public class BasicOpenApiProviderSession {
 
@@ -367,6 +368,10 @@ public class BasicOpenApiProviderSession {
 		}
 	}
 
+	@SuppressWarnings({
+		"java:S3776", // Cognitive complexity acceptable for OpenAPI operation transformation logic
+		"java:S6541"  // Brain Method acceptable for OpenAPI operation transformation dispatch
+	})
 	private static Json5Map transformOperation(Json5Map op, List<String> topConsumes, List<String> topProduces) {
 		var newOp = new Json5Map();
 		for (var e : op.entrySet()) {
@@ -446,6 +451,9 @@ public class BasicOpenApiProviderSession {
 		return newOp;
 	}
 
+	@SuppressWarnings({
+		"java:S3776" // Cognitive complexity acceptable for OpenAPI body-parameter to request-body conversion
+	})
 	private static Json5Map bodyParameterToRequestBody(Json5Map p, List<String> consumes) {
 		var rb = new Json5Map();
 		if (p.containsKey(K_description))
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ops/ErrorMixin.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ops/ErrorMixin.java
index eb659e126a..7dc11c42f6 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ops/ErrorMixin.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ops/ErrorMixin.java
@@ -52,5 +52,5 @@ public class ErrorMixin extends RestMixin {
 			"(such as an WWW-Authenticate response header)."
 		}
 	)
-	public void error() {}
+	public void error() { /* intentionally empty — triggers the exception handler for all error conditions */ }
 }
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ops/NavigationMixin.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ops/NavigationMixin.java
index df8bf1cb1b..78d2ec339d 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ops/NavigationMixin.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ops/NavigationMixin.java
@@ -66,7 +66,7 @@ import org.apache.juneau.rest.servlet.*;
 public class NavigationMixin extends RestMixin {
 
 	/** No-arg constructor &mdash; navigation has no configurable state. */
-	public NavigationMixin() {}
+	public NavigationMixin() { /* intentionally empty */ }
 
 	/**
 	 * [GET /] - Get child resources.
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ops/RouteIndexMixin.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ops/RouteIndexMixin.java
index 0bf3be60b7..866165e19b 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ops/RouteIndexMixin.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ops/RouteIndexMixin.java
@@ -131,6 +131,9 @@ import org.apache.juneau.rest.beans.*;
  */
 // @formatter:off
 @Rest
+@SuppressWarnings({
+	"java:S1192" // Duplicate string literals are REST media type strings and path names; intentional
+})
 public class RouteIndexMixin {
 
 	private static final List<Class<? extends Annotation>> REST_OP_ANNOTATIONS = List.of(
@@ -138,7 +141,7 @@ public class RouteIndexMixin {
 		RestPatch.class, RestOptions.class, RestOp.class);
 
 	/** No-arg constructor &mdash; route-index has no configurable state. */
-	public RouteIndexMixin() {}
+	public RouteIndexMixin() { /* intentionally empty */ }
 
 	/**
 	 * [GET /options] &mdash; return the route index as a content-negotiated POJO.
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/LegacyHttpResponseAdapter.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/LegacyHttpResponseAdapter.java
index 94eecadff0..a1ab107458 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/LegacyHttpResponseAdapter.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/LegacyHttpResponseAdapter.java
@@ -39,6 +39,9 @@ import org.apache.juneau.http.response.*;
  * Detection: an object is considered a "legacy HTTP response" if it implements
  * {@code org.apache.http.HttpResponse}. Detection caches the loaded class once per VM.
  */
+@SuppressWarnings({
+	"java:S1192" // Duplicate string literals are HTTP header names and MIME type strings; intentional
+})
 final class LegacyHttpResponseAdapter {
 
 	private static final Class<?> LEGACY_HTTP_RESPONSE = tryLoad("org.apache.http.HttpResponse");
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ProblemDetailsProcessor.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ProblemDetailsProcessor.java
index e1d4e5d21b..c504cf4497 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ProblemDetailsProcessor.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ProblemDetailsProcessor.java
@@ -111,7 +111,8 @@ public class ProblemDetailsProcessor implements ResponseProcessor {
 
 	@Override /* Overridden from ResponseProcessor */
 	@SuppressWarnings({
-		"resource"  // negotiated output stream owned by the response; closed by the container/RestCall
+		"resource",  // negotiated output stream owned by the response; closed by the container/RestCall
+		"java:S3776" // Cognitive complexity acceptable for RFC-9457 problem-details response dispatch
 	})
 	public int process(RestOpSession opSession) throws IOException {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseProcessorList.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseProcessorList.java
index efb4e5267b..f019fb2c10 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseProcessorList.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseProcessorList.java
@@ -155,6 +155,9 @@ public class ResponseProcessorList {
 	 *
 	 * @param builder The builder containing the contents for this list.
 	 */
+	@SuppressWarnings({
+		"java:S3776" // Cognitive complexity acceptable for response-processor list construction and ordering logic
+	})
 	protected ResponseProcessorList(Builder builder) {
 		var bs = builder.beanStore();
 		// Instantiate all entries first.
@@ -168,7 +171,7 @@ public class ResponseProcessorList {
 			if (p instanceof ViewRenderer)
 				viewRenderers.add(p);
 
-		var hasCatchAll = list.stream().anyMatch(p -> p instanceof CatchAllResponseProcessor);
+		var hasCatchAll = list.stream().anyMatch(CatchAllResponseProcessor.class::isInstance);
 
 		if (!viewRenderers.isEmpty() && hasCatchAll) {
 			// Build new list: non-ViewRenderer entries in original order, then insert all
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/RestMixin.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/RestMixin.java
index 82ca7a3f7e..d0d26901d3 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/RestMixin.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/RestMixin.java
@@ -114,6 +114,9 @@ public abstract class RestMixin {
 	 *
 	 * @return The stashed builder, or <jk>null</jk>.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // RestBuilder<?> wildcard return intentional; concrete builder type varies by REST resource class
+	})
 	public RestBuilder<?> getRestBuilder() {
 		return restBuilder;
 	}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/RestResource.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/RestResource.java
index 70fe8d59f9..8a0d089f96 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/RestResource.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/RestResource.java
@@ -73,6 +73,9 @@ public abstract class RestResource {
 	 *
 	 * @return The stashed builder, or <jk>null</jk>.
 	 */
+	@SuppressWarnings({
+		"java:S1452" // RestBuilder<?> wildcard return intentional; concrete builder type varies by REST resource class
+	})
 	public RestBuilder<?> getRestBuilder() {
 		return restBuilder;
 	}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/RestServlet.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/RestServlet.java
index 184ed2a1c7..34c2692a21 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/RestServlet.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/RestServlet.java
@@ -85,7 +85,7 @@ public abstract class RestServlet extends HttpServlet {
 	 * Read non-reflectively by {@link RestContext} during construction so builder-supplied values take precedence
 	 * over {@link Rest @Rest} annotation values.
 	 */
-	RestBuilder<?> restBuilder;
+	transient RestBuilder<?> restBuilder;
 
 	/**
 	 * Default constructor.
@@ -107,6 +107,9 @@ public abstract class RestServlet extends HttpServlet {
 	 * @return The stashed builder, or <jk>null</jk>.
 	 * @since 9.5.0
 	 */
+	@SuppressWarnings({
+		"java:S1452" // RestBuilder<?> wildcard return intentional; concrete builder type varies by REST resource class
+	})
 	public RestBuilder<?> getRestBuilder() {
 		return restBuilder;
 	}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanChannel_Test.java b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanChannel_Test.java
index 519de6d08b..537f88ad6a 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanChannel_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanChannel_Test.java
@@ -190,7 +190,7 @@ class RoundTripBeanChannel_Test extends RoundTripTest_Base {
 		// so that all serializers treat it as a sequence, not a bean.
 		BeanChannel<String> a = new BeanChannel<>() {
 			@Override public Iterator<String> iterator() { return List.of("hello").iterator(); }
-			@Override public void acceptThrows(String item) {}
+			@Override public void acceptThrows(String item) { /* intentionally empty */ }
 		};
 		assertDoesNotThrow(() -> t.getSerializer().serialize(a));
 	}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/annotation/BeanCtorAnnotation_Test.java b/juneau-utest/src/test/java/org/apache/juneau/annotation/BeanCtorAnnotation_Test.java
index 248cc806db..77b9379665 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/annotation/BeanCtorAnnotation_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/annotation/BeanCtorAnnotation_Test.java
@@ -69,7 +69,7 @@ class BeanCtorAnnotation_Test extends TestBase {
 			description={ "a" },
 			properties="c"
 		)
-		public D1() {}
+		public D1() { /* intentionally empty */ }
 	}
 
 	public static class D2 {
@@ -77,7 +77,7 @@ class BeanCtorAnnotation_Test extends TestBase {
 			description={ "a" },
 			properties="c"
 		)
-		public D2() {}
+		public D2() { /* intentionally empty */ }
 	}
 
 	BeanCtor d1, d2;
diff --git a/juneau-utest/src/test/java/org/apache/juneau/bean/jsonschema/JsonSchemaMap_Test.java b/juneau-utest/src/test/java/org/apache/juneau/bean/jsonschema/JsonSchemaMap_Test.java
index e2cc443963..6479d6fdcc 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/bean/jsonschema/JsonSchemaMap_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/bean/jsonschema/JsonSchemaMap_Test.java
@@ -25,7 +25,8 @@ import org.apache.juneau.*;
 import org.junit.jupiter.api.*;
 
 @SuppressWarnings({
-	"removal" // Tests deprecated getId() / setId() for backward compatibility
+	"removal",  // Tests deprecated getId() / setId() for backward compatibility
+	"java:S5778" // assertThrows lambdas with chained calls; intermediate invocations do not throw in practice
 })
 class JsonSchemaMap_Test extends TestBase {
 
@@ -111,7 +112,7 @@ class JsonSchemaMap_Test extends TestBase {
 						throw new java.io.IOException("Simulated IO error");
 					}
 					@Override
-					public void close() {}
+					public void close() { /* intentionally empty */ }
 				};
 			}
 		};
diff --git a/juneau-utest/src/test/java/org/apache/juneau/commons/bean/BeanConfigContext_Test.java b/juneau-utest/src/test/java/org/apache/juneau/commons/bean/BeanConfigContext_Test.java
index 27e445953b..3e387b02f6 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/commons/bean/BeanConfigContext_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/commons/bean/BeanConfigContext_Test.java
@@ -26,6 +26,7 @@ import org.apache.juneau.commons.inject.*;
 import org.apache.juneau.commons.reflect.*;
 import org.junit.jupiter.api.*;
 
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class BeanConfigContext_Test extends TestBase {
 
 	//====================================================================================================
diff --git a/juneau-utest/src/test/java/org/apache/juneau/commons/function/BeanChannel_Test.java b/juneau-utest/src/test/java/org/apache/juneau/commons/function/BeanChannel_Test.java
index ec0661ef0e..a522a822e2 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/commons/function/BeanChannel_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/commons/function/BeanChannel_Test.java
@@ -27,6 +27,7 @@ import org.junit.jupiter.api.*;
  * Unit tests for {@link BeanFactory}, {@link BeanConsumer}, {@link BeanSupplier},
  * {@link BeanChannel}, and {@link ListBeanChannel}.
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class BeanChannel_Test extends TestBase {
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -126,7 +127,7 @@ class BeanChannel_Test extends TestBase {
 	@Test void d02_beanChannel_defaultLifecycleMethods() throws Exception {
 		BeanChannel<String> a = new BeanChannel<>() {
 			@Override public Iterator<String> iterator() { return Collections.emptyIterator(); }
-			@Override public void acceptThrows(String item) {}
+			@Override public void acceptThrows(String item) { /* intentionally empty */ }
 		};
 		// begin and complete are no-ops by default
 		a.begin();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/commons/inject/BasicBeanStore_PushPopOverlay_Test.java b/juneau-utest/src/test/java/org/apache/juneau/commons/inject/BasicBeanStore_PushPopOverlay_Test.java
index 180eb61d9c..2b5897e1b0 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/commons/inject/BasicBeanStore_PushPopOverlay_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/commons/inject/BasicBeanStore_PushPopOverlay_Test.java
@@ -31,6 +31,7 @@ import org.junit.jupiter.api.*;
  * happy-path lookup-shadow-then-restore semantics that the {@code JuneauBeanStoreExtension} Mode OVERLAY
  * machinery depends on.
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class BasicBeanStore_PushPopOverlay_Test extends TestBase {
 
 	//-----------------------------------------------------------------------------------------------------------------
diff --git a/juneau-utest/src/test/java/org/apache/juneau/commons/inject/BasicBeanStore_Test.java b/juneau-utest/src/test/java/org/apache/juneau/commons/inject/BasicBeanStore_Test.java
index 06a1b1a3c4..03d670effa 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/commons/inject/BasicBeanStore_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/commons/inject/BasicBeanStore_Test.java
@@ -1396,7 +1396,7 @@ class BasicBeanStore_Test extends TestBase {
 	}
 
 	static class SimpleNoArgBean {
-		public SimpleNoArgBean() {}
+		public SimpleNoArgBean() { /* intentionally empty */ }
 	}
 
 	@Test
@@ -1553,7 +1553,7 @@ class BasicBeanStore_Test extends TestBase {
 	 */
 	@Configuration
 	public static class Z02_OnMissingNamedConfig {
-		public Z02_OnMissingNamedConfig() {}
+		public Z02_OnMissingNamedConfig() { /* intentionally empty */ }
 		@Bean(name = "secondary")
 		@ConditionalOnMissingBean(name = "primaryName")
 		public TestBean tb() { return new TestBean("conditional"); }
@@ -1578,7 +1578,7 @@ class BasicBeanStore_Test extends TestBase {
 	 */
 	@Configuration
 	public static class Z03_MixedFieldConfig {
-		public Z03_MixedFieldConfig() {}
+		public Z03_MixedFieldConfig() { /* intentionally empty */ }
 		public String nonBeanField = "ignored";
 		@Bean public TestBean tb = new TestBean("z03");
 		@SuppressWarnings("unused") public String helperMethod() { return "not a bean"; }
@@ -1603,13 +1603,13 @@ class BasicBeanStore_Test extends TestBase {
 	 */
 	@Configuration
 	public static class Z04_FirstFieldConfig {
-		public Z04_FirstFieldConfig() {}
+		public Z04_FirstFieldConfig() { /* intentionally empty */ }
 		@Bean(name = "shared") public TestBean tb = new TestBean("first");
 	}
 
 	@Configuration
 	public static class Z04_DuplicateFieldConfig {
-		public Z04_DuplicateFieldConfig() {}
+		public Z04_DuplicateFieldConfig() { /* intentionally empty */ }
 		@Bean(name = "shared") public TestBean tb = new TestBean("second");
 	}
 
diff --git a/juneau-utest/src/test/java/org/apache/juneau/commons/inject/BeanAnnotation_Test.java b/juneau-utest/src/test/java/org/apache/juneau/commons/inject/BeanAnnotation_Test.java
index 6cbf4d3339..17058cc83f 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/commons/inject/BeanAnnotation_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/commons/inject/BeanAnnotation_Test.java
@@ -67,8 +67,8 @@ class BeanAnnotation_Test extends TestBase {
 	}
 
 	public static class A04Target {
-		public void method1() {}
-		public void method2() {}
+		public void method1() { /* intentionally empty */ }
+		public void method2() { /* intentionally empty */ }
 	}
 
 	@Test
diff --git a/juneau-utest/src/test/java/org/apache/juneau/commons/inject/BeanInstantiator_OptionD_Test.java b/juneau-utest/src/test/java/org/apache/juneau/commons/inject/BeanInstantiator_OptionD_Test.java
index 605c00da1a..70b0e11d0a 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/commons/inject/BeanInstantiator_OptionD_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/commons/inject/BeanInstantiator_OptionD_Test.java
@@ -56,7 +56,7 @@ class BeanInstantiator_OptionD_Test extends TestBase {
 	public static class A_Base {
 		static boolean builderUsed;
 		public static Builder create() { return new Builder(); }
-		public A_Base() {}
+		public A_Base() { /* intentionally empty */ }
 		public static class Builder {
 			public A_Base build() { builderUsed = true; return new A_Base(); }
 		}
@@ -92,7 +92,7 @@ class BeanInstantiator_OptionD_Test extends TestBase {
 	public static class C_Base {
 		static boolean factoryUsed;
 		public static <R extends C_Base> DefaultBuilder<R> builder(Class<R> type) { return new DefaultBuilder<>(type); }
-		public C_Base() {}
+		public C_Base() { /* intentionally empty */ }
 		public static class DefaultBuilder<R extends C_Base> {
 			private final Class<R> type;
 			DefaultBuilder(Class<R> type) { this.type = type; }
@@ -125,7 +125,7 @@ class BeanInstantiator_OptionD_Test extends TestBase {
 	//-----------------------------------------------------------------------------------------------------------------
 
 	public static class D_Base {
-		public D_Base() {}
+		public D_Base() { /* intentionally empty */ }
 	}
 
 	public static class D_Sub extends D_Base {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/commons/inject/Conditional_Test.java b/juneau-utest/src/test/java/org/apache/juneau/commons/inject/Conditional_Test.java
index d53b9870ee..b218eed38b 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/commons/inject/Conditional_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/commons/inject/Conditional_Test.java
@@ -42,20 +42,20 @@ class Conditional_Test extends TestBase {
 	//------------------------------------------------------------------------------------------------
 
 	public static class SvcA { public final String tag; public SvcA(String tag) { this.tag = tag; } }
-	public static class SvcB { public SvcB() {} }
+	public static class SvcB { public SvcB() { /* intentionally empty */ } }
 
 	public static class AlwaysTrue implements Condition {
-		public AlwaysTrue() {}
+		public AlwaysTrue() { /* intentionally empty */ }
 		@Override public boolean matches(ConditionContext ctx) { return true; }
 	}
 
 	public static class AlwaysFalse implements Condition {
-		public AlwaysFalse() {}
+		public AlwaysFalse() { /* intentionally empty */ }
 		@Override public boolean matches(ConditionContext ctx) { return false; }
 	}
 
 	public static class HasBeanProperty implements Condition {
-		public HasBeanProperty() {}
+		public HasBeanProperty() { /* intentionally empty */ }
 		@Override public boolean matches(ConditionContext ctx) {
 			return ctx.settings().get("conditional.test.enabled").isPresent();
 		}
@@ -69,7 +69,7 @@ class Conditional_Test extends TestBase {
 	 * {@link HasBeanProperty}).
 	 */
 	public static class FullContextSnapshot implements Condition {
-		public FullContextSnapshot() {}
+		public FullContextSnapshot() { /* intentionally empty */ }
 		@Override public boolean matches(ConditionContext ctx) {
 			return ctx.beanStore() != null
 				&& ctx.classLoader() != null
@@ -81,32 +81,32 @@ class Conditional_Test extends TestBase {
 	@Configuration
 	@Conditional(FullContextSnapshot.class)
 	public static class FullContextGatedConfig {
-		public FullContextGatedConfig() {}
+		public FullContextGatedConfig() { /* intentionally empty */ }
 		@Bean public SvcA svcA() { return new SvcA("full-context"); }
 	}
 
 	@Configuration
 	public static class ClassLevelTrueConfig {
-		public ClassLevelTrueConfig() {}
+		public ClassLevelTrueConfig() { /* intentionally empty */ }
 		@Bean public SvcA svcA() { return new SvcA("class-level-true"); }
 	}
 
 	@Configuration
 	@Conditional(AlwaysFalse.class)
 	public static class ClassLevelFalseConfig {
-		public ClassLevelFalseConfig() {}
+		public ClassLevelFalseConfig() { /* intentionally empty */ }
 		@Bean public SvcA svcA() { return new SvcA("class-level-false"); }
 	}
 
 	@Configuration(imports = { ClassLevelFalseConfig.class })
 	public static class ImporterOfFalse {
-		public ImporterOfFalse() {}
+		public ImporterOfFalse() { /* intentionally empty */ }
 		@Bean public SvcB svcB() { return new SvcB(); }
 	}
 
 	@Configuration
 	public static class MemberLevelConfig {
-		public MemberLevelConfig() {}
+		public MemberLevelConfig() { /* intentionally empty */ }
 		@Bean @Conditional(AlwaysTrue.class) public SvcA enabled() { return new SvcA("enabled"); }
 		@Bean @Conditional(AlwaysFalse.class) public SvcB disabled() { return new SvcB(); }
 	}
@@ -119,7 +119,7 @@ class Conditional_Test extends TestBase {
 	 */
 	@Configuration
 	public static class FieldConditionalConfig {
-		public FieldConditionalConfig() {}
+		public FieldConditionalConfig() { /* intentionally empty */ }
 		@Bean(name = "enabled") @Conditional(AlwaysTrue.class) public SvcA enabledField = new SvcA("enabled-field");
 		@Bean(name = "disabled") @Conditional(AlwaysFalse.class) public SvcA disabledField = new SvcA("disabled-field");
 		@Bean(name = "second") public SvcA secondField = new SvcA("second-field");
@@ -127,14 +127,14 @@ class Conditional_Test extends TestBase {
 
 	@Configuration
 	public static class OnClassConfig {
-		public OnClassConfig() {}
+		public OnClassConfig() { /* intentionally empty */ }
 		@Bean @ConditionalOnClass("java.lang.String") public SvcA presentBean() { return new SvcA("present"); }
 		@Bean @ConditionalOnClass("definitely.does.not.Exist") public SvcB absentBean() { return new SvcB(); }
 	}
 
 	@Configuration
 	public static class OnMissingBeanConfig {
-		public OnMissingBeanConfig() {}
+		public OnMissingBeanConfig() { /* intentionally empty */ }
 		@Bean(name = "second") @ConditionalOnMissingBean(SvcA.class) public SvcA conditional() {
 			return new SvcA("conditional");
 		}
@@ -142,7 +142,7 @@ class Conditional_Test extends TestBase {
 
 	@Configuration
 	public static class OnMissingBeanNamedConfig {
-		public OnMissingBeanNamedConfig() {}
+		public OnMissingBeanNamedConfig() { /* intentionally empty */ }
 		// type=Object.class signals "match by bean name only". The conditional bean is skipped if a
 		// bean of any type already exists under "primaryName" in the local store.
 		@Bean(name = "secondary")
@@ -152,7 +152,7 @@ class Conditional_Test extends TestBase {
 
 	@Configuration
 	public static class OnPropertyConfig {
-		public OnPropertyConfig() {}
+		public OnPropertyConfig() { /* intentionally empty */ }
 		@Bean @ConditionalOnProperty(name = "conditional.test.enabled") public SvcA enabled() {
 			return new SvcA("enabled");
 		}
@@ -163,7 +163,7 @@ class Conditional_Test extends TestBase {
 
 	@Configuration
 	public static class OnPropertyHavingValueConfig {
-		public OnPropertyHavingValueConfig() {}
+		public OnPropertyHavingValueConfig() { /* intentionally empty */ }
 		// Property must equal "expected" — when it's present but different, registration is skipped.
 		@Bean @ConditionalOnProperty(name = "conditional.test.matchedValue", havingValue = "expected")
 		public SvcA matched() { return new SvcA("matched"); }
@@ -171,7 +171,7 @@ class Conditional_Test extends TestBase {
 
 	@Configuration
 	public static class CustomConditionalConfig {
-		public CustomConditionalConfig() {}
+		public CustomConditionalConfig() { /* intentionally empty */ }
 		@Bean @Conditional(HasBeanProperty.class) public SvcA gated() { return new SvcA("gated"); }
 	}
 
@@ -400,7 +400,7 @@ class Conditional_Test extends TestBase {
 	@org.apache.juneau.commons.inject.Configuration
 	@ConditionalOnClass("definitely.does.not.Exist")
 	public static class ClassLevelOnClassMissingConfig {
-		public ClassLevelOnClassMissingConfig() {}
+		public ClassLevelOnClassMissingConfig() { /* intentionally empty */ }
 		@Bean public SvcA svcA() { return new SvcA("never"); }
 	}
 
diff --git a/juneau-utest/src/test/java/org/apache/juneau/commons/inject/Lifecycle_Test.java b/juneau-utest/src/test/java/org/apache/juneau/commons/inject/Lifecycle_Test.java
index d2c2a0fbcc..cf7c20cf07 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/commons/inject/Lifecycle_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/commons/inject/Lifecycle_Test.java
@@ -46,7 +46,7 @@ class Lifecycle_Test extends TestBase {
 
 	public static class PostConstructBean {
 		public boolean postConstructCalled;
-		public PostConstructBean() {}
+		public PostConstructBean() { /* intentionally empty */ }
 		@PostConstruct public void init() { postConstructCalled = true; }
 	}
 
diff --git a/juneau-utest/src/test/java/org/apache/juneau/commons/inject/PrimaryAndOrder_Test.java b/juneau-utest/src/test/java/org/apache/juneau/commons/inject/PrimaryAndOrder_Test.java
index a1024b5700..f9aa98c25e 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/commons/inject/PrimaryAndOrder_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/commons/inject/PrimaryAndOrder_Test.java
@@ -44,7 +44,7 @@ class PrimaryAndOrder_Test extends TestBase {
 
 	@Configuration
 	public static class SinglePrimaryConfig {
-		public SinglePrimaryConfig() {}
+		public SinglePrimaryConfig() { /* intentionally empty */ }
 		@Bean(name = "a") public Plugin a() { return new Plugin("a"); }
 		@Bean(name = "b") @Primary public Plugin b() { return new Plugin("b"); }
 		@Bean(name = "c") public Plugin c() { return new Plugin("c"); }
@@ -52,14 +52,14 @@ class PrimaryAndOrder_Test extends TestBase {
 
 	@Configuration
 	public static class MultiplePrimaryConfig {
-		public MultiplePrimaryConfig() {}
+		public MultiplePrimaryConfig() { /* intentionally empty */ }
 		@Bean(name = "a") @Primary public Plugin a() { return new Plugin("a"); }
 		@Bean(name = "b") @Primary public Plugin b() { return new Plugin("b"); }
 	}
 
 	@Configuration
 	public static class OrderedConfig {
-		public OrderedConfig() {}
+		public OrderedConfig() { /* intentionally empty */ }
 		@Bean(name = "low") @Order(10) public Plugin low() { return new Plugin("low"); }
 		@Bean(name = "high") @Order(1) public Plugin high() { return new Plugin("high"); }
 		@Bean(name = "mid") @Order(5) public Plugin mid() { return new Plugin("mid"); }
@@ -67,7 +67,7 @@ class PrimaryAndOrder_Test extends TestBase {
 
 	@Configuration
 	public static class PriorityConfig {
-		public PriorityConfig() {}
+		public PriorityConfig() { /* intentionally empty */ }
 		@Bean(name = "alpha", priority = 100) public Plugin alpha() { return new Plugin("alpha"); }
 		@Bean(name = "beta", priority = 50) public Plugin beta() { return new Plugin("beta"); }
 		@Bean(name = "gamma", priority = 75) public Plugin gamma() { return new Plugin("gamma"); }
@@ -75,7 +75,7 @@ class PrimaryAndOrder_Test extends TestBase {
 
 	@Configuration
 	public static class OrderWinsOverPriorityConfig {
-		public OrderWinsOverPriorityConfig() {}
+		public OrderWinsOverPriorityConfig() { /* intentionally empty */ }
 		@Bean(name = "x", priority = 1) @Order(100) public Plugin x() { return new Plugin("x"); }
 		@Bean(name = "y", priority = 100) @Order(1) public Plugin y() { return new Plugin("y"); }
 	}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/commons/inject/Value_SupplierTypedFieldType_Test.java b/juneau-utest/src/test/java/org/apache/juneau/commons/inject/Value_SupplierTypedFieldType_Test.java
index f02e138a1c..03103333b0 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/commons/inject/Value_SupplierTypedFieldType_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/commons/inject/Value_SupplierTypedFieldType_Test.java
@@ -42,6 +42,7 @@ import org.junit.jupiter.api.*;
  * 	<li>{@code Optional<Supplier<T>>} nesting is not specially handled.
  * </ul>
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class Value_SupplierTypedFieldType_Test extends TestBase {
 
 	private static final String P_KEY = "Value_SupplierTypedFieldType_Test.key";
diff --git a/juneau-utest/src/test/java/org/apache/juneau/commons/runtime/Args_Test.java b/juneau-utest/src/test/java/org/apache/juneau/commons/runtime/Args_Test.java
index ddec850353..e9c95266ed 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/commons/runtime/Args_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/commons/runtime/Args_Test.java
@@ -23,7 +23,8 @@ import org.apache.juneau.*;
 import org.junit.jupiter.api.*;
 
 @SuppressWarnings({
-	"java:S5961" // High assertion count acceptable in comprehensive test
+	"java:S5961", // High assertion count acceptable in comprehensive test
+	"java:S5778"  // assertThrows lambdas with chained calls; intermediate invocations do not throw in practice
 })
 class Args_Test extends TestBase {
 
diff --git a/juneau-utest/src/test/java/org/apache/juneau/commons/svl/ArgCoercer_Test.java b/juneau-utest/src/test/java/org/apache/juneau/commons/svl/ArgCoercer_Test.java
index bc0f58be4d..b8e3b5af98 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/commons/svl/ArgCoercer_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/commons/svl/ArgCoercer_Test.java
@@ -30,6 +30,7 @@ import org.junit.jupiter.api.*;
  * Drives {@link ArgCoercer} indirectly through {@link TypedFunction} subclasses so the integration
  * path (function dispatch → coercion → typed invoke) is exercised end-to-end.
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class ArgCoercer_Test extends TestBase {
 
 	public static class IntFn extends TypedFunction {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/commons/svl/VarFunction_Test.java b/juneau-utest/src/test/java/org/apache/juneau/commons/svl/VarFunction_Test.java
index cbab7881ef..25ba783ff2 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/commons/svl/VarFunction_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/commons/svl/VarFunction_Test.java
@@ -27,6 +27,7 @@ import org.junit.jupiter.api.*;
  * Tests the {@link VarFunction} SPI + {@link TypedFunction} reflection-based dispatch +
  * builder registration + lazy-fail for unknown functions.
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class VarFunction_Test extends TestBase {
 
 	/** Simple typed-function: upper-case its single string arg. */
diff --git a/juneau-utest/src/test/java/org/apache/juneau/config/Config_Test.java b/juneau-utest/src/test/java/org/apache/juneau/config/Config_Test.java
index 1b440a6db3..636df27aa9 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/config/Config_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/config/Config_Test.java
@@ -40,7 +40,8 @@ import org.junit.jupiter.api.*;
 
 @SuppressWarnings({
 	"rawtypes", // Raw types used for generic testing scenarios
-	"unchecked" // Cast from Object to List/Map in config tests
+	"unchecked",  // Cast from Object to List/Map in config tests
+	"java:S5778"  // assertThrows lambdas with chained calls; intermediate invocations do not throw in practice
 })
 class Config_Test extends TestBase {
 
diff --git a/juneau-utest/src/test/java/org/apache/juneau/encoders/EncoderSet_Test.java b/juneau-utest/src/test/java/org/apache/juneau/encoders/EncoderSet_Test.java
index fbbd0cc8fa..9908255f23 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/encoders/EncoderSet_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/encoders/EncoderSet_Test.java
@@ -24,6 +24,7 @@ import org.apache.juneau.*;
 import org.apache.juneau.commons.inject.*;
 import org.junit.jupiter.api.*;
 
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class EncoderSet_Test extends TestBase {
 
 	//====================================================================================================
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/Http_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/Http_Test.java
index 789a45b25b..556f4baab2 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/Http_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/Http_Test.java
@@ -36,6 +36,7 @@ import org.junit.jupiter.api.*;
 /**
  * Unit tests for all http classes: headers, parts, bodies, response, and static factory helpers.
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 public class Http_Test {
 
 	// ------------------------------------------------------------------------------------------------------------------
diff --git a/juneau-utest/src/test/java/org/apache/juneau/jena/RdfParser_Test.java b/juneau-utest/src/test/java/org/apache/juneau/jena/RdfParser_Test.java
index dbc286f5a6..428ea0d225 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/jena/RdfParser_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/jena/RdfParser_Test.java
@@ -29,6 +29,7 @@ import org.junit.jupiter.api.*;
 import org.junit.jupiter.api.Nested;
 import org.apache.juneau.commons.bean.*;
 
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class RdfParser_Test extends TestBase {
 
 	public static class NamedBean {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/junit/bct/BasicBeanConverter_Test.java b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/BasicBeanConverter_Test.java
index 4f1e5111b8..3112a5d6bf 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/junit/bct/BasicBeanConverter_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/BasicBeanConverter_Test.java
@@ -37,6 +37,7 @@ import org.junit.jupiter.api.*;
  * Unit tests for BasicBeanConverter.
  */
 @DisplayName("BasicBeanConverter")
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class BasicBeanConverter_Test extends TestBase {
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -410,7 +411,7 @@ class BasicBeanConverter_Test extends TestBase {
 	}
 
 	public static class NoSizeAtAll {
-		public NoSizeAtAll() {}
+		public NoSizeAtAll() { /* intentionally empty */ }
 		public String name() { return "test"; }
 		public String name(String prefix) { return prefix + "test"; }
 	}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/junit5/JuneauBeanStoreExtension_Test.java b/juneau-utest/src/test/java/org/apache/juneau/junit5/JuneauBeanStoreExtension_Test.java
index 9b7ac00333..44d35881f2 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/junit5/JuneauBeanStoreExtension_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/junit5/JuneauBeanStoreExtension_Test.java
@@ -38,6 +38,7 @@ import org.junit.jupiter.api.extension.*;
  * spawning a nested JUnit launcher.
  */
 @ExtendWith(JuneauBeanStoreExtension.class)
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class JuneauBeanStoreExtension_Test extends TestBase {
 
 	//-----------------------------------------------------------------------------------------------------------------
diff --git a/juneau-utest/src/test/java/org/apache/juneau/junit5/testsupport/StubExtensionContext.java b/juneau-utest/src/test/java/org/apache/juneau/junit5/testsupport/StubExtensionContext.java
index 79204132d1..9e22464d91 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/junit5/testsupport/StubExtensionContext.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/junit5/testsupport/StubExtensionContext.java
@@ -171,10 +171,10 @@ public final class StubExtensionContext {
 					}
 					if (args.length == 2) {
 						var fn = (Function) args[1];
-						return backing.computeIfAbsent(args[0], k -> fn.apply(k));
+						return backing.computeIfAbsent(args[0], fn::apply);
 					}
 					var fn2 = (Function) args[1];
-					var typed = backing.computeIfAbsent(args[0], k -> fn2.apply(k));
+					var typed = backing.computeIfAbsent(args[0], fn2::apply);
 					return ((Class<?>) args[2]).cast(typed);
 				case "equals":
 					return proxy == args[0];
diff --git a/juneau-utest/src/test/java/org/apache/juneau/microservice/BootTimeBenchmark.java b/juneau-utest/src/test/java/org/apache/juneau/microservice/BootTimeBenchmark.java
index 11e9645790..72964a16e9 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/microservice/BootTimeBenchmark.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/microservice/BootTimeBenchmark.java
@@ -194,7 +194,7 @@ public class BootTimeBenchmark {
 	}
 
 	private static double warmMedian(Sample[] s) {
-		return median(warmValues(s, x -> x.totalMs()));
+		return median(warmValues(s, Sample::totalMs));
 	}
 
 	private static double warmMedian(Sample[] s, boolean build) {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/microservice/Microservice_Builder_Test.java b/juneau-utest/src/test/java/org/apache/juneau/microservice/Microservice_Builder_Test.java
index c16960cdd9..18b9b44c97 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/microservice/Microservice_Builder_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/microservice/Microservice_Builder_Test.java
@@ -32,6 +32,7 @@ import org.junit.jupiter.api.*;
  * Tests for {@link Microservice.Builder} methods.
  */
 @org.apache.juneau.testing.annotations.JettyMicroserviceTest
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class Microservice_Builder_Test extends TestBase {
 
 	@Test void a01_create() {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/parser/ParserSet_Test.java b/juneau-utest/src/test/java/org/apache/juneau/parser/ParserSet_Test.java
index 6fb23875b7..a3b6c2fb8b 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/parser/ParserSet_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/parser/ParserSet_Test.java
@@ -25,6 +25,7 @@ import org.apache.juneau.commons.inject.*;
 import org.apache.juneau.json.*;
 import org.junit.jupiter.api.*;
 
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class ParserSet_Test extends TestBase {
 
 	//====================================================================================================
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/RestOpContext_HttpMethodResolution_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/RestOpContext_HttpMethodResolution_Test.java
index afe7efa258..549ebe6892 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/RestOpContext_HttpMethodResolution_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/RestOpContext_HttpMethodResolution_Test.java
@@ -54,10 +54,10 @@ class RestOpContext_HttpMethodResolution_Test extends TestBase {
 	@Rest
 	public static class A {
 		@RestPatch
-		public void doPatch() {}
+		public void doPatch() { /* intentionally empty */ }
 
 		@RestOptions
-		public void doOptions() {}
+		public void doOptions() { /* intentionally empty */ }
 	}
 
 	@Test void a01_restPatch_yieldsPATCH() throws Exception {
@@ -73,13 +73,13 @@ class RestOpContext_HttpMethodResolution_Test extends TestBase {
 	@Rest
 	public static class B {
 		@RestOp(method = "head")
-		public void someName() {}
+		public void someName() { /* intentionally empty */ }
 
 		@RestOp("trace /x")
-		public void valueWithSpace() {}
+		public void valueWithSpace() { /* intentionally empty */ }
 
 		@RestOp("connect")
-		public void valueNoSpace() {}
+		public void valueNoSpace() { /* intentionally empty */ }
 	}
 
 	@Test void b01_restOpMethodAttribute_explicitVerb() throws Exception {
@@ -101,11 +101,11 @@ class RestOpContext_HttpMethodResolution_Test extends TestBase {
 	public static class C {
 		// "METHOD" wildcard literal must be normalized to "*".
 		@RestOp(method = "method")
-		public void wildcardVerb() {}
+		public void wildcardVerb() { /* intentionally empty */ }
 
 		// No verb anywhere; falls back to detectHttpMethod() which picks up the "doGet"-style prefix.
 		@RestOp(path = "/x")
-		public void doGet() {}
+		public void doGet() { /* intentionally empty */ }
 	}
 
 	@Test void c01_methodLiteral_normalizesToWildcard() throws Exception {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/RestOpContext_OpLevelOverrides_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/RestOpContext_OpLevelOverrides_Test.java
index 1e5f3ba503..7df587a2d0 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/RestOpContext_OpLevelOverrides_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/RestOpContext_OpLevelOverrides_Test.java
@@ -53,7 +53,7 @@ class RestOpContext_OpLevelOverrides_Test extends TestBase {
 	@Rest(defaultCharset = "UTF-8")
 	public static class A {
 		@RestGet(defaultCharset = "ISO-8859-1")
-		public void get() {}
+		public void get() { /* intentionally empty */ }
 	}
 
 	@Test void a01_opLevelDefaultCharset_overridesClassLevel() throws Exception {
@@ -65,7 +65,7 @@ class RestOpContext_OpLevelOverrides_Test extends TestBase {
 	@Rest(maxInput = "1M")
 	public static class B {
 		@RestOp(method = "get", maxInput = "9M")
-		public void get() {}
+		public void get() { /* intentionally empty */ }
 	}
 
 	@Test void b01_opLevelMaxInput_overridesClassLevel() throws Exception {
@@ -77,7 +77,7 @@ class RestOpContext_OpLevelOverrides_Test extends TestBase {
 	@Rest
 	public static class C {
 		@RestGet(debug="true")
-		public void get() {}
+		public void get() { /* intentionally empty */ }
 	}
 
 	@Test void c01_opLevelDebug_buildsSuccessfully() throws Exception {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/RestResponse_EtagHelpers_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/RestResponse_EtagHelpers_Test.java
index 3d19684f00..40c4125d09 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/RestResponse_EtagHelpers_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/RestResponse_EtagHelpers_Test.java
@@ -30,6 +30,7 @@ import org.junit.jupiter.api.*;
  * Tests for the conditional-GET response helpers on {@link RestResponse}:
  * {@code eTag(...)}, {@code lastModified(...)}, and {@code cacheControl(...)}.
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class RestResponse_EtagHelpers_Test extends TestBase {
 
 	//-----------------------------------------------------------------------------------------------------------------
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/VirtualThreadDispatch_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/VirtualThreadDispatch_Test.java
index 5a366a8a38..6c8717e137 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/VirtualThreadDispatch_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/VirtualThreadDispatch_Test.java
@@ -142,8 +142,8 @@ class VirtualThreadDispatch_Test extends TestBase {
 				if (r.getLevel() == Level.WARNING)
 					captured.append(r.getMessage());
 			}
-			@Override public void flush() {}
-			@Override public void close() {}
+			@Override public void flush() { /* intentionally empty */ }
+			@Override public void close() { /* intentionally empty */ }
 		};
 		logger.addHandler(handler);
 		try {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/ApiKeyAuthFilter_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/ApiKeyAuthFilter_Test.java
index f12889d00b..67058502cb 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/ApiKeyAuthFilter_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/ApiKeyAuthFilter_Test.java
@@ -33,6 +33,7 @@ import jakarta.servlet.http.*;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class ApiKeyAuthFilter_Test extends TestBase {
 
 	private static final Principal ALICE = () -> "alice";
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/ApiKeyGuard_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/ApiKeyGuard_Test.java
index c5634ada90..481cb820cb 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/ApiKeyGuard_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/ApiKeyGuard_Test.java
@@ -34,6 +34,7 @@ import org.junit.jupiter.api.*;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class ApiKeyGuard_Test extends TestBase {
 
 	// -----------------------------------------------------------------------------------------
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/AuthResult_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/AuthResult_Test.java
index 0016c9d8ed..af3e4b5175 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/AuthResult_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/AuthResult_Test.java
@@ -29,6 +29,7 @@ import org.junit.jupiter.api.*;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class AuthResult_Test extends TestBase {
 
 	private static final Principal ALICE = () -> "alice";
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/BearerTokenAuthFilter_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/BearerTokenAuthFilter_Test.java
index e76ea54e0c..f8336fc9f9 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/BearerTokenAuthFilter_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/BearerTokenAuthFilter_Test.java
@@ -33,6 +33,7 @@ import jakarta.servlet.http.*;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class BearerTokenAuthFilter_Test extends TestBase {
 
 	private static final Principal ALICE = () -> "alice";
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/BearerTokenGuard_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/BearerTokenGuard_Test.java
index 947a693b81..f6ed0d0f3c 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/BearerTokenGuard_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/BearerTokenGuard_Test.java
@@ -33,6 +33,7 @@ import org.junit.jupiter.api.*;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class BearerTokenGuard_Test extends TestBase {
 
 	// -----------------------------------------------------------------------------------------
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/ClaimsPrincipal_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/ClaimsPrincipal_Test.java
index 18480a3665..32776b6be0 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/ClaimsPrincipal_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/ClaimsPrincipal_Test.java
@@ -27,6 +27,7 @@ import org.junit.jupiter.api.*;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class ClaimsPrincipal_Test extends TestBase {
 
 	@Test void a01_nameAndClaims() {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/jwt/JwtTokenValidator_Builder_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/jwt/JwtTokenValidator_Builder_Test.java
index 5c1e776c2c..9bdaae926b 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/jwt/JwtTokenValidator_Builder_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/jwt/JwtTokenValidator_Builder_Test.java
@@ -34,6 +34,7 @@ import com.nimbusds.jose.*;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class JwtTokenValidator_Builder_Test extends TestBase {
 
 	// -----------------------------------------------------------------------------------------
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/jwt/JwtTokenValidator_Security_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/jwt/JwtTokenValidator_Security_Test.java
index dfa938f2da..b0c930dd8f 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/jwt/JwtTokenValidator_Security_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/jwt/JwtTokenValidator_Security_Test.java
@@ -33,6 +33,7 @@ import com.nimbusds.jose.*;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class JwtTokenValidator_Security_Test extends TestBase {
 
 	private static final Clock CLOCK = Clock.fixed(Instant.parse("2026-01-01T00:00:00Z"), ZoneOffset.UTC);
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/oauth/BoundedLruTokenCache_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/oauth/BoundedLruTokenCache_Test.java
index f5db3945f1..d5325ba380 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/oauth/BoundedLruTokenCache_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/oauth/BoundedLruTokenCache_Test.java
@@ -31,6 +31,7 @@ import org.junit.jupiter.api.Test;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class BoundedLruTokenCache_Test extends TestBase {
 
 	private static final Principal ALICE = () -> "alice";
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/oauth/OAuthFilter_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/oauth/OAuthFilter_Test.java
index 38f50453b9..fc37c4cfa0 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/oauth/OAuthFilter_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/oauth/OAuthFilter_Test.java
@@ -34,6 +34,7 @@ import jakarta.servlet.http.HttpServletRequest;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class OAuthFilter_Test extends TestBase {
 
 	private static final Principal ALICE = () -> "alice";
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/oauth/OAuthFlowBuilder_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/oauth/OAuthFlowBuilder_Test.java
index 21d921ab60..4847417ef2 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/oauth/OAuthFlowBuilder_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/oauth/OAuthFlowBuilder_Test.java
@@ -32,6 +32,7 @@ import com.nimbusds.oauth2.sdk.pkce.*;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class OAuthFlowBuilder_Test extends TestBase {
 
 	@Test void a01_clientCredentials_requiredFields() {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/oauth/OAuthIntrospectionValidator_Builder_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/oauth/OAuthIntrospectionValidator_Builder_Test.java
index 36222ae34d..28c8f8174c 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/oauth/OAuthIntrospectionValidator_Builder_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/oauth/OAuthIntrospectionValidator_Builder_Test.java
@@ -29,6 +29,7 @@ import org.junit.jupiter.api.Test;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class OAuthIntrospectionValidator_Builder_Test extends TestBase {
 
 	private static OAuthIntrospectionValidator.Builder fresh() {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/oauth/OAuthToken_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/oauth/OAuthToken_Test.java
index 166a953369..146aae1bf1 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/oauth/OAuthToken_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/oauth/OAuthToken_Test.java
@@ -29,6 +29,7 @@ import org.junit.jupiter.api.Test;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class OAuthToken_Test extends TestBase {
 
 	@Test void a01_construct_happyPath() {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/oauth/OidcDiscoveryClient_Builder_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/oauth/OidcDiscoveryClient_Builder_Test.java
index b5a47f2b7b..46426768c5 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/oauth/OidcDiscoveryClient_Builder_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/oauth/OidcDiscoveryClient_Builder_Test.java
@@ -30,6 +30,7 @@ import org.junit.jupiter.api.Test;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class OidcDiscoveryClient_Builder_Test extends TestBase {
 
 	@Test void a01_requireIssuer() {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/oidc/rp/EphemeralStore_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/oidc/rp/EphemeralStore_Test.java
index e7ac5a37e9..e9360d864d 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/oidc/rp/EphemeralStore_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/oidc/rp/EphemeralStore_Test.java
@@ -28,6 +28,7 @@ import org.junit.jupiter.api.Test;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class EphemeralStore_Test extends TestBase {
 
 	private static EphemeralStore store(Clock clock) {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/oidc/rp/IdTokenValidatorAdapter_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/oidc/rp/IdTokenValidatorAdapter_Test.java
index 5f49576d15..eeffb90503 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/oidc/rp/IdTokenValidatorAdapter_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/oidc/rp/IdTokenValidatorAdapter_Test.java
@@ -33,6 +33,7 @@ import com.nimbusds.jose.jwk.RSAKey;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class IdTokenValidatorAdapter_Test extends TestBase {
 
 	private static final String ISS = "https://stub-idp.example.com";
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/oidc/rp/SignedCookieSessionStore_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/oidc/rp/SignedCookieSessionStore_Test.java
index c539bb26cc..5652cb7385 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/oidc/rp/SignedCookieSessionStore_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/oidc/rp/SignedCookieSessionStore_Test.java
@@ -31,6 +31,7 @@ import org.junit.jupiter.api.Test;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class SignedCookieSessionStore_Test extends TestBase {
 
 	private static final String KEY = "0123456789abcdef0123456789abcdef";  // 32 bytes
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/saml/SamlAssertionValidator_Builder_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/saml/SamlAssertionValidator_Builder_Test.java
index c3692c6cf4..f6aa5aac3d 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/saml/SamlAssertionValidator_Builder_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/saml/SamlAssertionValidator_Builder_Test.java
@@ -31,6 +31,7 @@ import org.opensaml.xmlsec.signature.support.SignatureConstants;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class SamlAssertionValidator_Builder_Test extends TestBase {
 
 	private static BasicCredential dummyCredential() throws Exception {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/saml/SamlAuthFilter_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/saml/SamlAuthFilter_Test.java
index f6ae5665e3..3d18b84d56 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/auth/saml/SamlAuthFilter_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/auth/saml/SamlAuthFilter_Test.java
@@ -37,6 +37,7 @@ import jakarta.servlet.http.HttpServletRequest;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class SamlAuthFilter_Test extends TestBase {
 
 	private static SamlAssertionValidator validator(java.util.function.Function<String,java.security.Principal> impl) throws Exception {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RemoteClient_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RemoteClient_Test.java
index c8711ea950..8e2c637bb3 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RemoteClient_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RemoteClient_Test.java
@@ -634,8 +634,8 @@ public class RemoteClient_Test {
 		try (var client = RestClient.builder().transport(MockHttpTransport.of(200, "ok")).rootUrl("http://x.com").build()) {
 			var svc = client.remote(B01_ItemService.class);
 			// These invoke Object.class methods directly on the handler — should not throw
-			assertDoesNotThrow(() -> svc.toString());
-			assertDoesNotThrow(() -> svc.hashCode());
+			assertDoesNotThrow(svc::toString);
+			assertDoesNotThrow(svc::hashCode);
 			assertDoesNotThrow(() -> svc.equals(svc));
 		}
 	}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClientFeatures_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClientFeatures_Test.java
index 16c41e3812..232eaf9920 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClientFeatures_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClientFeatures_Test.java
@@ -32,6 +32,7 @@ import org.junit.jupiter.api.*;
  * Tests for RestCallInterceptor, RestLogger, RestLogEntry, RestLogLevelResolver,
  * BasicRestLogger, BodyConverter, and related RestClient features.
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 public class RestClientFeatures_Test {
 
 	// =================================================================================================================
@@ -1011,7 +1012,7 @@ public class RestClientFeatures_Test {
 			var body = new HttpBody() {
 				@Override public String getContentType() { return null; }
 				@Override public long getContentLength() { return 0; }
-				@Override public void writeTo(java.io.OutputStream out) {}
+				@Override public void writeTo(java.io.OutputStream out) { /* intentionally empty */ }
 				@Override public boolean isRepeatable() { return true; }
 			};
 			return TransportBody.of(body);
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Test.java
index 24a51448f3..8c73f91a88 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Test.java
@@ -31,6 +31,7 @@ import org.junit.jupiter.api.*;
 /**
  * First end-to-end tests for the next-generation REST client using {@link MockHttpTransport}.
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 public class RestClient_Test {
 
 	// =================================================================================================================
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/docs/BasicApiDocs_Springboot_MultiOpenApiProvider_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/docs/BasicApiDocs_Springboot_MultiOpenApiProvider_Test.java
index 28f7deb62a..604d1ee0d8 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/docs/BasicApiDocs_Springboot_MultiOpenApiProvider_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/docs/BasicApiDocs_Springboot_MultiOpenApiProvider_Test.java
@@ -69,6 +69,7 @@ import org.springframework.context.annotation.*;
  * @since 9.5.0
  */
 @org.apache.juneau.testing.annotations.SpringbootTest
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class BasicApiDocs_Springboot_MultiOpenApiProvider_Test {
 
 	/** Spring Boot app config with two {@link OpenApiProvider} beans, one {@code @Primary}. */
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/filter/RequestIdFilter_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/filter/RequestIdFilter_Test.java
index 5ed8683133..45b62c9d79 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/filter/RequestIdFilter_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/filter/RequestIdFilter_Test.java
@@ -27,6 +27,7 @@ import org.junit.jupiter.api.*;
 
 import jakarta.servlet.http.*;
 
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class RequestIdFilter_Test extends TestBase {
 
 	@Rest
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/guard/RateLimitGuard_Snapshot_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/guard/RateLimitGuard_Snapshot_Test.java
index 8874afd58b..f55bb67c50 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/guard/RateLimitGuard_Snapshot_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/guard/RateLimitGuard_Snapshot_Test.java
@@ -31,6 +31,7 @@ import org.junit.jupiter.api.*;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class RateLimitGuard_Snapshot_Test extends TestBase {
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -124,7 +125,7 @@ class RateLimitGuard_Snapshot_Test extends TestBase {
 		@Override public Storage.AcquireResult tryAcquire(String key, int capacity, double permitsPerSecond) {
 			return new Storage.AcquireResult(true, capacity - 1, 0L);
 		}
-		@Override public void evict(Duration ttl) {}
+		@Override public void evict(Duration ttl) { /* intentionally empty */ }
 	}
 
 	@Test void c01_customStorageWithoutSnapshotOverrideReturnsEmptyMap() {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/guard/RateLimitGuard_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/guard/RateLimitGuard_Test.java
index 53ee588310..c78b7d5dcc 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/guard/RateLimitGuard_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/guard/RateLimitGuard_Test.java
@@ -26,6 +26,7 @@ import org.apache.juneau.rest.mock.classic.*;
 import org.apache.juneau.rest.servlet.*;
 import org.junit.jupiter.api.*;
 
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class RateLimitGuard_Test extends TestBase {
 
 	//------------------------------------------------------------------------------------------------------------------
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/mock2/MockServletRequest_Coverage_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/mock2/MockServletRequest_Coverage_Test.java
index c4e0172639..095d9e3f07 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/mock2/MockServletRequest_Coverage_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/mock2/MockServletRequest_Coverage_Test.java
@@ -404,8 +404,8 @@ class MockServletRequest_Coverage_Test extends TestBase {
 	@Test void b12_getRequestDispatcher() {
 		var req = MockServletRequest.create("GET", "/test");
 		req.requestDispatcher("/path", new jakarta.servlet.RequestDispatcher() {
-			@Override public void forward(jakarta.servlet.ServletRequest r, jakarta.servlet.ServletResponse s) {}
-			@Override public void include(jakarta.servlet.ServletRequest r, jakarta.servlet.ServletResponse s) {}
+			@Override public void forward(jakarta.servlet.ServletRequest r, jakarta.servlet.ServletResponse s) { /* intentionally empty */ }
+			@Override public void include(jakarta.servlet.ServletRequest r, jakarta.servlet.ServletResponse s) { /* intentionally empty */ }
 		});
 		assertNotNull(req.getRequestDispatcher("/path"));
 	}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/observability/TraceContextResponseProcessor_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/observability/TraceContextResponseProcessor_Test.java
index a0bc0b23ba..9ce509c292 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/observability/TraceContextResponseProcessor_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/observability/TraceContextResponseProcessor_Test.java
@@ -195,7 +195,7 @@ class TraceContextResponseProcessor_Test extends TestBase {
 
 		var p = new TraceContextResponseProcessor();
 		var rc = assertDoesNotThrow(() -> p.process(opSession));
-		assertEquals(ResponseProcessor.NEXT, rc);
+		assertEquals(ResponseProcessor.FINISHED, rc);
 		// Committed ⇒ no header write attempted.
 		verify(res, never()).setHeader(eq("traceparent"), anyString());
 	}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/ops/AdminMixin_AsMixin_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/ops/AdminMixin_AsMixin_Test.java
index 15382f0ced..4edb35bdbe 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/ops/AdminMixin_AsMixin_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/ops/AdminMixin_AsMixin_Test.java
@@ -49,6 +49,7 @@ import org.junit.jupiter.api.*;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class AdminMixin_AsMixin_Test extends TestBase {
 
 	// -----------------------------------------------------------------------------------------
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/ops/AdminMixin_RateLimitSnapshot_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/ops/AdminMixin_RateLimitSnapshot_Test.java
index 2facde68ea..404273b1ef 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/ops/AdminMixin_RateLimitSnapshot_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/ops/AdminMixin_RateLimitSnapshot_Test.java
@@ -222,7 +222,7 @@ class AdminMixin_RateLimitSnapshot_Test extends TestBase {
 		@Override public RateLimitGuard.Storage.AcquireResult tryAcquire(String key, int capacity, double permitsPerSecond) {
 			return new RateLimitGuard.Storage.AcquireResult(true, capacity, 0L);
 		}
-		@Override public void evict(Duration ttl) {}
+		@Override public void evict(Duration ttl) { /* intentionally empty */ }
 	}
 
 	static final RateLimitGuard E_GUARD = RateLimitGuard.create()
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/ops/EchoMixin_AsMixin_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/ops/EchoMixin_AsMixin_Test.java
index 006814b777..2f95d01877 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/ops/EchoMixin_AsMixin_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/ops/EchoMixin_AsMixin_Test.java
@@ -47,6 +47,7 @@ import org.junit.jupiter.api.*;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class EchoMixin_AsMixin_Test extends TestBase {
 
 	/** Default-host mounting the mixin without {@code @Rest(debug)}. */
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/springboot/JuneauServletRegistrations_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/springboot/JuneauServletRegistrations_Test.java
index d01e9bc626..3fb2c43dbe 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/springboot/JuneauServletRegistrations_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/springboot/JuneauServletRegistrations_Test.java
@@ -32,6 +32,7 @@ import org.junit.jupiter.api.*;
  * @since 9.5.0
  */
 @org.apache.juneau.testing.annotations.SpringbootTest
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class JuneauServletRegistrations_Test extends TestBase {
 
 	@Test void a01_derivesMappingFromAnnotation() {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/tracing/otel/OtelTracerHook_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/tracing/otel/OtelTracerHook_Test.java
index 3d0b1e9382..e7866cc8b3 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/tracing/otel/OtelTracerHook_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/tracing/otel/OtelTracerHook_Test.java
@@ -39,6 +39,7 @@ import io.opentelemetry.sdk.trace.export.*;
  * to capture and assert against real {@link io.opentelemetry.sdk.trace.data.SpanData SpanData}
  * produced by the bridge during {@code @RestOp} invocations.
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class OtelTracerHook_Test extends TestBase {
 
 	// Static init so the SDK is wired before MockRestClient.buildLax() in the @Rest classes runs.
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/validation/BeanValidator_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/validation/BeanValidator_Test.java
index cdebfe0a59..723918c732 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/validation/BeanValidator_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/validation/BeanValidator_Test.java
@@ -31,6 +31,7 @@ import jakarta.validation.constraints.*;
  * Direct unit tests for {@link BeanValidator}, exercising the entrypoint contract independent of the
  * REST argument-resolver wiring covered elsewhere.
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class BeanValidator_Test extends TestBase {
 
 	// -----------------------------------------------------------------------------------------------------------------
@@ -38,9 +39,9 @@ class BeanValidator_Test extends TestBase {
 	// -----------------------------------------------------------------------------------------------------------------
 
 	static class A_Holder {
-		void noMarker(String x) {}
-		void jakartaValid(@jakarta.validation.Valid String x) {}
-		void deprecated(@Deprecated String x) {}
+		void noMarker(String x) { /* intentionally empty */ }
+		void jakartaValid(@jakarta.validation.Valid String x) { /* intentionally empty */ }
+		void deprecated(@Deprecated String x) { /* intentionally empty */ }
 	}
 
 	@Test
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/view/View_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/view/View_Test.java
index b3665e0a29..5a5b7b3465 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/view/View_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/view/View_Test.java
@@ -42,6 +42,7 @@ import org.junit.jupiter.api.*;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class View_Test extends TestBase {
 
 	/** Minimal {@code View} impl that exercises the abstract members only. */
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/view/freemarker/FreemarkerView_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/view/freemarker/FreemarkerView_Test.java
index a9198ee394..7df9c7c6dd 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/view/freemarker/FreemarkerView_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/view/freemarker/FreemarkerView_Test.java
@@ -37,6 +37,7 @@ import org.junit.jupiter.api.*;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class FreemarkerView_Test extends TestBase {
 
 	/* ---------------------------------------------------------------------------------------- *
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/view/jsp/JspView_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/view/jsp/JspView_Test.java
index 12bafa0e0a..daa9c31a41 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/view/jsp/JspView_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/view/jsp/JspView_Test.java
@@ -35,6 +35,7 @@ import org.junit.jupiter.api.*;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class JspView_Test extends TestBase {
 
 	/* ---------------------------------------------------------------------------------------- *
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/view/mustache/MustacheView_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/view/mustache/MustacheView_Test.java
index 214b2ce559..89ff4a89be 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/view/mustache/MustacheView_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/view/mustache/MustacheView_Test.java
@@ -36,6 +36,7 @@ import org.junit.jupiter.api.*;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class MustacheView_Test extends TestBase {
 
 	/* ---------------------------------------------------------------------------------------- *
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/view/thymeleaf/ThymeleafView_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/view/thymeleaf/ThymeleafView_Test.java
index 7aae223e4e..94908a80ec 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/view/thymeleaf/ThymeleafView_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/view/thymeleaf/ThymeleafView_Test.java
@@ -36,6 +36,7 @@ import org.junit.jupiter.api.*;
  *
  * @since 9.5.0
  */
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class ThymeleafView_Test extends TestBase {
 
 	/* ---------------------------------------------------------------------------------------- *
diff --git a/juneau-utest/src/test/java/org/apache/juneau/serializer/SerializerSet_Test.java b/juneau-utest/src/test/java/org/apache/juneau/serializer/SerializerSet_Test.java
index 14509620cd..6de677c95e 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/serializer/SerializerSet_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/serializer/SerializerSet_Test.java
@@ -25,6 +25,7 @@ import org.apache.juneau.commons.inject.*;
 import org.apache.juneau.json.*;
 import org.junit.jupiter.api.*;
 
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class SerializerSet_Test extends TestBase {
 
 	//====================================================================================================
diff --git a/juneau-utest/src/test/java/org/apache/juneau/sse/Sse_Test.java b/juneau-utest/src/test/java/org/apache/juneau/sse/Sse_Test.java
index b630d5ccb0..46e95f047a 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/sse/Sse_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/sse/Sse_Test.java
@@ -536,7 +536,7 @@ class Sse_Test extends TestBase {
 	@Test void d08_ioExceptionWrapped() {
 		var failingReader = new Reader() {
 			@Override public int read(char[] cbuf, int off, int len) throws IOException { throw new IOException("boom"); }
-			@Override public void close() {}
+			@Override public void close() { /* intentionally empty */ }
 		};
 		var r = new SseEventReader(failingReader);
 		var ex = assertThrows(UncheckedIOException.class, r::hasNext);
@@ -546,7 +546,7 @@ class Sse_Test extends TestBase {
 	@Test void d09_toListPropagatesIo() {
 		var failingReader = new Reader() {
 			@Override public int read(char[] cbuf, int off, int len) throws IOException { throw new IOException("boom"); }
-			@Override public void close() {}
+			@Override public void close() { /* intentionally empty */ }
 		};
 		var r = new SseEventReader(failingReader);
 		var ex = assertThrows(IOException.class, r::toList);
diff --git a/juneau-utest/src/test/java/org/apache/juneau/transforms/CalendarFormat_Test.java b/juneau-utest/src/test/java/org/apache/juneau/transforms/CalendarFormat_Test.java
index 4d95e88c37..d44a3138de 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/transforms/CalendarFormat_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/transforms/CalendarFormat_Test.java
@@ -25,6 +25,7 @@ import java.util.*;
 import org.apache.juneau.*;
 import org.junit.jupiter.api.*;
 
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class CalendarFormat_Test {
 
 	private static final ZoneId Z = ZoneId.of("Z");
diff --git a/juneau-utest/src/test/java/org/apache/juneau/transforms/DateFormat_Test.java b/juneau-utest/src/test/java/org/apache/juneau/transforms/DateFormat_Test.java
index 2df4ce7e7f..693ed94448 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/transforms/DateFormat_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/transforms/DateFormat_Test.java
@@ -25,6 +25,7 @@ import java.util.*;
 import org.apache.juneau.*;
 import org.junit.jupiter.api.*;
 
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class DateFormat_Test {
 
 	private static final ZoneId Z = ZoneId.of("Z");
diff --git a/juneau-utest/src/test/java/org/apache/juneau/transforms/TemporalFormat_Test.java b/juneau-utest/src/test/java/org/apache/juneau/transforms/TemporalFormat_Test.java
index b3169a8837..1fbe15dea5 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/transforms/TemporalFormat_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/transforms/TemporalFormat_Test.java
@@ -25,6 +25,7 @@ import java.time.chrono.*;
 import org.apache.juneau.*;
 import org.junit.jupiter.api.*;
 
+@SuppressWarnings({"java:S5778" /* assertThrows lambdas with chained calls; intermediate invocations do not throw in practice */})
 class TemporalFormat_Test {
 
 	private static final ZoneId Z = ZoneId.of("Z");