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/07/23 13:13:20 UTC
(juneau) branch master updated (a319b14a55 -> e32f1a5867)
This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
from a319b14a55 TODO-285: remove no-op/bogus Sonar @SuppressWarnings rule keys
new 7901a7a66d TODO-279: triage @Disabled tests; drop LogRecord source-detection feature
new dfc800eea8 TODO-283: accept oversized classes as cohesive-by-design (add java:S6539)
new e32f1a5867 TODO-286: resolve null-effect doc/impl contradictions + enrich ambiguous sites
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/juneau/bean/html5/HtmlBuilder.java | 3 +
.../apache/juneau/bean/jsonschema/JsonSchema.java | 3 +-
.../org/apache/juneau/commons/bean/BeanMeta.java | 3 +-
.../juneau/commons/bean/BeanMetaInitializer.java | 6 +-
.../apache/juneau/commons/collections/BidiMap.java | 9 ++-
.../juneau/commons/inject/BeanInstantiator.java | 3 +-
.../apache/juneau/commons/logging/LogRecord.java | 78 +++----------------
.../apache/juneau/commons/reflect/ClassInfo.java | 3 +-
.../juneau/commons/utils/CollectionUtils.java | 3 +-
.../org/apache/juneau/commons/utils/Shorts.java | 3 +-
.../apache/juneau/commons/utils/StringUtils.java | 3 +-
.../commons/logging/LogRecordCapture_Test.java | 2 +-
.../juneau/commons/logging/LogRecord_Test.java | 90 +---------------------
.../apache/juneau/marshall/MarshallingContext.java | 2 +-
.../org/apache/juneau/marshall/UriResolver.java | 8 +-
.../juneau/marshall/collections/MarshalledMap.java | 3 +-
.../marshall/httppart/BaseHttpPartParser.java | 6 +-
.../marshall/httppart/BaseHttpPartSerializer.java | 2 +-
.../juneau/marshall/httppart/HttpPartSchema.java | 3 +-
.../juneau/marshall/marshaller/MarshallUtils.java | 3 +
.../marshall/parquet/ParquetParserSession.java | 3 +-
.../marshall/serializer/SerializerSession.java | 3 +-
.../marshall/serializer/SerializerWriter.java | 2 +-
.../apache/juneau/marshall/yaml/YamlWriter.java | 2 +-
.../juneau/marshall/bson/BsonArrayDebug_Test.java | 6 +-
juneau-integration-tests/pom.xml | 6 +-
.../a/rttests/RoundTripLargeObjects_Test.java | 7 +-
.../juneau/rest/client/classic/RestClient.java | 1 +
.../juneau/rest/client/classic/RestRequest.java | 3 +-
.../assertion/FluentResponseHeaderAssertion.java | 18 ++---
.../FluentResponseHeaderAssertion_Test.java | 51 ++++++++++++
.../apache/juneau/http/classic/HttpHeaders.java | 3 +-
.../http/classic/entity/BasicHttpEntity.java | 2 +-
.../http/classic/header/BasicMediaTypeHeader.java | 2 +-
.../apache/juneau/http/classic/header/IfRange.java | 2 +-
.../http/classic/header/SerializedHeader.java | 8 +-
.../juneau/http/classic/part/PartBeanMeta.java | 4 +-
.../juneau/http/classic/part/SerializedPart.java | 4 +-
.../http/classic/resource/BasicResource.java | 2 +-
.../http/classic/response/BasicHttpException.java | 2 +-
.../http/classic/response/BasicHttpResponse.java | 2 +-
.../FluentRequestFormParamAssertion.java | 18 ++---
.../assertions/FluentRequestHeaderAssertion.java | 18 ++---
.../FluentRequestQueryParamAssertion.java | 18 ++---
.../juneau/rest/server/stats/MethodExecStats.java | 2 +-
.../juneau/rest/server/util/UrlPathMatch.java | 2 +-
.../FluentRequestFormParamAssertion_Test.java | 52 +++++++++++++
.../FluentRequestHeaderAssertion_Test.java | 22 ++++++
.../FluentRequestQueryParamAssertion_Test.java | 52 +++++++++++++
pom.xml | 12 +++
50 files changed, 318 insertions(+), 247 deletions(-)
create mode 100644 juneau-rest/juneau-rest-client-classic/src/test/java/org/apache/juneau/rest/client/classic/assertion/FluentResponseHeaderAssertion_Test.java
create mode 100644 juneau-rest/juneau-rest-server/src/test/java/org/apache/juneau/rest/server/assertions/FluentRequestFormParamAssertion_Test.java
create mode 100644 juneau-rest/juneau-rest-server/src/test/java/org/apache/juneau/rest/server/assertions/FluentRequestQueryParamAssertion_Test.java
(juneau) 01/03: TODO-279: triage @Disabled tests; drop LogRecord source-detection feature
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit 7901a7a66d85321b2125bb5d16b951fd929981fb
Author: James Bognar <ja...@apache.org>
AuthorDate: Thu Jul 23 09:12:42 2026 -0400
TODO-279: triage @Disabled tests; drop LogRecord source-detection feature
- Remove the unreliable JUL-style source detection from LogRecord: findSource()
stack-walk, the memoized source field, getSourceClassName()/getSourceMethodName()
overrides, and the {source}/{class}/{method} placeholder cases in formatted().
10.0.0 behavior change: formatted() no longer supports those placeholders, and
positional %N$s specifiers shift down one index. Deletes the 2 chronically
@Disabled tests that exercised it (feature confirmed self-contained, no other
consumers).
- Convert BsonArrayDebug_Test and RoundTripLargeObjects_Test from @Disabled to
@Tag("manual") so they're runnable on demand; add a property-driven
${excludedGroups} (default "manual") Surefire mechanism so -DexcludedGroups=
can re-enable them.
Co-authored-by: Cursor <cu...@cursor.com>
---
.../apache/juneau/commons/logging/LogRecord.java | 78 +++----------------
.../commons/logging/LogRecordCapture_Test.java | 2 +-
.../juneau/commons/logging/LogRecord_Test.java | 90 +---------------------
.../juneau/marshall/bson/BsonArrayDebug_Test.java | 6 +-
juneau-integration-tests/pom.xml | 6 +-
.../a/rttests/RoundTripLargeObjects_Test.java | 7 +-
pom.xml | 12 +++
7 files changed, 37 insertions(+), 164 deletions(-)
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/logging/LogRecord.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/logging/LogRecord.java
index 63559fe860..8e7c1af3eb 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/logging/LogRecord.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/logging/LogRecord.java
@@ -16,7 +16,6 @@
*/
package org.apache.juneau.commons.logging;
-import static org.apache.juneau.commons.function.Suppliers.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.Shorts.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
@@ -75,20 +74,15 @@ public class LogRecord extends java.util.logging.LogRecord {
// Key constants for format placeholders
private static final String KEY_date = "date";
- private static final String KEY_source = "source";
private static final String KEY_logger = "logger";
private static final String KEY_level = "level";
private static final String KEY_msg = "msg";
private static final String KEY_thrown = "thrown";
private static final String KEY_timestamp = "timestamp";
- private static final String KEY_class = "class";
- private static final String KEY_method = "method";
private static final String KEY_thread = "thread";
private static final String KEY_threadid = "threadid";
private static final String KEY_exception = "exception";
- private transient Supplier<Optional<StackTraceElement>> source = memoize(()->findSource());
-
/**
* Constructor.
*
@@ -121,49 +115,6 @@ public class LogRecord extends java.util.logging.LogRecord {
return isEmptyArray(p) ? m : f(m, p);
}
- /**
- * Returns the source class name, calculating it lazily from the stack trace if not already set.
- *
- * @return The source class name, or <jk>null</jk> if not available.
- */
- @Override
- public String getSourceClassName() {
- if (source == null)
- source = memoize(()->findSource());
- return source.get().map(x -> x.getClassName()).orElse(null);
- }
-
- /**
- * Returns the source method name, calculating it lazily from the stack trace if not already set.
- *
- * @return The source method name, or <jk>null</jk> if not available.
- */
- @Override
- public String getSourceMethodName() {
- if (source == null)
- source = memoize(()->findSource());
- return source.get().map(x -> x.getMethodName()).orElse(null);
- }
-
- @SuppressWarnings({
- "java:S3776" // Cognitive complexity acceptable for stack trace filtering
- })
- private static Optional<StackTraceElement> findSource() {
- for (var e : new Throwable().getStackTrace()) {
- var c = e.getClassName();
- var m = e.getMethodName();
- // Skip internal classes, logging classes, lambda methods/classes, and synthetic methods
- if (eq(c, cn(LogRecord.class)) || eq(c, cn(Logger.class)) || eq(c, cn(StringUtils.class))
- || c.startsWith("java.util.logging.")
- || (m != null && (m.contains("lambda$") || m.startsWith("access$")))
- || c.contains("$$Lambda$") || (c.contains("/") && c.contains("$Lambda"))) {
- continue;
- }
- return o(e);
- }
- return oe();
- }
-
/**
* Formats this log record as a string using the specified format pattern.
*
@@ -179,7 +130,6 @@ public class LogRecord extends java.util.logging.LogRecord {
* {@link java.util.Formatter Formatter} with the following arguments:
* <ol>
* <li><c>date</c> - The date/time as a {@link Date} object
- * <li><c>source</c> - The source class name and method name (e.g., "com.example.MyClass myMethod")
* <li><c>logger</c> - The logger name
* <li><c>level</c> - The log level
* <li><c>message</c> - The formatted log message
@@ -190,9 +140,6 @@ public class LogRecord extends java.util.logging.LogRecord {
* <ul>
* <li><js>"{date}"</js> - The date/time formatted using {@link SimpleFormatter SimpleFormatter}'s default date format
* <li><js>"{timestamp}"</js> - The date/time formatted as ISO-8601 (yyyy-MM-dd'T'HH:mm:ss.SSSZ)
- * <li><js>"{class}"</js> - The source class name
- * <li><js>"{method}"</js> - The source method name
- * <li><js>"{source}"</js> - The source class name and method name (e.g., "com.example.MyClass myMethod")
* <li><js>"{logger}"</js> - The logger name
* <li><js>"{level}"</js> - The log level name
* <li><js>"{msg}"</js> - The log message (formatted if parameters are present)
@@ -209,11 +156,10 @@ public class LogRecord extends java.util.logging.LogRecord {
* </p>
* <ul>
* <li><js>"%1$s"</js> or <js>"%1$tc"</js> - The date/time (argument 1)
- * <li><js>"%2$s"</js> - The source (argument 2)
- * <li><js>"%3$s"</js> - The logger name (argument 3)
- * <li><js>"%4$s"</js> - The log level (argument 4)
- * <li><js>"%5$s"</js> - The log message (argument 5)
- * <li><js>"%6$s"</js> - The throwable and its backtrace (argument 6)
+ * <li><js>"%2$s"</js> - The logger name (argument 2)
+ * <li><js>"%3$s"</js> - The log level (argument 3)
+ * <li><js>"%4$s"</js> - The log message (argument 4)
+ * <li><js>"%5$s"</js> - The throwable and its backtrace (argument 5)
* </ul>
*
* <p>
@@ -245,7 +191,7 @@ public class LogRecord extends java.util.logging.LogRecord {
* <jc>// Result: "[2025-01-22T07:42:45.123-0500 INFO] User John logged in"</jc>
*
* <jc>// Using Formatter-style specifiers</jc>
- * String <jv>formatted2</jv> = <jv>record</jv>.formatted(<js>"%4$s: %5$s [%1$tc]%n"</js>);
+ * String <jv>formatted2</jv> = <jv>record</jv>.formatted(<js>"%3$s: %4$s [%1$tc]%n"</js>);
* <jc>// Result: "INFO: User John logged in [Tue Jan 22 07:42:45 PST 2025]"</jc>
*
* <jc>// Mixed named placeholders and Formatter specifiers</jc>
@@ -263,23 +209,19 @@ public class LogRecord extends java.util.logging.LogRecord {
})
public String formatted(String format) {
var date = new Date(getMillis());
- Supplier<String> sourceName = () -> getSourceClassName() + ' ' + getSourceMethodName();
Function<String, Object> resolver = key -> switch (key) {
case KEY_date -> "%1$s";
- case KEY_source -> sourceName.get(); // Override default behavior since logging class doesn't handle classes outside of java.util.logging.
- case KEY_logger -> "%3$s";
- case KEY_level -> "%4$s";
- case KEY_msg -> "%5$s";
- case KEY_thrown -> "%6$s";
+ case KEY_logger -> "%2$s";
+ case KEY_level -> "%3$s";
+ case KEY_msg -> "%4$s";
+ case KEY_thrown -> "%5$s";
case KEY_timestamp -> new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ").format(date);
- case KEY_class -> getSourceClassName();
- case KEY_method -> getSourceMethodName();
case KEY_thread, KEY_threadid -> s(getThreadID());
case KEY_exception -> o(getThrown()).map(x -> x.getMessage()).orElse("");
default -> "";
};
- return safeOptCatch(()->f(formatNamed(format, resolver), date, sourceName, getLoggerName(), getLevel(), getMessage(), getThrown()), x -> x.getLocalizedMessage()).orElse(null);
+ return safeOptCatch(()->f(formatNamed(format, resolver), date, getLoggerName(), getLevel(), getMessage(), getThrown()), x -> x.getLocalizedMessage()).orElse(null);
}
}
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/logging/LogRecordCapture_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/logging/LogRecordCapture_Test.java
index 8666cff19a..2efef2beff 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/logging/LogRecordCapture_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/logging/LogRecordCapture_Test.java
@@ -141,7 +141,7 @@ class LogRecordCapture_Test extends TestBase {
try (var capture = logger.captureEvents()) {
logger.info("Message");
- var formatted = capture.getRecords("%4$s: %5$s");
+ var formatted = capture.getRecords("%3$s: %4$s");
assertSize(1, formatted);
assertTrue(formatted.get(0).contains("INFO"));
assertTrue(formatted.get(0).contains("Message"));
diff --git a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/logging/LogRecord_Test.java b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/logging/LogRecord_Test.java
index 976c958664..2d6dde98fc 100644
--- a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/logging/LogRecord_Test.java
+++ b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/logging/LogRecord_Test.java
@@ -108,58 +108,6 @@ class LogRecord_Test extends TestBase {
assertNull(rec.getParameters());
}
- //====================================================================================================
- // Source class and method name calculation
- //====================================================================================================
-
- @Test void c01_getSourceClassName_calculatedLazily() {
- // Create LogRecord through Logger to get proper call stack
- // findSource() filters out LogRecord, Logger, and lambda methods, so test classes are included
- try (var capture = getLogger("c01").captureEvents()) {
- var logger = getLogger("c01");
- logger.info("Message");
-
- var rec = capture.getRecords().get(0);
- var className = rec.getSourceClassName();
- // Should be calculated from stack trace
- assertNotNull(className);
- assertTrue(className.contains("LogRecord_Test")); // Should be this test class
- }
- }
-
- @Test void c02_getSourceMethodName_calculatedLazily() {
- // Create LogRecord through Logger to get proper call stack
- // findSource() filters out LogRecord, Logger, and lambda methods, so test methods are included
- try (var capture = getLogger("c02").captureEvents()) {
- var logger = getLogger("c02");
- logger.info("Message");
-
- var rec = capture.getRecords().get(0);
- var methodName = rec.getSourceMethodName();
- // Should be calculated from stack trace
- assertNotNull(methodName);
- assertEquals("c02_getSourceMethodName_calculatedLazily", methodName);
- }
- }
-
- @Test void c03_source_cachedAfterFirstAccess() {
- // Create LogRecord through Logger to get proper call stack
- try (var capture = getLogger("c03").captureEvents()) {
- var logger = getLogger("c03");
- logger.info("Message");
-
- var rec = capture.getRecords().get(0);
- var className1 = rec.getSourceClassName();
- var className2 = rec.getSourceClassName();
- var methodName1 = rec.getSourceMethodName();
- var methodName2 = rec.getSourceMethodName();
-
- // Should return same values (cached)
- assertEquals(className1, className2);
- assertEquals(methodName1, methodName2);
- }
- }
-
//====================================================================================================
// formatted() method - named placeholders
//====================================================================================================
@@ -195,23 +143,6 @@ class LogRecord_Test extends TestBase {
);
}
- // Stack-walk source detection is unreliable in this JVM/test-runner combination; revisit if source-detection accuracy becomes important.
- @Disabled("stack-walk source detection is unreliable in this JVM/test-runner combination")
- @Test void d04_formatted_classAndMethod() {
- // Create LogRecord through Logger to get proper call stack
- // findSource() filters out LogRecord, Logger, and lambda methods, so test classes are included
- try (var capture = getLogger("d04").captureEvents()) {
- var logger = getLogger("d04");
- logger.info("Message");
-
- var rec = capture.getRecords().get(0);
- var formatted = rec.formatted("{class}.{method}");
- assertNotNull(formatted);
- assertTrue(formatted.contains("LogRecord_Test"));
- assertTrue(formatted.contains("d04_formatted_classAndMethod"));
- }
- }
-
@Test void d05_formatted_logger() {
var rec = new LogRecord("test.logger", Level.INFO, "Message", null, null);
@@ -266,25 +197,6 @@ class LogRecord_Test extends TestBase {
assertTrue(formatted.contains("RuntimeException"));
}
- // Stack-walk source detection is unreliable in this JVM/test-runner combination; revisit if source-detection accuracy becomes important.
- @Disabled("stack-walk source detection is unreliable in this JVM/test-runner combination")
- @Test void d12_formatted_source() {
- // Create LogRecord through Logger to get proper call stack
- // findSource() now only filters out LogRecord and Logger classes, so test classes are included
- try (var capture = getLogger("d12").captureEvents()) {
- var logger = getLogger("d12");
- logger.info("Message");
-
- var rec = capture.getRecords().get(0);
- var formatted = rec.formatted("{source}");
- assertNotNull(formatted);
- // The {source} placeholder resolves to %2$s which formats the source supplier
- // The source supplier returns "className methodName"
- assertTrue(formatted.contains("LogRecord_Test"));
- assertTrue(formatted.contains("d12_formatted_source"));
- }
- }
-
//====================================================================================================
// formatted() method - Formatter-style specifiers
//====================================================================================================
@@ -292,7 +204,7 @@ class LogRecord_Test extends TestBase {
@Test void e01_formatted_formatterSpecifiers() {
var rec = new LogRecord("test.logger", Level.INFO, "Message", null, null);
- var formatted = rec.formatted("%4$s: %5$s");
+ var formatted = rec.formatted("%3$s: %4$s");
assertTrue(formatted.contains("INFO"));
assertTrue(formatted.contains("Message"));
}
diff --git a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/bson/BsonArrayDebug_Test.java b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/bson/BsonArrayDebug_Test.java
index a96c5e645c..b88750a83f 100644
--- a/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/bson/BsonArrayDebug_Test.java
+++ b/juneau-core/juneau-marshall/src/test/java/org/apache/juneau/marshall/bson/BsonArrayDebug_Test.java
@@ -21,8 +21,8 @@ import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.*;
-/** Debug test to inspect BSON output for arrays. Disabled to avoid stdout noise during normal test runs. */
-@Disabled("Debug test - prints hex dumps for manual inspection; run manually when needed")
+/** Debug test to inspect BSON output for arrays. Tagged manual to avoid stdout noise during normal test runs; run explicitly with -Dgroups=manual. */
+@Tag("manual")
class BsonArrayDebug_Test {
@Test
@@ -35,7 +35,7 @@ class BsonArrayDebug_Test {
@Test
void dumpJsonListBson() {
var s = BsonSerializer.create().keepNullProperties().addBeanTypes().addRootType().build();
- var x = new org.apache.juneau.marshall.collections.JsonList("['abc',123]");
+ var x = new org.apache.juneau.marshall.collections.JsonList("[\"abc\",123]");
var bytes = s.write(x);
assertTrue(bytes.length > 0);
}
diff --git a/juneau-integration-tests/pom.xml b/juneau-integration-tests/pom.xml
index 63758c684e..4048af59f9 100644
--- a/juneau-integration-tests/pom.xml
+++ b/juneau-integration-tests/pom.xml
@@ -681,7 +681,9 @@
<execution>
<id>default-test</id>
<configuration>
- <excludedGroups>container,benchmark</excludedGroups>
+ <!-- ${excludedGroups} (default "manual", see root pom) is merged in here so it stays
+ overridable via -DexcludedGroups= the same way as every other module. -->
+ <excludedGroups>container,benchmark,${excludedGroups}</excludedGroups>
<reportsDirectory>${project.build.directory}/surefire-reports/core</reportsDirectory>
<!--
Process-level parallelism for the in-memory core bucket: each fork is a
@@ -701,7 +703,7 @@
</goals>
<configuration>
<groups>container</groups>
- <excludedGroups>benchmark</excludedGroups>
+ <excludedGroups>benchmark,${excludedGroups}</excludedGroups>
<reportsDirectory>${project.build.directory}/surefire-reports/container</reportsDirectory>
</configuration>
</execution>
diff --git a/juneau-integration-tests/src/test/java/org/apache/juneau/a/rttests/RoundTripLargeObjects_Test.java b/juneau-integration-tests/src/test/java/org/apache/juneau/a/rttests/RoundTripLargeObjects_Test.java
index 570e959881..98aeb1fa0f 100755
--- a/juneau-integration-tests/src/test/java/org/apache/juneau/a/rttests/RoundTripLargeObjects_Test.java
+++ b/juneau-integration-tests/src/test/java/org/apache/juneau/a/rttests/RoundTripLargeObjects_Test.java
@@ -44,8 +44,13 @@ import org.junit.jupiter.params.provider.*;
/**
* Tests designed to serialize and parse objects to make sure we end up
* with the same objects for all serializers and parsers.
+ *
+ * <p>
+ * Round-trips a 20000-element object across every serializer/parser pair in the reactor, 10 times each;
+ * tagged manual because the runtime cost is too high for the normal build, not because of a correctness issue.
+ * </p>
*/
-@Disabled
+@Tag("manual")
@SuppressWarnings({
"serial" // serialVersionUID not required for test classes.
})
diff --git a/pom.xml b/pom.xml
index 21de6b65e3..aa6d485eee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,6 +79,9 @@
<jakarta.validation-api.version>3.0.2</jakarta.validation-api.version>
<logback.version>1.5.18</logback.version>
<log4j.version>2.24.3</log4j.version>
+ <!-- Default Surefire excludedGroups; overridable on the CLI (e.g. -DexcludedGroups= to run "manual"-tagged
+ tests) because it's referenced via ${excludedGroups} rather than hardcoded in the plugin config. -->
+ <excludedGroups>manual</excludedGroups>
</properties>
<modules>
@@ -296,11 +299,20 @@
WARNING/SEVERE still surface.
Modules that define their own surefire <systemPropertyVariables> (e.g. java.locale.providers)
merge with these; module-level keys win on conflict. See src/test/resources/.
+
+ Also excludes the "manual" JUnit5 tag by default so on-demand/manual-inspection tests
+ (e.g. debug harnesses, expensive stress tests) are skipped during normal builds; run them
+ explicitly with -DexcludedGroups= -Dgroups=manual. The value comes from the ${excludedGroups}
+ property (default "manual") rather than a literal, so it can be overridden on the CLI -
+ a literal value in this <configuration> would take precedence over any -D override.
+ Modules that already override <excludedGroups> per execution (e.g. juneau-integration-tests)
+ merge ${excludedGroups} into their own exclusion lists the same way.
-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <excludedGroups>${excludedGroups}</excludedGroups>
<systemPropertyVariables>
<logback.configurationFile>${maven.multiModuleProjectDirectory}/src/test/resources/logback-test.xml</logback.configurationFile>
<java.util.logging.config.file>${maven.multiModuleProjectDirectory}/src/test/resources/logging.properties</java.util.logging.config.file>
(juneau) 02/03: TODO-283: accept oversized classes as cohesive-by-design (add java:S6539)
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit dfc800eea82074301d8a8012d31361043e7d3ed9
Author: James Bognar <ja...@apache.org>
AuthorDate: Thu Jul 23 09:12:56 2026 -0400
TODO-283: accept oversized classes as cohesive-by-design (add java:S6539)
ARCH-02 triage: add class-level @SuppressWarnings("java:S6539") with a one-line
rationale to 17 oversized-but-cohesive classes (RestClient, RestRequest,
StringUtils, ClassInfo, CollectionUtils, BeanInstantiator, BeanMeta, Shorts,
HttpPartSchema, MarshallUtils, MarshallingContext, SerializerSession,
MarshalledMap, ParquetParserSession, HttpHeaders, JsonSchema, HtmlBuilder) so
future sweeps don't re-flag them. No splits. Annotation-type declarations and
threshold-adjacent files intentionally left unsuppressed.
Co-authored-by: Cursor <cu...@cursor.com>
---
.../src/main/java/org/apache/juneau/bean/html5/HtmlBuilder.java | 3 +++
.../src/main/java/org/apache/juneau/bean/jsonschema/JsonSchema.java | 3 ++-
.../src/main/java/org/apache/juneau/commons/bean/BeanMeta.java | 3 ++-
.../main/java/org/apache/juneau/commons/inject/BeanInstantiator.java | 3 ++-
.../src/main/java/org/apache/juneau/commons/reflect/ClassInfo.java | 3 ++-
.../src/main/java/org/apache/juneau/commons/utils/CollectionUtils.java | 3 ++-
.../src/main/java/org/apache/juneau/commons/utils/Shorts.java | 3 ++-
.../src/main/java/org/apache/juneau/commons/utils/StringUtils.java | 3 ++-
.../src/main/java/org/apache/juneau/marshall/MarshallingContext.java | 2 +-
.../java/org/apache/juneau/marshall/collections/MarshalledMap.java | 3 ++-
.../main/java/org/apache/juneau/marshall/httppart/HttpPartSchema.java | 3 ++-
.../main/java/org/apache/juneau/marshall/marshaller/MarshallUtils.java | 3 +++
.../java/org/apache/juneau/marshall/parquet/ParquetParserSession.java | 3 ++-
.../java/org/apache/juneau/marshall/serializer/SerializerSession.java | 3 ++-
.../main/java/org/apache/juneau/rest/client/classic/RestClient.java | 1 +
.../main/java/org/apache/juneau/rest/client/classic/RestRequest.java | 3 ++-
.../src/main/java/org/apache/juneau/http/classic/HttpHeaders.java | 3 ++-
17 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlBuilder.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlBuilder.java
index f3108cce5f..86d068690e 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlBuilder.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlBuilder.java
@@ -126,6 +126,9 @@ package org.apache.juneau.bean.html5;
* <li class='link'><a class="doclink" href="https://juneau.apache.org/docs/topics/JuneauBeanHtml5">juneau-bean-html5</a>
* </ul>
*/
+@SuppressWarnings({
+ "java:S6539" // Monster class; HtmlBuilder is intentionally a single static-factory facade, one creator method per HTML5 element
+})
public class HtmlBuilder {
/**
diff --git a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchema.java b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchema.java
index 2a6ffdf1d7..39f8ad5475 100644
--- a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchema.java
+++ b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchema.java
@@ -202,7 +202,8 @@ import org.apache.juneau.marshall.swap.*;
@Marshalled(typeName = "schema")
@SuppressWarnings({
"java:S116", // Field names follow OpenAPI/JSON Schema spec
- "java:S119" // 'SELF' (CRTP self-type) is intentional and clearer than a single-letter name.
+ "java:S119", // 'SELF' (CRTP self-type) is intentional and clearer than a single-letter name.
+ "java:S6539" // Monster class; JsonSchema intentionally models the entire JSON Schema Draft 2020-12 keyword set as one cohesive bean
})
public class JsonSchema<SELF extends JsonSchema<SELF>> {
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/bean/BeanMeta.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/bean/BeanMeta.java
index 489868829b..02d2715cd0 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/bean/BeanMeta.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/bean/BeanMeta.java
@@ -78,7 +78,8 @@ import org.apache.juneau.commons.utils.*;
*/
@SuppressWarnings({
"java:S115", // Constants use UPPER_snakeCase convention (e.g., PROP_class)
- "java:S1200" // Central bean-introspection type; high coupling to annotations/reflect/utils is inherent to its role
+ "java:S1200", // Central bean-introspection type; high coupling to annotations/reflect/utils is inherent to its role
+ "java:S6539" // Monster class; BeanMeta is intentionally a single cohesive bean-introspection metadata cache
})
public class BeanMeta<T> {
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 7d3cbddb83..6e5a99d89a 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
@@ -188,7 +188,8 @@ import org.apache.juneau.commons.reflect.*;
*/
@SuppressWarnings({
"java:S115", // Constants use UPPER_snakeCase convention
- "resource" // transient build-time scratch store; lifetime is bounded by the Builder itself, no foreign resources are captured
+ "resource", // transient build-time scratch store; lifetime is bounded by the Builder itself, no foreign resources are captured
+ "java:S6539" // Monster class; BeanInstantiator intentionally centralizes multi-strategy bean-instantiation auto-wiring
})
public class BeanInstantiator<T> {
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ClassInfo.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ClassInfo.java
index e22505ebb2..e5724366a7 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ClassInfo.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ClassInfo.java
@@ -72,7 +72,8 @@ import org.apache.juneau.commons.inject.*;
"unchecked", // Type erasure requires unchecked casts
"rawtypes", // Raw types necessary for generic type handling
"java:S115", // Constants use UPPER_snakeCase naming convention
- "java:S1452" // Wildcard required - List<AnnotationInfo<? extends Annotation>>, List<TypeVariable<?>>
+ "java:S1452", // Wildcard required - List<AnnotationInfo<? extends Annotation>>, List<TypeVariable<?>>
+ "java:S6539" // Monster class; ClassInfo is intentionally a single cohesive reflection-metadata facade over Class
})
public non-sealed class ClassInfo extends ElementInfo implements Annotatable, Type, Comparable<ClassInfo> {
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/CollectionUtils.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/CollectionUtils.java
index 4e8c6755c9..14d1d42cb8 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/CollectionUtils.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/CollectionUtils.java
@@ -123,7 +123,8 @@ import org.apache.juneau.commons.collections.*;
* </ul>
*/
@SuppressWarnings({
- "java:S115" // Constants use UPPER_snakeCase convention
+ "java:S115", // Constants use UPPER_snakeCase convention
+ "java:S6539" // Monster class; CollectionUtils is intentionally a single cohesive collection-utility hub, not a set of unrelated responsibilities
})
public class CollectionUtils {
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/Shorts.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/Shorts.java
index 12538dd35c..ca52b6fe7f 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/Shorts.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/Shorts.java
@@ -54,7 +54,8 @@ import org.apache.juneau.commons.reflect.*;
* replace {@code import static ...utils.Utils.*} with {@code import static ...utils.Shorts.*}.
*/
@SuppressWarnings({
- "java:S1118" // Utility facade with static methods only.
+ "java:S1118", // Utility facade with static methods only.
+ "java:S6539" // Monster class; Shorts is intentionally a single terse-alias factory facade, each method tiny and independent
})
public class Shorts {
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/StringUtils.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/StringUtils.java
index 598bf7fabc..fc49277272 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/StringUtils.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/StringUtils.java
@@ -57,7 +57,8 @@ import org.apache.juneau.commons.reflect.*;
"java:S115", // Constant names use UPPER_snakeCase convention
"java:S1192", // Duplicated string literals (HTML entities) are intentional
"java:S5843", // FP_REGEX copied from JDK source for parsing consistency
- "java:S3516" // Methods flagged as always returning the same value are valid utility implementations (e.g. null-safe wrappers)
+ "java:S3516", // Methods flagged as always returning the same value are valid utility implementations (e.g. null-safe wrappers)
+ "java:S6539" // Monster class; StringUtils is intentionally a single cohesive string-utility hub, not a set of unrelated responsibilities
})
public class StringUtils {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/MarshallingContext.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/MarshallingContext.java
index ecf0444d74..41a60ecd5e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/MarshallingContext.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/MarshallingContext.java
@@ -177,7 +177,7 @@ import org.apache.juneau.marshall.utils.*;
@SuppressWarnings({
"unchecked", // Type erasure requires unchecked casts
"rawtypes", // Raw types necessary for generic type handling
- "java:S6539", // Collection.toArray() usage intentional
+ "java:S6539", // Monster class; MarshallingContext is intentionally the central bean-context configuration hub (also covers Collection.toArray() usage)
"java:S115", // Constants use UPPER_snakeCase naming convention
"java:S1452", // Wildcard required - ClassMeta<?> for parameter resolution and type variables
"java:S1612" // Lambdas used instead of method references for readability in complex chained expressions
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/collections/MarshalledMap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/collections/MarshalledMap.java
index 698d15aa68..83335ae922 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/collections/MarshalledMap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/collections/MarshalledMap.java
@@ -55,7 +55,8 @@ import org.apache.juneau.marshall.swap.*;
* </ul>
*/
@SuppressWarnings({
- "java:S2160" // equals() / hashCode() inherited from LinkedHashMap; map equality is element-based
+ "java:S2160", // equals() / hashCode() inherited from LinkedHashMap; map equality is element-based
+ "java:S6539" // Monster class; MarshalledMap's large method surface follows directly from implementing the Map contract plus path-navigation helpers
})
public class MarshalledMap extends LinkedHashMap<String,Object> {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/httppart/HttpPartSchema.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/httppart/HttpPartSchema.java
index 74c6fb83c4..e1a068b2ed 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/httppart/HttpPartSchema.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/httppart/HttpPartSchema.java
@@ -92,7 +92,8 @@ import org.apache.juneau.marshall.parser.*;
"java:S116", // Field names use trailing underscores (default_, enum_, const_) to avoid Java keyword conflicts
"java:S115", // Constants use UPPER_snakeCase convention (e.g., PROP_additionalProperties)
"java:S5843", // Complex regex patterns needed for RFC compliance (IPv6, ISO 8601 duration, date-time formats)
- "java:S1452" // Wildcard required for parsed type metadata
+ "java:S1452", // Wildcard required for parsed type metadata
+ "java:S6539" // Monster class; HttpPartSchema is intentionally a single cohesive OpenAPI/HTTP-part schema model+validator
})
public class HttpPartSchema {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/marshaller/MarshallUtils.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/marshaller/MarshallUtils.java
index 066d8f7398..698a83aac6 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/marshaller/MarshallUtils.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/marshaller/MarshallUtils.java
@@ -63,6 +63,9 @@ import org.apache.juneau.marshall.serializer.*;
* <li class='link'><a class="doclink" href="https://juneau.apache.org/docs/topics/Marshallers">Marshallers</a>
* </ul>
*/
+@SuppressWarnings({
+ "java:S6539" // Monster class; MarshallUtils is intentionally a single cohesive terse-marshalling-facade hub, one method family per format
+})
public final class MarshallUtils {
private MarshallUtils() {}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/parquet/ParquetParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/parquet/ParquetParserSession.java
index 580d8e1972..eab6cf89f2 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/parquet/ParquetParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/parquet/ParquetParserSession.java
@@ -41,7 +41,8 @@ import org.apache.juneau.marshall.stream.*;
"java:S3776",
"java:S6541", // Brain Method: Parquet parsing/serialization flows are inherently branchy
"java:S1192", // Duplicated literals (.list.element, root.list.element., value) are schema keys; constants would obscure
- "resource" // RecordReader returned by RecordAdapter is a Closeable owned by the caller; Eclipse JDT @Owning warning is by design.
+ "resource", // RecordReader returned by RecordAdapter is a Closeable owned by the caller; Eclipse JDT @Owning warning is by design.
+ "java:S6539" // Monster class; ParquetParserSession is intentionally a single cohesive Parquet codec session
})
public class ParquetParserSession extends InputStreamParserSession implements RecordReadable, ArrayRecordReadable {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/serializer/SerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/serializer/SerializerSession.java
index c08d8ae5d5..30f122b549 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/serializer/SerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/serializer/SerializerSession.java
@@ -78,7 +78,8 @@ import org.apache.juneau.marshall.utils.*;
"java:S115", // Constants use UPPER_snakeCase convention
"rawtypes", // Raw types necessary for generic type handling throughout serializer session
"unchecked", // Type erasure requires unchecked casts throughout serializer session
- "resource" // Internal helpers return Closeables wired into pipe lifecycle; Eclipse JDT @Owning warning is by design.
+ "resource", // Internal helpers return Closeables wired into pipe lifecycle; Eclipse JDT @Owning warning is by design.
+ "java:S6539" // Monster class; SerializerSession is intentionally the core per-run serialization session base, aggregating traversal/formatting state
})
public class SerializerSession extends MarshallingTraverseSession {
diff --git a/juneau-rest/juneau-rest-client-classic/src/main/java/org/apache/juneau/rest/client/classic/RestClient.java b/juneau-rest/juneau-rest-client-classic/src/main/java/org/apache/juneau/rest/client/classic/RestClient.java
index eb9f4dce11..9a8fc38e75 100644
--- a/juneau-rest/juneau-rest-client-classic/src/main/java/org/apache/juneau/rest/client/classic/RestClient.java
+++ b/juneau-rest/juneau-rest-client-classic/src/main/java/org/apache/juneau/rest/client/classic/RestClient.java
@@ -1070,6 +1070,7 @@ import org.apache.juneau.rest.client.classic.remote.*;
"resource", // Resource management handled externally
"java:S106", // System.err is the intentional default fallback for the configurable console PrintStream
"java:S115", // Constants use UPPER_snakeCase naming convention
+ "java:S6539" // Monster class; RestClient is intentionally a single fluent builder/client aggregating config, call orchestration, and remote-proxy wiring
})
public class RestClient extends MarshallingContextable implements HttpClient, Closeable {
diff --git a/juneau-rest/juneau-rest-client-classic/src/main/java/org/apache/juneau/rest/client/classic/RestRequest.java b/juneau-rest/juneau-rest-client-classic/src/main/java/org/apache/juneau/rest/client/classic/RestRequest.java
index 13e8d5498f..0ab695244f 100644
--- a/juneau-rest/juneau-rest-client-classic/src/main/java/org/apache/juneau/rest/client/classic/RestRequest.java
+++ b/juneau-rest/juneau-rest-client-classic/src/main/java/org/apache/juneau/rest/client/classic/RestRequest.java
@@ -110,7 +110,8 @@ import org.apache.juneau.marshall.xml.*;
"java:S115", // Constants use UPPER_snakeCase naming convention
"resource", // Resource management handled externally
"java:S3740", // Raw Class/Supplier types used for fluent REST request building where response type is unknown at construction time
- "java:S1133" // Intentional deprecation retained for backward compatibility until the documented removal; the reminder is not actionable now.
+ "java:S1133", // Intentional deprecation retained for backward compatibility until the documented removal; the reminder is not actionable now.
+ "java:S6539" // Monster class; RestRequest is intentionally a single per-request fluent builder aggregating headers/query/form/body/serialization config
})
public class RestRequest extends MarshallingSession implements HttpUriRequest, Configurable, AutoCloseable {
diff --git a/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/HttpHeaders.java b/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/HttpHeaders.java
index 93331ad686..30fcd9a6cf 100644
--- a/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/HttpHeaders.java
+++ b/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/HttpHeaders.java
@@ -95,7 +95,8 @@ import org.apache.juneau.marshall.oapi.*;
* </ul>
*/
@SuppressWarnings({
- "java:S3740" // Raw Supplier/Header types used in factory methods where HTTP header value type cannot be statically parameterized
+ "java:S3740", // Raw Supplier/Header types used in factory methods where HTTP header value type cannot be statically parameterized
+ "java:S6539" // Monster class; HttpHeaders is intentionally a single static-factory facade, one creator method per standard HTTP header
})
public class HttpHeaders {
(juneau) 03/03: TODO-286: resolve null-effect doc/impl contradictions + enrich ambiguous sites
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit e32f1a586793de88bcfd82b6085f18228c886065
Author: James Bognar <ja...@apache.org>
AuthorDate: Thu Jul 23 09:13:08 2026 -0400
TODO-286: resolve null-effect doc/impl contradictions + enrich ambiguous sites
Triage of 36 flagged sites from the TODO-265 null-effect sweep:
- DOC-FIX (behavior-preserving) where the Javadoc contradicted traced reality:
BidiMap null-handling, BasicMediaTypeHeader "never null", and must-not-be-null
NPE docs on IfRange.isEtag, UrlPathMatch, MethodExecStats.
- CODE-FIX (10.0.0 behavior change): make the fluent request/response
header/param/form assertions null-tolerant so asserting on an absent value no
longer NPEs; adds null-value test coverage.
- Enrich the genuinely implementation-dependent Group 2 sites with the TODO-265
convention pointing at the relevant {@link} target; setContent() reuses the
existing leaf-type-dependent clause.
- JsonSchemaMap left unchanged (contradiction refuted: ConcurrentHashMap rejects
null keys regardless).
Co-authored-by: Cursor <cu...@cursor.com>
---
.../juneau/commons/bean/BeanMetaInitializer.java | 6 +--
.../apache/juneau/commons/collections/BidiMap.java | 9 ++--
.../org/apache/juneau/marshall/UriResolver.java | 8 ++--
.../marshall/httppart/BaseHttpPartParser.java | 6 +--
.../marshall/httppart/BaseHttpPartSerializer.java | 2 +-
.../marshall/serializer/SerializerWriter.java | 2 +-
.../apache/juneau/marshall/yaml/YamlWriter.java | 2 +-
.../assertion/FluentResponseHeaderAssertion.java | 18 ++++----
.../FluentResponseHeaderAssertion_Test.java | 51 +++++++++++++++++++++
.../http/classic/entity/BasicHttpEntity.java | 2 +-
.../http/classic/header/BasicMediaTypeHeader.java | 2 +-
.../apache/juneau/http/classic/header/IfRange.java | 2 +-
.../http/classic/header/SerializedHeader.java | 8 ++--
.../juneau/http/classic/part/PartBeanMeta.java | 4 +-
.../juneau/http/classic/part/SerializedPart.java | 4 +-
.../http/classic/resource/BasicResource.java | 2 +-
.../http/classic/response/BasicHttpException.java | 2 +-
.../http/classic/response/BasicHttpResponse.java | 2 +-
.../FluentRequestFormParamAssertion.java | 18 ++++----
.../assertions/FluentRequestHeaderAssertion.java | 18 ++++----
.../FluentRequestQueryParamAssertion.java | 18 ++++----
.../juneau/rest/server/stats/MethodExecStats.java | 2 +-
.../juneau/rest/server/util/UrlPathMatch.java | 2 +-
.../FluentRequestFormParamAssertion_Test.java | 52 ++++++++++++++++++++++
.../FluentRequestHeaderAssertion_Test.java | 22 +++++++++
.../FluentRequestQueryParamAssertion_Test.java | 52 ++++++++++++++++++++++
26 files changed, 247 insertions(+), 69 deletions(-)
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/bean/BeanMetaInitializer.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/bean/BeanMetaInitializer.java
index efcb65256d..c411c95e6e 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/bean/BeanMetaInitializer.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/bean/BeanMetaInitializer.java
@@ -130,8 +130,8 @@ public interface BeanMetaInitializer {
* Builds the bean-level {@link BeanRegistryLookup} for the supplied class. Returns <jk>null</jk> on the
* commons-side path (no marshalling context).
*
- * @param marshallingContext The marshalling-side context (as an opaque {@link Object}). Can be <jk>null</jk>.
- * @param beanFilter The bean filter applied to this bean meta. Can be <jk>null</jk>.
+ * @param marshallingContext The marshalling-side context (as an opaque {@link Object}). Can be <jk>null</jk>. The effect is implementation-dependent — see {@link org.apache.juneau.marshall.MarshalledBeanMetaInitializer}, the sole concrete implementer of this SPI.
+ * @param beanFilter The bean filter applied to this bean meta. Can be <jk>null</jk>. The effect is implementation-dependent — see {@link org.apache.juneau.marshall.MarshalledBeanMetaInitializer}.
* @param classInfo The class info of the bean. Must not be <jk>null</jk>.
* @param config The bean-modeling configuration. Must not be <jk>null</jk>.
* @return The bean-level registry, or <jk>null</jk>.
@@ -152,7 +152,7 @@ public interface BeanMetaInitializer {
* Walks the parent classes/interfaces of {@code classInfo} and returns the first dictionary-name mapping for
* {@code rawClass} found in any parent's registry, or <jk>null</jk> if none.
*
- * @param marshallingContext The marshalling-side context. Can be <jk>null</jk>.
+ * @param marshallingContext The marshalling-side context. Can be <jk>null</jk>. The effect is implementation-dependent — see {@link org.apache.juneau.marshall.MarshalledBeanMetaInitializer}.
* @param classInfo The bean's class info.
* @param rawClass The raw class to look up.
* @return The dictionary name found in a parent's registry, or <jk>null</jk>.
diff --git a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/BidiMap.java b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/BidiMap.java
index 2f833b5988..9d2e4ab13d 100644
--- a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/BidiMap.java
+++ b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/BidiMap.java
@@ -36,7 +36,7 @@ import java.util.*;
* <li>Implements the standard {@link Map} interface for forward key→value lookups
* <li>Provides {@link #getKey(Object)} method for reverse value→key lookups
* <li>Maintains insertion order using {@link LinkedHashMap} internally
- * <li>Automatically filters out null keys and values
+ * <li>Filters out null keys and values when built via the {@link Builder}
* <li>Supports both mutable and unmodifiable instances via the builder
* <li>Thread-safety: Not thread-safe by default; external synchronization required if accessed by multiple threads
* </ul>
@@ -59,9 +59,10 @@ import java.util.*;
*
* <h5 class='section'>Null Handling:</h5>
* <p>
- * This map automatically filters out entries with null keys or values during construction.
- * Attempting to add null keys or values via {@link #put(Object, Object)} or {@link #putAll(Map)}
- * after construction will result in them being stored in the forward map but not the reverse map.
+ * The {@link Builder#add(Object, Object)}/{@link Builder#build()} construction path filters out entries with
+ * null keys or values.
+ * {@link #put(Object, Object)} and {@link #putAll(Map)} perform <b>no</b> null filtering after construction —
+ * null keys and values are stored in both the forward and reverse maps unconditionally.
*
* <h5 class='section'>Unmodifiable Instances:</h5>
* <p class='bjava'>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/UriResolver.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/UriResolver.java
index aaaa342e61..73561797c6 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/UriResolver.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/UriResolver.java
@@ -130,7 +130,7 @@ public class UriResolver {
* Same as {@link #resolve(Object)} except appends result to the specified appendable.
*
* @param a The appendable to append the URL to. Must not be <jk>null</jk>.
- * @param o The URI to convert to absolute form. Can be <jk>null</jk>.
+ * @param o The URI to convert to absolute form. Can be <jk>null</jk>. The effect is implementation-dependent, varying with the configured {@link UriResolution} and {@link UriRelativity}.
* @return The same appendable passed in.
*/
@SuppressWarnings({
@@ -282,8 +282,8 @@ public class UriResolver {
* String <jv>relativeUri</jv> = <jv>resolver</jv>.relativize(<js>"servlet:/"</js>, <js>"/context/servlet/path/foo"</js>);
* </p>
*
- * @param relativeTo The URI to relativize against. Can be <jk>null</jk>.
- * @param uri The URI to relativize. Can be <jk>null</jk>.
+ * @param relativeTo The URI to relativize against. Can be <jk>null</jk>. The effect is implementation-dependent, varying with the configured {@link UriResolution} and {@link UriRelativity}.
+ * @param uri The URI to relativize. Can be <jk>null</jk>. The effect is implementation-dependent, varying with the configured {@link UriResolution} and {@link UriRelativity}.
* @return The relativized URI.
*/
public String relativize(Object relativeTo, Object uri) {
@@ -297,7 +297,7 @@ public class UriResolver {
*
* @param uri
* The URI to convert to absolute form.
- * Can be <jk>null</jk>.
+ * Can be <jk>null</jk>. The effect is implementation-dependent, varying with the configured {@link UriResolution} and {@link UriRelativity}.
* Can be any of the following:
* <ul>
* <li>{@link URI}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/httppart/BaseHttpPartParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/httppart/BaseHttpPartParser.java
index 4006de8088..4b70a5ba4f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/httppart/BaseHttpPartParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/httppart/BaseHttpPartParser.java
@@ -96,7 +96,7 @@ public abstract class BaseHttpPartParser extends MarshallingContextable implemen
* <br>Can be <jk>null</jk> (will default to {@link HttpPartType#OTHER}).
* @param schema
* Schema information about the part.
- * <br>Can be <jk>null</jk>.
+ * <br>Can be <jk>null</jk>. The effect is implementation-dependent — see {@link HttpPartParserSession}.
* <br>Not all part parsers use the schema information.
* @param in The input being parsed.
* <br>Can be <jk>null</jk> (will return <jk>null</jk> or use schema default if available).
@@ -118,7 +118,7 @@ public abstract class BaseHttpPartParser extends MarshallingContextable implemen
* <br>Can be <jk>null</jk> (will default to {@link HttpPartType#OTHER}).
* @param schema
* Schema information about the part.
- * <br>Can be <jk>null</jk>.
+ * <br>Can be <jk>null</jk>. The effect is implementation-dependent — see {@link HttpPartParserSession}.
* <br>Not all part parsers use the schema information.
* @param in The input being parsed.
* <br>Can be <jk>null</jk> (will return <jk>null</jk> or use schema default if available).
@@ -140,7 +140,7 @@ public abstract class BaseHttpPartParser extends MarshallingContextable implemen
* <br>Can be <jk>null</jk> (will default to {@link HttpPartType#OTHER}).
* @param schema
* Schema information about the part.
- * <br>Can be <jk>null</jk>.
+ * <br>Can be <jk>null</jk>. The effect is implementation-dependent — see {@link HttpPartParserSession}.
* <br>Not all part parsers use the schema information.
* @param in The input being parsed.
* <br>Can be <jk>null</jk> (will return <jk>null</jk> or use schema default if available).
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/httppart/BaseHttpPartSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/httppart/BaseHttpPartSerializer.java
index bd6e738abc..58dd097cf8 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/httppart/BaseHttpPartSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/httppart/BaseHttpPartSerializer.java
@@ -84,7 +84,7 @@ public abstract class BaseHttpPartSerializer extends MarshallingContextable impl
* <br>Can be <jk>null</jk> (will default to {@link HttpPartType#OTHER}).
* @param schema
* Schema information about the part.
- * <br>Can be <jk>null</jk>.
+ * <br>Can be <jk>null</jk>. The effect is implementation-dependent — see {@link HttpPartSerializerSession}.
* <br>Not all part serializers use the schema information.
* @param value The value being serialized.
* <br>Can be <jk>null</jk> (will return <jk>null</jk>).
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/serializer/SerializerWriter.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/serializer/SerializerWriter.java
index 6ffbd1d453..07f93a019a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/serializer/SerializerWriter.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/serializer/SerializerWriter.java
@@ -235,7 +235,7 @@ public abstract class SerializerWriter<SELF extends SerializerWriter<SELF>> exte
* session.
*
* @param value The URI to serialize.
- * <br>Can be <jk>null</jk>.
+ * <br>Can be <jk>null</jk>. The effect is implementation-dependent — see {@link UriResolver#append(Appendable, Object)}.
* @return This object.
*/
public SELF appendUri(Object value) {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/yaml/YamlWriter.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/yaml/YamlWriter.java
index b677be3c36..668a3efa4a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/yaml/YamlWriter.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/yaml/YamlWriter.java
@@ -149,7 +149,7 @@ public class YamlWriter extends SerializerWriter<YamlWriter> {
* Resolves the URI and writes it as a double-quoted YAML string.
*
* @param uri The URI to append to the output.
- * <br>Can be <jk>null</jk>.
+ * <br>Can be <jk>null</jk>. The effect is implementation-dependent — see {@link UriResolver#resolve(Object)}.
* @return This object.
*/
public YamlWriter uriValue(Object uri) {
diff --git a/juneau-rest/juneau-rest-client-classic/src/main/java/org/apache/juneau/rest/client/classic/assertion/FluentResponseHeaderAssertion.java b/juneau-rest/juneau-rest-client-classic/src/main/java/org/apache/juneau/rest/client/classic/assertion/FluentResponseHeaderAssertion.java
index 7f766eec56..be3f2a0beb 100644
--- a/juneau-rest/juneau-rest-client-classic/src/main/java/org/apache/juneau/rest/client/classic/assertion/FluentResponseHeaderAssertion.java
+++ b/juneau-rest/juneau-rest-client-classic/src/main/java/org/apache/juneau/rest/client/classic/assertion/FluentResponseHeaderAssertion.java
@@ -138,14 +138,14 @@ public class FluentResponseHeaderAssertion<R> extends FluentStringAssertion<R> {
* <br>Should be <jk>null</jk> if this is the top-level assertion.
* @param value
* The object being tested.
- * <br>Can be <jk>null</jk>.
+ * <br>Can be <jk>null</jk>, in which case this assertion behaves as if testing a header with no value (e.g. {@link #isNull()} passes, transform methods yield <jk>null</jk>-valued assertions).
* @param returns
* The object to return after a test method is called.
* <br>If <jk>null</jk>, the test method returns this object allowing multiple test method calls to be
* used on the same assertion.
*/
public FluentResponseHeaderAssertion(Assertion creator, ResponseHeader value, R returns) {
- super(creator, value.asString().orElse(null), returns);
+ super(creator, value == null ? null : value.asString().orElse(null), returns);
this.value = value;
setThrowable(BadRequest.class);
}
@@ -155,7 +155,7 @@ public class FluentResponseHeaderAssertion<R> extends FluentStringAssertion<R> {
*
* @param value
* The object being tested.
- * <br>Can be <jk>null</jk>.
+ * <br>Can be <jk>null</jk>, in which case this assertion behaves as if testing a header with no value (e.g. {@link #isNull()} passes, transform methods yield <jk>null</jk>-valued assertions).
* @param returns
* The object to return after a test method is called.
* <br>If <jk>null</jk>, the test method returns this object allowing multiple test method calls to be
@@ -174,7 +174,7 @@ public class FluentResponseHeaderAssertion<R> extends FluentStringAssertion<R> {
* @throws RestCallException If value could not be parsed.
*/
public <T> FluentAnyAssertion<T,R> as(Class<T> type) throws RestCallException {
- return new FluentAnyAssertion<>(value.as(type).orElse(null), returns());
+ return new FluentAnyAssertion<>(value == null ? null : value.as(type).orElse(null), returns());
}
/**
@@ -189,7 +189,7 @@ public class FluentResponseHeaderAssertion<R> extends FluentStringAssertion<R> {
* @throws RestCallException If value could not be parsed.
*/
public FluentAnyAssertion<Object,R> as(Type type, Type...args) throws RestCallException {
- return new FluentAnyAssertion<>(value.as(type, args).orElse(null), returns());
+ return new FluentAnyAssertion<>(value == null ? null : value.as(type, args).orElse(null), returns());
}
/**
@@ -199,7 +199,7 @@ public class FluentResponseHeaderAssertion<R> extends FluentStringAssertion<R> {
* @throws AssertionError If object is not a boolean.
*/
public FluentBooleanAssertion<R> asBoolean() {
- return new FluentBooleanAssertion<>(this, value.asBoolean().orElse(null), returns());
+ return new FluentBooleanAssertion<>(this, value == null ? null : value.asBoolean().orElse(null), returns());
}
/**
@@ -209,7 +209,7 @@ public class FluentResponseHeaderAssertion<R> extends FluentStringAssertion<R> {
* @throws AssertionError If object is not an integer.
*/
public FluentIntegerAssertion<R> asInteger() {
- return new FluentIntegerAssertion<>(this, value.asInteger().orElse(null), returns());
+ return new FluentIntegerAssertion<>(this, value == null ? null : value.asInteger().orElse(null), returns());
}
@Override /* Overridden from FluentStringAssertion */
@@ -225,7 +225,7 @@ public class FluentResponseHeaderAssertion<R> extends FluentStringAssertion<R> {
* @throws AssertionError If object is not a long.
*/
public FluentLongAssertion<R> asLong() {
- return new FluentLongAssertion<>(this, value.asLong().orElse(null), returns());
+ return new FluentLongAssertion<>(this, value == null ? null : value.asLong().orElse(null), returns());
}
/**
@@ -235,7 +235,7 @@ public class FluentResponseHeaderAssertion<R> extends FluentStringAssertion<R> {
* @throws AssertionError If object is not a zoned-datetime.
*/
public FluentZonedDateTimeAssertion<R> asZonedDateTime() {
- return new FluentZonedDateTimeAssertion<>(this, value.asDateHeader().asZonedDateTime().orElse(null), returns());
+ return new FluentZonedDateTimeAssertion<>(this, value == null ? null : value.asDateHeader().asZonedDateTime().orElse(null), returns());
}
@Override /* Overridden from Assertion */
diff --git a/juneau-rest/juneau-rest-client-classic/src/test/java/org/apache/juneau/rest/client/classic/assertion/FluentResponseHeaderAssertion_Test.java b/juneau-rest/juneau-rest-client-classic/src/test/java/org/apache/juneau/rest/client/classic/assertion/FluentResponseHeaderAssertion_Test.java
new file mode 100644
index 0000000000..a136f73846
--- /dev/null
+++ b/juneau-rest/juneau-rest-client-classic/src/test/java/org/apache/juneau/rest/client/classic/assertion/FluentResponseHeaderAssertion_Test.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.juneau.rest.client.classic.assertion;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.apache.juneau.rest.client.classic.*;
+import org.junit.jupiter.api.*;
+
+/**
+ * Validates {@link FluentResponseHeaderAssertion} tolerates a null {@code value} (TODO-286 #9/#10 null-tolerance fix).
+ *
+ * <p>
+ * A null {@link ResponseHeader} used to NPE in both constructors ({@code value.asString()}) and in every transform
+ * method ({@code value.asBoolean()}, etc.).
+ */
+class FluentResponseHeaderAssertion_Test {
+
+ @Test void a01_nullValue_chainedConstructor_doesNotThrow() {
+ var a = new FluentResponseHeaderAssertion<>(null, (ResponseHeader)null, null);
+ assertDoesNotThrow(a::isNull);
+ }
+
+ @Test void a02_nullValue_directConstructor_doesNotThrow() {
+ var a = new FluentResponseHeaderAssertion<>((ResponseHeader)null, null);
+ assertDoesNotThrow(a::isNull);
+ }
+
+ @Test void a03_nullValue_transformMethodsDoNotThrowAndYieldNull() {
+ var a = new FluentResponseHeaderAssertion<>((ResponseHeader)null, null);
+ assertDoesNotThrow(() -> a.asBoolean().isNull());
+ assertDoesNotThrow(() -> a.asInteger().isNull());
+ assertDoesNotThrow(() -> a.asLong().isNull());
+ assertDoesNotThrow(() -> a.asZonedDateTime().isNull());
+ assertDoesNotThrow(() -> a.as(String.class).isNull());
+ }
+}
diff --git a/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/entity/BasicHttpEntity.java b/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/entity/BasicHttpEntity.java
index 4c6043417d..f6eea6e254 100644
--- a/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/entity/BasicHttpEntity.java
+++ b/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/entity/BasicHttpEntity.java
@@ -293,7 +293,7 @@ public abstract class BasicHttpEntity<SELF extends BasicHttpEntity<SELF>> implem
/**
* Sets the content on this entity bean.
*
- * @param value The entity content, can be <jk>null</jk>.
+ * @param value The entity content. Can be <jk>null</jk> (the effect depends on the concrete leaf type: e.g. treated as empty for {@link StringEntity}/{@link ByteArrayEntity}, or a {@link NullPointerException} on read for {@link StreamEntity}/{@link ReaderEntity}/{@link FileEntity}).
* @return This object.
*/
public SELF setContent(Object value) {
diff --git a/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/header/BasicMediaTypeHeader.java b/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/header/BasicMediaTypeHeader.java
index 490ffcf113..9fa0a42daf 100644
--- a/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/header/BasicMediaTypeHeader.java
+++ b/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/header/BasicMediaTypeHeader.java
@@ -177,7 +177,7 @@ public class BasicMediaTypeHeader extends BasicStringHeader {
* For example, the media type <js>"text/foo+bar"</js> will return a list of
* <code>[<js>'foo'</js>,<js>'bar'</js>]</code>
*
- * @return An unmodifiable list of subtype fragments. Can be <jk>null</jk>.
+ * @return An unmodifiable list of subtype fragments. Never <jk>null</jk>.
*/
public final List<String> getSubTypes() { return orElse(MediaType.EMPTY).getSubTypes(); }
diff --git a/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/header/IfRange.java b/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/header/IfRange.java
index 60fa6cc2c2..71a4678fc9 100644
--- a/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/header/IfRange.java
+++ b/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/header/IfRange.java
@@ -161,7 +161,7 @@ public class IfRange extends BasicDateHeader {
* @param value
* The header value.
* <br>Must be an RFC-1123 formated string (e.g. <js>"Sat, 29 Oct 1994 19:43:31 GMT"</js>).
- * <br>Can be <jk>null</jk>.
+ * <br>Must not be <jk>null</jk> (a <jk>null</jk> argument throws {@link NullPointerException}).
*/
public IfRange(String value) {
super(NAME, isEtag(value) ? null : value);
diff --git a/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/header/SerializedHeader.java b/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/header/SerializedHeader.java
index ffa27d5797..3058832343 100644
--- a/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/header/SerializedHeader.java
+++ b/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/header/SerializedHeader.java
@@ -44,7 +44,7 @@ public class SerializedHeader extends BasicHeader {
* @param name The header name.
* @param value
* The POJO to serialize as the header value.
- * <br>Can be <jk>null</jk>.
+ * <br>Can be <jk>null</jk>. The effect is implementation-dependent — see {@link HttpPartSerializerSession} and {@link HttpPartSchema}.
* @return A new header bean. Never <jk>null</jk>.
* @throws IllegalArgumentException If name is <jk>null</jk> or empty.
*/
@@ -84,7 +84,7 @@ public class SerializedHeader extends BasicHeader {
* @param name The header name.
* @param value
* The supplier of the POJO to serialize as the header value.
- * <br>Can be <jk>null</jk>.
+ * <br>Can be <jk>null</jk>. The effect is implementation-dependent — see {@link HttpPartSerializerSession} and {@link HttpPartSchema}.
* @return A new header bean. Never <jk>null</jk>.
* @throws IllegalArgumentException If name is <jk>null</jk> or empty.
*/
@@ -128,7 +128,7 @@ public class SerializedHeader extends BasicHeader {
* Constructor.
*
* @param name The HTTP header name name.
- * @param value The POJO to serialize to the parameter value. Can be <jk>null</jk>.
+ * @param value The POJO to serialize to the parameter value. Can be <jk>null</jk>. The effect is implementation-dependent — see {@link HttpPartSerializerSession} and {@link HttpPartSchema}.
* @param serializer
* The serializer to use for serializing the value to a string value.
* <br>Can be <jk>null</jk>, in which case the value is converted directly to a string instead of being serialized.
@@ -160,7 +160,7 @@ public class SerializedHeader extends BasicHeader {
* Header value is re-evaluated on each call to {@link #getValue()}.
*
* @param name The HTTP header name name.
- * @param value The supplier of the POJO to serialize to the parameter value. Can be <jk>null</jk>.
+ * @param value The supplier of the POJO to serialize to the parameter value. Can be <jk>null</jk>. The effect is implementation-dependent — see {@link HttpPartSerializerSession} and {@link HttpPartSchema}.
* @param serializer
* The serializer to use for serializing the value to a string value.
* <br>Can be <jk>null</jk>, in which case the value is converted directly to a string instead of being serialized.
diff --git a/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/part/PartBeanMeta.java b/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/part/PartBeanMeta.java
index cb76b21c2d..358ed034f1 100644
--- a/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/part/PartBeanMeta.java
+++ b/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/part/PartBeanMeta.java
@@ -121,7 +121,7 @@ public class PartBeanMeta<T> {
*
* @param value
* The part value.
- * <br>Can be <jk>null</jk>.
+ * <br>Can be <jk>null</jk>. The effect is implementation-dependent, depending on the target bean type's constructor shape — see {@link #construct(String, Object)}.
* @return A newly constructed bean.
* @throws UnsupportedOperationException If bean could not be constructed (e.g. couldn't find a constructor).
*/
@@ -138,7 +138,7 @@ public class PartBeanMeta<T> {
* {@link Header#value() @Header(value)} annotations.
* @param value
* The part value.
- * <br>Can be <jk>null</jk>.
+ * <br>Can be <jk>null</jk>. The effect is implementation-dependent, depending on the target bean type's constructor shape (e.g. coerced to <c>String</c> for a single-<c>String</c>-arg constructor, passed through unchanged otherwise).
* @return A newly constructed bean.
* @throws UnsupportedOperationException If bean could not be constructed (e.g. couldn't find a constructor).
*/
diff --git a/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/part/SerializedPart.java b/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/part/SerializedPart.java
index 390e3c3252..f9ca83d98b 100644
--- a/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/part/SerializedPart.java
+++ b/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/part/SerializedPart.java
@@ -89,7 +89,7 @@ public class SerializedPart extends BasicPart {
*
* @param name The part name.
* @param value The POJO to serialize to The part value.
- * @param type The HTTP part type. Can be <jk>null</jk>.
+ * @param type The HTTP part type. Can be <jk>null</jk>. The effect is implementation-dependent — see {@link HttpPartSerializerSession#write}.
* @param serializer
* The serializer to use for serializing the value to a string value.
* <br>Can be <jk>null</jk>, in which case the value is converted using a simple string conversion instead of being serialized.
@@ -232,7 +232,7 @@ public class SerializedPart extends BasicPart {
/**
* Sets the HTTP part type.
*
- * @param value The new value for this property. Can be <jk>null</jk>.
+ * @param value The new value for this property. Can be <jk>null</jk>. The effect is implementation-dependent — see {@link HttpPartSerializerSession#write}.
* @return This object.
*/
public SerializedPart type(HttpPartType value) {
diff --git a/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/resource/BasicResource.java b/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/resource/BasicResource.java
index 7512fa1997..d1dc9ade40 100644
--- a/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/resource/BasicResource.java
+++ b/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/resource/BasicResource.java
@@ -304,7 +304,7 @@ public abstract class BasicResource<SELF extends BasicResource<SELF>> implements
/**
* Sets the content on this entity bean.
*
- * @param value The entity content, can be <jk>null</jk>.
+ * @param value The entity content. Can be <jk>null</jk> (the effect depends on the concrete leaf type: e.g. treated as empty for {@link StringEntity}/{@link ByteArrayEntity}, or a {@link NullPointerException} on read for {@link StreamEntity}/{@link ReaderEntity}/{@link FileEntity}).
* @return This object.
*/
public SELF setContent(Object value) {
diff --git a/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/response/BasicHttpException.java b/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/response/BasicHttpException.java
index 6021f6b846..6eb78b4b17 100644
--- a/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/response/BasicHttpException.java
+++ b/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/response/BasicHttpException.java
@@ -448,7 +448,7 @@ public class BasicHttpException extends BasicRuntimeException implements HttpRes
* <p>
* If not specified, uses {@link Locale#getDefault()}.
*
- * @param value The new value. Can be <jk>null</jk>.
+ * @param value The new value. Can be <jk>null</jk>. The effect is implementation-dependent, depending on the configured {@link ReasonPhraseCatalog} (e.g. ignored by {@link EnglishReasonPhraseCatalog}).
* @return This object.
*/
public BasicHttpException setLocale2(Locale value) {
diff --git a/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/response/BasicHttpResponse.java b/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/response/BasicHttpResponse.java
index 47b9b5cf80..60aaab7f5a 100644
--- a/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/response/BasicHttpResponse.java
+++ b/juneau-rest/juneau-rest-common-classic/src/main/java/org/apache/juneau/http/classic/response/BasicHttpResponse.java
@@ -302,7 +302,7 @@ public abstract class BasicHttpResponse<SELF extends BasicHttpResponse<SELF>> im
* <p>
* If not specified, uses {@link Locale#getDefault()}.
*
- * @param value The new value. Can be <jk>null</jk>.
+ * @param value The new value. Can be <jk>null</jk>. The effect is implementation-dependent, depending on the configured {@link ReasonPhraseCatalog} (e.g. ignored by {@link EnglishReasonPhraseCatalog}).
* @return This object.
*/
public SELF setLocale2(Locale value) {
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/server/assertions/FluentRequestFormParamAssertion.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/server/assertions/FluentRequestFormParamAssertion.java
index e09dce7844..d0e7e8d30b 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/server/assertions/FluentRequestFormParamAssertion.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/server/assertions/FluentRequestFormParamAssertion.java
@@ -137,14 +137,14 @@ public class FluentRequestFormParamAssertion<R> extends FluentStringAssertion<R>
* <br>Should be <jk>null</jk> if this is the top-level assertion.
* @param value
* The object being tested.
- * <br>Can be <jk>null</jk>.
+ * <br>Can be <jk>null</jk>, in which case this assertion behaves as if testing a part with no value (e.g. {@link #isNull()} passes, transform methods yield <jk>null</jk>-valued assertions).
* @param returns
* The object to return after a test method is called.
* <br>If <jk>null</jk>, the test method returns this object allowing multiple test method calls to be
* used on the same assertion.
*/
public FluentRequestFormParamAssertion(Assertion creator, RequestFormParam value, R returns) {
- super(creator, value.asString().orElse(null), returns);
+ super(creator, value == null ? null : value.asString().orElse(null), returns);
this.value = value;
setThrowable(BadRequest.class);
}
@@ -154,7 +154,7 @@ public class FluentRequestFormParamAssertion<R> extends FluentStringAssertion<R>
*
* @param value
* The object being tested.
- * <br>Can be <jk>null</jk>.
+ * <br>Can be <jk>null</jk>, in which case this assertion behaves as if testing a part with no value (e.g. {@link #isNull()} passes, transform methods yield <jk>null</jk>-valued assertions).
* @param returns
* The object to return after a test method is called.
* <br>If <jk>null</jk>, the test method returns this object allowing multiple test method calls to be
@@ -172,7 +172,7 @@ public class FluentRequestFormParamAssertion<R> extends FluentStringAssertion<R>
* @return A new fluent assertion object.
*/
public <T> FluentAnyAssertion<T,R> as(Class<T> type) {
- return new FluentAnyAssertion<>(value.as(type).orElse(null), returns());
+ return new FluentAnyAssertion<>(value == null ? null : value.as(type).orElse(null), returns());
}
/**
@@ -186,7 +186,7 @@ public class FluentRequestFormParamAssertion<R> extends FluentStringAssertion<R>
* @return A new fluent assertion object.
*/
public FluentAnyAssertion<Object,R> as(Type type, Type...args) {
- return new FluentAnyAssertion<>(value.as(type, args).orElse(null), returns());
+ return new FluentAnyAssertion<>(value == null ? null : value.as(type, args).orElse(null), returns());
}
/**
@@ -196,7 +196,7 @@ public class FluentRequestFormParamAssertion<R> extends FluentStringAssertion<R>
* @throws AssertionError If object is not a boolean.
*/
public FluentBooleanAssertion<R> asBoolean() {
- return new FluentBooleanAssertion<>(this, value.asBoolean().orElse(null), returns());
+ return new FluentBooleanAssertion<>(this, value == null ? null : value.asBoolean().orElse(null), returns());
}
/**
@@ -206,7 +206,7 @@ public class FluentRequestFormParamAssertion<R> extends FluentStringAssertion<R>
* @throws AssertionError If object is not an integer.
*/
public FluentIntegerAssertion<R> asInteger() {
- return new FluentIntegerAssertion<>(this, value.asInteger().orElse(null), returns());
+ return new FluentIntegerAssertion<>(this, value == null ? null : value.asInteger().orElse(null), returns());
}
@Override /* Overridden from FluentStringAssertion */
@@ -222,7 +222,7 @@ public class FluentRequestFormParamAssertion<R> extends FluentStringAssertion<R>
* @throws AssertionError If object is not a long.
*/
public FluentLongAssertion<R> asLong() {
- return new FluentLongAssertion<>(this, value.asLong().orElse(null), returns());
+ return new FluentLongAssertion<>(this, value == null ? null : value.asLong().orElse(null), returns());
}
/**
@@ -232,7 +232,7 @@ public class FluentRequestFormParamAssertion<R> extends FluentStringAssertion<R>
* @throws AssertionError If object is not a zoned-datetime.
*/
public FluentZonedDateTimeAssertion<R> asZonedDateTime() {
- return new FluentZonedDateTimeAssertion<>(this, value.asDatePart().asZonedDateTime().orElse(null), returns());
+ return new FluentZonedDateTimeAssertion<>(this, value == null ? null : value.asDatePart().asZonedDateTime().orElse(null), returns());
}
@Override /* Overridden from Assertion */
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/server/assertions/FluentRequestHeaderAssertion.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/server/assertions/FluentRequestHeaderAssertion.java
index 8140424327..332a5474a0 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/server/assertions/FluentRequestHeaderAssertion.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/server/assertions/FluentRequestHeaderAssertion.java
@@ -136,14 +136,14 @@ public class FluentRequestHeaderAssertion<R> extends FluentStringAssertion<R> {
* <br>Should be <jk>null</jk> if this is the top-level assertion.
* @param value
* The object being tested.
- * <br>Can be <jk>null</jk>.
+ * <br>Can be <jk>null</jk>, in which case this assertion behaves as if testing a part with no value (e.g. {@link #isNull()} passes, transform methods yield <jk>null</jk>-valued assertions).
* @param returns
* The object to return after a test method is called.
* <br>If <jk>null</jk>, the test method returns this object allowing multiple test method calls to be
* used on the same assertion.
*/
public FluentRequestHeaderAssertion(Assertion creator, RequestHeader value, R returns) {
- super(creator, value.asString().orElse(null), returns);
+ super(creator, value == null ? null : value.asString().orElse(null), returns);
this.value = value;
setThrowable(BadRequest.class);
}
@@ -153,7 +153,7 @@ public class FluentRequestHeaderAssertion<R> extends FluentStringAssertion<R> {
*
* @param value
* The object being tested.
- * <br>Can be <jk>null</jk>.
+ * <br>Can be <jk>null</jk>, in which case this assertion behaves as if testing a part with no value (e.g. {@link #isNull()} passes, transform methods yield <jk>null</jk>-valued assertions).
* @param returns
* The object to return after a test method is called.
* <br>If <jk>null</jk>, the test method returns this object allowing multiple test method calls to be
@@ -171,7 +171,7 @@ public class FluentRequestHeaderAssertion<R> extends FluentStringAssertion<R> {
* @return A new fluent assertion object.
*/
public <T> FluentAnyAssertion<T,R> as(Class<T> type) {
- return new FluentAnyAssertion<>(value.as(type).orElse(null), returns());
+ return new FluentAnyAssertion<>(value == null ? null : value.as(type).orElse(null), returns());
}
/**
@@ -185,7 +185,7 @@ public class FluentRequestHeaderAssertion<R> extends FluentStringAssertion<R> {
* @return A new fluent assertion object.
*/
public FluentAnyAssertion<Object,R> as(Type type, Type...args) {
- return new FluentAnyAssertion<>(value.as(type, args).orElse(null), returns());
+ return new FluentAnyAssertion<>(value == null ? null : value.as(type, args).orElse(null), returns());
}
/**
@@ -195,7 +195,7 @@ public class FluentRequestHeaderAssertion<R> extends FluentStringAssertion<R> {
* @throws AssertionError If object is not a boolean.
*/
public FluentBooleanAssertion<R> asBoolean() {
- return new FluentBooleanAssertion<>(this, value.asBoolean().orElse(null), returns());
+ return new FluentBooleanAssertion<>(this, value == null ? null : value.asBoolean().orElse(null), returns());
}
/**
@@ -205,7 +205,7 @@ public class FluentRequestHeaderAssertion<R> extends FluentStringAssertion<R> {
* @throws AssertionError If object is not an integer.
*/
public FluentIntegerAssertion<R> asInteger() {
- return new FluentIntegerAssertion<>(this, value.asInteger().orElse(null), returns());
+ return new FluentIntegerAssertion<>(this, value == null ? null : value.asInteger().orElse(null), returns());
}
@Override /* Overridden from FluentStringAssertion */
@@ -221,7 +221,7 @@ public class FluentRequestHeaderAssertion<R> extends FluentStringAssertion<R> {
* @throws AssertionError If object is not a long.
*/
public FluentLongAssertion<R> asLong() {
- return new FluentLongAssertion<>(this, value.asLong().orElse(null), returns());
+ return new FluentLongAssertion<>(this, value == null ? null : value.asLong().orElse(null), returns());
}
/**
@@ -231,7 +231,7 @@ public class FluentRequestHeaderAssertion<R> extends FluentStringAssertion<R> {
* @throws AssertionError If object is not a zoned-datetime.
*/
public FluentZonedDateTimeAssertion<R> asZonedDateTime() {
- return new FluentZonedDateTimeAssertion<>(this, value.asDateHeader().asZonedDateTime().orElse(null), returns());
+ return new FluentZonedDateTimeAssertion<>(this, value == null ? null : value.asDateHeader().asZonedDateTime().orElse(null), returns());
}
@Override /* Overridden from Assertion */
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/server/assertions/FluentRequestQueryParamAssertion.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/server/assertions/FluentRequestQueryParamAssertion.java
index d9715e6355..cad335c245 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/server/assertions/FluentRequestQueryParamAssertion.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/server/assertions/FluentRequestQueryParamAssertion.java
@@ -137,14 +137,14 @@ public class FluentRequestQueryParamAssertion<R> extends FluentStringAssertion<R
* <br>Should be <jk>null</jk> if this is the top-level assertion.
* @param value
* The object being tested.
- * <br>Can be <jk>null</jk>.
+ * <br>Can be <jk>null</jk>, in which case this assertion behaves as if testing a part with no value (e.g. {@link #isNull()} passes, transform methods yield <jk>null</jk>-valued assertions).
* @param returns
* The object to return after a test method is called.
* <br>If <jk>null</jk>, the test method returns this object allowing multiple test method calls to be
* used on the same assertion.
*/
public FluentRequestQueryParamAssertion(Assertion creator, RequestQueryParam value, R returns) {
- super(creator, value.asString().orElse(null), returns);
+ super(creator, value == null ? null : value.asString().orElse(null), returns);
this.value = value;
setThrowable(BadRequest.class);
}
@@ -154,7 +154,7 @@ public class FluentRequestQueryParamAssertion<R> extends FluentStringAssertion<R
*
* @param value
* The object being tested.
- * <br>Can be <jk>null</jk>.
+ * <br>Can be <jk>null</jk>, in which case this assertion behaves as if testing a part with no value (e.g. {@link #isNull()} passes, transform methods yield <jk>null</jk>-valued assertions).
* @param returns
* The object to return after a test method is called.
* <br>If <jk>null</jk>, the test method returns this object allowing multiple test method calls to be
@@ -172,7 +172,7 @@ public class FluentRequestQueryParamAssertion<R> extends FluentStringAssertion<R
* @return A new fluent assertion object.
*/
public <T> FluentAnyAssertion<T,R> as(Class<T> type) {
- return new FluentAnyAssertion<>(value.as(type).orElse(null), returns());
+ return new FluentAnyAssertion<>(value == null ? null : value.as(type).orElse(null), returns());
}
/**
@@ -186,7 +186,7 @@ public class FluentRequestQueryParamAssertion<R> extends FluentStringAssertion<R
* @return A new fluent assertion object.
*/
public FluentAnyAssertion<Object,R> as(Type type, Type...args) {
- return new FluentAnyAssertion<>(value.as(type, args).orElse(null), returns());
+ return new FluentAnyAssertion<>(value == null ? null : value.as(type, args).orElse(null), returns());
}
/**
@@ -196,7 +196,7 @@ public class FluentRequestQueryParamAssertion<R> extends FluentStringAssertion<R
* @throws AssertionError If object is not a boolean.
*/
public FluentBooleanAssertion<R> asBoolean() {
- return new FluentBooleanAssertion<>(this, value.asBoolean().orElse(null), returns());
+ return new FluentBooleanAssertion<>(this, value == null ? null : value.asBoolean().orElse(null), returns());
}
/**
@@ -206,7 +206,7 @@ public class FluentRequestQueryParamAssertion<R> extends FluentStringAssertion<R
* @throws AssertionError If object is not an integer.
*/
public FluentIntegerAssertion<R> asInteger() {
- return new FluentIntegerAssertion<>(this, value.asInteger().orElse(null), returns());
+ return new FluentIntegerAssertion<>(this, value == null ? null : value.asInteger().orElse(null), returns());
}
@Override /* Overridden from FluentStringAssertion */
@@ -222,7 +222,7 @@ public class FluentRequestQueryParamAssertion<R> extends FluentStringAssertion<R
* @throws AssertionError If object is not a long.
*/
public FluentLongAssertion<R> asLong() {
- return new FluentLongAssertion<>(this, value.asLong().orElse(null), returns());
+ return new FluentLongAssertion<>(this, value == null ? null : value.asLong().orElse(null), returns());
}
/**
@@ -232,7 +232,7 @@ public class FluentRequestQueryParamAssertion<R> extends FluentStringAssertion<R
* @throws AssertionError If object is not a zoned-datetime.
*/
public FluentZonedDateTimeAssertion<R> asZonedDateTime() {
- return new FluentZonedDateTimeAssertion<>(this, value.asDatePart().asZonedDateTime().orElse(null), returns());
+ return new FluentZonedDateTimeAssertion<>(this, value == null ? null : value.asDatePart().asZonedDateTime().orElse(null), returns());
}
@Override /* Overridden from Assertion */
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/server/stats/MethodExecStats.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/server/stats/MethodExecStats.java
index 2e603e2ceb..8c01d4ed2f 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/server/stats/MethodExecStats.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/server/stats/MethodExecStats.java
@@ -184,7 +184,7 @@ public class MethodExecStats {
/**
* Call when an error occurs.
*
- * @param e The exception thrown. Can be <jk>null</jk>.
+ * @param e The exception thrown. Must not be <jk>null</jk> (a <jk>null</jk> argument throws {@link NullPointerException} via {@link ThrownStore#add(Throwable)}).
* @return This object.
*/
public MethodExecStats error(Throwable e) {
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/server/util/UrlPathMatch.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/server/util/UrlPathMatch.java
index b670f461fe..fe10b0b3de 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/server/util/UrlPathMatch.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/server/util/UrlPathMatch.java
@@ -49,7 +49,7 @@ public class UrlPathMatch {
/**
* Constructor.
*
- * @param path The path being matched against. Can be <jk>null</jk>.
+ * @param path The path being matched against. Must not be <jk>null</jk> (a <jk>null</jk> argument causes {@link #getPrefix()}/{@link #getSuffix()} to throw {@link NullPointerException}).
* @param matchedParts The number of parts that were matched against the path.
* @param keys The variable keys. Can be <jk>null</jk> (no path variables are recorded; the variable map resolves to empty).
* @param values The variable values. Can be <jk>null</jk> if <c>keys</c> is also <jk>null</jk>; otherwise must align positionally with <c>keys</c>.
diff --git a/juneau-rest/juneau-rest-server/src/test/java/org/apache/juneau/rest/server/assertions/FluentRequestFormParamAssertion_Test.java b/juneau-rest/juneau-rest-server/src/test/java/org/apache/juneau/rest/server/assertions/FluentRequestFormParamAssertion_Test.java
new file mode 100644
index 0000000000..e74480762d
--- /dev/null
+++ b/juneau-rest/juneau-rest-server/src/test/java/org/apache/juneau/rest/server/assertions/FluentRequestFormParamAssertion_Test.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.juneau.rest.server.assertions;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.apache.juneau.*;
+import org.apache.juneau.rest.server.httppart.*;
+import org.junit.jupiter.api.*;
+
+/**
+ * Validates {@link FluentRequestFormParamAssertion} tolerates a null {@code value} (TODO-286 #6 null-tolerance fix).
+ *
+ * <p>
+ * A null {@link RequestFormParam} used to NPE in the constructor ({@code value.asString()}) and in every transform
+ * method ({@code value.asBoolean()}, etc.).
+ */
+class FluentRequestFormParamAssertion_Test extends TestBase {
+
+ @Test void a01_nullValue_chainedConstructor_doesNotThrow() {
+ var a = new FluentRequestFormParamAssertion<>(null, (RequestFormParam)null, null);
+ assertDoesNotThrow(a::isNull);
+ }
+
+ @Test void a02_nullValue_directConstructor_doesNotThrow() {
+ var a = new FluentRequestFormParamAssertion<>((RequestFormParam)null, null);
+ assertDoesNotThrow(a::isNull);
+ }
+
+ @Test void a03_nullValue_transformMethodsDoNotThrowAndYieldNull() {
+ var a = new FluentRequestFormParamAssertion<>((RequestFormParam)null, null);
+ assertDoesNotThrow(() -> a.asBoolean().isNull());
+ assertDoesNotThrow(() -> a.asInteger().isNull());
+ assertDoesNotThrow(() -> a.asLong().isNull());
+ assertDoesNotThrow(() -> a.asZonedDateTime().isNull());
+ assertDoesNotThrow(() -> a.as(String.class).isNull());
+ }
+}
diff --git a/juneau-rest/juneau-rest-server/src/test/java/org/apache/juneau/rest/server/assertions/FluentRequestHeaderAssertion_Test.java b/juneau-rest/juneau-rest-server/src/test/java/org/apache/juneau/rest/server/assertions/FluentRequestHeaderAssertion_Test.java
index 0061b9395e..baa71235b2 100644
--- a/juneau-rest/juneau-rest-server/src/test/java/org/apache/juneau/rest/server/assertions/FluentRequestHeaderAssertion_Test.java
+++ b/juneau-rest/juneau-rest-server/src/test/java/org/apache/juneau/rest/server/assertions/FluentRequestHeaderAssertion_Test.java
@@ -59,4 +59,26 @@ class FluentRequestHeaderAssertion_Test extends TestBase {
var e = assertThrows(RuntimeException.class, () -> h.is("expected"));
assertFalse(e.getMessage().startsWith("CUSTOM "));
}
+
+ // TODO-286 #5: a null RequestHeader used to NPE in the constructor (value.asString()) and in every
+ // transform method (value.asBoolean(), etc.). Verify null is now tolerated end-to-end.
+
+ @Test void a03_nullValue_chainedConstructor_doesNotThrow() {
+ var h = new FluentRequestHeaderAssertion<>(null, (RequestHeader)null, null);
+ assertDoesNotThrow(h::isNull);
+ }
+
+ @Test void a04_nullValue_directConstructor_doesNotThrow() {
+ var h = new FluentRequestHeaderAssertion<>((RequestHeader)null, null);
+ assertDoesNotThrow(h::isNull);
+ }
+
+ @Test void a05_nullValue_transformMethodsDoNotThrowAndYieldNull() {
+ var h = new FluentRequestHeaderAssertion<>((RequestHeader)null, null);
+ assertDoesNotThrow(() -> h.asBoolean().isNull());
+ assertDoesNotThrow(() -> h.asInteger().isNull());
+ assertDoesNotThrow(() -> h.asLong().isNull());
+ assertDoesNotThrow(() -> h.asZonedDateTime().isNull());
+ assertDoesNotThrow(() -> h.as(String.class).isNull());
+ }
}
diff --git a/juneau-rest/juneau-rest-server/src/test/java/org/apache/juneau/rest/server/assertions/FluentRequestQueryParamAssertion_Test.java b/juneau-rest/juneau-rest-server/src/test/java/org/apache/juneau/rest/server/assertions/FluentRequestQueryParamAssertion_Test.java
new file mode 100644
index 0000000000..10cefe827a
--- /dev/null
+++ b/juneau-rest/juneau-rest-server/src/test/java/org/apache/juneau/rest/server/assertions/FluentRequestQueryParamAssertion_Test.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.juneau.rest.server.assertions;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.apache.juneau.*;
+import org.apache.juneau.rest.server.httppart.*;
+import org.junit.jupiter.api.*;
+
+/**
+ * Validates {@link FluentRequestQueryParamAssertion} tolerates a null {@code value} (TODO-286 #4 null-tolerance fix).
+ *
+ * <p>
+ * A null {@link RequestQueryParam} used to NPE in the constructor ({@code value.asString()}) and in every transform
+ * method ({@code value.asBoolean()}, etc.).
+ */
+class FluentRequestQueryParamAssertion_Test extends TestBase {
+
+ @Test void a01_nullValue_chainedConstructor_doesNotThrow() {
+ var a = new FluentRequestQueryParamAssertion<>(null, (RequestQueryParam)null, null);
+ assertDoesNotThrow(a::isNull);
+ }
+
+ @Test void a02_nullValue_directConstructor_doesNotThrow() {
+ var a = new FluentRequestQueryParamAssertion<>((RequestQueryParam)null, null);
+ assertDoesNotThrow(a::isNull);
+ }
+
+ @Test void a03_nullValue_transformMethodsDoNotThrowAndYieldNull() {
+ var a = new FluentRequestQueryParamAssertion<>((RequestQueryParam)null, null);
+ assertDoesNotThrow(() -> a.asBoolean().isNull());
+ assertDoesNotThrow(() -> a.asInteger().isNull());
+ assertDoesNotThrow(() -> a.asLong().isNull());
+ assertDoesNotThrow(() -> a.asZonedDateTime().isNull());
+ assertDoesNotThrow(() -> a.as(String.class).isNull());
+ }
+}