You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by gi...@apache.org on 2025/12/02 02:51:31 UTC

(juneau) branch asf-staging updated: Deploy documentation staging from 34316d2beaa2fb5d95b96e014223eca22d2f1f5a 34316d2beaa2fb5d95b96e014223eca22d2f1f5a

This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a commit to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/juneau.git


The following commit(s) were added to refs/heads/asf-staging by this push:
     new a9d8acaf7d Deploy documentation staging from 34316d2beaa2fb5d95b96e014223eca22d2f1f5a 34316d2beaa2fb5d95b96e014223eca22d2f1f5a
a9d8acaf7d is described below

commit a9d8acaf7ddb0d7c4a0b6a04e26666320728bd8f
Author: github-actions[bot] <gi...@users.noreply.github.com>
AuthorDate: Tue Dec 2 02:51:21 2025 +0000

    Deploy documentation staging from 34316d2beaa2fb5d95b96e014223eca22d2f1f5a 34316d2beaa2fb5d95b96e014223eca22d2f1f5a
---
 site/xref-test/allclasses-frame.html               |   760 +-
 .../org/apache/juneau/BeanConfig_Test.html         |     8 +-
 .../org/apache/juneau/BeanContext_Test.html        |     2 +-
 site/xref-test/org/apache/juneau/BeanMap_Test.html |     2 +-
 .../org/apache/juneau/BenchmarkRunner.html         |     2 +-
 .../org/apache/juneau/ClassMeta_Test.html          |     4 +-
 site/xref-test/org/apache/juneau/ComboInput.html   |     6 +-
 .../org/apache/juneau/ComboRoundTrip_Tester.html   |     6 +-
 .../org/apache/juneau/ComboSerialize_Tester.html   |     8 +-
 .../org/apache/juneau/DataConversion_Test.html     |     2 +-
 .../apache/juneau/DynaBean_ComboRoundTripTest.html |     2 +-
 .../org/apache/juneau/JacocoDummy_Test.html        |     6 +-
 .../xref-test/org/apache/juneau/JsonList_Test.html |     2 +-
 .../org/apache/juneau/MaxIndent_Test.html          |     2 +-
 .../org/apache/juneau/MediaRange_Test.html         |     2 +-
 .../org/apache/juneau/PojoExamplesTest.html        |     2 +-
 .../juneau/ReadWriteOnlyProperties_Test.html       |     2 +-
 .../SerializerProperties_ComboRoundTripTest.html   |     2 +-
 site/xref-test/org/apache/juneau/TestUtils.html    |     4 +-
 .../org/apache/juneau/Visibility_Test.html         |     4 +-
 .../org/apache/juneau/XmlValidatorParser.html      |     2 +-
 .../a/rttests/BeanProperties_RoundTripTest.html    |     4 +-
 .../juneau/a/rttests/Classes_RoundTripTest.html    |     2 +-
 .../juneau/a/rttests/Enum_RoundTripTest.html       |     2 +-
 .../juneau/a/rttests/JsonMaps_RoundTripTest.html   |     2 +-
 .../a/rttests/ObjectsAsStrings_RoundTripTest.html  |     2 +-
 .../a/rttests/OptionalObjects_RoundTripTest.html   |     4 +-
 .../a/rttests/PrimitivesBeans_RoundTripTest.html   |     2 +-
 .../a/rttests/RoundTripAddClassAttrs_Test.html     |     2 +-
 .../juneau/a/rttests/RoundTripBeanMaps_Test.html   |     2 +-
 .../a/rttests/RoundTripBeansWithBuilders_Test.html |     2 +-
 .../a/rttests/RoundTripLargeObjects_Test.html      |     2 +-
 .../juneau/a/rttests/RoundTripMaps_Test.html       |     2 +-
 .../a/rttests/RoundTripTransformBeans_Test.html    |     6 +-
 .../apache/juneau/a/rttests/RoundTrip_Tester.html  |     4 +-
 .../a/rttests/SimpleObjects_RoundTripTest.html     |     4 +-
 .../a/rttests/TrimStrings_RoundTripTest.html       |     2 +-
 .../annotation/BeanConfigAnnotation_Test.html      |    10 +-
 .../org/apache/juneau/annotation/Bean_Test.html    |     8 +-
 .../juneau/assertions/AnyAssertion_Test.html       |   991 +-
 .../juneau/assertions/ArrayAssertion_Test.html     |     4 +-
 .../assertions/AssertionPredicates_Test.html       |     2 +-
 .../apache/juneau/assertions/Assertions_Test.html  |     4 +-
 .../juneau/assertions/BeanAssertion_Test.html      |     4 +-
 .../juneau/assertions/BeanListAssertion_Test.html  |     6 +-
 .../juneau/assertions/BooleanAssertion_Test.html   |     2 +-
 .../juneau/assertions/ByteArrayAssertion_Test.html |     2 +-
 .../assertions/CollectionAssertion_Test.html       |     2 +-
 .../assertions/ComparableAssertion_Test.html       |     2 +-
 .../juneau/assertions/DateAssertion_Test.html      |     2 +-
 .../juneau/assertions/IntegerAssertion_Test.html   |     2 +-
 .../juneau/assertions/ListAssertion_Test.html      |     2 +-
 .../juneau/assertions/LongAssertion_Test.html      |     2 +-
 .../juneau/assertions/MapAssertion_Test.html       |     4 +-
 .../juneau/assertions/ObjectAssertion_Test.html    |     4 +-
 .../juneau/assertions/StringAssertion_Test.html    |     2 +-
 .../assertions/StringListAssertion_Test.html       |     2 +-
 .../juneau/assertions/ThrowableAssertion_Test.html |     2 +-
 .../juneau/assertions/VersionAssertion_Test.html   |    12 +-
 .../assertions/ZonedDateTimeAssertion_Test.html    |     2 +-
 .../org/apache/juneau/bean/html5/A_Test.html       |     2 +-
 .../bean/html5/Html5_ComboRoundTripTest.html       |     4 +-
 .../bean/html5/HtmlElementContainer_Test.html      |     2 +-
 .../juneau/bean/html5/HtmlElementMixed_Test.html   |     2 +-
 .../JsonSchemaPropertySimpleArray_Test.html        |     2 +-
 .../bean/jsonschema/JsonSchemaProperty_Test.html   |     2 +-
 .../juneau/bean/jsonschema/JsonSchemaRef_Test.html |     2 +-
 .../apache/juneau/bean/openapi3/Callback_Test.html |     2 +-
 .../juneau/bean/openapi3/Components_Test.html      |     2 +-
 .../juneau/bean/openapi3/Discriminator_Test.html   |     2 +-
 .../apache/juneau/bean/openapi3/Encoding_Test.html |     2 +-
 .../juneau/bean/openapi3/HeaderInfo_Test.html      |     2 +-
 .../apache/juneau/bean/openapi3/Items_Test.html    |     2 +-
 .../org/apache/juneau/bean/openapi3/Link_Test.html |     2 +-
 .../juneau/bean/openapi3/MediaType_Test.html       |     2 +-
 .../juneau/bean/openapi3/OAuthFlow_Test.html       |     2 +-
 .../juneau/bean/openapi3/OpenApiBuilder_Test.html  |     2 +-
 .../apache/juneau/bean/openapi3/OpenApi_Test.html  |     2 +-
 .../juneau/bean/openapi3/Operation_Test.html       |     2 +-
 .../juneau/bean/openapi3/Parameter_Test.html       |     2 +-
 .../apache/juneau/bean/openapi3/PathItem_Test.html |     2 +-
 .../juneau/bean/openapi3/RequestBodyInfo_Test.html |     2 +-
 .../apache/juneau/bean/openapi3/Response_Test.html |     2 +-
 .../juneau/bean/openapi3/SchemaInfo_Test.html      |     2 +-
 .../bean/openapi3/SecurityRequirement_Test.html    |     2 +-
 .../juneau/bean/openapi3/ServerVariable_Test.html  |     2 +-
 .../apache/juneau/bean/openapi3/Server_Test.html   |     2 +-
 .../juneau/bean/swagger/HeaderInfo_Test.html       |     2 +-
 .../org/apache/juneau/bean/swagger/Items_Test.html |     2 +-
 .../apache/juneau/bean/swagger/Operation_Test.html |     2 +-
 .../juneau/bean/swagger/ParameterInfo_Test.html    |     2 +-
 .../juneau/bean/swagger/ResponseInfo_Test.html     |     2 +-
 .../juneau/bean/swagger/SchemaInfo_Test.html       |     2 +-
 .../juneau/bean/swagger/SecurityScheme_Test.html   |     2 +-
 .../apache/juneau/bean/swagger/Swagger_Test.html   |     2 +-
 .../juneau/bean/swagger/ui/SwaggerUI_Test.html     |     2 +-
 .../apache/juneau/collections/package-frame.html   |    21 -
 .../apache/juneau/collections/package-summary.html |   107 -
 .../annotation/AnnotationObject_Test.html          |     6 +-
 .../annotation/AppliedAnnotationObject_Test.html   |     8 +-
 .../AppliedOnClassAnnotationObject_Test.html       |     8 +-
 .../annotation/package-frame.html                  |     4 +-
 .../annotation/package-summary.html                |    96 +-
 .../{ => commons}/collections/Args_Test.html       |   231 +-
 .../collections/BidiMap_Test.html                  |     6 +-
 .../collections/BooleanValue_Test.html             |     8 +-
 .../collections/ByteValue_Test.html                |     8 +-
 .../collections/Cache2_Test.html                   |  1207 +-
 .../collections/Cache3_Test.html                   |   649 +-
 .../collections/Cache4_Test.html                   |   649 +-
 .../collections/Cache5_Test.html                   |   651 +-
 .../collections/CacheMode_Test.html                |     6 +-
 .../collections/Cache_Test.html                    |  1827 ++-
 .../collections/CharValue_Test.html                |     6 +-
 .../collections/ControlledArrayList_Test.html      |     8 +-
 .../collections/DoubleValue_Test.html              |     8 +-
 .../{common => commons}/collections/Flag_Test.html |     8 +-
 .../collections/FloatValue_Test.html               |     8 +-
 .../collections/IntegerValue_Test.html             |     8 +-
 .../collections/KeywordSet_Test.html               |     6 +-
 .../collections/ListBuilder_Test.html              |    20 +-
 .../collections/LongValue_Test.html                |     8 +-
 .../collections/MapBuilder_Test.html               |     8 +-
 .../collections/MultiSet_Test.html                 |     8 +-
 .../collections/ReversedList_Test.html             |     6 +-
 .../collections/SetBuilder_Test.html               |    20 +-
 .../collections/ShortValue_Test.html               |     8 +-
 .../collections/SimpleMap_Test.html                |     8 +-
 .../collections/SimpleUnmodifiableMap_Test.html    |     8 +-
 .../collections/StringValue_Test.html              |     8 +-
 .../collections/Value_Test.html                    |    10 +-
 .../collections/package-frame.html                 |     7 +-
 .../collections/package-summary.html               |    81 +-
 .../function/Consumer2_Test.html                   |     6 +-
 .../function/Consumer3_Test.html                   |     6 +-
 .../function/Consumer4_Test.html                   |     6 +-
 .../function/Consumer5_Test.html                   |     6 +-
 .../function/Function2_Test.html                   |     6 +-
 .../function/Function3_Test.html                   |     6 +-
 .../function/Function4_Test.html                   |     6 +-
 .../function/Function5_Test.html                   |     6 +-
 .../function/ResettableSupplier_Test.html          |     6 +-
 .../function/ThrowingConsumer_Test.html            |     6 +-
 .../function/ThrowingFunction_Test.html            |     6 +-
 .../{common => commons}/function/Tuple1_Test.html  |     6 +-
 .../{common => commons}/function/Tuple2_Test.html  |     6 +-
 .../{common => commons}/function/Tuple3_Test.html  |     6 +-
 .../{common => commons}/function/Tuple4_Test.html  |     6 +-
 .../{common => commons}/function/Tuple5_Test.html  |     6 +-
 .../function/package-frame.html                    |     4 +-
 .../function/package-summary.html                  |    38 +-
 .../io/CharSequenceReader_Test.html                |     6 +-
 .../io/FileReaderBuilder_Test.html                 |     8 +-
 .../io/FileWriterBuilder_Test.html                 |     6 +-
 .../{common => commons}/io/LocalDir_Test.html      |     6 +-
 .../{common => commons}/io/LocalFile_Test.html     |     8 +-
 .../io/NoCloseOutputStream_Test.html               |     6 +-
 .../{common => commons}/io/NoCloseWriter_Test.html |     6 +-
 .../io/PathReaderBuilder_Test.html                 |     8 +-
 .../io/ReaderInputStream_Test.html                 |     6 +-
 .../io/StringBuilderWriter_Test.html               |     6 +-
 .../{common => commons}/io/package-frame.html      |     4 +-
 .../{common => commons}/io/package-summary.html    |    24 +-
 .../juneau/{common => commons}/reflect/AClass.html |     6 +-
 .../{common => commons}/reflect/AInterface.html    |     6 +-
 .../reflect/AnnotationInfoTest.html                |    10 +-
 .../reflect/AnnotationInfo_ValueMethods_Test.html  |    10 +-
 .../reflect/ClassInfo_Test.html                    |    60 +-
 .../reflect/ConstructorInfoTest.html               |    10 +-
 .../reflect/ExecutableInfo_Test.html               |    22 +-
 .../reflect/FieldInfo_AnnotationInfos_Test.html    |     6 +-
 .../reflect/FieldInfo_FullName_Test.html           |    10 +-
 .../reflect/FieldInfo_Test.html                    |    10 +-
 .../reflect/MethodInfo_Test.html                   |    10 +-
 .../juneau/{common => commons}/reflect/PA.html     |     6 +-
 .../reflect/ParameterInfoTest.html                 |    10 +-
 .../reflect/ReflectionMap_Test.html                |    34 +-
 .../reflect/ThrowingSupplier_Test.html             |    12 +-
 .../{common => commons}/reflect/package-frame.html |     4 +-
 .../reflect/package-summary.html                   |   398 +-
 .../utils/AnnotationUtils_Test.html                |     8 +-
 .../{common => commons}/utils/AsciiMap_Test.html   |     6 +-
 .../{common => commons}/utils/AsciiSet_Test.html   |     6 +-
 .../utils/AssertionUtils_Test.html                 |    10 +-
 .../{common => commons}/utils/ClassUtils_Test.html |  1355 +-
 .../utils/CollectionUtils_Test.html                |     8 +-
 .../{common => commons}/utils/Console_Test.html    |     6 +-
 .../{common => commons}/utils/DateUtils_Test.html  |     8 +-
 .../{common => commons}/utils/FileUtils_Test.html  |     6 +-
 .../utils/GranularZonedDateTime_Test.html          |     6 +-
 .../{common => commons}/utils/HashCode_Test.html   |     8 +-
 .../{common => commons}/utils/IOUtils_Test.html    |   221 +-
 .../utils/MimeTypeDetector_Test.html               |     8 +-
 .../utils/PredicateUtils_Test.html                 |    12 +-
 .../utils/ResourceBundleUtils_Test.html            |     6 +-
 .../utils/SimpleReadWriteLock_Test.html            |     6 +-
 .../{common => commons}/utils/StateEnum_Test.html  |     8 +-
 .../utils/StringFormat_Test.html                   |    10 +-
 .../utils/StringUtils_Test.html                    | 12911 +++++++++----------
 .../utils/ThrowableUtils_Test.html                 |     8 +-
 .../{common => commons}/utils/Utils_Test.html      |    16 +-
 .../utils/VersionRange_Test.html                   |     6 +-
 .../{common => commons}/utils/Version_Test.html    |    10 +-
 .../utils/WeightedAverage_Test.html                |     6 +-
 .../{common => commons}/utils/package-frame.html   |     4 +-
 .../{common => commons}/utils/package-summary.html |   150 +-
 .../apache/juneau/config/ConfigBuilder_Test.html   |     4 +-
 .../apache/juneau/config/ConfigImportsTest.html    |     2 +-
 .../apache/juneau/config/ConfigInterfaceTest.html  |     2 +-
 .../juneau/config/ConfigMapListener_Test.html      |     2 +-
 .../org/apache/juneau/config/ConfigMap_Test.html   |     4 +-
 .../org/apache/juneau/config/Config_Test.html      |     2 +-
 .../juneau/config/store/ConfigFileStoreTest.html   |     4 +-
 .../org/apache/juneau/cp/BeanStore_Test.html       |     4 +-
 .../org/apache/juneau/cp/FileFinder_Test.html      |     6 +-
 .../juneau/csv/annotation/CsvConfig_Test.html      |     6 +-
 .../apache/juneau/encoders/EncoderSet_Test.html    |     2 +-
 .../juneau/examples/rest/ContentComboTestBase.html |     4 +-
 .../juneau/examples/rest/RootContentTest.html      |     2 +-
 .../org/apache/juneau/examples/rest/TestUtils.html |     4 +-
 .../org/apache/juneau/html/BasicHtml_Test.html     |     4 +-
 .../org/apache/juneau/html/Common_Test.html        |     2 +-
 .../juneau/html/HtmlConfigAnnotation_Test.html     |     6 +-
 .../juneau/html/HtmlDocConfigAnnotation_Test.html  |     8 +-
 .../org/apache/juneau/html/Html_Test.html          |     2 +-
 .../apache/juneau/html/SimpleHtmlWriter_Test.html  |     2 +-
 .../org/apache/juneau/http/BasicHeader_Test.html   |     2 +-
 .../apache/juneau/http/BasicHttpResource_Test.html |     2 +-
 .../org/apache/juneau/http/BasicPart_Test.html     |     2 +-
 .../org/apache/juneau/http/HttpHeaders_Test.html   |     2 +-
 .../juneau/http/MediaRanges_FindMatch_Test.html    |     4 +-
 .../org/apache/juneau/http/MediaRanges_Test.html   |     2 +-
 .../apache/juneau/http/SerializedHeader_Test.html  |     2 +-
 .../juneau/http/SerializedHttpEntity_Test.html     |     4 +-
 .../apache/juneau/http/SerializedPart_Test.html    |     2 +-
 .../org/apache/juneau/http/StringRange_Test.html   |     2 +-
 .../org/apache/juneau/http/StringRanges_Test.html  |     2 +-
 .../http/annotation/AnnotationUtils_Test.html      |     2 +-
 .../juneau/http/header/AcceptCharset_Test.html     |     2 +-
 .../juneau/http/header/AcceptEncoding_Test.html    |     2 +-
 .../juneau/http/header/AcceptLanguage_Test.html    |     2 +-
 .../juneau/http/header/AcceptRanges_Test.html      |     2 +-
 .../org/apache/juneau/http/header/Accept_Test.html |     4 +-
 .../org/apache/juneau/http/header/Age_Test.html    |     2 +-
 .../org/apache/juneau/http/header/Allow_Test.html  |     2 +-
 .../juneau/http/header/Authorization_Test.html     |     2 +-
 .../http/header/BasicBooleanHeader_Test.html       |     2 +-
 .../juneau/http/header/BasicCsvHeader_Test.html    |     2 +-
 .../juneau/http/header/BasicDateHeader_Test.html   |     2 +-
 .../http/header/BasicEntityTagHeader_Test.html     |     2 +-
 .../http/header/BasicEntityTagsHeader_Test.html    |     2 +-
 .../http/header/BasicIntegerHeader_Test.html       |     2 +-
 .../juneau/http/header/BasicLongHeader_Test.html   |     2 +-
 .../http/header/BasicMediaRangesHeader_Test.html   |     4 +-
 .../http/header/BasicMediaTypeHeader_Test.html     |     2 +-
 .../juneau/http/header/BasicStringHeader_Test.html |     2 +-
 .../http/header/BasicStringRangesHeader_Test.html  |     2 +-
 .../juneau/http/header/BasicUriHeader_Test.html    |     2 +-
 .../juneau/http/header/CacheControl_Test.html      |     2 +-
 .../juneau/http/header/ClientVersion_Test.html     |     4 +-
 .../apache/juneau/http/header/Connection_Test.html |     2 +-
 .../http/header/ContentDisposition_Test.html       |     2 +-
 .../juneau/http/header/ContentEncoding_Test.html   |     2 +-
 .../juneau/http/header/ContentLanguage_Test.html   |     2 +-
 .../juneau/http/header/ContentLength_Test.html     |     2 +-
 .../juneau/http/header/ContentLocation_Test.html   |     2 +-
 .../juneau/http/header/ContentRange_Test.html      |     2 +-
 .../juneau/http/header/ContentType_Match_Test.html |     4 +-
 .../juneau/http/header/ContentType_Test.html       |     2 +-
 .../org/apache/juneau/http/header/Date_Test.html   |     2 +-
 .../org/apache/juneau/http/header/ETag_Test.html   |     2 +-
 .../org/apache/juneau/http/header/Expect_Test.html |     2 +-
 .../apache/juneau/http/header/Expires_Test.html    |     2 +-
 .../apache/juneau/http/header/Forwarded_Test.html  |     2 +-
 .../org/apache/juneau/http/header/From_Test.html   |     2 +-
 .../apache/juneau/http/header/HeaderList_Test.html |     2 +-
 .../org/apache/juneau/http/header/Host_Test.html   |     2 +-
 .../apache/juneau/http/header/IfMatch_Test.html    |     2 +-
 .../juneau/http/header/IfModifiedSince_Test.html   |     2 +-
 .../juneau/http/header/IfNoneMatch_Test.html       |     2 +-
 .../apache/juneau/http/header/IfRange_Test.html    |     2 +-
 .../juneau/http/header/IfUnmodifiedSince_Test.html |     2 +-
 .../juneau/http/header/LastModified_Test.html      |     2 +-
 .../apache/juneau/http/header/Location_Test.html   |     2 +-
 .../juneau/http/header/MaxForwards_Test.html       |     2 +-
 .../apache/juneau/http/header/NoTrace_Test.html    |     2 +-
 .../org/apache/juneau/http/header/Origin_Test.html |     2 +-
 .../org/apache/juneau/http/header/Pragma_Test.html |     2 +-
 .../juneau/http/header/ProxyAuthenticate_Test.html |     2 +-
 .../http/header/ProxyAuthorization_Test.html       |     2 +-
 .../org/apache/juneau/http/header/Range_Test.html  |     2 +-
 .../apache/juneau/http/header/Referer_Test.html    |     2 +-
 .../apache/juneau/http/header/RetryAfter_Test.html |     2 +-
 .../org/apache/juneau/http/header/Server_Test.html |     2 +-
 .../org/apache/juneau/http/header/TE_Test.html     |     2 +-
 .../apache/juneau/http/header/Trailer_Test.html    |     2 +-
 .../juneau/http/header/TransferEncoding_Test.html  |     2 +-
 .../apache/juneau/http/header/Upgrade_Test.html    |     2 +-
 .../apache/juneau/http/header/UserAgent_Test.html  |     2 +-
 .../org/apache/juneau/http/header/Vary_Test.html   |     2 +-
 .../org/apache/juneau/http/header/Via_Test.html    |     2 +-
 .../apache/juneau/http/header/Warning_Test.html    |     2 +-
 .../juneau/http/header/WwwAuthenticate_Test.html   |     2 +-
 .../org/apache/juneau/http/part/PartList_Test.html |     2 +-
 .../http/remote/Remote_CommonInterfaces_Test.html  |     2 +-
 .../http/remote/Remote_ContentAnnotation_Test.html |     4 +-
 .../remote/Remote_FormDataAnnotation_Test.html     |     2 +-
 .../http/remote/Remote_HeaderAnnotation_Test.html  |     2 +-
 .../http/remote/Remote_PathAnnotation_Test.html    |     2 +-
 .../http/remote/Remote_QueryAnnotation_Test.html   |     2 +-
 .../remote/Remote_RemoteOpAnnotation_Test.html     |     2 +-
 .../http/remote/Remote_RequestAnnotation_Test.html |     2 +-
 .../remote/Remote_ResponseAnnotation_Test.html     |     2 +-
 .../juneau/http/remote/RrpcInterface_Test.html     |     2 +-
 .../http/resource/ByteArrayResource_Test.html      |     2 +-
 .../juneau/http/resource/FileResource_Test.html    |     2 +-
 .../juneau/http/resource/ReaderResource_Test.html  |     2 +-
 .../juneau/http/resource/StreamResource_Test.html  |     2 +-
 .../juneau/http/resource/StringResource_Test.html  |     2 +-
 .../juneau/http/response/BadRequest_Test.html      |     2 +-
 .../juneau/http/response/HttpException_Test.html   |     2 +-
 .../juneau/httppart/HttpPartSchema_Body_Test.html  |     8 +-
 .../httppart/HttpPartSchema_FormData_Test.html     |     8 +-
 .../httppart/HttpPartSchema_Header_Test.html       |     8 +-
 .../juneau/httppart/HttpPartSchema_Path_Test.html  |     8 +-
 .../juneau/httppart/HttpPartSchema_Query_Test.html |     8 +-
 .../HttpPartSchema_ResponseHeader_Test.html        |     8 +-
 .../httppart/HttpPartSchema_Response_Test.html     |     4 +-
 .../juneau/httppart/OpenApiPartParser_Test.html    |     4 +-
 .../httppart/OpenApiPartSerializer_Test.html       |     6 +-
 .../org/apache/juneau/json/Common_Test.html        |     2 +-
 .../juneau/json/JsonConfigAnnotationTest.html      |     6 +-
 .../juneau/json/JsonParserEdgeCases_Test.html      |     4 +-
 .../org/apache/juneau/json/Json_Test.html          |     2 +-
 .../jsonschema/JsonSchemaConfigAnnotationTest.html |     6 +-
 .../juneau/jsonschema/JsonSchemaGeneratorTest.html |     4 +-
 .../juneau/junit/bct/BasicBeanConverter_Test.html  |     4 +-
 .../juneau/junit/bct/BctAssertions_Test.html       |     4 +-
 .../juneau/junit/bct/BeanConverter_Test.html       |     2 +-
 .../apache/juneau/junit/bct/Listifier_Test.html    |     2 +-
 .../apache/juneau/junit/bct/Listifiers_Test.html   |     4 +-
 .../juneau/junit/bct/NestedTokenizer_Test.html     |     2 +-
 .../juneau/junit/bct/PropertyExtractor_Test.html   |     2 +-
 .../juneau/junit/bct/PropertyExtractors_Test.html  |     2 +-
 .../apache/juneau/junit/bct/Stringifier_Test.html  |     2 +-
 .../apache/juneau/junit/bct/Stringifiers_Test.html |     2 +-
 .../org/apache/juneau/junit/bct/Swapper_Test.html  |     4 +-
 .../org/apache/juneau/junit/bct/Swappers_Test.html |     4 +-
 .../org/apache/juneau/marshaller/Csv_Test.html     |     2 +-
 .../org/apache/juneau/marshaller/MsgPack_Test.html |     2 +-
 .../msgpack/MsgPackConfigAnnotationTest.html       |     6 +-
 .../apache/juneau/msgpack/MsgPackParser_Test.html  |     2 +-
 .../juneau/msgpack/MsgPackSerializerTest.html      |     4 +-
 .../org/apache/juneau/mstat/ThrownStore_Test.html  |     2 +-
 .../juneau/oapi/OpenApiConfigAnnotation_Test.html  |     6 +-
 .../org/apache/juneau/oapi/OpenApi_Test.html       |     4 +-
 .../objecttools/ObjectIntrospector_Test.html       |     2 +-
 .../juneau/objecttools/ObjectPaginator_Test.html   |     2 +-
 .../juneau/objecttools/ObjectSearcher_Test.html    |     8 +-
 .../juneau/objecttools/ObjectSorter_Test.html      |     2 +-
 .../juneau/objecttools/ObjectViewer_Test.html      |     2 +-
 .../juneau/parser/ParserConfigAnnotationTest.html  |    10 +-
 .../plaintext/PlainTextConfigAnnotation_Test.html  |     6 +-
 .../juneau/rest/Header_AcceptEncoding_Test.html    |     4 +-
 .../org/apache/juneau/rest/RestOp_Params_Test.html |    20 +-
 .../org/apache/juneau/rest/Swagger_Test.html       |     4 +-
 .../juneau/rest/annotation/Content_Test.html       |     4 +-
 .../apache/juneau/rest/annotation/Path_Test.html   |     2 +-
 .../rest/annotation/ResponseHeader_Test.html       |     2 +-
 .../rest/annotation/ResponseStatus_Test.html       |     2 +-
 .../juneau/rest/annotation/Response_Test.html      |     6 +-
 .../rest/annotation/RestOp_Matchers_Test.html      |     2 +-
 .../Rest_DefaultRequestAttributes_Test.html        |     2 +-
 .../juneau/rest/annotation/Rest_Encoders_Test.html |     4 +-
 .../rest/annotation/Swagger_Response_Test.html     |     2 +-
 .../apache/juneau/rest/arg/ArgException_Test.html  |     8 +-
 .../juneau/rest/beans/SeeOtherRoot_Test.html       |     2 +-
 .../rest/client/RestClient_BasicCalls_Test.html    |     2 +-
 .../client/RestClient_CallbackStrings_Test.html    |     2 +-
 .../client/RestClient_Config_BeanContext_Test.html |     4 +-
 .../client/RestClient_Config_Context_Test.html     |     4 +-
 .../client/RestClient_Config_OpenApi_Test.html     |     2 +-
 .../client/RestClient_Config_RestClient_Test.html  |     4 +-
 .../client/RestClient_Config_Serializer_Test.html  |     2 +-
 .../rest/client/RestClient_FormData_Test.html      |     2 +-
 .../rest/client/RestClient_Headers_Test.html       |     2 +-
 .../juneau/rest/client/RestClient_Paths_Test.html  |     2 +-
 .../juneau/rest/client/RestClient_Query_Test.html  |     2 +-
 .../rest/client/RestClient_Response_Body_Test.html |     4 +-
 .../client/RestClient_Response_Headers_Test.html   |     2 +-
 .../rest/client/RestClient_Response_Test.html      |     2 +-
 .../apache/juneau/rest/client/RestClient_Test.html |     8 +-
 .../juneau/rest/guards/RoleMatcher_Test.html       |     6 +-
 .../apache/juneau/rest/helper/Hyperlink_Test.html  |     4 +-
 .../apache/juneau/rest/mock/PathResolverTest.html  |     2 +-
 .../rest/springboot/SpringBeanStore_Test.html      |     2 +-
 .../rest/test/client/ThirdPartyProxyResource.html  |     2 +-
 .../rest/test/client/ThirdPartyProxy_Test.html     |     2 +-
 .../apache/juneau/rest/util/RestUtils_Test.html    |     4 +-
 .../ReaderObject_ComboSerializeTest.html           |     2 +-
 .../serializer/SerializerConfigAnnotationTest.html |     8 +-
 .../org/apache/juneau/serializer/TestURI.html      |     2 +-
 .../org/apache/juneau/serializer/TestURIc.html     |     2 +-
 .../juneau/serializer/UriResolution_Test.html      |     2 +-
 .../serializer/WriterFluentSetters_Test.html       |     2 +-
 .../juneau/soap/SoapXmlConfigAnnotationTest.html   |     4 +-
 .../apache/juneau/svl/ResolvingJsonMapTest.html    |     2 +-
 .../org/apache/juneau/svl/vars/IfVarTest.html      |     2 +-
 .../pojos/PrimitiveAtomicObjectsBean.html          |     2 +-
 .../testutils/pojos/PrimitiveObjectsBean.html      |     2 +-
 .../juneau/testutils/pojos/SwappedObjectSwap.html  |     2 +-
 .../juneau/testutils/pojos/TestEnumToString.html   |     2 +-
 .../org/apache/juneau/testutils/pojos/XBeans.html  |     2 +-
 .../apache/juneau/transform/AutoListSwapTest.html  |     6 +-
 .../apache/juneau/transform/AutoMapSwapTest.html   |     6 +-
 .../juneau/transform/AutoNumberSwapTest.html       |     4 +-
 .../juneau/transform/AutoObjectSwapTest.html       |     6 +-
 .../BeanDictionary_ComboRoundTripTest.html         |     2 +-
 .../ByteArrayBase64Swap_ComboRoundTripTest.html    |     2 +-
 .../juneau/transforms/DefaultSwaps_Test.html       |     2 +-
 .../juneau/transforms/EnumerationSwapTest.html     |     2 +-
 .../apache/juneau/transforms/IteratorSwapTest.html |     2 +-
 .../juneau/transforms/OneWayStringSwap_Tester.html |     2 +-
 .../ReaderObjectSwap_ComboSerializeTest.html       |     2 +-
 .../transforms/RoundTripObjectSwap_Tester.html     |     2 +-
 .../juneau/transforms/StringSwap_Tester.html       |     2 +-
 .../org/apache/juneau/uon/Common_UonTest.html      |     2 +-
 .../apache/juneau/uon/UonConfigAnnotationTest.html |     4 +-
 .../apache/juneau/uon/UonParserReader_Test.html    |     2 +-
 .../org/apache/juneau/uon/UonSerializer_Test.html  |     2 +-
 .../juneau/urlencoding/Common_UrlEncodingTest.html |     2 +-
 .../org/apache/juneau/urlencoding/DTOs.html        |     2 +-
 .../org/apache/juneau/urlencoding/DTOs2.html       |     2 +-
 .../UrlEncodingConfigAnnotationTest.html           |     4 +-
 .../urlencoding/UrlEncodingSerializer_Test.html    |     2 +-
 .../juneau/utest/utils/FakeReaderParser.html       |     4 +-
 .../juneau/utest/utils/FakeStreamParser.html       |     6 +-
 .../juneau/utest/utils/FakeStreamSerializer.html   |     2 +-
 .../juneau/utest/utils/FakeWriterSerializer.html   |     8 +-
 .../org/apache/juneau/utils/BeanDiffTest.html      |     2 +-
 .../org/apache/juneau/utils/FilteredMapTest.html   |     2 +-
 .../juneau/utils/StringExpressionMatcher_Test.html |     4 +-
 .../juneau/utils/StringVarResolver_Test.html       |     6 +-
 .../org/apache/juneau/utils/Tuple2_Test.html       |     2 +-
 .../org/apache/juneau/utils/Tuple3_Test.html       |     2 +-
 .../org/apache/juneau/utils/Tuple4_Test.html       |     2 +-
 .../org/apache/juneau/utils/Tuple5_Test.html       |     2 +-
 .../utils/UriContextResolutionCombo_Test.html      |     2 +-
 .../juneau/utils/UriContextUriCombo_Test.html      |     2 +-
 .../apache/juneau/utils/WeightedAverageTest.html   |     2 +-
 .../org/apache/juneau/xml/BasicXml_Test.html       |     4 +-
 .../org/apache/juneau/xml/Common_Test.html         |     2 +-
 .../org/apache/juneau/xml/XmlCollapsed_Test.html   |     2 +-
 .../apache/juneau/xml/XmlConfigAnnotationTest.html |     6 +-
 .../apache/juneau/xml/XmlIgnoreComments_Test.html  |     2 +-
 site/xref-test/org/apache/juneau/xml/Xml_Test.html |     2 +-
 site/xref-test/overview-frame.html                 |    15 +-
 site/xref-test/overview-summary.html               |   155 +-
 site/xref/allclasses-frame.html                    |   280 +-
 site/xref/org/apache/juneau/AnnotationApplier.html |    10 +-
 site/xref/org/apache/juneau/AnnotationWork.html    |     6 +-
 .../xref/org/apache/juneau/AnnotationWorkList.html |     6 +-
 .../org/apache/juneau/BasicAssertionError.html     |     2 +-
 site/xref/org/apache/juneau/BasicException.html    |     4 +-
 .../org/apache/juneau/BasicRuntimeException.html   |     4 +-
 site/xref/org/apache/juneau/BeanBuilder.html       |     2 +-
 site/xref/org/apache/juneau/BeanContext.html       |    48 +-
 site/xref/org/apache/juneau/BeanContextable.html   |  5903 ++++-----
 site/xref/org/apache/juneau/BeanDictionaryMap.html |     6 +-
 site/xref/org/apache/juneau/BeanFilter.html        |     8 +-
 site/xref/org/apache/juneau/BeanMap.html           |    14 +-
 site/xref/org/apache/juneau/BeanMeta.html          |    40 +-
 .../org/apache/juneau/BeanPropertyConsumer.html    |     2 +-
 site/xref/org/apache/juneau/BeanPropertyMeta.html  |    34 +-
 .../apache/juneau/BeanProxyInvocationHandler.html  |     6 +-
 site/xref/org/apache/juneau/BeanRegistry.html      |    12 +-
 site/xref/org/apache/juneau/BeanSession.html       |    36 +-
 .../org/apache/juneau/BeanTraverseContext.html     |    16 +-
 .../org/apache/juneau/BeanTraverseSession.html     |     4 +-
 site/xref/org/apache/juneau/ClassMeta.html         |    44 +-
 .../apache/juneau/ClassMetaRuntimeException.html   |     2 +-
 site/xref/org/apache/juneau/ConfigException.html   |     2 +-
 site/xref/org/apache/juneau/Context.html           |    20 +-
 site/xref/org/apache/juneau/ContextSession.html    |     8 +-
 site/xref/org/apache/juneau/Enablement.html        |     2 +-
 site/xref/org/apache/juneau/ExtendedBeanMeta.html  |     4 +-
 .../apache/juneau/ExtendedBeanPropertyMeta.html    |     4 +-
 site/xref/org/apache/juneau/ExtendedClassMeta.html |     4 +-
 .../juneau/InvalidDataConversionException.html     |     4 +-
 site/xref/org/apache/juneau/MarshalledFilter.html  |     4 +-
 site/xref/org/apache/juneau/MediaRange.html        |     2 +-
 site/xref/org/apache/juneau/MediaRanges.html       |     8 +-
 site/xref/org/apache/juneau/MediaType.html         |    10 +-
 site/xref/org/apache/juneau/PropertyNamerDLC.html  |     2 +-
 site/xref/org/apache/juneau/PropertyNamerDUCS.html |     2 +-
 site/xref/org/apache/juneau/PropertyNamerULC.html  |     2 +-
 site/xref/org/apache/juneau/StringRange.html       |     6 +-
 site/xref/org/apache/juneau/StringRanges.html      |     8 +-
 site/xref/org/apache/juneau/UriContext.html        |     6 +-
 site/xref/org/apache/juneau/UriResolver.html       |     6 +-
 .../apache/juneau/annotation/BeanAnnotation.html   |     8 +-
 .../juneau/annotation/BeanConfigAnnotation.html    |     4 +-
 .../juneau/annotation/BeanIgnoreAnnotation.html    |     8 +-
 .../apache/juneau/annotation/BeancAnnotation.html  |     8 +-
 .../apache/juneau/annotation/BeanpAnnotation.html  |     8 +-
 .../juneau/annotation/ExampleAnnotation.html       |     8 +-
 .../juneau/annotation/ExternalDocsAnnotation.html  |   265 +-
 .../annotation/InvalidAnnotationException.html     |     6 +-
 .../apache/juneau/annotation/ItemsAnnotation.html  |     6 +-
 .../juneau/annotation/MarshalledAnnotation.html    |     8 +-
 .../juneau/annotation/NamePropertyAnnotation.html  |     8 +-
 .../annotation/ParentPropertyAnnotation.html       |     8 +-
 .../apache/juneau/annotation/SchemaAnnotation.html |    12 +-
 .../juneau/annotation/SubItemsAnnotation.html      |     8 +-
 .../apache/juneau/annotation/SwapAnnotation.html   |     8 +-
 .../apache/juneau/annotation/UriAnnotation.html    |     8 +-
 .../org/apache/juneau/assertions/Assertion.html    |     8 +-
 .../juneau/assertions/AssertionPredicate.html      |     6 +-
 .../juneau/assertions/AssertionPredicates.html     |     8 +-
 .../org/apache/juneau/assertions/Assertions.html   |    10 +-
 .../juneau/assertions/FluentAnyAssertion.html      |     6 +-
 .../juneau/assertions/FluentArrayAssertion.html    |     8 +-
 .../apache/juneau/assertions/FluentAssertion.html  |     2 +-
 .../juneau/assertions/FluentBeanAssertion.html     |     2 +-
 .../juneau/assertions/FluentBeanListAssertion.html |     2 +-
 .../assertions/FluentByteArrayAssertion.html       |     4 +-
 .../assertions/FluentCollectionAssertion.html      |     2 +-
 .../assertions/FluentComparableAssertion.html      |     4 +-
 .../juneau/assertions/FluentDateAssertion.html     |     4 +-
 .../juneau/assertions/FluentListAssertion.html     |     6 +-
 .../juneau/assertions/FluentMapAssertion.html      |     4 +-
 .../juneau/assertions/FluentObjectAssertion.html   |    12 +-
 .../assertions/FluentPrimitiveArrayAssertion.html  |     4 +-
 .../juneau/assertions/FluentStringAssertion.html   |  1263 +-
 .../assertions/FluentStringListAssertion.html      |     2 +-
 .../assertions/FluentThrowableAssertion.html       |   842 +-
 .../juneau/assertions/FluentVersionAssertion.html  |     6 +-
 .../assertions/FluentZonedDateTimeAssertion.html   |     4 +-
 .../apache/juneau/assertions/StringAssertion.html  |     2 +-
 site/xref/org/apache/juneau/assertions/Verify.html |     2 +-
 .../apache/juneau/assertions/VersionAssertion.html |     6 +-
 site/xref/org/apache/juneau/bean/LinkString.html   |     4 +-
 .../xref/org/apache/juneau/bean/ResultSetList.html |     6 +-
 .../xref/org/apache/juneau/bean/atom/Category.html |     2 +-
 site/xref/org/apache/juneau/bean/atom/Common.html  |     2 +-
 .../org/apache/juneau/bean/atom/CommonEntry.html   |     2 +-
 site/xref/org/apache/juneau/bean/atom/Content.html |     2 +-
 site/xref/org/apache/juneau/bean/atom/Entry.html   |     2 +-
 .../org/apache/juneau/bean/atom/Generator.html     |     2 +-
 site/xref/org/apache/juneau/bean/atom/Icon.html    |     2 +-
 site/xref/org/apache/juneau/bean/atom/Logo.html    |     2 +-
 site/xref/org/apache/juneau/bean/atom/Person.html  |     2 +-
 .../org/apache/juneau/bean/html5/HtmlElement.html  |     6 +-
 site/xref/org/apache/juneau/bean/html5/Script.html |     2 +-
 site/xref/org/apache/juneau/bean/html5/Select.html |     2 +-
 site/xref/org/apache/juneau/bean/html5/Style.html  |     2 +-
 .../apache/juneau/bean/jsonschema/JsonSchema.html  |    10 +-
 .../juneau/bean/jsonschema/JsonSchemaMap.html      |     6 +-
 .../org/apache/juneau/bean/openapi3/Callback.html  |     8 +-
 .../apache/juneau/bean/openapi3/Components.html    |     8 +-
 .../org/apache/juneau/bean/openapi3/Contact.html   |    10 +-
 .../apache/juneau/bean/openapi3/Discriminator.html |     8 +-
 .../org/apache/juneau/bean/openapi3/Encoding.html  |     8 +-
 .../org/apache/juneau/bean/openapi3/Example.html   |     8 +-
 .../bean/openapi3/ExternalDocumentation.html       |    10 +-
 .../apache/juneau/bean/openapi3/HeaderInfo.html    |     8 +-
 .../xref/org/apache/juneau/bean/openapi3/Info.html |     8 +-
 .../org/apache/juneau/bean/openapi3/Items.html     |    12 +-
 .../org/apache/juneau/bean/openapi3/License.html   |    10 +-
 .../xref/org/apache/juneau/bean/openapi3/Link.html |     8 +-
 .../org/apache/juneau/bean/openapi3/MediaType.html |     8 +-
 .../org/apache/juneau/bean/openapi3/OAuthFlow.html |     8 +-
 .../apache/juneau/bean/openapi3/OAuthFlows.html    |     8 +-
 .../org/apache/juneau/bean/openapi3/OpenApi.html   |    10 +-
 .../juneau/bean/openapi3/OpenApiBuilder.html       |     2 +-
 .../juneau/bean/openapi3/OpenApiElement.html       |     8 +-
 .../org/apache/juneau/bean/openapi3/Operation.html |     8 +-
 .../org/apache/juneau/bean/openapi3/Parameter.html |    10 +-
 .../org/apache/juneau/bean/openapi3/PathItem.html  |     8 +-
 .../juneau/bean/openapi3/RequestBodyInfo.html      |     8 +-
 .../org/apache/juneau/bean/openapi3/Response.html  |     8 +-
 .../apache/juneau/bean/openapi3/SchemaInfo.html    |     8 +-
 .../juneau/bean/openapi3/SecurityRequirement.html  |     8 +-
 .../juneau/bean/openapi3/SecuritySchemeInfo.html   |    12 +-
 .../org/apache/juneau/bean/openapi3/Server.html    |    10 +-
 .../juneau/bean/openapi3/ServerVariable.html       |     8 +-
 site/xref/org/apache/juneau/bean/openapi3/Tag.html |     8 +-
 site/xref/org/apache/juneau/bean/openapi3/Xml.html |     8 +-
 .../apache/juneau/bean/openapi3/ui/OpenApiUI.html  |   723 +-
 .../org/apache/juneau/bean/swagger/Contact.html    |    10 +-
 .../juneau/bean/swagger/ExternalDocumentation.html |    10 +-
 .../org/apache/juneau/bean/swagger/HeaderInfo.html |    10 +-
 site/xref/org/apache/juneau/bean/swagger/Info.html |     8 +-
 .../xref/org/apache/juneau/bean/swagger/Items.html |    10 +-
 .../org/apache/juneau/bean/swagger/License.html    |    10 +-
 .../org/apache/juneau/bean/swagger/Operation.html  |     8 +-
 .../apache/juneau/bean/swagger/OperationMap.html   |     6 +-
 .../apache/juneau/bean/swagger/ParameterInfo.html  |    10 +-
 .../apache/juneau/bean/swagger/ResponseInfo.html   |     8 +-
 .../org/apache/juneau/bean/swagger/SchemaInfo.html |     8 +-
 .../apache/juneau/bean/swagger/SecurityScheme.html |    10 +-
 .../org/apache/juneau/bean/swagger/Swagger.html    |    10 +-
 .../apache/juneau/bean/swagger/SwaggerBuilder.html |     2 +-
 .../apache/juneau/bean/swagger/SwaggerElement.html |     8 +-
 site/xref/org/apache/juneau/bean/swagger/Tag.html  |     8 +-
 site/xref/org/apache/juneau/bean/swagger/Xml.html  |     8 +-
 .../apache/juneau/bean/swagger/ui/SwaggerUI.html   |   827 +-
 site/xref/org/apache/juneau/collections/Args.html  |     8 +-
 .../org/apache/juneau/collections/JsonList.html    |    10 +-
 .../org/apache/juneau/collections/JsonMap.html     |    14 +-
 .../annotation/AnnotationGroup.html                |     4 +-
 .../annotation/AnnotationObject.html               |    14 +-
 .../annotation/AppliedAnnotationObject.html        |    16 +-
 .../annotation/AppliedOnClassAnnotationObject.html |    10 +-
 .../annotation/package-frame.html                  |     4 +-
 .../annotation/package-summary.html                |    28 +-
 .../{common => commons}/collections/BidiMap.html   |    10 +-
 .../collections/BooleanValue.html                  |    18 +-
 .../{common => commons}/collections/ByteValue.html |    26 +-
 .../{common => commons}/collections/Cache.html     |    18 +-
 .../{common => commons}/collections/Cache2.html    |  1225 +-
 .../{common => commons}/collections/Cache3.html    |   833 +-
 .../{common => commons}/collections/Cache4.html    |   831 +-
 .../{common => commons}/collections/Cache5.html    |   853 +-
 .../{common => commons}/collections/CacheMode.html |     8 +-
 .../{common => commons}/collections/CharValue.html |    24 +-
 .../collections/ControlledArrayList.html           |    12 +-
 .../collections/DoubleValue.html                   |    16 +-
 .../{common => commons}/collections/Flag.html      |    28 +-
 .../collections/FloatValue.html                    |    16 +-
 .../collections/IntegerValue.html                  |    26 +-
 .../collections/KeywordSet.html                    |     8 +-
 .../collections/ListBuilder.html                   |   727 +-
 .../{common => commons}/collections/LongValue.html |    24 +-
 .../collections/MapBuilder.html                    |    24 +-
 .../{common => commons}/collections/MultiSet.html  |     8 +-
 .../collections/ReversedList.html                  |     8 +-
 .../collections/SetBuilder.html                    |   733 +-
 .../collections/ShortValue.html                    |    24 +-
 .../{common => commons}/collections/SimpleMap.html |    14 +-
 .../collections/SimpleUnmodifiableMap.html         |    14 +-
 .../collections/StringValue.html                   |    20 +-
 .../{common => commons}/collections/Value.html     |    18 +-
 .../collections/ValueListener.html                 |     4 +-
 .../collections/package-frame.html                 |     4 +-
 .../collections/package-summary.html               |    76 +-
 .../{common => commons}/function/Consumer2.html    |     6 +-
 .../{common => commons}/function/Consumer3.html    |     6 +-
 .../{common => commons}/function/Consumer4.html    |     6 +-
 .../{common => commons}/function/Consumer5.html    |     6 +-
 .../{common => commons}/function/Function2.html    |     6 +-
 .../{common => commons}/function/Function3.html    |     6 +-
 .../{common => commons}/function/Function4.html    |     6 +-
 .../{common => commons}/function/Function5.html    |     6 +-
 .../function/ResettableSupplier.html               |    12 +-
 .../{common => commons}/function/Snippet.html      |     6 +-
 .../function/ThrowingConsumer.html                 |     6 +-
 .../function/ThrowingFunction.html                 |     6 +-
 .../function/ThrowingSupplier.html                 |     4 +-
 .../{common => commons}/function/Tuple1.html       |    12 +-
 .../{common => commons}/function/Tuple2.html       |    12 +-
 .../{common => commons}/function/Tuple3.html       |    10 +-
 .../{common => commons}/function/Tuple4.html       |    10 +-
 .../{common => commons}/function/Tuple5.html       |    10 +-
 .../function/package-frame.html                    |     4 +-
 .../function/package-summary.html                  |    40 +-
 .../{common => commons}/io/CharSequenceReader.html |    12 +-
 .../{common => commons}/io/FileReaderBuilder.html  |    26 +-
 .../{common => commons}/io/FileWriterBuilder.html  |    32 +-
 .../juneau/{common => commons}/io/LocalDir.html    |    26 +-
 .../juneau/{common => commons}/io/LocalFile.html   |    18 +-
 .../io/NoCloseOutputStream.html                    |    10 +-
 .../{common => commons}/io/NoCloseWriter.html      |    10 +-
 .../{common => commons}/io/PathReaderBuilder.html  |    28 +-
 .../{common => commons}/io/ReaderInputStream.html  |    20 +-
 .../io/StringBuilderWriter.html                    |    20 +-
 .../{common => commons}/io/package-frame.html      |     4 +-
 .../{common => commons}/io/package-summary.html    |    24 +-
 .../reflect/AccessibleInfo.html                    |    10 +-
 .../{common => commons}/reflect/Annotatable.html   |     6 +-
 .../reflect/AnnotatableType.html                   |     6 +-
 .../reflect/AnnotationInfo.html                    |    24 +-
 .../reflect/AnnotationProvider.html                |    68 +-
 .../reflect/AnnotationTraversal.html               |     6 +-
 .../reflect/BeanRuntimeException.html              |    18 +-
 .../reflect/ClassArrayFormat.html                  |     6 +-
 .../{common => commons}/reflect/ClassInfo.html     |    66 +-
 .../reflect/ClassInfoTyped.html                    |     8 +-
 .../reflect/ClassNameFormat.html                   |     6 +-
 .../reflect/ConstructorInfo.html                   |   392 +-
 .../{common => commons}/reflect/ElementFlag.html   |     6 +-
 .../{common => commons}/reflect/ElementInfo.html   |    16 +-
 .../reflect/ExecutableException.html               |    14 +-
 .../reflect/ExecutableInfo.html                    |    32 +-
 .../{common => commons}/reflect/FieldInfo.html     |    40 +-
 .../{common => commons}/reflect/MethodInfo.html    |    42 +-
 .../{common => commons}/reflect/PackageInfo.html   |    30 +-
 .../{common => commons}/reflect/ParameterInfo.html |    36 +-
 .../{common => commons}/reflect/ReflectionMap.html |    16 +-
 .../reflect/ReflectionUtils.html                   |    12 +-
 .../juneau/{common => commons}/reflect/Setter.html |    18 +-
 .../{common => commons}/reflect/Visibility.html    |     8 +-
 .../{common => commons}/reflect/package-frame.html |     4 +-
 .../reflect/package-summary.html                   |    62 +-
 .../{common => commons}/utils/AnnotationUtils.html |    12 +-
 .../juneau/{common => commons}/utils/AsciiMap.html |    10 +-
 .../juneau/{common => commons}/utils/AsciiSet.html |    14 +-
 .../{common => commons}/utils/AssertionUtils.html  |    20 +-
 .../{common => commons}/utils/ClassUtils.html      |    18 +-
 .../{common => commons}/utils/CollectionUtils.html |    18 +-
 .../juneau/{common => commons}/utils/Console.html  |     8 +-
 .../{common => commons}/utils/Converter.html       |     6 +-
 .../{common => commons}/utils/DateUtils.html       |    16 +-
 .../{common => commons}/utils/FileUtils.html       |    16 +-
 .../utils/GranularZonedDateTime.html               |    30 +-
 .../juneau/{common => commons}/utils/HashCode.html |    14 +-
 .../juneau/{common => commons}/utils/IOUtils.html  |    16 +-
 .../utils/MimeTypeDetector.html                    |    28 +-
 .../{common => commons}/utils/PredicateUtils.html  |   451 +-
 .../utils/ResourceBundleUtils.html                 |     8 +-
 .../{common => commons}/utils/SimpleLock.html      |    12 +-
 .../utils/SimpleReadWriteLock.html                 |    24 +-
 .../{common => commons}/utils/StateEnum.html       |     8 +-
 .../{common => commons}/utils/StringFormat.html    |  1371 +-
 .../{common => commons}/utils/StringUtils.html     |    64 +-
 .../{common => commons}/utils/SystemUtils.html     |     6 +-
 .../{common => commons}/utils/ThrowableUtils.html  |    30 +-
 .../juneau/{common => commons}/utils/Utils.html    |    24 +-
 .../juneau/{common => commons}/utils/Version.html  |    30 +-
 .../{common => commons}/utils/VersionRange.html    |    20 +-
 .../{common => commons}/utils/WeightedAverage.html |    10 +-
 .../{common => commons}/utils/package-frame.html   |     4 +-
 .../{common => commons}/utils/package-summary.html |    74 +-
 site/xref/org/apache/juneau/config/Config.html     |    16 +-
 site/xref/org/apache/juneau/config/Entry.html      |     8 +-
 site/xref/org/apache/juneau/config/Section.html    |     8 +-
 .../apache/juneau/config/event/ConfigEvent.html    |     4 +-
 .../apache/juneau/config/event/ConfigEvents.html   |     2 +-
 .../apache/juneau/config/internal/ConfigMap.html   |    14 +-
 .../juneau/config/internal/ConfigMapEntry.html     |    10 +-
 .../org/apache/juneau/config/mod/XorEncodeMod.html |     4 +-
 .../apache/juneau/config/store/ClasspathStore.html |     6 +-
 .../apache/juneau/config/store/ConfigStore.html    |     6 +-
 .../org/apache/juneau/config/store/FileStore.html  |    12 +-
 .../apache/juneau/config/store/MemoryStore.html    |     4 +-
 .../xref/org/apache/juneau/cp/BasicFileFinder.html |    22 +-
 .../apache/juneau/cp/BeanCreateMethodFinder.html   |    14 +-
 site/xref/org/apache/juneau/cp/BeanCreator.html    |    26 +-
 site/xref/org/apache/juneau/cp/BeanStore.html      |  1309 +-
 site/xref/org/apache/juneau/cp/BeanStoreEntry.html |     6 +-
 .../org/apache/juneau/cp/ContextBeanCreator.html   |     4 +-
 site/xref/org/apache/juneau/cp/FileFinder.html     |    12 +-
 site/xref/org/apache/juneau/cp/Messages.html       |   941 +-
 site/xref/org/apache/juneau/csv/CsvParser.html     |    14 +-
 site/xref/org/apache/juneau/csv/CsvSerializer.html |    14 +-
 .../apache/juneau/csv/CsvSerializerSession.html    |     8 +-
 .../juneau/csv/annotation/CsvAnnotation.html       |     8 +-
 .../juneau/csv/annotation/CsvConfigAnnotation.html |     4 +-
 .../org/apache/juneau/encoders/EncoderSet.html     |    10 +-
 .../org/apache/juneau/encoders/GzipEncoder.html    |     2 +-
 .../apache/juneau/encoders/IdentityEncoder.html    |     2 +-
 .../examples/core/config/store/SqlStore.html       |     4 +-
 .../apache/juneau/html/BasicHtmlDocTemplate.html   |     8 +-
 .../apache/juneau/html/HtmlBeanPropertyMeta.html   |     6 +-
 .../xref/org/apache/juneau/html/HtmlClassMeta.html |     4 +-
 .../org/apache/juneau/html/HtmlDocSerializer.html  |    20 +-
 site/xref/org/apache/juneau/html/HtmlParser.html   |    14 +-
 .../org/apache/juneau/html/HtmlParserSession.html  |    14 +-
 .../juneau/html/HtmlSchemaDocSerializer.html       |    14 +-
 .../apache/juneau/html/HtmlSchemaSerializer.html   |    14 +-
 .../org/apache/juneau/html/HtmlSerializer.html     |    16 +-
 .../apache/juneau/html/HtmlSerializerSession.html  |    12 +-
 .../juneau/html/HtmlStrippedDocSerializer.html     |    14 +-
 .../html/HtmlStrippedDocSerializerSession.html     |     2 +-
 site/xref/org/apache/juneau/html/HtmlWriter.html   |     2 +-
 .../juneau/html/annotation/HtmlAnnotation.html     |     8 +-
 .../html/annotation/HtmlConfigAnnotation.html      |     4 +-
 .../html/annotation/HtmlDocConfigAnnotation.html   |     4 +-
 .../juneau/html/annotation/HtmlLinkAnnotation.html |     8 +-
 .../org/apache/juneau/http/BasicStatusLine.html    |     4 +-
 site/xref/org/apache/juneau/http/HttpHeaders.html  |    20 +-
 site/xref/org/apache/juneau/http/HttpMethod.html   |     4 +-
 site/xref/org/apache/juneau/http/HttpParts.html    |    14 +-
 .../juneau/http/annotation/ContactAnnotation.html  |     6 +-
 .../juneau/http/annotation/ContentAnnotation.html  |     8 +-
 .../juneau/http/annotation/FormDataAnnotation.html |    16 +-
 .../http/annotation/HasFormDataAnnotation.html     |     6 +-
 .../juneau/http/annotation/HasQueryAnnotation.html |     6 +-
 .../juneau/http/annotation/HeaderAnnotation.html   |    16 +-
 .../juneau/http/annotation/LicenseAnnotation.html  |     6 +-
 .../juneau/http/annotation/PathAnnotation.html     |    16 +-
 .../http/annotation/PathRemainderAnnotation.html   |    12 +-
 .../juneau/http/annotation/QueryAnnotation.html    |    16 +-
 .../juneau/http/annotation/RequestAnnotation.html  |     8 +-
 .../juneau/http/annotation/ResponseAnnotation.html |     8 +-
 .../apache/juneau/http/annotation/StatusCode.html  |     2 +-
 .../http/annotation/StatusCodeAnnotation.html      |     8 +-
 .../juneau/http/annotation/TagAnnotation.html      |     6 +-
 .../apache/juneau/http/entity/BasicHttpEntity.html |     6 +-
 .../apache/juneau/http/entity/ByteArrayEntity.html |     2 +-
 .../org/apache/juneau/http/entity/FileEntity.html  |     6 +-
 .../apache/juneau/http/entity/ReaderEntity.html    |    10 +-
 .../juneau/http/entity/SerializedEntity.html       |    10 +-
 .../apache/juneau/http/entity/StreamEntity.html    |     6 +-
 .../apache/juneau/http/entity/StringEntity.html    |    10 +-
 .../xref/org/apache/juneau/http/header/Accept.html |     2 +-
 .../apache/juneau/http/header/AcceptCharset.html   |     2 +-
 .../apache/juneau/http/header/AcceptEncoding.html  |     2 +-
 .../apache/juneau/http/header/AcceptLanguage.html  |     2 +-
 .../juneau/http/header/BasicBooleanHeader.html     |     2 +-
 .../apache/juneau/http/header/BasicCsvHeader.html  |   501 +-
 .../apache/juneau/http/header/BasicDateHeader.html |     2 +-
 .../juneau/http/header/BasicEntityTagHeader.html   |     2 +-
 .../juneau/http/header/BasicEntityTagsHeader.html  |     2 +-
 .../org/apache/juneau/http/header/BasicHeader.html |     6 +-
 .../juneau/http/header/BasicHeaderIterator.html    |     6 +-
 .../juneau/http/header/BasicIntegerHeader.html     |     4 +-
 .../apache/juneau/http/header/BasicLongHeader.html |     4 +-
 .../juneau/http/header/BasicMediaRangesHeader.html |     2 +-
 .../juneau/http/header/BasicMediaTypeHeader.html   |     2 +-
 .../juneau/http/header/BasicStringHeader.html      |     2 +-
 .../http/header/BasicStringRangesHeader.html       |     2 +-
 .../apache/juneau/http/header/BasicUriHeader.html  |     2 +-
 .../apache/juneau/http/header/ClientVersion.html   |    12 +-
 .../org/apache/juneau/http/header/Connection.html  |     2 +-
 .../juneau/http/header/ContentDisposition.html     |     2 +-
 .../org/apache/juneau/http/header/ContentType.html |     2 +-
 .../org/apache/juneau/http/header/EntityTag.html   |     8 +-
 .../org/apache/juneau/http/header/EntityTags.html  |     8 +-
 .../apache/juneau/http/header/HeaderBeanMeta.html  |     8 +-
 .../org/apache/juneau/http/header/HeaderList.html  |    14 +-
 .../org/apache/juneau/http/header/IfRange.html     |     4 +-
 .../org/apache/juneau/http/header/RetryAfter.html  |     6 +-
 .../juneau/http/header/SerializedHeader.html       |     4 +-
 site/xref/org/apache/juneau/http/header/TE.html    |     2 +-
 .../xref/org/apache/juneau/http/header/Thrown.html |     8 +-
 .../apache/juneau/http/part/BasicBooleanPart.html  |     2 +-
 .../apache/juneau/http/part/BasicCsvArrayPart.html |   427 +-
 .../org/apache/juneau/http/part/BasicDatePart.html |     2 +-
 .../apache/juneau/http/part/BasicIntegerPart.html  |     2 +-
 .../org/apache/juneau/http/part/BasicLongPart.html |     2 +-
 .../org/apache/juneau/http/part/BasicPart.html     |    10 +-
 .../apache/juneau/http/part/BasicPartIterator.html |     6 +-
 .../apache/juneau/http/part/BasicStringPart.html   |     2 +-
 .../org/apache/juneau/http/part/BasicUriPart.html  |     2 +-
 .../org/apache/juneau/http/part/PartBeanMeta.html  |    10 +-
 .../xref/org/apache/juneau/http/part/PartList.html |    14 +-
 .../apache/juneau/http/part/SerializedPart.html    |     4 +-
 .../apache/juneau/http/remote/RemoteDelete.html    |     2 +-
 .../org/apache/juneau/http/remote/RemoteGet.html   |     2 +-
 .../org/apache/juneau/http/remote/RemoteOp.html    |     2 +-
 .../org/apache/juneau/http/remote/RemotePatch.html |     2 +-
 .../org/apache/juneau/http/remote/RemotePost.html  |     2 +-
 .../org/apache/juneau/http/remote/RemotePut.html   |     2 +-
 .../org/apache/juneau/http/remote/RemoteUtils.html |     2 +-
 .../juneau/http/remote/RrpcInterfaceMeta.html      |   211 +-
 .../http/remote/RrpcInterfaceMethodMeta.html       |     4 +-
 .../apache/juneau/http/resource/BasicResource.html |     4 +-
 .../juneau/http/response/BasicHttpException.html   |     4 +-
 .../juneau/http/response/BasicHttpResponse.html    |     6 +-
 site/xref/org/apache/juneau/httppart/HttpPart.html |     4 +-
 .../org/apache/juneau/httppart/HttpPartSchema.html |  9156 +++++++------
 .../apache/juneau/httppart/SimplePartParser.html   |     2 +-
 .../juneau/httppart/SimplePartSerializer.html      |     2 +-
 .../juneau/httppart/bean/MethodInfoUtils.html      |    12 +-
 .../juneau/httppart/bean/RequestBeanMeta.html      |    20 +-
 .../httppart/bean/RequestBeanPropertyMeta.html     |    14 +-
 .../juneau/httppart/bean/ResponseBeanMeta.html     |    20 +-
 .../httppart/bean/ResponseBeanPropertyMeta.html    |    14 +-
 .../org/apache/juneau/internal/ClassUtils2.html    |     4 +-
 .../org/apache/juneau/internal/ConverterUtils.html |     8 +-
 .../apache/juneau/internal/DelegateBeanMap.html    |     4 +-
 .../org/apache/juneau/internal/DelegateMap.html    |     2 +-
 .../org/apache/juneau/internal/FilteredMap.html    |     2 +-
 site/xref/org/apache/juneau/internal/Utils2.html   |     8 +-
 .../xref/org/apache/juneau/json/JsonClassMeta.html |     4 +-
 site/xref/org/apache/juneau/json/JsonParser.html   |    16 +-
 .../org/apache/juneau/json/JsonParserSession.html  |    32 +-
 .../apache/juneau/json/JsonSchemaSerializer.html   |    14 +-
 .../org/apache/juneau/json/JsonSerializer.html     |    16 +-
 .../apache/juneau/json/JsonSerializerSession.html  |     6 +-
 site/xref/org/apache/juneau/json/JsonWriter.html   |    16 +-
 .../juneau/json/annotation/JsonAnnotation.html     |     8 +-
 .../json/annotation/JsonConfigAnnotation.html      |     4 +-
 .../juneau/jsonschema/BasicBeanDefMapper.html      |     2 +-
 .../jsonschema/JsonSchemaBeanPropertyMeta.html     |     2 +-
 .../juneau/jsonschema/JsonSchemaClassMeta.html     |     2 +-
 .../juneau/jsonschema/JsonSchemaGenerator.html     |    22 +-
 .../jsonschema/JsonSchemaGeneratorSession.html     |     6 +-
 .../org/apache/juneau/jsonschema/SchemaUtils.html  |     8 +-
 .../org/apache/juneau/jsonschema/TypeCategory.html |     6 +-
 .../annotation/JsonSchemaConfigAnnotation.html     |     4 +-
 .../juneau/junit/bct/BasicBeanConverter.html       |    10 +-
 .../org/apache/juneau/junit/bct/BctAssertions.html |    14 +-
 .../xref/org/apache/juneau/junit/bct/BctUtils.html |    10 +-
 .../org/apache/juneau/junit/bct/Listifiers.html    |     2 +-
 .../apache/juneau/junit/bct/NestedTokenizer.html   |   463 +-
 .../juneau/junit/bct/PropertyExtractors.html       |     4 +-
 .../junit/bct/PropertyNotFoundException.html       |     2 +-
 .../org/apache/juneau/junit/bct/Stringifiers.html  |     2 +-
 .../apache/juneau/microservice/Microservice.html   |    16 +-
 .../juneau/microservice/console/ConfigCommand.html |     2 +-
 .../juneau/microservice/console/HelpCommand.html   |     2 +-
 .../jetty/BasicJettyServerFactory.html             |     4 +-
 .../juneau/microservice/jetty/JettyLogger.html     |     2 +-
 .../microservice/jetty/JettyMicroservice.html      |    30 +-
 .../microservice/resources/DirectoryResource.html  |     8 +-
 .../microservice/resources/LogEntryFormatter.html  |     8 +-
 .../juneau/microservice/resources/LogParser.html   |     6 +-
 .../microservice/resources/LogsResource.html       |     4 +-
 .../springboot/template/HelloWorldResource.html    |     2 +-
 .../apache/juneau/msgpack/MsgPackInputStream.html  |     4 +-
 .../apache/juneau/msgpack/MsgPackOutputStream.html |     2 +-
 .../org/apache/juneau/msgpack/MsgPackParser.html   |    14 +-
 .../juneau/msgpack/MsgPackParserSession.html       |    10 +-
 .../apache/juneau/msgpack/MsgPackSerializer.html   |    16 +-
 .../juneau/msgpack/MsgPackSerializerSession.html   |     6 +-
 .../msgpack/annotation/MsgPackAnnotation.html      |     8 +-
 .../annotation/MsgPackConfigAnnotation.html        |     4 +-
 .../xref/org/apache/juneau/oapi/OpenApiParser.html |    14 +-
 .../apache/juneau/oapi/OpenApiParserSession.html   |    14 +-
 .../org/apache/juneau/oapi/OpenApiSerializer.html  |    14 +-
 .../juneau/oapi/OpenApiSerializerSession.html      |    16 +-
 .../juneau/oapi/annotation/OpenApiAnnotation.html  |     8 +-
 .../oapi/annotation/OpenApiConfigAnnotation.html   |     6 +-
 .../juneau/objecttools/NumberMatcherFactory.html   |     6 +-
 .../juneau/objecttools/ObjectIntrospector.html     |     6 +-
 .../apache/juneau/objecttools/ObjectMerger.html    |    10 +-
 .../org/apache/juneau/objecttools/ObjectRest.html  |     6 +-
 .../apache/juneau/objecttools/ObjectSearcher.html  |     4 +-
 .../apache/juneau/objecttools/ObjectSorter.html    |     4 +-
 .../apache/juneau/objecttools/ObjectViewer.html    |     2 +-
 .../org/apache/juneau/objecttools/PageArgs.html    |     2 +-
 .../org/apache/juneau/objecttools/SearchArgs.html  |   177 +-
 .../org/apache/juneau/objecttools/SortArgs.html    |     6 +-
 .../juneau/objecttools/StringMatcherFactory.html   |     6 +-
 .../juneau/objecttools/TimeMatcherFactory.html     |     6 +-
 .../org/apache/juneau/objecttools/ViewArgs.html    |     4 +-
 .../apache/juneau/parser/InputStreamParser.html    |    16 +-
 .../org/apache/juneau/parser/ParseException.html   |     4 +-
 site/xref/org/apache/juneau/parser/Parser.html     |    22 +-
 .../org/apache/juneau/parser/ParserListener.html   |     4 +-
 site/xref/org/apache/juneau/parser/ParserPipe.html |    10 +-
 .../org/apache/juneau/parser/ParserReader.html     |     8 +-
 .../org/apache/juneau/parser/ParserSession.html    |    14 +-
 site/xref/org/apache/juneau/parser/ParserSet.html  |     8 +-
 site/xref/org/apache/juneau/parser/Position.html   |     4 +-
 .../org/apache/juneau/parser/ReaderParser.html     |    18 +-
 .../parser/annotation/ParserConfigAnnotation.html  |     4 +-
 .../apache/juneau/plaintext/PlainTextParser.html   |    14 +-
 .../juneau/plaintext/PlainTextParserSession.html   |     6 +-
 .../juneau/plaintext/PlainTextSerializer.html      |    14 +-
 .../plaintext/annotation/PlainTextAnnotation.html  |     8 +-
 .../annotation/PlainTextConfigAnnotation.html      |     4 +-
 site/xref/org/apache/juneau/reflect/Mutaters.html  |    14 +-
 site/xref/org/apache/juneau/rest/RestChildren.html |     4 +-
 site/xref/org/apache/juneau/rest/RestContext.html  | 12142 +++++++++--------
 .../xref/org/apache/juneau/rest/RestOpContext.html |  5028 ++++----
 .../xref/org/apache/juneau/rest/RestOpInvoker.html |     6 +-
 .../org/apache/juneau/rest/RestOperations.html     |     4 +-
 site/xref/org/apache/juneau/rest/RestRequest.html  |    12 +-
 site/xref/org/apache/juneau/rest/RestResponse.html |     4 +-
 site/xref/org/apache/juneau/rest/RestSession.html  |     4 +-
 .../rest/annotation/OpSwaggerAnnotation.html       |     6 +-
 .../org/apache/juneau/rest/annotation/Rest.html    |     2 +-
 .../juneau/rest/annotation/RestAnnotation.html     |     8 +-
 .../apache/juneau/rest/annotation/RestDelete.html  |     2 +-
 .../rest/annotation/RestDeleteAnnotation.html      |     8 +-
 .../rest/annotation/RestDestroyAnnotation.html     |   237 +-
 .../rest/annotation/RestEndCallAnnotation.html     |   237 +-
 .../org/apache/juneau/rest/annotation/RestGet.html |     2 +-
 .../juneau/rest/annotation/RestGetAnnotation.html  |     8 +-
 .../juneau/rest/annotation/RestInitAnnotation.html |   237 +-
 .../rest/annotation/RestInjectAnnotation.html      |   369 +-
 .../org/apache/juneau/rest/annotation/RestOp.html  |     2 +-
 .../juneau/rest/annotation/RestOpAnnotation.html   |    12 +-
 .../apache/juneau/rest/annotation/RestOptions.html |     2 +-
 .../rest/annotation/RestOptionsAnnotation.html     |     8 +-
 .../apache/juneau/rest/annotation/RestPatch.html   |     2 +-
 .../rest/annotation/RestPatchAnnotation.html       |     8 +-
 .../apache/juneau/rest/annotation/RestPost.html    |     2 +-
 .../juneau/rest/annotation/RestPostAnnotation.html |     8 +-
 .../rest/annotation/RestPostCallAnnotation.html    |   237 +-
 .../rest/annotation/RestPostInitAnnotation.html    |   273 +-
 .../rest/annotation/RestPreCallAnnotation.html     |   237 +-
 .../org/apache/juneau/rest/annotation/RestPut.html |     2 +-
 .../juneau/rest/annotation/RestPutAnnotation.html  |     8 +-
 .../rest/annotation/RestStartCallAnnotation.html   |   237 +-
 .../juneau/rest/annotation/SwaggerAnnotation.html  |     6 +-
 .../org/apache/juneau/rest/arg/ArgException.html   |    12 +-
 .../org/apache/juneau/rest/arg/AttributeArg.html   |    10 +-
 .../org/apache/juneau/rest/arg/ContentArg.html     |    10 +-
 .../org/apache/juneau/rest/arg/CookieList.html     |     2 +-
 .../org/apache/juneau/rest/arg/DefaultArg.html     |    12 +-
 .../org/apache/juneau/rest/arg/FormDataArg.html    |    18 +-
 .../org/apache/juneau/rest/arg/HasFormDataArg.html |    10 +-
 .../org/apache/juneau/rest/arg/HasQueryArg.html    |    10 +-
 .../xref/org/apache/juneau/rest/arg/HeaderArg.html |    22 +-
 .../juneau/rest/arg/HttpServletRequestArgs.html    |     6 +-
 .../juneau/rest/arg/HttpServletResponseArgs.html   |     6 +-
 .../apache/juneau/rest/arg/HttpSessionArgs.html    |     6 +-
 .../juneau/rest/arg/InputStreamParserArg.html      |     6 +-
 .../xref/org/apache/juneau/rest/arg/MethodArg.html |     4 +-
 .../xref/org/apache/juneau/rest/arg/ParserArg.html |     6 +-
 site/xref/org/apache/juneau/rest/arg/PathArg.html  |    18 +-
 .../apache/juneau/rest/arg/PathRemainderArg.html   |    12 +-
 site/xref/org/apache/juneau/rest/arg/QueryArg.html |    18 +-
 .../apache/juneau/rest/arg/ReaderParserArg.html    |     6 +-
 .../org/apache/juneau/rest/arg/RequestBeanArg.html |    10 +-
 .../apache/juneau/rest/arg/ResponseBeanArg.html    |    12 +-
 .../apache/juneau/rest/arg/ResponseCodeArg.html    |    12 +-
 .../apache/juneau/rest/arg/ResponseHeaderArg.html  |    16 +-
 .../apache/juneau/rest/arg/RestContextArgs.html    |    12 +-
 .../org/apache/juneau/rest/arg/RestOpArgList.html  |     4 +-
 .../apache/juneau/rest/arg/RestOpContextArgs.html  |    10 +-
 .../apache/juneau/rest/arg/RestOpSessionArgs.html  |     8 +-
 .../apache/juneau/rest/arg/RestRequestArgs.html    |    10 +-
 .../apache/juneau/rest/arg/RestResponseArgs.html   |     6 +-
 .../apache/juneau/rest/arg/RestSessionArgs.html    |     6 +-
 .../juneau/rest/arg/SimpleRestOperationArg.html    |     2 +-
 .../apache/juneau/rest/beans/BeanDescription.html  |     4 +-
 .../rest/beans/ChildResourceDescriptions.html      |     2 +-
 .../juneau/rest/beans/ResourceDescription.html     |     2 +-
 .../apache/juneau/rest/client/ResponseContent.html |    10 +-
 .../apache/juneau/rest/client/ResponseHeader.html  |    10 +-
 .../juneau/rest/client/RestCallException.html      |     4 +-
 .../org/apache/juneau/rest/client/RestClient.html  |    30 +-
 .../org/apache/juneau/rest/client/RestRequest.html |    42 +-
 .../apache/juneau/rest/client/RestResponse.html    |     4 +-
 .../juneau/rest/client/remote/RemoteMeta.html      |    16 +-
 .../client/remote/RemoteMetadataException.html     |     2 +-
 .../rest/client/remote/RemoteOperationArg.html     |    10 +-
 .../rest/client/remote/RemoteOperationMeta.html    |    28 +-
 .../rest/client/remote/RemoteOperationReturn.html  |    14 +-
 .../juneau/rest/converter/Introspectable.html      |     4 +-
 .../apache/juneau/rest/converter/Queryable.html    |     2 +-
 .../juneau/rest/converter/RestConverterList.html   |     2 +-
 .../apache/juneau/rest/converter/Traversable.html  |     2 +-
 .../juneau/rest/debug/BasicDebugEnablement.html    |    10 +-
 .../apache/juneau/rest/debug/DebugEnablement.html  |     4 +-
 .../juneau/rest/debug/DebugEnablementMap.html      |     2 +-
 .../apache/juneau/rest/guard/RestGuardList.html    |     2 +-
 .../org/apache/juneau/rest/guard/RoleMatcher.html  |    12 +-
 .../juneau/rest/httppart/BasicNamedAttribute.html  |     4 +-
 .../juneau/rest/httppart/RequestAttribute.html     |     2 +-
 .../juneau/rest/httppart/RequestAttributes.html    |     6 +-
 .../juneau/rest/httppart/RequestContent.html       |  1157 +-
 .../juneau/rest/httppart/RequestFormParam.html     |     8 +-
 .../juneau/rest/httppart/RequestFormParams.html    |    14 +-
 .../juneau/rest/httppart/RequestHeaders.html       |    12 +-
 .../juneau/rest/httppart/RequestHttpPart.html      |     2 +-
 .../juneau/rest/httppart/RequestPathParams.html    |    14 +-
 .../juneau/rest/httppart/RequestQueryParams.html   |    14 +-
 .../juneau/rest/logger/BasicTestCallLogger.html    |     2 +-
 .../org/apache/juneau/rest/logger/CallLogger.html  |    12 +-
 .../apache/juneau/rest/logger/CallLoggerRule.html  |     2 +-
 .../juneau/rest/logger/CallLoggingDetail.html      |     2 +-
 .../juneau/rest/matcher/ClientVersionMatcher.html  |    14 +-
 .../rest/matcher/MultipartFormDataMatcher.html     |     2 +-
 .../juneau/rest/matcher/RestMatcherList.html       |     2 +-
 .../juneau/rest/matcher/UrlEncodedFormMatcher.html |     2 +-
 .../rest/mock/MockHttpClientConnectionManager.html |     2 +-
 .../apache/juneau/rest/mock/MockHttpSession.html   |     2 +-
 .../org/apache/juneau/rest/mock/MockLogger.html    |     4 +-
 .../apache/juneau/rest/mock/MockPathResolver.html  |    12 +-
 .../apache/juneau/rest/mock/MockRestClient.html    |    18 +-
 .../apache/juneau/rest/mock/MockRestRequest.html   |  2351 ++--
 .../juneau/rest/mock/MockServletRequest.html       |    12 +-
 .../juneau/rest/mock/MockServletResponse.html      |     6 +-
 .../rest/processor/InputStreamProcessor.html       |     2 +-
 .../rest/processor/PlainTextPojoProcessor.html     |     2 +-
 .../juneau/rest/processor/ReaderProcessor.html     |     2 +-
 .../rest/processor/ResponseBeanProcessor.html      |     4 +-
 .../rest/processor/ResponseProcessorList.html      |     8 +-
 .../rest/processor/SerializedPojoProcessor.html    |     4 +-
 .../org/apache/juneau/rest/remote/RrpcServlet.html |     4 +-
 .../apache/juneau/rest/rrpc/RrpcRestOpSession.html |     4 +-
 .../org/apache/juneau/rest/servlet/RestObject.html |     2 +-
 .../apache/juneau/rest/servlet/RestServlet.html    |    12 +-
 .../juneau/rest/springboot/SpringBeanStore.html    |     2 +-
 .../juneau/rest/staticfile/BasicStaticFiles.html   |     8 +-
 .../apache/juneau/rest/staticfile/StaticFiles.html |     6 +-
 .../apache/juneau/rest/stats/MethodExecStats.html  |     2 +-
 .../apache/juneau/rest/stats/MethodExecStore.html  |     2 +-
 .../apache/juneau/rest/stats/MethodInvoker.html    |    10 +-
 .../org/apache/juneau/rest/stats/ThrownStats.html  |     4 +-
 .../org/apache/juneau/rest/stats/ThrownStore.html  |     4 +-
 .../juneau/rest/swagger/BasicSwaggerProvider.html  |     2 +-
 .../rest/swagger/BasicSwaggerProviderSession.html  |  2307 ++--
 .../juneau/rest/swagger/SwaggerException.html      |     2 +-
 .../juneau/rest/swagger/SwaggerProvider.html       |     2 +-
 .../rest/util/BoundedServletInputStream.html       |     4 +-
 .../rest/util/CachingHttpServletRequest.html       |     2 +-
 .../apache/juneau/rest/util/DefaultClassList.html  |     6 +-
 .../juneau/rest/util/DefaultSettingsMap.html       |     4 +-
 .../juneau/rest/util/FinishablePrintWriter.html    |     2 +-
 .../rest/util/FinishableServletOutputStream.html   |     2 +-
 .../org/apache/juneau/rest/util/RestUtils.html     |  1047 +-
 site/xref/org/apache/juneau/rest/util/UrlPath.html |     8 +-
 .../org/apache/juneau/rest/util/UrlPathMatch.html  |     6 +-
 .../apache/juneau/rest/util/UrlPathMatcher.html    |     6 +-
 .../juneau/rest/util/UrlPathMatcherList.html       |     2 +-
 site/xref/org/apache/juneau/rest/vars/FileVar.html |     2 +-
 .../apache/juneau/rest/vars/RequestSwaggerVar.html |     4 +-
 .../org/apache/juneau/rest/vars/RequestVar.html    |     2 +-
 .../juneau/rest/vars/SerializedRequestAttrVar.html |     6 +-
 .../org/apache/juneau/rest/vars/UrlEncodeVar.html  |     4 +-
 .../juneau/rest/widget/ContentTypeMenuItem.html    |     2 +-
 .../apache/juneau/rest/widget/MenuItemWidget.html  |    12 +-
 .../apache/juneau/rest/widget/ThemeMenuItem.html   |     2 +-
 .../org/apache/juneau/rest/widget/Tooltip.html     |   101 +-
 .../xref/org/apache/juneau/rest/widget/Widget.html |     4 +-
 .../juneau/serializer/OutputStreamSerializer.html  |    16 +-
 .../serializer/OutputStreamSerializerSession.html  |     2 +-
 .../juneau/serializer/SerializeException.html      |     2 +-
 .../org/apache/juneau/serializer/Serializer.html   |    22 +-
 .../juneau/serializer/SerializerListener.html      |     4 +-
 .../apache/juneau/serializer/SerializerPipe.html   |    16 +-
 .../juneau/serializer/SerializerSession.html       |    16 +-
 .../apache/juneau/serializer/SerializerSet.html    |     8 +-
 .../apache/juneau/serializer/SerializerWriter.html |     2 +-
 .../apache/juneau/serializer/WriterSerializer.html |    20 +-
 .../juneau/serializer/WriterSerializerSession.html |     2 +-
 .../annotation/SerializerConfigAnnotation.html     |     2 +-
 .../org/apache/juneau/soap/SoapXmlSerializer.html  |    14 +-
 .../juneau/soap/SoapXmlSerializerSession.html      |     2 +-
 .../juneau/soap/annotation/SoapXmlAnnotation.html  |     8 +-
 .../soap/annotation/SoapXmlConfigAnnotation.html   |     2 +-
 site/xref/org/apache/juneau/svl/MapVar.html        |     4 +-
 .../apache/juneau/svl/MultipartResolvingVar.html   |     4 +-
 site/xref/org/apache/juneau/svl/MultipartVar.html  |     4 +-
 site/xref/org/apache/juneau/svl/SimpleVar.html     |     2 +-
 site/xref/org/apache/juneau/svl/StreamedVar.html   |     2 +-
 site/xref/org/apache/juneau/svl/Var.html           |     4 +-
 site/xref/org/apache/juneau/svl/VarList.html       |     2 +-
 site/xref/org/apache/juneau/svl/VarResolver.html   |     2 +-
 .../org/apache/juneau/svl/VarResolverSession.html  |    18 +-
 site/xref/org/apache/juneau/svl/vars/ArgsVar.html  |     2 +-
 site/xref/org/apache/juneau/svl/vars/IfVar.html    |     2 +-
 site/xref/org/apache/juneau/svl/vars/LenVar.html   |     2 +-
 .../apache/juneau/svl/vars/PatternExtractVar.html  |     2 +-
 .../apache/juneau/svl/vars/PatternMatchVar.html    |     2 +-
 .../apache/juneau/svl/vars/PatternReplaceVar.html  |     2 +-
 .../org/apache/juneau/svl/vars/SubstringVar.html   |     2 +-
 .../xref/org/apache/juneau/svl/vars/SwitchVar.html |     4 +-
 site/xref/org/apache/juneau/swap/AutoListSwap.html |    16 +-
 site/xref/org/apache/juneau/swap/AutoMapSwap.html  |    16 +-
 .../org/apache/juneau/swap/AutoNumberSwap.html     |    18 +-
 .../org/apache/juneau/swap/AutoObjectSwap.html     |    16 +-
 site/xref/org/apache/juneau/swap/BuilderSwap.html  |    34 +-
 site/xref/org/apache/juneau/swap/DefaultSwaps.html |     4 +-
 .../org/apache/juneau/swap/FunctionalSwap.html     |     2 +-
 site/xref/org/apache/juneau/swap/ObjectSwap.html   |     8 +-
 .../xref/org/apache/juneau/swap/SurrogateSwap.html |     8 +-
 .../org/apache/juneau/swaps/ByteArraySwap.html     |     2 +-
 .../juneau/swaps/DefaultingTemporalAccessor.html   |     2 +-
 .../org/apache/juneau/swaps/InputStreamSwap.html   |     4 +-
 .../org/apache/juneau/swaps/MatchResultSwap.html   |     2 +-
 .../org/apache/juneau/swaps/ParsedReaderSwap.html  |     2 +-
 site/xref/org/apache/juneau/swaps/ReaderSwap.html  |     2 +-
 .../apache/juneau/swaps/TemporalCalendarSwap.html  |     2 +-
 .../org/apache/juneau/swaps/TemporalDateSwap.html  |     2 +-
 .../xref/org/apache/juneau/swaps/TemporalSwap.html |    10 +-
 .../juneau/swaps/XMLGregorianCalendarSwap.html     |     4 +-
 site/xref/org/apache/juneau/uon/UonParser.html     |    16 +-
 .../org/apache/juneau/uon/UonParserSession.html    |    30 +-
 site/xref/org/apache/juneau/uon/UonReader.html     |     2 +-
 site/xref/org/apache/juneau/uon/UonSerializer.html |    16 +-
 .../apache/juneau/uon/UonSerializerSession.html    |     8 +-
 site/xref/org/apache/juneau/uon/UonUtils.html      |     8 +-
 site/xref/org/apache/juneau/uon/UonWriter.html     |    12 +-
 .../juneau/uon/annotation/UonAnnotation.html       |     8 +-
 .../juneau/uon/annotation/UonConfigAnnotation.html |     2 +-
 .../juneau/urlencoding/UrlEncodingClassMeta.html   |     2 +-
 .../juneau/urlencoding/UrlEncodingParser.html      |    16 +-
 .../urlencoding/UrlEncodingParserSession.html      |    22 +-
 .../juneau/urlencoding/UrlEncodingSerializer.html  |    16 +-
 .../urlencoding/UrlEncodingSerializerSession.html  |     6 +-
 .../annotation/UrlEncodingAnnotation.html          |     8 +-
 .../annotation/UrlEncodingConfigAnnotation.html    |     2 +-
 site/xref/org/apache/juneau/utils/BeanDiff.html    |     4 +-
 .../org/apache/juneau/utils/GenericConverter.html  |     4 +-
 site/xref/org/apache/juneau/utils/HashKey.html     |     2 +-
 .../xref/org/apache/juneau/utils/ManifestFile.html |     4 +-
 .../juneau/utils/StringExpressionMatcher.html      |    12 +-
 site/xref/org/apache/juneau/xml/Namespace.html     |     6 +-
 site/xref/org/apache/juneau/xml/XmlBeanMeta.html   |    10 +-
 .../org/apache/juneau/xml/XmlBeanPropertyMeta.html |     6 +-
 site/xref/org/apache/juneau/xml/XmlClassMeta.html  |     4 +-
 site/xref/org/apache/juneau/xml/XmlParser.html     |    18 +-
 .../org/apache/juneau/xml/XmlParserSession.html    |    14 +-
 site/xref/org/apache/juneau/xml/XmlReader.html     |     4 +-
 site/xref/org/apache/juneau/xml/XmlSerializer.html |    18 +-
 .../apache/juneau/xml/XmlSerializerSession.html    |     8 +-
 site/xref/org/apache/juneau/xml/XmlUtils.html      |    16 +-
 site/xref/org/apache/juneau/xml/XmlWriter.html     |     2 +-
 .../juneau/xml/annotation/XmlAnnotation.html       |     8 +-
 .../juneau/xml/annotation/XmlConfigAnnotation.html |     2 +-
 site/xref/overview-frame.html                      |    12 +-
 site/xref/overview-summary.html                    |    12 +-
 1200 files changed, 43782 insertions(+), 43945 deletions(-)

diff --git a/site/xref-test/allclasses-frame.html b/site/xref-test/allclasses-frame.html
index 4bad0fe267..15277efa38 100644
--- a/site/xref-test/allclasses-frame.html
+++ b/site/xref-test/allclasses-frame.html
@@ -12,8 +12,8 @@
         <div class="indexContainer">
             <ul>
                 <li><a href="org/apache/juneau/testutils/pojos/ABean.html#ABean" target="classFrame">ABean</a></li>
-                <li><a href="org/apache/juneau/common/reflect/AClass.html#AClass" target="classFrame">AClass</a></li>
-                <li><a href="org/apache/juneau/common/reflect/AInterface.html#AInterface" target="classFrame">AInterface</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/AClass.html#AClass" target="classFrame">AClass</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/AInterface.html#AInterface" target="classFrame">AInterface</a></li>
                 <li><a href="org/apache/juneau/bean/html5/A_Test.html#A_Test" target="classFrame">A_Test</a></li>
                 <li><a href="org/apache/juneau/bean/html5/Abbr_Test.html#Abbr_Test" target="classFrame">Abbr_Test</a></li>
                 <li><a href="org/apache/juneau/http/header/AcceptCharset_Test.html#AcceptCharset_Test" target="classFrame">AcceptCharset_Test</a></li>
@@ -35,41 +35,41 @@
                 <li><a href="org/apache/juneau/http/header/Allow_Test.html#Allow_Test.A" target="classFrame">Allow_Test.A</a></li>
                 <li><a href="org/apache/juneau/http/response/AlreadyReported_Test.html#AlreadyReported_Test" target="classFrame">AlreadyReported_Test</a></li>
                 <li><a href="org/apache/juneau/http/response/AlreadyReported_Test.html#AlreadyReported_Test.A" target="classFrame">AlreadyReported_Test.A</a></li>
-                <li><a href="org/apache/juneau/common/reflect/AnnotationInfoTest.html#AnnotationInfoTest" target="classFrame">AnnotationInfoTest</a></li>
-                <li><a href="org/apache/juneau/common/reflect/AnnotationInfoTest.html#AnnotationInfoTest.D" target="classFrame">AnnotationInfoTest.D</a></li>
-                <li><a href="org/apache/juneau/common/reflect/AnnotationInfoTest.html#AnnotationInfoTest.D1" target="classFrame">AnnotationInfoTest.D1</a></li>
-                <li><a href="org/apache/juneau/common/reflect/AnnotationInfoTest.html#AnnotationInfoTest.D2" target="classFrame">AnnotationInfoTest.D2</a></li>
-                <li><a href="org/apache/juneau/common/reflect/AnnotationInfoTest.html#AnnotationInfoTest.D3" target="classFrame">AnnotationInfoTest.D3</a></li>
-                <li><a href="org/apache/juneau/common/reflect/AnnotationInfo_ValueMethods_Test.html#AnnotationInfo_ValueMethods_Test" target="classFrame">AnnotationInfo_ValueMethods_Test</a></li>
-                <li><a href="org/apache/juneau/common/reflect/AnnotationInfo_ValueMethods_Test.html#AnnotationInfo_ValueMethods_Test.AnnotatedClass" target="classFrame">AnnotationInfo_ValueMethods_Test.AnnotatedClass</a></li>
-                <li><a href="org/apache/juneau/common/reflect/AnnotationInfo_ValueMethods_Test.html#AnnotationInfo_ValueMethods_Test.TestAnnotation" target="classFrame">AnnotationInfo_ValueMethods_Test.TestAnnotation</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/AnnotationInfoTest.html#AnnotationInfoTest" target="classFrame">AnnotationInfoTest</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/AnnotationInfoTest.html#AnnotationInfoTest.D" target="classFrame">AnnotationInfoTest.D</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/AnnotationInfoTest.html#AnnotationInfoTest.D1" target="classFrame">AnnotationInfoTest.D1</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/AnnotationInfoTest.html#AnnotationInfoTest.D2" target="classFrame">AnnotationInfoTest.D2</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/AnnotationInfoTest.html#AnnotationInfoTest.D3" target="classFrame">AnnotationInfoTest.D3</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/AnnotationInfo_ValueMethods_Test.html#AnnotationInfo_ValueMethods_Test" target="classFrame">AnnotationInfo_ValueMethods_Test</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/AnnotationInfo_ValueMethods_Test.html#AnnotationInfo_ValueMethods_Test.AnnotatedClass" target="classFrame">AnnotationInfo_ValueMethods_Test.AnnotatedClass</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/AnnotationInfo_ValueMethods_Test.html#AnnotationInfo_ValueMethods_Test.TestAnnotation" target="classFrame">AnnotationInfo_ValueMethods_Test.TestAnnotation</a></li>
                 <li><a href="org/apache/juneau/AnnotationInheritance_Test.html#AnnotationInheritance_Test" target="classFrame">AnnotationInheritance_Test</a></li>
                 <li><a href="org/apache/juneau/AnnotationInheritance_Test.html#AnnotationInheritance_Test.A1_Child" target="classFrame">AnnotationInheritance_Test.A1_Child</a></li>
                 <li><a href="org/apache/juneau/AnnotationInheritance_Test.html#AnnotationInheritance_Test.A1_Parent" target="classFrame">AnnotationInheritance_Test.A1_Parent</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AnnotationObject_Test.html#AnnotationObject_Test" target="classFrame">AnnotationObject_Test</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AnnotationObject_Test.html#AnnotationObject_Test.B" target="classFrame">AnnotationObject_Test.B</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AnnotationObject_Test.html#AnnotationObject_Test.T" target="classFrame">AnnotationObject_Test.T</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AnnotationObject_Test.html#AnnotationObject_Test.T.Builder" target="classFrame">AnnotationObject_Test.T.Builder</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AnnotationObject_Test.html#AnnotationObject_Test.TA" target="classFrame">AnnotationObject_Test.TA</a></li>
-                <li><a href="org/apache/juneau/common/utils/AnnotationUtils_Test.html#AnnotationUtils_Test" target="classFrame">AnnotationUtils_Test</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AnnotationObject_Test.html#AnnotationObject_Test" target="classFrame">AnnotationObject_Test</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AnnotationObject_Test.html#AnnotationObject_Test.B" target="classFrame">AnnotationObject_Test.B</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AnnotationObject_Test.html#AnnotationObject_Test.T" target="classFrame">AnnotationObject_Test.T</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AnnotationObject_Test.html#AnnotationObject_Test.T.Builder" target="classFrame">AnnotationObject_Test.T.Builder</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AnnotationObject_Test.html#AnnotationObject_Test.TA" target="classFrame">AnnotationObject_Test.TA</a></li>
+                <li><a href="org/apache/juneau/commons/utils/AnnotationUtils_Test.html#AnnotationUtils_Test" target="classFrame">AnnotationUtils_Test</a></li>
                 <li><a href="org/apache/juneau/http/annotation/AnnotationUtils_Test.html#AnnotationUtils_Test" target="classFrame">AnnotationUtils_Test</a></li>
                 <li><a href="org/apache/juneau/http/annotation/AnnotationUtils_Test.html#AnnotationUtils_Test.A1" target="classFrame">AnnotationUtils_Test.A1</a></li>
                 <li><a href="org/apache/juneau/http/annotation/AnnotationUtils_Test.html#AnnotationUtils_Test.A2" target="classFrame">AnnotationUtils_Test.A2</a></li>
-                <li><a href="org/apache/juneau/common/utils/AnnotationUtils_Test.html#AnnotationUtils_Test.ArrayAnnotation" target="classFrame">AnnotationUtils_Test.ArrayAnnotation</a></li>
-                <li><a href="org/apache/juneau/common/utils/AnnotationUtils_Test.html#AnnotationUtils_Test.DifferentAnnotation" target="classFrame">AnnotationUtils_Test.DifferentAnnotation</a></li>
-                <li><a href="org/apache/juneau/common/utils/AnnotationUtils_Test.html#AnnotationUtils_Test.MultiMemberAnnotation" target="classFrame">AnnotationUtils_Test.MultiMemberAnnotation</a></li>
-                <li><a href="org/apache/juneau/common/utils/AnnotationUtils_Test.html#AnnotationUtils_Test.SimpleAnnotation" target="classFrame">AnnotationUtils_Test.SimpleAnnotation</a></li>
-                <li><a href="org/apache/juneau/common/utils/AnnotationUtils_Test.html#AnnotationUtils_Test.TestClass1" target="classFrame">AnnotationUtils_Test.TestClass1</a></li>
-                <li><a href="org/apache/juneau/common/utils/AnnotationUtils_Test.html#AnnotationUtils_Test.TestClass10" target="classFrame">AnnotationUtils_Test.TestClass10</a></li>
-                <li><a href="org/apache/juneau/common/utils/AnnotationUtils_Test.html#AnnotationUtils_Test.TestClass11" target="classFrame">AnnotationUtils_Test.TestClass11</a></li>
-                <li><a href="org/apache/juneau/common/utils/AnnotationUtils_Test.html#AnnotationUtils_Test.TestClass2" target="classFrame">AnnotationUtils_Test.TestClass2</a></li>
-                <li><a href="org/apache/juneau/common/utils/AnnotationUtils_Test.html#AnnotationUtils_Test.TestClass3" target="classFrame">AnnotationUtils_Test.TestClass3</a></li>
-                <li><a href="org/apache/juneau/common/utils/AnnotationUtils_Test.html#AnnotationUtils_Test.TestClass4" target="classFrame">AnnotationUtils_Test.TestClass4</a></li>
-                <li><a href="org/apache/juneau/common/utils/AnnotationUtils_Test.html#AnnotationUtils_Test.TestClass5" target="classFrame">AnnotationUtils_Test.TestClass5</a></li>
-                <li><a href="org/apache/juneau/common/utils/AnnotationUtils_Test.html#AnnotationUtils_Test.TestClass6" target="classFrame">AnnotationUtils_Test.TestClass6</a></li>
-                <li><a href="org/apache/juneau/common/utils/AnnotationUtils_Test.html#AnnotationUtils_Test.TestClass7" target="classFrame">AnnotationUtils_Test.TestClass7</a></li>
-                <li><a href="org/apache/juneau/common/utils/AnnotationUtils_Test.html#AnnotationUtils_Test.TestClass8" target="classFrame">AnnotationUtils_Test.TestClass8</a></li>
-                <li><a href="org/apache/juneau/common/utils/AnnotationUtils_Test.html#AnnotationUtils_Test.TestClass9" target="classFrame">AnnotationUtils_Test.TestClass9</a></li>
+                <li><a href="org/apache/juneau/commons/utils/AnnotationUtils_Test.html#AnnotationUtils_Test.ArrayAnnotation" target="classFrame">AnnotationUtils_Test.ArrayAnnotation</a></li>
+                <li><a href="org/apache/juneau/commons/utils/AnnotationUtils_Test.html#AnnotationUtils_Test.DifferentAnnotation" target="classFrame">AnnotationUtils_Test.DifferentAnnotation</a></li>
+                <li><a href="org/apache/juneau/commons/utils/AnnotationUtils_Test.html#AnnotationUtils_Test.MultiMemberAnnotation" target="classFrame">AnnotationUtils_Test.MultiMemberAnnotation</a></li>
+                <li><a href="org/apache/juneau/commons/utils/AnnotationUtils_Test.html#AnnotationUtils_Test.SimpleAnnotation" target="classFrame">AnnotationUtils_Test.SimpleAnnotation</a></li>
+                <li><a href="org/apache/juneau/commons/utils/AnnotationUtils_Test.html#AnnotationUtils_Test.TestClass1" target="classFrame">AnnotationUtils_Test.TestClass1</a></li>
+                <li><a href="org/apache/juneau/commons/utils/AnnotationUtils_Test.html#AnnotationUtils_Test.TestClass10" target="classFrame">AnnotationUtils_Test.TestClass10</a></li>
+                <li><a href="org/apache/juneau/commons/utils/AnnotationUtils_Test.html#AnnotationUtils_Test.TestClass11" target="classFrame">AnnotationUtils_Test.TestClass11</a></li>
+                <li><a href="org/apache/juneau/commons/utils/AnnotationUtils_Test.html#AnnotationUtils_Test.TestClass2" target="classFrame">AnnotationUtils_Test.TestClass2</a></li>
+                <li><a href="org/apache/juneau/commons/utils/AnnotationUtils_Test.html#AnnotationUtils_Test.TestClass3" target="classFrame">AnnotationUtils_Test.TestClass3</a></li>
+                <li><a href="org/apache/juneau/commons/utils/AnnotationUtils_Test.html#AnnotationUtils_Test.TestClass4" target="classFrame">AnnotationUtils_Test.TestClass4</a></li>
+                <li><a href="org/apache/juneau/commons/utils/AnnotationUtils_Test.html#AnnotationUtils_Test.TestClass5" target="classFrame">AnnotationUtils_Test.TestClass5</a></li>
+                <li><a href="org/apache/juneau/commons/utils/AnnotationUtils_Test.html#AnnotationUtils_Test.TestClass6" target="classFrame">AnnotationUtils_Test.TestClass6</a></li>
+                <li><a href="org/apache/juneau/commons/utils/AnnotationUtils_Test.html#AnnotationUtils_Test.TestClass7" target="classFrame">AnnotationUtils_Test.TestClass7</a></li>
+                <li><a href="org/apache/juneau/commons/utils/AnnotationUtils_Test.html#AnnotationUtils_Test.TestClass8" target="classFrame">AnnotationUtils_Test.TestClass8</a></li>
+                <li><a href="org/apache/juneau/commons/utils/AnnotationUtils_Test.html#AnnotationUtils_Test.TestClass9" target="classFrame">AnnotationUtils_Test.TestClass9</a></li>
                 <li><a href="org/apache/juneau/http/annotation/AnnotationUtils_Test.html#AnnotationUtils_Test.X1" target="classFrame">AnnotationUtils_Test.X1</a></li>
                 <li><a href="org/apache/juneau/Annotations_Test.html#Annotations_Test" target="classFrame">Annotations_Test</a></li>
                 <li><a href="org/apache/juneau/Annotations_Test.html#Annotations_Test.Person1" target="classFrame">Annotations_Test.Person1</a></li>
@@ -80,58 +80,58 @@
                 <li><a href="org/apache/juneau/assertions/AnyAssertion_Test.html#AnyAssertion_Test" target="classFrame">AnyAssertion_Test</a></li>
                 <li><a href="org/apache/juneau/assertions/AnyAssertion_Test.html#AnyAssertion_Test.A1" target="classFrame">AnyAssertion_Test.A1</a></li>
                 <li><a href="org/apache/juneau/assertions/AnyAssertion_Test.html#AnyAssertion_Test.A2" target="classFrame">AnyAssertion_Test.A2</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test" target="classFrame">AppliedAnnotationObject_Test</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.A_BasicOnTests" target="classFrame">AppliedAnnotationObject_Test.A_BasicOnTests</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.B_EqualityAndHashCodeTests" target="classFrame">AppliedAnnotationObject_Test.B_EqualityAndHashCodeTests</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.C_BuilderTTests" target="classFrame">AppliedAnnotationObject_Test.C_BuilderTTests</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.C_BuilderTTests.C" target="classFrame">AppliedAnnotationObject_Test.C_BuilderTTests.C</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.C_BuilderTTests.C.Builder" target="classFrame">AppliedAnnotationObject_Test.C_BuilderTTests.C.Builder</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.D_BuilderMTests" target="classFrame">AppliedAnnotationObject_Test.D_BuilderMTests</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.D_BuilderMTests.D" target="classFrame">AppliedAnnotationObject_Test.D_BuilderMTests.D</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.D_BuilderMTests.D.Builder" target="classFrame">AppliedAnnotationObject_Test.D_BuilderMTests.D.Builder</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.E_BuilderCTests" target="classFrame">AppliedAnnotationObject_Test.E_BuilderCTests</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.E_BuilderCTests.E" target="classFrame">AppliedAnnotationObject_Test.E_BuilderCTests.E</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.E_BuilderCTests.E.Builder" target="classFrame">AppliedAnnotationObject_Test.E_BuilderCTests.E.Builder</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.F_BuilderMFTests" target="classFrame">AppliedAnnotationObject_Test.F_BuilderMFTests</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.F_BuilderMFTests.F" target="classFrame">AppliedAnnotationObject_Test.F_BuilderMFTests.F</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.F_BuilderMFTests.F.Builder" target="classFrame">AppliedAnnotationObject_Test.F_BuilderMFTests.F.Builder</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.G_BuilderTMTests" target="classFrame">AppliedAnnotationObject_Test.G_BuilderTMTests</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.G_BuilderTMTests.G" target="classFrame">AppliedAnnotationObject_Test.G_BuilderTMTests.G</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.G_BuilderTMTests.G.Builder" target="classFrame">AppliedAnnotationObject_Test.G_BuilderTMTests.G.Builder</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.H_BuilderTMFTests" target="classFrame">AppliedAnnotationObject_Test.H_BuilderTMFTests</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.H_BuilderTMFTests.H" target="classFrame">AppliedAnnotationObject_Test.H_BuilderTMFTests.H</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.H_BuilderTMFTests.H.Builder" target="classFrame">AppliedAnnotationObject_Test.H_BuilderTMFTests.H.Builder</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.I_BuilderTMFCTests" target="classFrame">AppliedAnnotationObject_Test.I_BuilderTMFCTests</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.I_BuilderTMFCTests.I" target="classFrame">AppliedAnnotationObject_Test.I_BuilderTMFCTests.I</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.I_BuilderTMFCTests.I.Builder" target="classFrame">AppliedAnnotationObject_Test.I_BuilderTMFCTests.I.Builder</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.J_FluentApiTests" target="classFrame">AppliedAnnotationObject_Test.J_FluentApiTests</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.K_ToMapTests" target="classFrame">AppliedAnnotationObject_Test.K_ToMapTests</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.L_EdgeCaseTests" target="classFrame">AppliedAnnotationObject_Test.L_EdgeCaseTests</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.M_NullValidationTests" target="classFrame">AppliedAnnotationObject_Test.M_NullValidationTests</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.TA" target="classFrame">AppliedAnnotationObject_Test.TA</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.TAO" target="classFrame">AppliedAnnotationObject_Test.TAO</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.TAO.Builder" target="classFrame">AppliedAnnotationObject_Test.TAO.Builder</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.TC" target="classFrame">AppliedAnnotationObject_Test.TC</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.TC2" target="classFrame">AppliedAnnotationObject_Test.TC2</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedOnClassAnnotationObject_Test.html#AppliedOnClassAnnotationObject_Test" target="classFrame">AppliedOnClassAnnotationObject_Test</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedOnClassAnnotationObject_Test.html#AppliedOnClassAnnotationObject_Test.T" target="classFrame">AppliedOnClassAnnotationObject_Test.T</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedOnClassAnnotationObject_Test.html#AppliedOnClassAnnotationObject_Test.T.Builder" target="classFrame">AppliedOnClassAnnotationObject_Test.T.Builder</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedOnClassAnnotationObject_Test.html#AppliedOnClassAnnotationObject_Test.TA" target="classFrame">AppliedOnClassAnnotationObject_Test.TA</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedOnClassAnnotationObject_Test.html#AppliedOnClassAnnotationObject_Test.TC1" target="classFrame">AppliedOnClassAnnotationObject_Test.TC1</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedOnClassAnnotationObject_Test.html#AppliedOnClassAnnotationObject_Test.TC2" target="classFrame">AppliedOnClassAnnotationObject_Test.TC2</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedOnClassAnnotationObject_Test.html#AppliedOnClassAnnotationObject_Test.TC3" target="classFrame">AppliedOnClassAnnotationObject_Test.TC3</a></li>
-                <li><a href="org/apache/juneau/common/annotation/AppliedOnClassAnnotationObject_Test.html#AppliedOnClassAnnotationObject_Test.TestClass" target="classFrame">AppliedOnClassAnnotationObject_Test.TestClass</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test" target="classFrame">AppliedAnnotationObject_Test</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.A_BasicOnTests" target="classFrame">AppliedAnnotationObject_Test.A_BasicOnTests</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.B_EqualityAndHashCodeTests" target="classFrame">AppliedAnnotationObject_Test.B_EqualityAndHashCodeTests</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.C_BuilderTTests" target="classFrame">AppliedAnnotationObject_Test.C_BuilderTTests</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.C_BuilderTTests.C" target="classFrame">AppliedAnnotationObject_Test.C_BuilderTTests.C</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.C_BuilderTTests.C.Builder" target="classFrame">AppliedAnnotationObject_Test.C_BuilderTTests.C.Builder</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.D_BuilderMTests" target="classFrame">AppliedAnnotationObject_Test.D_BuilderMTests</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.D_BuilderMTests.D" target="classFrame">AppliedAnnotationObject_Test.D_BuilderMTests.D</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.D_BuilderMTests.D.Builder" target="classFrame">AppliedAnnotationObject_Test.D_BuilderMTests.D.Builder</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.E_BuilderCTests" target="classFrame">AppliedAnnotationObject_Test.E_BuilderCTests</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.E_BuilderCTests.E" target="classFrame">AppliedAnnotationObject_Test.E_BuilderCTests.E</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.E_BuilderCTests.E.Builder" target="classFrame">AppliedAnnotationObject_Test.E_BuilderCTests.E.Builder</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.F_BuilderMFTests" target="classFrame">AppliedAnnotationObject_Test.F_BuilderMFTests</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.F_BuilderMFTests.F" target="classFrame">AppliedAnnotationObject_Test.F_BuilderMFTests.F</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.F_BuilderMFTests.F.Builder" target="classFrame">AppliedAnnotationObject_Test.F_BuilderMFTests.F.Builder</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.G_BuilderTMTests" target="classFrame">AppliedAnnotationObject_Test.G_BuilderTMTests</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.G_BuilderTMTests.G" target="classFrame">AppliedAnnotationObject_Test.G_BuilderTMTests.G</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.G_BuilderTMTests.G.Builder" target="classFrame">AppliedAnnotationObject_Test.G_BuilderTMTests.G.Builder</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.H_BuilderTMFTests" target="classFrame">AppliedAnnotationObject_Test.H_BuilderTMFTests</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.H_BuilderTMFTests.H" target="classFrame">AppliedAnnotationObject_Test.H_BuilderTMFTests.H</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.H_BuilderTMFTests.H.Builder" target="classFrame">AppliedAnnotationObject_Test.H_BuilderTMFTests.H.Builder</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.I_BuilderTMFCTests" target="classFrame">AppliedAnnotationObject_Test.I_BuilderTMFCTests</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.I_BuilderTMFCTests.I" target="classFrame">AppliedAnnotationObject_Test.I_BuilderTMFCTests.I</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.I_BuilderTMFCTests.I.Builder" target="classFrame">AppliedAnnotationObject_Test.I_BuilderTMFCTests.I.Builder</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.J_FluentApiTests" target="classFrame">AppliedAnnotationObject_Test.J_FluentApiTests</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.K_ToMapTests" target="classFrame">AppliedAnnotationObject_Test.K_ToMapTests</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.L_EdgeCaseTests" target="classFrame">AppliedAnnotationObject_Test.L_EdgeCaseTests</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.M_NullValidationTests" target="classFrame">AppliedAnnotationObject_Test.M_NullValidationTests</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.TA" target="classFrame">AppliedAnnotationObject_Test.TA</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.TAO" target="classFrame">AppliedAnnotationObject_Test.TAO</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.TAO.Builder" target="classFrame">AppliedAnnotationObject_Test.TAO.Builder</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.TC" target="classFrame">AppliedAnnotationObject_Test.TC</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.TC2" target="classFrame">AppliedAnnotationObject_Test.TC2</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedOnClassAnnotationObject_Test.html#AppliedOnClassAnnotationObject_Test" target="classFrame">AppliedOnClassAnnotationObject_Test</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedOnClassAnnotationObject_Test.html#AppliedOnClassAnnotationObject_Test.T" target="classFrame">AppliedOnClassAnnotationObject_Test.T</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedOnClassAnnotationObject_Test.html#AppliedOnClassAnnotationObject_Test.T.Builder" target="classFrame">AppliedOnClassAnnotationObject_Test.T.Builder</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedOnClassAnnotationObject_Test.html#AppliedOnClassAnnotationObject_Test.TA" target="classFrame">AppliedOnClassAnnotationObject_Test.TA</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedOnClassAnnotationObject_Test.html#AppliedOnClassAnnotationObject_Test.TC1" target="classFrame">AppliedOnClassAnnotationObject_Test.TC1</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedOnClassAnnotationObject_Test.html#AppliedOnClassAnnotationObject_Test.TC2" target="classFrame">AppliedOnClassAnnotationObject_Test.TC2</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedOnClassAnnotationObject_Test.html#AppliedOnClassAnnotationObject_Test.TC3" target="classFrame">AppliedOnClassAnnotationObject_Test.TC3</a></li>
+                <li><a href="org/apache/juneau/commons/annotation/AppliedOnClassAnnotationObject_Test.html#AppliedOnClassAnnotationObject_Test.TestClass" target="classFrame">AppliedOnClassAnnotationObject_Test.TestClass</a></li>
                 <li><a href="org/apache/juneau/bean/html5/Area_Test.html#Area_Test" target="classFrame">Area_Test</a></li>
                 <li><a href="org/apache/juneau/rest/arg/ArgException_Test.html#ArgException_Test" target="classFrame">ArgException_Test</a></li>
-                <li><a href="org/apache/juneau/collections/Args_Test.html#Args_Test" target="classFrame">Args_Test</a></li>
+                <li><a href="org/apache/juneau/commons/collections/Args_Test.html#Args_Test" target="classFrame">Args_Test</a></li>
                 <li><a href="org/apache/juneau/assertions/ArrayAssertion_Test.html#ArrayAssertion_Test" target="classFrame">ArrayAssertion_Test</a></li>
                 <li><a href="org/apache/juneau/assertions/ArrayAssertion_Test.html#ArrayAssertion_Test.A" target="classFrame">ArrayAssertion_Test.A</a></li>
                 <li><a href="org/apache/juneau/bean/html5/Article_Test.html#Article_Test" target="classFrame">Article_Test</a></li>
-                <li><a href="org/apache/juneau/common/utils/AsciiMap_Test.html#AsciiMap_Test" target="classFrame">AsciiMap_Test</a></li>
-                <li><a href="org/apache/juneau/common/utils/AsciiSet_Test.html#AsciiSet_Test" target="classFrame">AsciiSet_Test</a></li>
+                <li><a href="org/apache/juneau/commons/utils/AsciiMap_Test.html#AsciiMap_Test" target="classFrame">AsciiMap_Test</a></li>
+                <li><a href="org/apache/juneau/commons/utils/AsciiSet_Test.html#AsciiSet_Test" target="classFrame">AsciiSet_Test</a></li>
                 <li><a href="org/apache/juneau/bean/html5/Aside_Test.html#Aside_Test" target="classFrame">Aside_Test</a></li>
                 <li><a href="org/apache/juneau/assertions/AssertionPredicates_Test.html#AssertionPredicates_Test" target="classFrame">AssertionPredicates_Test</a></li>
-                <li><a href="org/apache/juneau/common/utils/AssertionUtils_Test.html#AssertionUtils_Test" target="classFrame">AssertionUtils_Test</a></li>
+                <li><a href="org/apache/juneau/commons/utils/AssertionUtils_Test.html#AssertionUtils_Test" target="classFrame">AssertionUtils_Test</a></li>
                 <li><a href="org/apache/juneau/assertions/Assertion_Test.html#Assertion_Test" target="classFrame">Assertion_Test</a></li>
                 <li><a href="org/apache/juneau/assertions/Assertion_Test.html#Assertion_Test.A" target="classFrame">Assertion_Test.A</a></li>
                 <li><a href="org/apache/juneau/assertions/Assertion_Test.html#Assertion_Test.A1" target="classFrame">Assertion_Test.A1</a></li>
@@ -417,11 +417,11 @@
                 <li><a href="org/apache/juneau/jmh_generated/BenchmarkRunner_throwingMapForEach_jmhTest.html#BenchmarkRunner_throwingMapForEach_jmhTest" target="classFrame">BenchmarkRunner_throwingMapForEach_jmhTest</a></li>
                 <li><a href="org/apache/juneau/jmh_generated/BenchmarkRunner_throwingMapValuesForEach_jmhTest.html#BenchmarkRunner_throwingMapValuesForEach_jmhTest" target="classFrame">BenchmarkRunner_throwingMapValuesForEach_jmhTest</a></li>
                 <li><a href="org/apache/juneau/jmh_generated/BenchmarkRunner_throwingMapValuesIterator_jmhTest.html#BenchmarkRunner_throwingMapValuesIterator_jmhTest" target="classFrame">BenchmarkRunner_throwingMapValuesIterator_jmhTest</a></li>
-                <li><a href="org/apache/juneau/common/collections/BidiMap_Test.html#BidiMap_Test" target="classFrame">BidiMap_Test</a></li>
+                <li><a href="org/apache/juneau/commons/collections/BidiMap_Test.html#BidiMap_Test" target="classFrame">BidiMap_Test</a></li>
                 <li><a href="org/apache/juneau/bean/html5/Blockquote_Test.html#Blockquote_Test" target="classFrame">Blockquote_Test</a></li>
                 <li><a href="org/apache/juneau/bean/html5/Body_Test.html#Body_Test" target="classFrame">Body_Test</a></li>
                 <li><a href="org/apache/juneau/assertions/BooleanAssertion_Test.html#BooleanAssertion_Test" target="classFrame">BooleanAssertion_Test</a></li>
-                <li><a href="org/apache/juneau/common/collections/BooleanValue_Test.html#BooleanValue_Test" target="classFrame">BooleanValue_Test</a></li>
+                <li><a href="org/apache/juneau/commons/collections/BooleanValue_Test.html#BooleanValue_Test" target="classFrame">BooleanValue_Test</a></li>
                 <li><a href="org/apache/juneau/bean/html5/Br_Test.html#Br_Test" target="classFrame">Br_Test</a></li>
                 <li><a href="org/apache/juneau/transforms/Builder_ComboRoundTripTest.html#Builder_ComboRoundTripTest" target="classFrame">Builder_ComboRoundTripTest</a></li>
                 <li><a href="org/apache/juneau/transforms/Builder_ComboRoundTripTest.html#Builder_ComboRoundTripTest.A" target="classFrame">Builder_ComboRoundTripTest.A</a></li>
@@ -448,15 +448,15 @@
                 <li><a href="org/apache/juneau/transforms/ByteArrayBase64Swap_ComboRoundTripTest.html#ByteArrayBase64Swap_ComboRoundTripTest.BeanWithByteArrayMapField" target="classFrame">ByteArrayBase64Swap_ComboRoundTripTest.BeanWithByteArrayMapField</a></li>
                 <li><a href="org/apache/juneau/transforms/ByteArrayBase64Swap_ComboRoundTripTest.html#ByteArrayBase64Swap_ComboRoundTripTest.BeanWithByteArrayNullField" target="classFrame">ByteArrayBase64Swap_ComboRoundTripTest.BeanWithByteArrayNullField</a></li>
                 <li><a href="org/apache/juneau/http/resource/ByteArrayResource_Test.html#ByteArrayResource_Test" target="classFrame">ByteArrayResource_Test</a></li>
-                <li><a href="org/apache/juneau/common/collections/ByteValue_Test.html#ByteValue_Test" target="classFrame">ByteValue_Test</a></li>
-                <li><a href="org/apache/juneau/common/collections/Cache2_Test.html#Cache2_Test" target="classFrame">Cache2_Test</a></li>
-                <li><a href="org/apache/juneau/common/collections/Cache3_Test.html#Cache3_Test" target="classFrame">Cache3_Test</a></li>
-                <li><a href="org/apache/juneau/common/collections/Cache4_Test.html#Cache4_Test" target="classFrame">Cache4_Test</a></li>
-                <li><a href="org/apache/juneau/common/collections/Cache5_Test.html#Cache5_Test" target="classFrame">Cache5_Test</a></li>
+                <li><a href="org/apache/juneau/commons/collections/ByteValue_Test.html#ByteValue_Test" target="classFrame">ByteValue_Test</a></li>
+                <li><a href="org/apache/juneau/commons/collections/Cache2_Test.html#Cache2_Test" target="classFrame">Cache2_Test</a></li>
+                <li><a href="org/apache/juneau/commons/collections/Cache3_Test.html#Cache3_Test" target="classFrame">Cache3_Test</a></li>
+                <li><a href="org/apache/juneau/commons/collections/Cache4_Test.html#Cache4_Test" target="classFrame">Cache4_Test</a></li>
+                <li><a href="org/apache/juneau/commons/collections/Cache5_Test.html#Cache5_Test" target="classFrame">Cache5_Test</a></li>
                 <li><a href="org/apache/juneau/http/header/CacheControl_Test.html#CacheControl_Test" target="classFrame">CacheControl_Test</a></li>
                 <li><a href="org/apache/juneau/http/header/CacheControl_Test.html#CacheControl_Test.A" target="classFrame">CacheControl_Test.A</a></li>
-                <li><a href="org/apache/juneau/common/collections/CacheMode_Test.html#CacheMode_Test" target="classFrame">CacheMode_Test</a></li>
-                <li><a href="org/apache/juneau/common/collections/Cache_Test.html#Cache_Test" target="classFrame">Cache_Test</a></li>
+                <li><a href="org/apache/juneau/commons/collections/CacheMode_Test.html#CacheMode_Test" target="classFrame">CacheMode_Test</a></li>
+                <li><a href="org/apache/juneau/commons/collections/Cache_Test.html#Cache_Test" target="classFrame">Cache_Test</a></li>
                 <li><a href="org/apache/juneau/bean/openapi3/Callback_Test.html#Callback_Test" target="classFrame">Callback_Test</a></li>
                 <li><a href="org/apache/juneau/bean/openapi3/Callback_Test.html#Callback_Test.A_basicTests" target="classFrame">Callback_Test.A_basicTests</a></li>
                 <li><a href="org/apache/juneau/bean/openapi3/Callback_Test.html#Callback_Test.B_emptyTests" target="classFrame">Callback_Test.B_emptyTests</a></li>
@@ -464,95 +464,95 @@
                 <li><a href="org/apache/juneau/bean/html5/Canvas_Test.html#Canvas_Test" target="classFrame">Canvas_Test</a></li>
                 <li><a href="org/apache/juneau/bean/html5/Caption_Test.html#Caption_Test" target="classFrame">Caption_Test</a></li>
                 <li><a href="org/apache/juneau/utest/utils/CapturingPrintStream.html#CapturingPrintStream" target="classFrame">CapturingPrintStream</a></li>
-                <li><a href="org/apache/juneau/common/io/CharSequenceReader_Test.html#CharSequenceReader_Test" target="classFrame">CharSequenceReader_Test</a></li>
-                <li><a href="org/apache/juneau/common/collections/CharValue_Test.html#CharValue_Test" target="classFrame">CharValue_Test</a></li>
+                <li><a href="org/apache/juneau/commons/io/CharSequenceReader_Test.html#CharSequenceReader_Test" target="classFrame">CharSequenceReader_Test</a></li>
+                <li><a href="org/apache/juneau/commons/collections/CharValue_Test.html#CharValue_Test" target="classFrame">CharValue_Test</a></li>
                 <li><a href="org/apache/juneau/rest/beans/ChildResourceDescriptions_Test.html#ChildResourceDescriptions_Test" target="classFrame">ChildResourceDescriptions_Test</a></li>
                 <li><a href="org/apache/juneau/bean/html5/Cite_Test.html#Cite_Test" target="classFrame">Cite_Test</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test" target="classFrame">ClassInfo_Test</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.A" target="classFrame">ClassInfo_Test.A</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.A1" target="classFrame">ClassInfo_Test.A1</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.A2" target="classFrame">ClassInfo_Test.A2</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.A3" target="classFrame">ClassInfo_Test.A3</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.A4" target="classFrame">ClassInfo_Test.A4</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.A6" target="classFrame">ClassInfo_Test.A6</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.AConfig" target="classFrame">ClassInfo_Test.AConfig</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.AConfigApply" target="classFrame">ClassInfo_Test.AConfigApply</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.B" target="classFrame">ClassInfo_Test.B</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.BC1" target="classFrame">ClassInfo_Test.BC1</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.BC2" target="classFrame">ClassInfo_Test.BC2</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.BC3" target="classFrame">ClassInfo_Test.BC3</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.BI1" target="classFrame">ClassInfo_Test.BI1</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.BI2" target="classFrame">ClassInfo_Test.BI2</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.BI3" target="classFrame">ClassInfo_Test.BI3</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.BI4" target="classFrame">ClassInfo_Test.BI4</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.CC1" target="classFrame">ClassInfo_Test.CC1</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.CC2" target="classFrame">ClassInfo_Test.CC2</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.CC3" target="classFrame">ClassInfo_Test.CC3</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.CI1" target="classFrame">ClassInfo_Test.CI1</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.CI2" target="classFrame">ClassInfo_Test.CI2</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.CI3" target="classFrame">ClassInfo_Test.CI3</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.CI4" target="classFrame">ClassInfo_Test.CI4</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.E1" target="classFrame">ClassInfo_Test.E1</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.E2" target="classFrame">ClassInfo_Test.E2</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.E3" target="classFrame">ClassInfo_Test.E3</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.E4" target="classFrame">ClassInfo_Test.E4</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.E5" target="classFrame">ClassInfo_Test.E5</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.E6" target="classFrame">ClassInfo_Test.E6</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.F" target="classFrame">ClassInfo_Test.F</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.F1" target="classFrame">ClassInfo_Test.F1</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.F2" target="classFrame">ClassInfo_Test.F2</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.F3" target="classFrame">ClassInfo_Test.F3</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.G1" target="classFrame">ClassInfo_Test.G1</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.G2" target="classFrame">ClassInfo_Test.G2</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.G3" target="classFrame">ClassInfo_Test.G3</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.G4" target="classFrame">ClassInfo_Test.G4</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.G5" target="classFrame">ClassInfo_Test.G5</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.GB1" target="classFrame">ClassInfo_Test.GB1</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.GB2" target="classFrame">ClassInfo_Test.GB2</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.GB3" target="classFrame">ClassInfo_Test.GB3</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.GB4" target="classFrame">ClassInfo_Test.GB4</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.GB5" target="classFrame">ClassInfo_Test.GB5</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.GBI1" target="classFrame">ClassInfo_Test.GBI1</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.GBI2" target="classFrame">ClassInfo_Test.GBI2</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.GBI3" target="classFrame">ClassInfo_Test.GBI3</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.GBI4" target="classFrame">ClassInfo_Test.GBI4</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.GI1" target="classFrame">ClassInfo_Test.GI1</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.GI2" target="classFrame">ClassInfo_Test.GI2</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.GI3" target="classFrame">ClassInfo_Test.GI3</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.GI4" target="classFrame">ClassInfo_Test.GI4</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.H2_Abstract" target="classFrame">ClassInfo_Test.H2_Abstract</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.H2_Deprecated" target="classFrame">ClassInfo_Test.H2_Deprecated</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.H2_Member" target="classFrame">ClassInfo_Test.H2_Member</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.H2_NotAbstract" target="classFrame">ClassInfo_Test.H2_NotAbstract</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.H2_NotDeprecated" target="classFrame">ClassInfo_Test.H2_NotDeprecated</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.H2_NotPublic" target="classFrame">ClassInfo_Test.H2_NotPublic</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.H2_NotStatic" target="classFrame">ClassInfo_Test.H2_NotStatic</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.H2_Public" target="classFrame">ClassInfo_Test.H2_Public</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.H2_Static" target="classFrame">ClassInfo_Test.H2_Static</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.H2_StaticMember" target="classFrame">ClassInfo_Test.H2_StaticMember</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.H2a" target="classFrame">ClassInfo_Test.H2a</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.H2b" target="classFrame">ClassInfo_Test.H2b</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.H_AbstractPublic" target="classFrame">ClassInfo_Test.H_AbstractPublic</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.H_Package" target="classFrame">ClassInfo_Test.H_Package</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.H_Private" target="classFrame">ClassInfo_Test.H_Private</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.H_Protected" target="classFrame">ClassInfo_Test.H_Protected</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.H_Public" target="classFrame">ClassInfo_Test.H_Public</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.H_PublicDeprecated" target="classFrame">ClassInfo_Test.H_PublicDeprecated</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.H_PublicMember" target="classFrame">ClassInfo_Test.H_PublicMember</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.J1" target="classFrame">ClassInfo_Test.J1</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.J2" target="classFrame">ClassInfo_Test.J2</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.KA" target="classFrame">ClassInfo_Test.KA</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.KB" target="classFrame">ClassInfo_Test.KB</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.KC" target="classFrame">ClassInfo_Test.KC</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.LA" target="classFrame">ClassInfo_Test.LA</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.LocalClass" target="classFrame">ClassInfo_Test.LocalClass</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.MA" target="classFrame">ClassInfo_Test.MA</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.MB" target="classFrame">ClassInfo_Test.MB</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.MC" target="classFrame">ClassInfo_Test.MC</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.MD" target="classFrame">ClassInfo_Test.MD</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.ME" target="classFrame">ClassInfo_Test.ME</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.MF" target="classFrame">ClassInfo_Test.MF</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ClassInfo_Test.html#ClassInfo_Test.MG" target="classFrame">ClassInfo_Test.MG</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test" target="classFrame">ClassInfo_Test</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.A" target="classFrame">ClassInfo_Test.A</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.A1" target="classFrame">ClassInfo_Test.A1</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.A2" target="classFrame">ClassInfo_Test.A2</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.A3" target="classFrame">ClassInfo_Test.A3</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.A4" target="classFrame">ClassInfo_Test.A4</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.A6" target="classFrame">ClassInfo_Test.A6</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.AConfig" target="classFrame">ClassInfo_Test.AConfig</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.AConfigApply" target="classFrame">ClassInfo_Test.AConfigApply</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.B" target="classFrame">ClassInfo_Test.B</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.BC1" target="classFrame">ClassInfo_Test.BC1</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.BC2" target="classFrame">ClassInfo_Test.BC2</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.BC3" target="classFrame">ClassInfo_Test.BC3</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.BI1" target="classFrame">ClassInfo_Test.BI1</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.BI2" target="classFrame">ClassInfo_Test.BI2</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.BI3" target="classFrame">ClassInfo_Test.BI3</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.BI4" target="classFrame">ClassInfo_Test.BI4</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.CC1" target="classFrame">ClassInfo_Test.CC1</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.CC2" target="classFrame">ClassInfo_Test.CC2</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.CC3" target="classFrame">ClassInfo_Test.CC3</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.CI1" target="classFrame">ClassInfo_Test.CI1</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.CI2" target="classFrame">ClassInfo_Test.CI2</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.CI3" target="classFrame">ClassInfo_Test.CI3</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.CI4" target="classFrame">ClassInfo_Test.CI4</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.E1" target="classFrame">ClassInfo_Test.E1</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.E2" target="classFrame">ClassInfo_Test.E2</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.E3" target="classFrame">ClassInfo_Test.E3</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.E4" target="classFrame">ClassInfo_Test.E4</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.E5" target="classFrame">ClassInfo_Test.E5</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.E6" target="classFrame">ClassInfo_Test.E6</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.F" target="classFrame">ClassInfo_Test.F</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.F1" target="classFrame">ClassInfo_Test.F1</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.F2" target="classFrame">ClassInfo_Test.F2</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.F3" target="classFrame">ClassInfo_Test.F3</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.G1" target="classFrame">ClassInfo_Test.G1</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.G2" target="classFrame">ClassInfo_Test.G2</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.G3" target="classFrame">ClassInfo_Test.G3</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.G4" target="classFrame">ClassInfo_Test.G4</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.G5" target="classFrame">ClassInfo_Test.G5</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.GB1" target="classFrame">ClassInfo_Test.GB1</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.GB2" target="classFrame">ClassInfo_Test.GB2</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.GB3" target="classFrame">ClassInfo_Test.GB3</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.GB4" target="classFrame">ClassInfo_Test.GB4</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.GB5" target="classFrame">ClassInfo_Test.GB5</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.GBI1" target="classFrame">ClassInfo_Test.GBI1</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.GBI2" target="classFrame">ClassInfo_Test.GBI2</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.GBI3" target="classFrame">ClassInfo_Test.GBI3</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.GBI4" target="classFrame">ClassInfo_Test.GBI4</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.GI1" target="classFrame">ClassInfo_Test.GI1</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.GI2" target="classFrame">ClassInfo_Test.GI2</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.GI3" target="classFrame">ClassInfo_Test.GI3</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.GI4" target="classFrame">ClassInfo_Test.GI4</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.H2_Abstract" target="classFrame">ClassInfo_Test.H2_Abstract</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.H2_Deprecated" target="classFrame">ClassInfo_Test.H2_Deprecated</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.H2_Member" target="classFrame">ClassInfo_Test.H2_Member</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.H2_NotAbstract" target="classFrame">ClassInfo_Test.H2_NotAbstract</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.H2_NotDeprecated" target="classFrame">ClassInfo_Test.H2_NotDeprecated</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.H2_NotPublic" target="classFrame">ClassInfo_Test.H2_NotPublic</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.H2_NotStatic" target="classFrame">ClassInfo_Test.H2_NotStatic</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.H2_Public" target="classFrame">ClassInfo_Test.H2_Public</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.H2_Static" target="classFrame">ClassInfo_Test.H2_Static</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.H2_StaticMember" target="classFrame">ClassInfo_Test.H2_StaticMember</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.H2a" target="classFrame">ClassInfo_Test.H2a</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.H2b" target="classFrame">ClassInfo_Test.H2b</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.H_AbstractPublic" target="classFrame">ClassInfo_Test.H_AbstractPublic</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.H_Package" target="classFrame">ClassInfo_Test.H_Package</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.H_Private" target="classFrame">ClassInfo_Test.H_Private</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.H_Protected" target="classFrame">ClassInfo_Test.H_Protected</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.H_Public" target="classFrame">ClassInfo_Test.H_Public</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.H_PublicDeprecated" target="classFrame">ClassInfo_Test.H_PublicDeprecated</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.H_PublicMember" target="classFrame">ClassInfo_Test.H_PublicMember</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.J1" target="classFrame">ClassInfo_Test.J1</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.J2" target="classFrame">ClassInfo_Test.J2</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.KA" target="classFrame">ClassInfo_Test.KA</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.KB" target="classFrame">ClassInfo_Test.KB</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.KC" target="classFrame">ClassInfo_Test.KC</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.LA" target="classFrame">ClassInfo_Test.LA</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.LocalClass" target="classFrame">ClassInfo_Test.LocalClass</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.MA" target="classFrame">ClassInfo_Test.MA</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.MB" target="classFrame">ClassInfo_Test.MB</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.MC" target="classFrame">ClassInfo_Test.MC</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.MD" target="classFrame">ClassInfo_Test.MD</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.ME" target="classFrame">ClassInfo_Test.ME</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.MF" target="classFrame">ClassInfo_Test.MF</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ClassInfo_Test.html#ClassInfo_Test.MG" target="classFrame">ClassInfo_Test.MG</a></li>
                 <li><a href="org/apache/juneau/a/rttests/Classes_RoundTripTest.html#Classes_RoundTripTest" target="classFrame">Classes_RoundTripTest</a></li>
                 <li><a href="org/apache/juneau/http/header/ClientVersion_Test.html#ClientVersion_Test" target="classFrame">ClientVersion_Test</a></li>
                 <li><a href="org/apache/juneau/http/header/ClientVersion_Test.html#ClientVersion_Test.A" target="classFrame">ClientVersion_Test.A</a></li>
@@ -563,7 +563,7 @@
                 <li><a href="org/apache/juneau/bean/html5/Colgroup_Test.html#Colgroup_Test" target="classFrame">Colgroup_Test</a></li>
                 <li><a href="org/apache/juneau/assertions/CollectionAssertion_Test.html#CollectionAssertion_Test" target="classFrame">CollectionAssertion_Test</a></li>
                 <li><a href="org/apache/juneau/http/annotation/CollectionFormatType_Test.html#CollectionFormatType_Test" target="classFrame">CollectionFormatType_Test</a></li>
-                <li><a href="org/apache/juneau/common/utils/CollectionUtils_Test.html#CollectionUtils_Test" target="classFrame">CollectionUtils_Test</a></li>
+                <li><a href="org/apache/juneau/commons/utils/CollectionUtils_Test.html#CollectionUtils_Test" target="classFrame">CollectionUtils_Test</a></li>
                 <li><a href="org/apache/juneau/ComboInput.html#ComboInput" target="classFrame">ComboInput</a></li>
                 <li><a href="org/apache/juneau/ComboRoundTripTest_Base.html#ComboRoundTripTest_Base" target="classFrame">ComboRoundTripTest_Base</a></li>
                 <li><a href="org/apache/juneau/ComboRoundTrip_Tester.html#ComboRoundTrip_Tester" target="classFrame">ComboRoundTrip_Tester</a></li>
@@ -648,15 +648,15 @@
                 <li><a href="org/apache/juneau/http/response/Conflict_Test.html#Conflict_Test.A" target="classFrame">Conflict_Test.A</a></li>
                 <li><a href="org/apache/juneau/http/header/Connection_Test.html#Connection_Test" target="classFrame">Connection_Test</a></li>
                 <li><a href="org/apache/juneau/http/header/Connection_Test.html#Connection_Test.A" target="classFrame">Connection_Test.A</a></li>
-                <li><a href="org/apache/juneau/common/utils/Console_Test.html#Console_Test" target="classFrame">Console_Test</a></li>
+                <li><a href="org/apache/juneau/commons/utils/Console_Test.html#Console_Test" target="classFrame">Console_Test</a></li>
                 <li><a href="org/apache/juneau/utest/utils/Constants.html#Constants" target="classFrame">Constants</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ConstructorInfoTest.html#ConstructorInfoTest" target="classFrame">ConstructorInfoTest</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ConstructorInfoTest.html#ConstructorInfoTest.A" target="classFrame">ConstructorInfoTest.A</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ConstructorInfoTest.html#ConstructorInfoTest.B" target="classFrame">ConstructorInfoTest.B</a></li>
-                <li><a href="org/apache/juneau/common/function/Consumer2_Test.html#Consumer2_Test" target="classFrame">Consumer2_Test</a></li>
-                <li><a href="org/apache/juneau/common/function/Consumer3_Test.html#Consumer3_Test" target="classFrame">Consumer3_Test</a></li>
-                <li><a href="org/apache/juneau/common/function/Consumer4_Test.html#Consumer4_Test" target="classFrame">Consumer4_Test</a></li>
-                <li><a href="org/apache/juneau/common/function/Consumer5_Test.html#Consumer5_Test" target="classFrame">Consumer5_Test</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ConstructorInfoTest.html#ConstructorInfoTest" target="classFrame">ConstructorInfoTest</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ConstructorInfoTest.html#ConstructorInfoTest.A" target="classFrame">ConstructorInfoTest.A</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ConstructorInfoTest.html#ConstructorInfoTest.B" target="classFrame">ConstructorInfoTest.B</a></li>
+                <li><a href="org/apache/juneau/commons/function/Consumer2_Test.html#Consumer2_Test" target="classFrame">Consumer2_Test</a></li>
+                <li><a href="org/apache/juneau/commons/function/Consumer3_Test.html#Consumer3_Test" target="classFrame">Consumer3_Test</a></li>
+                <li><a href="org/apache/juneau/commons/function/Consumer4_Test.html#Consumer4_Test" target="classFrame">Consumer4_Test</a></li>
+                <li><a href="org/apache/juneau/commons/function/Consumer5_Test.html#Consumer5_Test" target="classFrame">Consumer5_Test</a></li>
                 <li><a href="org/apache/juneau/http/annotation/ContactAnnotation_Test.html#ContactAnnotation_Test" target="classFrame">ContactAnnotation_Test</a></li>
                 <li><a href="org/apache/juneau/bean/openapi3/Contact_Test.html#Contact_Test" target="classFrame">Contact_Test</a></li>
                 <li><a href="org/apache/juneau/bean/swagger/Contact_Test.html#Contact_Test" target="classFrame">Contact_Test</a></li>
@@ -724,14 +724,14 @@
                 <li><a href="org/apache/juneau/ContextPropertiesTest.html#ContextPropertiesTest.B2Config" target="classFrame">ContextPropertiesTest.B2Config</a></li>
                 <li><a href="org/apache/juneau/http/response/Continue_Test.html#Continue_Test" target="classFrame">Continue_Test</a></li>
                 <li><a href="org/apache/juneau/http/response/Continue_Test.html#Continue_Test.A" target="classFrame">Continue_Test.A</a></li>
-                <li><a href="org/apache/juneau/common/collections/ControlledArrayList_Test.html#ControlledArrayList_Test" target="classFrame">ControlledArrayList_Test</a></li>
-                <li><a href="org/apache/juneau/common/collections/ControlledArrayList_Test.html#ControlledArrayList_Test.A_ConstructorTests" target="classFrame">ControlledArrayList_Test.A_ConstructorTests</a></li>
-                <li><a href="org/apache/juneau/common/collections/ControlledArrayList_Test.html#ControlledArrayList_Test.B_ModificationTests" target="classFrame">ControlledArrayList_Test.B_ModificationTests</a></li>
-                <li><a href="org/apache/juneau/common/collections/ControlledArrayList_Test.html#ControlledArrayList_Test.C_IteratorTests" target="classFrame">ControlledArrayList_Test.C_IteratorTests</a></li>
-                <li><a href="org/apache/juneau/common/collections/ControlledArrayList_Test.html#ControlledArrayList_Test.D_ListIteratorTests" target="classFrame">ControlledArrayList_Test.D_ListIteratorTests</a></li>
-                <li><a href="org/apache/juneau/common/collections/ControlledArrayList_Test.html#ControlledArrayList_Test.E_SubListTests" target="classFrame">ControlledArrayList_Test.E_SubListTests</a></li>
-                <li><a href="org/apache/juneau/common/collections/ControlledArrayList_Test.html#ControlledArrayList_Test.F_SetUnmodifiableTests" target="classFrame">ControlledArrayList_Test.F_SetUnmodifiableTests</a></li>
-                <li><a href="org/apache/juneau/common/collections/ControlledArrayList_Test.html#ControlledArrayList_Test.G_EdgeCaseTests" target="classFrame">ControlledArrayList_Test.G_EdgeCaseTests</a></li>
+                <li><a href="org/apache/juneau/commons/collections/ControlledArrayList_Test.html#ControlledArrayList_Test" target="classFrame">ControlledArrayList_Test</a></li>
+                <li><a href="org/apache/juneau/commons/collections/ControlledArrayList_Test.html#ControlledArrayList_Test.A_ConstructorTests" target="classFrame">ControlledArrayList_Test.A_ConstructorTests</a></li>
+                <li><a href="org/apache/juneau/commons/collections/ControlledArrayList_Test.html#ControlledArrayList_Test.B_ModificationTests" target="classFrame">ControlledArrayList_Test.B_ModificationTests</a></li>
+                <li><a href="org/apache/juneau/commons/collections/ControlledArrayList_Test.html#ControlledArrayList_Test.C_IteratorTests" target="classFrame">ControlledArrayList_Test.C_IteratorTests</a></li>
+                <li><a href="org/apache/juneau/commons/collections/ControlledArrayList_Test.html#ControlledArrayList_Test.D_ListIteratorTests" target="classFrame">ControlledArrayList_Test.D_ListIteratorTests</a></li>
+                <li><a href="org/apache/juneau/commons/collections/ControlledArrayList_Test.html#ControlledArrayList_Test.E_SubListTests" target="classFrame">ControlledArrayList_Test.E_SubListTests</a></li>
+                <li><a href="org/apache/juneau/commons/collections/ControlledArrayList_Test.html#ControlledArrayList_Test.F_SetUnmodifiableTests" target="classFrame">ControlledArrayList_Test.F_SetUnmodifiableTests</a></li>
+                <li><a href="org/apache/juneau/commons/collections/ControlledArrayList_Test.html#ControlledArrayList_Test.G_EdgeCaseTests" target="classFrame">ControlledArrayList_Test.G_EdgeCaseTests</a></li>
                 <li><a href="org/apache/juneau/http/response/Created_Test.html#Created_Test" target="classFrame">Created_Test</a></li>
                 <li><a href="org/apache/juneau/http/response/Created_Test.html#Created_Test.A" target="classFrame">Created_Test.A</a></li>
                 <li><a href="org/apache/juneau/csv/annotation/CsvAnnotation_Test.html#CsvAnnotation_Test" target="classFrame">CsvAnnotation_Test</a></li>
@@ -760,22 +760,22 @@
                 <li><a href="org/apache/juneau/bean/html5/Data_Test.html#Data_Test" target="classFrame">Data_Test</a></li>
                 <li><a href="org/apache/juneau/bean/html5/Datalist_Test.html#Datalist_Test" target="classFrame">Datalist_Test</a></li>
                 <li><a href="org/apache/juneau/assertions/DateAssertion_Test.html#DateAssertion_Test" target="classFrame">DateAssertion_Test</a></li>
-                <li><a href="org/apache/juneau/common/utils/DateUtils_Test.html#DateUtils_Test" target="classFrame">DateUtils_Test</a></li>
-                <li><a href="org/apache/juneau/common/utils/DateUtils_Test.html#DateUtils_Test.A_getPrecisionFromString" target="classFrame">DateUtils_Test.A_getPrecisionFromString</a></li>
-                <li><a href="org/apache/juneau/common/utils/DateUtils_Test.html#DateUtils_Test.A_getPrecisionFromString.Input" target="classFrame">DateUtils_Test.A_getPrecisionFromString.Input</a></li>
-                <li><a href="org/apache/juneau/common/utils/DateUtils_Test.html#DateUtils_Test.D_toChronoField" target="classFrame">DateUtils_Test.D_toChronoField</a></li>
-                <li><a href="org/apache/juneau/common/utils/DateUtils_Test.html#DateUtils_Test.D_toChronoField.Input" target="classFrame">DateUtils_Test.D_toChronoField.Input</a></li>
-                <li><a href="org/apache/juneau/common/utils/DateUtils_Test.html#DateUtils_Test.E_toChronoUnit" target="classFrame">DateUtils_Test.E_toChronoUnit</a></li>
-                <li><a href="org/apache/juneau/common/utils/DateUtils_Test.html#DateUtils_Test.E_toChronoUnit.Input" target="classFrame">DateUtils_Test.E_toChronoUnit.Input</a></li>
-                <li><a href="org/apache/juneau/common/utils/DateUtils_Test.html#DateUtils_Test.F_toCalendarField" target="classFrame">DateUtils_Test.F_toCalendarField</a></li>
-                <li><a href="org/apache/juneau/common/utils/DateUtils_Test.html#DateUtils_Test.F_toCalendarField.Input" target="classFrame">DateUtils_Test.F_toCalendarField.Input</a></li>
-                <li><a href="org/apache/juneau/common/utils/DateUtils_Test.html#DateUtils_Test.G_roundTripConversions" target="classFrame">DateUtils_Test.G_roundTripConversions</a></li>
-                <li><a href="org/apache/juneau/common/utils/DateUtils_Test.html#DateUtils_Test.G_roundTripConversions.Input" target="classFrame">DateUtils_Test.G_roundTripConversions.Input</a></li>
-                <li><a href="org/apache/juneau/common/utils/DateUtils_Test.html#DateUtils_Test.H_toIso8601" target="classFrame">DateUtils_Test.H_toIso8601</a></li>
-                <li><a href="org/apache/juneau/common/utils/DateUtils_Test.html#DateUtils_Test.I_toIso8601_edgeCases" target="classFrame">DateUtils_Test.I_toIso8601_edgeCases</a></li>
-                <li><a href="org/apache/juneau/common/utils/DateUtils_Test.html#DateUtils_Test.J_fromIso8601Calendar" target="classFrame">DateUtils_Test.J_fromIso8601Calendar</a></li>
-                <li><a href="org/apache/juneau/common/utils/DateUtils_Test.html#DateUtils_Test.K_fromIso8601" target="classFrame">DateUtils_Test.K_fromIso8601</a></li>
-                <li><a href="org/apache/juneau/common/utils/DateUtils_Test.html#DateUtils_Test.L_fromIso8601_edgeCases" target="classFrame">DateUtils_Test.L_fromIso8601_edgeCases</a></li>
+                <li><a href="org/apache/juneau/commons/utils/DateUtils_Test.html#DateUtils_Test" target="classFrame">DateUtils_Test</a></li>
+                <li><a href="org/apache/juneau/commons/utils/DateUtils_Test.html#DateUtils_Test.A_getPrecisionFromString" target="classFrame">DateUtils_Test.A_getPrecisionFromString</a></li>
+                <li><a href="org/apache/juneau/commons/utils/DateUtils_Test.html#DateUtils_Test.A_getPrecisionFromString.Input" target="classFrame">DateUtils_Test.A_getPrecisionFromString.Input</a></li>
+                <li><a href="org/apache/juneau/commons/utils/DateUtils_Test.html#DateUtils_Test.D_toChronoField" target="classFrame">DateUtils_Test.D_toChronoField</a></li>
+                <li><a href="org/apache/juneau/commons/utils/DateUtils_Test.html#DateUtils_Test.D_toChronoField.Input" target="classFrame">DateUtils_Test.D_toChronoField.Input</a></li>
+                <li><a href="org/apache/juneau/commons/utils/DateUtils_Test.html#DateUtils_Test.E_toChronoUnit" target="classFrame">DateUtils_Test.E_toChronoUnit</a></li>
+                <li><a href="org/apache/juneau/commons/utils/DateUtils_Test.html#DateUtils_Test.E_toChronoUnit.Input" target="classFrame">DateUtils_Test.E_toChronoUnit.Input</a></li>
+                <li><a href="org/apache/juneau/commons/utils/DateUtils_Test.html#DateUtils_Test.F_toCalendarField" target="classFrame">DateUtils_Test.F_toCalendarField</a></li>
+                <li><a href="org/apache/juneau/commons/utils/DateUtils_Test.html#DateUtils_Test.F_toCalendarField.Input" target="classFrame">DateUtils_Test.F_toCalendarField.Input</a></li>
+                <li><a href="org/apache/juneau/commons/utils/DateUtils_Test.html#DateUtils_Test.G_roundTripConversions" target="classFrame">DateUtils_Test.G_roundTripConversions</a></li>
+                <li><a href="org/apache/juneau/commons/utils/DateUtils_Test.html#DateUtils_Test.G_roundTripConversions.Input" target="classFrame">DateUtils_Test.G_roundTripConversions.Input</a></li>
+                <li><a href="org/apache/juneau/commons/utils/DateUtils_Test.html#DateUtils_Test.H_toIso8601" target="classFrame">DateUtils_Test.H_toIso8601</a></li>
+                <li><a href="org/apache/juneau/commons/utils/DateUtils_Test.html#DateUtils_Test.I_toIso8601_edgeCases" target="classFrame">DateUtils_Test.I_toIso8601_edgeCases</a></li>
+                <li><a href="org/apache/juneau/commons/utils/DateUtils_Test.html#DateUtils_Test.J_fromIso8601Calendar" target="classFrame">DateUtils_Test.J_fromIso8601Calendar</a></li>
+                <li><a href="org/apache/juneau/commons/utils/DateUtils_Test.html#DateUtils_Test.K_fromIso8601" target="classFrame">DateUtils_Test.K_fromIso8601</a></li>
+                <li><a href="org/apache/juneau/commons/utils/DateUtils_Test.html#DateUtils_Test.L_fromIso8601_edgeCases" target="classFrame">DateUtils_Test.L_fromIso8601_edgeCases</a></li>
                 <li><a href="org/apache/juneau/http/header/Date_Test.html#Date_Test" target="classFrame">Date_Test</a></li>
                 <li><a href="org/apache/juneau/http/header/Date_Test.html#Date_Test.A" target="classFrame">Date_Test.A</a></li>
                 <li><a href="org/apache/juneau/bean/html5/Dd_Test.html#Dd_Test" target="classFrame">Dd_Test</a></li>
@@ -833,7 +833,7 @@
                 <li><a href="org/apache/juneau/bean/openapi3/Discriminator_Test.html#Discriminator_Test.C_extraProperties" target="classFrame">Discriminator_Test.C_extraProperties</a></li>
                 <li><a href="org/apache/juneau/bean/html5/Div_Test.html#Div_Test" target="classFrame">Div_Test</a></li>
                 <li><a href="org/apache/juneau/bean/html5/Dl_Test.html#Dl_Test" target="classFrame">Dl_Test</a></li>
-                <li><a href="org/apache/juneau/common/collections/DoubleValue_Test.html#DoubleValue_Test" target="classFrame">DoubleValue_Test</a></li>
+                <li><a href="org/apache/juneau/commons/collections/DoubleValue_Test.html#DoubleValue_Test" target="classFrame">DoubleValue_Test</a></li>
                 <li><a href="org/apache/juneau/bean/html5/Dt_Test.html#Dt_Test" target="classFrame">Dt_Test</a></li>
                 <li><a href="org/apache/juneau/DynaBean_ComboRoundTripTest.html#DynaBean_ComboRoundTripTest" target="classFrame">DynaBean_ComboRoundTripTest</a></li>
                 <li><a href="org/apache/juneau/DynaBean_ComboRoundTripTest.html#DynaBean_ComboRoundTripTest.BeanWithDynaField" target="classFrame">DynaBean_ComboRoundTripTest.BeanWithDynaField</a></li>
@@ -872,16 +872,16 @@
                 <li><a href="org/apache/juneau/bean/openapi3/Example_Test.html#Example_Test.A_basicTests" target="classFrame">Example_Test.A_basicTests</a></li>
                 <li><a href="org/apache/juneau/bean/openapi3/Example_Test.html#Example_Test.B_emptyTests" target="classFrame">Example_Test.B_emptyTests</a></li>
                 <li><a href="org/apache/juneau/bean/openapi3/Example_Test.html#Example_Test.C_extraProperties" target="classFrame">Example_Test.C_extraProperties</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ExecutableInfo_Test.html#ExecutableInfo_Test" target="classFrame">ExecutableInfo_Test</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ExecutableInfo_Test.html#ExecutableInfo_Test.A" target="classFrame">ExecutableInfo_Test.A</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ExecutableInfo_Test.html#ExecutableInfo_Test.B" target="classFrame">ExecutableInfo_Test.B</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ExecutableInfo_Test.html#ExecutableInfo_Test.B1" target="classFrame">ExecutableInfo_Test.B1</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ExecutableInfo_Test.html#ExecutableInfo_Test.C" target="classFrame">ExecutableInfo_Test.C</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ExecutableInfo_Test.html#ExecutableInfo_Test.CA" target="classFrame">ExecutableInfo_Test.CA</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ExecutableInfo_Test.html#ExecutableInfo_Test.D" target="classFrame">ExecutableInfo_Test.D</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ExecutableInfo_Test.html#ExecutableInfo_Test.E" target="classFrame">ExecutableInfo_Test.E</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ExecutableInfo_Test.html#ExecutableInfo_Test.F" target="classFrame">ExecutableInfo_Test.F</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ExecutableInfo_Test.html#ExecutableInfo_Test.X" target="classFrame">ExecutableInfo_Test.X</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ExecutableInfo_Test.html#ExecutableInfo_Test" target="classFrame">ExecutableInfo_Test</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ExecutableInfo_Test.html#ExecutableInfo_Test.A" target="classFrame">ExecutableInfo_Test.A</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ExecutableInfo_Test.html#ExecutableInfo_Test.B" target="classFrame">ExecutableInfo_Test.B</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ExecutableInfo_Test.html#ExecutableInfo_Test.B1" target="classFrame">ExecutableInfo_Test.B1</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ExecutableInfo_Test.html#ExecutableInfo_Test.C" target="classFrame">ExecutableInfo_Test.C</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ExecutableInfo_Test.html#ExecutableInfo_Test.CA" target="classFrame">ExecutableInfo_Test.CA</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ExecutableInfo_Test.html#ExecutableInfo_Test.D" target="classFrame">ExecutableInfo_Test.D</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ExecutableInfo_Test.html#ExecutableInfo_Test.E" target="classFrame">ExecutableInfo_Test.E</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ExecutableInfo_Test.html#ExecutableInfo_Test.F" target="classFrame">ExecutableInfo_Test.F</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ExecutableInfo_Test.html#ExecutableInfo_Test.X" target="classFrame">ExecutableInfo_Test.X</a></li>
                 <li><a href="org/apache/juneau/http/header/Expect_Test.html#Expect_Test" target="classFrame">Expect_Test</a></li>
                 <li><a href="org/apache/juneau/http/header/Expect_Test.html#Expect_Test.A" target="classFrame">Expect_Test.A</a></li>
                 <li><a href="org/apache/juneau/http/response/ExpectationFailed_Test.html#ExpectationFailed_Test" target="classFrame">ExpectationFailed_Test</a></li>
@@ -910,34 +910,34 @@
                 <li><a href="org/apache/juneau/utest/utils/FakeWriterSerializer.html#FakeWriterSerializer" target="classFrame">FakeWriterSerializer</a></li>
                 <li><a href="org/apache/juneau/utest/utils/FakeWriterSerializer.html#FakeWriterSerializer.Builder" target="classFrame">FakeWriterSerializer.Builder</a></li>
                 <li><a href="org/apache/juneau/utest/utils/FakeWriterSerializer.html#FakeWriterSerializer.X" target="classFrame">FakeWriterSerializer.X</a></li>
-                <li><a href="org/apache/juneau/common/reflect/FieldInfo_AnnotationInfos_Test.html#FieldInfo_AnnotationInfos_Test" target="classFrame">FieldInfo_AnnotationInfos_Test</a></li>
-                <li><a href="org/apache/juneau/common/reflect/FieldInfo_AnnotationInfos_Test.html#FieldInfo_AnnotationInfos_Test.TestAnnotation1" target="classFrame">FieldInfo_AnnotationInfos_Test.TestAnnotation1</a></li>
-                <li><a href="org/apache/juneau/common/reflect/FieldInfo_AnnotationInfos_Test.html#FieldInfo_AnnotationInfos_Test.TestAnnotation2" target="classFrame">FieldInfo_AnnotationInfos_Test.TestAnnotation2</a></li>
-                <li><a href="org/apache/juneau/common/reflect/FieldInfo_AnnotationInfos_Test.html#FieldInfo_AnnotationInfos_Test.TestAnnotation3" target="classFrame">FieldInfo_AnnotationInfos_Test.TestAnnotation3</a></li>
-                <li><a href="org/apache/juneau/common/reflect/FieldInfo_AnnotationInfos_Test.html#FieldInfo_AnnotationInfos_Test.TestClass" target="classFrame">FieldInfo_AnnotationInfos_Test.TestClass</a></li>
-                <li><a href="org/apache/juneau/common/reflect/FieldInfo_FullName_Test.html#FieldInfo_FullName_Test" target="classFrame">FieldInfo_FullName_Test</a></li>
-                <li><a href="org/apache/juneau/common/reflect/FieldInfo_FullName_Test.html#FieldInfo_FullName_Test.InnerClass" target="classFrame">FieldInfo_FullName_Test.InnerClass</a></li>
-                <li><a href="org/apache/juneau/common/reflect/FieldInfo_FullName_Test.html#FieldInfo_FullName_Test.TestClass" target="classFrame">FieldInfo_FullName_Test.TestClass</a></li>
-                <li><a href="org/apache/juneau/common/reflect/FieldInfo_Test.html#FieldInfo_Test" target="classFrame">FieldInfo_Test</a></li>
-                <li><a href="org/apache/juneau/common/reflect/FieldInfo_Test.html#FieldInfo_Test.A" target="classFrame">FieldInfo_Test.A</a></li>
-                <li><a href="org/apache/juneau/common/reflect/FieldInfo_Test.html#FieldInfo_Test.A1" target="classFrame">FieldInfo_Test.A1</a></li>
-                <li><a href="org/apache/juneau/common/reflect/FieldInfo_Test.html#FieldInfo_Test.AX" target="classFrame">FieldInfo_Test.AX</a></li>
-                <li><a href="org/apache/juneau/common/reflect/FieldInfo_Test.html#FieldInfo_Test.B" target="classFrame">FieldInfo_Test.B</a></li>
-                <li><a href="org/apache/juneau/common/reflect/FieldInfo_Test.html#FieldInfo_Test.C" target="classFrame">FieldInfo_Test.C</a></li>
-                <li><a href="org/apache/juneau/common/reflect/FieldInfo_Test.html#FieldInfo_Test.D" target="classFrame">FieldInfo_Test.D</a></li>
-                <li><a href="org/apache/juneau/common/reflect/FieldInfo_Test.html#FieldInfo_Test.E" target="classFrame">FieldInfo_Test.E</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/FieldInfo_AnnotationInfos_Test.html#FieldInfo_AnnotationInfos_Test" target="classFrame">FieldInfo_AnnotationInfos_Test</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/FieldInfo_AnnotationInfos_Test.html#FieldInfo_AnnotationInfos_Test.TestAnnotation1" target="classFrame">FieldInfo_AnnotationInfos_Test.TestAnnotation1</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/FieldInfo_AnnotationInfos_Test.html#FieldInfo_AnnotationInfos_Test.TestAnnotation2" target="classFrame">FieldInfo_AnnotationInfos_Test.TestAnnotation2</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/FieldInfo_AnnotationInfos_Test.html#FieldInfo_AnnotationInfos_Test.TestAnnotation3" target="classFrame">FieldInfo_AnnotationInfos_Test.TestAnnotation3</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/FieldInfo_AnnotationInfos_Test.html#FieldInfo_AnnotationInfos_Test.TestClass" target="classFrame">FieldInfo_AnnotationInfos_Test.TestClass</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/FieldInfo_FullName_Test.html#FieldInfo_FullName_Test" target="classFrame">FieldInfo_FullName_Test</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/FieldInfo_FullName_Test.html#FieldInfo_FullName_Test.InnerClass" target="classFrame">FieldInfo_FullName_Test.InnerClass</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/FieldInfo_FullName_Test.html#FieldInfo_FullName_Test.TestClass" target="classFrame">FieldInfo_FullName_Test.TestClass</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/FieldInfo_Test.html#FieldInfo_Test" target="classFrame">FieldInfo_Test</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/FieldInfo_Test.html#FieldInfo_Test.A" target="classFrame">FieldInfo_Test.A</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/FieldInfo_Test.html#FieldInfo_Test.A1" target="classFrame">FieldInfo_Test.A1</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/FieldInfo_Test.html#FieldInfo_Test.AX" target="classFrame">FieldInfo_Test.AX</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/FieldInfo_Test.html#FieldInfo_Test.B" target="classFrame">FieldInfo_Test.B</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/FieldInfo_Test.html#FieldInfo_Test.C" target="classFrame">FieldInfo_Test.C</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/FieldInfo_Test.html#FieldInfo_Test.D" target="classFrame">FieldInfo_Test.D</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/FieldInfo_Test.html#FieldInfo_Test.E" target="classFrame">FieldInfo_Test.E</a></li>
                 <li><a href="org/apache/juneau/bean/html5/Fieldset_Test.html#Fieldset_Test" target="classFrame">Fieldset_Test</a></li>
                 <li><a href="org/apache/juneau/bean/html5/Figcaption_Test.html#Figcaption_Test" target="classFrame">Figcaption_Test</a></li>
                 <li><a href="org/apache/juneau/bean/html5/Figure_Test.html#Figure_Test" target="classFrame">Figure_Test</a></li>
                 <li><a href="org/apache/juneau/cp/FileFinder_Test.html#FileFinder_Test" target="classFrame">FileFinder_Test</a></li>
                 <li><a href="org/apache/juneau/cp/sub/FileFinder_Test2.html#FileFinder_Test2" target="classFrame">FileFinder_Test2</a></li>
-                <li><a href="org/apache/juneau/common/io/FileReaderBuilder_Test.html#FileReaderBuilder_Test" target="classFrame">FileReaderBuilder_Test</a></li>
+                <li><a href="org/apache/juneau/commons/io/FileReaderBuilder_Test.html#FileReaderBuilder_Test" target="classFrame">FileReaderBuilder_Test</a></li>
                 <li><a href="org/apache/juneau/http/resource/FileResource_Test.html#FileResource_Test" target="classFrame">FileResource_Test</a></li>
-                <li><a href="org/apache/juneau/common/utils/FileUtils_Test.html#FileUtils_Test" target="classFrame">FileUtils_Test</a></li>
-                <li><a href="org/apache/juneau/common/io/FileWriterBuilder_Test.html#FileWriterBuilder_Test" target="classFrame">FileWriterBuilder_Test</a></li>
+                <li><a href="org/apache/juneau/commons/utils/FileUtils_Test.html#FileUtils_Test" target="classFrame">FileUtils_Test</a></li>
+                <li><a href="org/apache/juneau/commons/io/FileWriterBuilder_Test.html#FileWriterBuilder_Test" target="classFrame">FileWriterBuilder_Test</a></li>
                 <li><a href="org/apache/juneau/utils/FilteredMapTest.html#FilteredMapTest" target="classFrame">FilteredMapTest</a></li>
-                <li><a href="org/apache/juneau/common/collections/Flag_Test.html#Flag_Test" target="classFrame">Flag_Test</a></li>
-                <li><a href="org/apache/juneau/common/collections/FloatValue_Test.html#FloatValue_Test" target="classFrame">FloatValue_Test</a></li>
+                <li><a href="org/apache/juneau/commons/collections/Flag_Test.html#Flag_Test" target="classFrame">Flag_Test</a></li>
+                <li><a href="org/apache/juneau/commons/collections/FloatValue_Test.html#FloatValue_Test" target="classFrame">FloatValue_Test</a></li>
                 <li><a href="org/apache/juneau/bean/html5/Footer_Test.html#Footer_Test" target="classFrame">Footer_Test</a></li>
                 <li><a href="org/apache/juneau/http/response/Forbidden_Test.html#Forbidden_Test" target="classFrame">Forbidden_Test</a></li>
                 <li><a href="org/apache/juneau/http/response/Forbidden_Test.html#Forbidden_Test.A" target="classFrame">Forbidden_Test.A</a></li>
@@ -953,10 +953,10 @@
                 <li><a href="org/apache/juneau/http/response/Found_Test.html#Found_Test.A" target="classFrame">Found_Test.A</a></li>
                 <li><a href="org/apache/juneau/http/header/From_Test.html#From_Test" target="classFrame">From_Test</a></li>
                 <li><a href="org/apache/juneau/http/header/From_Test.html#From_Test.A" target="classFrame">From_Test.A</a></li>
-                <li><a href="org/apache/juneau/common/function/Function2_Test.html#Function2_Test" target="classFrame">Function2_Test</a></li>
-                <li><a href="org/apache/juneau/common/function/Function3_Test.html#Function3_Test" target="classFrame">Function3_Test</a></li>
-                <li><a href="org/apache/juneau/common/function/Function4_Test.html#Function4_Test" target="classFrame">Function4_Test</a></li>
-                <li><a href="org/apache/juneau/common/function/Function5_Test.html#Function5_Test" target="classFrame">Function5_Test</a></li>
+                <li><a href="org/apache/juneau/commons/function/Function2_Test.html#Function2_Test" target="classFrame">Function2_Test</a></li>
+                <li><a href="org/apache/juneau/commons/function/Function3_Test.html#Function3_Test" target="classFrame">Function3_Test</a></li>
+                <li><a href="org/apache/juneau/commons/function/Function4_Test.html#Function4_Test" target="classFrame">Function4_Test</a></li>
+                <li><a href="org/apache/juneau/commons/function/Function5_Test.html#Function5_Test" target="classFrame">Function5_Test</a></li>
                 <li><a href="org/apache/juneau/transforms/FunctionalSwapTest.html#FunctionalSwapTest" target="classFrame">FunctionalSwapTest</a></li>
                 <li><a href="org/apache/juneau/a/rttests/Generics_RoundTripTest.html#Generics_RoundTripTest" target="classFrame">Generics_RoundTripTest</a></li>
                 <li><a href="org/apache/juneau/a/rttests/Generics_RoundTripTest.html#Generics_RoundTripTest.Pair" target="classFrame">Generics_RoundTripTest.Pair</a></li>
@@ -965,7 +965,7 @@
                 <li><a href="org/apache/juneau/a/rttests/Generics_RoundTripTest.html#Generics_RoundTripTest.Target" target="classFrame">Generics_RoundTripTest.Target</a></li>
                 <li><a href="org/apache/juneau/http/response/Gone_Test.html#Gone_Test" target="classFrame">Gone_Test</a></li>
                 <li><a href="org/apache/juneau/http/response/Gone_Test.html#Gone_Test.A" target="classFrame">Gone_Test.A</a></li>
-                <li><a href="org/apache/juneau/common/utils/GranularZonedDateTime_Test.html#GranularZonedDateTime_Test" target="classFrame">GranularZonedDateTime_Test</a></li>
+                <li><a href="org/apache/juneau/commons/utils/GranularZonedDateTime_Test.html#GranularZonedDateTime_Test" target="classFrame">GranularZonedDateTime_Test</a></li>
                 <li><a href="org/apache/juneau/bean/html5/H1_Test.html#H1_Test" target="classFrame">H1_Test</a></li>
                 <li><a href="org/apache/juneau/bean/html5/H2_Test.html#H2_Test" target="classFrame">H2_Test</a></li>
                 <li><a href="org/apache/juneau/bean/html5/H3_Test.html#H3_Test" target="classFrame">H3_Test</a></li>
@@ -979,8 +979,8 @@
                 <li><a href="org/apache/juneau/http/annotation/HasQueryAnnotation_Test.html#HasQueryAnnotation_Test.X1" target="classFrame">HasQueryAnnotation_Test.X1</a></li>
                 <li><a href="org/apache/juneau/rest/annotation/HasQuery_Test.html#HasQuery_Test" target="classFrame">HasQuery_Test</a></li>
                 <li><a href="org/apache/juneau/rest/annotation/HasQuery_Test.html#HasQuery_Test.A" target="classFrame">HasQuery_Test.A</a></li>
-                <li><a href="org/apache/juneau/common/utils/HashCode_Test.html#HashCode_Test" target="classFrame">HashCode_Test</a></li>
-                <li><a href="org/apache/juneau/common/utils/HashCode_Test.html#HashCode_Test.TestObject" target="classFrame">HashCode_Test.TestObject</a></li>
+                <li><a href="org/apache/juneau/commons/utils/HashCode_Test.html#HashCode_Test" target="classFrame">HashCode_Test</a></li>
+                <li><a href="org/apache/juneau/commons/utils/HashCode_Test.html#HashCode_Test.TestObject" target="classFrame">HashCode_Test.TestObject</a></li>
                 <li><a href="org/apache/juneau/bean/html5/Head_Test.html#Head_Test" target="classFrame">Head_Test</a></li>
                 <li><a href="org/apache/juneau/http/annotation/HeaderAnnotation_Test.html#HeaderAnnotation_Test" target="classFrame">HeaderAnnotation_Test</a></li>
                 <li><a href="org/apache/juneau/http/annotation/HeaderAnnotation_Test.html#HeaderAnnotation_Test.X1" target="classFrame">HeaderAnnotation_Test.X1</a></li>
@@ -1237,11 +1237,11 @@
                 <li><a href="org/apache/juneau/rest/helper/Hyperlink_Test.html#Hyperlink_Test.A" target="classFrame">Hyperlink_Test.A</a></li>
                 <li><a href="org/apache/juneau/http/response/IMUsed_Test.html#IMUsed_Test" target="classFrame">IMUsed_Test</a></li>
                 <li><a href="org/apache/juneau/http/response/IMUsed_Test.html#IMUsed_Test.A" target="classFrame">IMUsed_Test.A</a></li>
-                <li><a href="org/apache/juneau/common/utils/IOUtils_Test.html#IOUtils_Test" target="classFrame">IOUtils_Test</a></li>
-                <li><a href="org/apache/juneau/common/utils/IOUtils_Test.html#IOUtils_Test.TestInputStream" target="classFrame">IOUtils_Test.TestInputStream</a></li>
-                <li><a href="org/apache/juneau/common/utils/IOUtils_Test.html#IOUtils_Test.TestOutputStream" target="classFrame">IOUtils_Test.TestOutputStream</a></li>
-                <li><a href="org/apache/juneau/common/utils/IOUtils_Test.html#IOUtils_Test.TestReader" target="classFrame">IOUtils_Test.TestReader</a></li>
-                <li><a href="org/apache/juneau/common/utils/IOUtils_Test.html#IOUtils_Test.TestWriter" target="classFrame">IOUtils_Test.TestWriter</a></li>
+                <li><a href="org/apache/juneau/commons/utils/IOUtils_Test.html#IOUtils_Test" target="classFrame">IOUtils_Test</a></li>
+                <li><a href="org/apache/juneau/commons/utils/IOUtils_Test.html#IOUtils_Test.TestInputStream" target="classFrame">IOUtils_Test.TestInputStream</a></li>
+                <li><a href="org/apache/juneau/commons/utils/IOUtils_Test.html#IOUtils_Test.TestOutputStream" target="classFrame">IOUtils_Test.TestOutputStream</a></li>
+                <li><a href="org/apache/juneau/commons/utils/IOUtils_Test.html#IOUtils_Test.TestReader" target="classFrame">IOUtils_Test.TestReader</a></li>
+                <li><a href="org/apache/juneau/commons/utils/IOUtils_Test.html#IOUtils_Test.TestWriter" target="classFrame">IOUtils_Test.TestWriter</a></li>
                 <li><a href="org/apache/juneau/bean/html5/I_Test.html#I_Test" target="classFrame">I_Test</a></li>
                 <li><a href="org/apache/juneau/http/header/IfMatch_Test.html#IfMatch_Test" target="classFrame">IfMatch_Test</a></li>
                 <li><a href="org/apache/juneau/http/header/IfMatch_Test.html#IfMatch_Test.A" target="classFrame">IfMatch_Test.A</a></li>
@@ -1273,7 +1273,7 @@
                 <li><a href="org/apache/juneau/http/response/InsufficentStorage_Test.html#InsufficentStorage_Test" target="classFrame">InsufficentStorage_Test</a></li>
                 <li><a href="org/apache/juneau/http/response/InsufficentStorage_Test.html#InsufficentStorage_Test.A" target="classFrame">InsufficentStorage_Test.A</a></li>
                 <li><a href="org/apache/juneau/assertions/IntegerAssertion_Test.html#IntegerAssertion_Test" target="classFrame">IntegerAssertion_Test</a></li>
-                <li><a href="org/apache/juneau/common/collections/IntegerValue_Test.html#IntegerValue_Test" target="classFrame">IntegerValue_Test</a></li>
+                <li><a href="org/apache/juneau/commons/collections/IntegerValue_Test.html#IntegerValue_Test" target="classFrame">IntegerValue_Test</a></li>
                 <li><a href="org/apache/juneau/http/response/InternalServerError_Test.html#InternalServerError_Test" target="classFrame">InternalServerError_Test</a></li>
                 <li><a href="org/apache/juneau/http/response/InternalServerError_Test.html#InternalServerError_Test.A" target="classFrame">InternalServerError_Test.A</a></li>
                 <li><a href="org/apache/juneau/xml/InvalidXmlBeans_Test.html#InvalidXmlBeans_Test" target="classFrame">InvalidXmlBeans_Test</a></li>
@@ -1348,7 +1348,7 @@
                 <li><a href="org/apache/juneau/marshaller/Json_Test.html#Json_Test" target="classFrame">Json_Test</a></li>
                 <li><a href="org/apache/juneau/bean/html5/Kbd_Test.html#Kbd_Test" target="classFrame">Kbd_Test</a></li>
                 <li><a href="org/apache/juneau/bean/html5/Keygen_Test.html#Keygen_Test" target="classFrame">Keygen_Test</a></li>
-                <li><a href="org/apache/juneau/common/collections/KeywordSet_Test.html#KeywordSet_Test" target="classFrame">KeywordSet_Test</a></li>
+                <li><a href="org/apache/juneau/commons/collections/KeywordSet_Test.html#KeywordSet_Test" target="classFrame">KeywordSet_Test</a></li>
                 <li><a href="org/apache/juneau/bean/html5/Label_Test.html#Label_Test" target="classFrame">Label_Test</a></li>
                 <li><a href="org/apache/juneau/http/header/LastModified_Test.html#LastModified_Test" target="classFrame">LastModified_Test</a></li>
                 <li><a href="org/apache/juneau/http/header/LastModified_Test.html#LastModified_Test.A" target="classFrame">LastModified_Test.A</a></li>
@@ -1372,7 +1372,7 @@
                 <li><a href="org/apache/juneau/bean/openapi3/Link_Test.html#Link_Test.B_emptyTests" target="classFrame">Link_Test.B_emptyTests</a></li>
                 <li><a href="org/apache/juneau/bean/openapi3/Link_Test.html#Link_Test.C_extraProperties" target="classFrame">Link_Test.C_extraProperties</a></li>
                 <li><a href="org/apache/juneau/assertions/ListAssertion_Test.html#ListAssertion_Test" target="classFrame">ListAssertion_Test</a></li>
-                <li><a href="org/apache/juneau/common/collections/ListBuilder_Test.html#ListBuilder_Test" target="classFrame">ListBuilder_Test</a></li>
+                <li><a href="org/apache/juneau/commons/collections/ListBuilder_Test.html#ListBuilder_Test" target="classFrame">ListBuilder_Test</a></li>
                 <li><a href="org/apache/juneau/junit/bct/Listifier_Test.html#Listifier_Test" target="classFrame">Listifier_Test</a></li>
                 <li><a href="org/apache/juneau/junit/bct/Listifier_Test.html#Listifier_Test.A_functionalInterfaceCompliance" target="classFrame">Listifier_Test.A_functionalInterfaceCompliance</a></li>
                 <li><a href="org/apache/juneau/junit/bct/Listifier_Test.html#Listifier_Test.B_lambdaComposition" target="classFrame">Listifier_Test.B_lambdaComposition</a></li>
@@ -1389,8 +1389,8 @@
                 <li><a href="org/apache/juneau/junit/bct/Listifiers_Test.html#Listifiers_Test.E_streamListifier" target="classFrame">Listifiers_Test.E_streamListifier</a></li>
                 <li><a href="org/apache/juneau/junit/bct/Listifiers_Test.html#Listifiers_Test.F_mapListifier" target="classFrame">Listifiers_Test.F_mapListifier</a></li>
                 <li><a href="org/apache/juneau/junit/bct/Listifiers_Test.html#Listifiers_Test.G_integration" target="classFrame">Listifiers_Test.G_integration</a></li>
-                <li><a href="org/apache/juneau/common/io/LocalDir_Test.html#LocalDir_Test" target="classFrame">LocalDir_Test</a></li>
-                <li><a href="org/apache/juneau/common/io/LocalFile_Test.html#LocalFile_Test" target="classFrame">LocalFile_Test</a></li>
+                <li><a href="org/apache/juneau/commons/io/LocalDir_Test.html#LocalDir_Test" target="classFrame">LocalDir_Test</a></li>
+                <li><a href="org/apache/juneau/commons/io/LocalFile_Test.html#LocalFile_Test" target="classFrame">LocalFile_Test</a></li>
                 <li><a href="org/apache/juneau/transforms/LocaleSwap_StringSwapTest.html#LocaleSwap_StringSwapTest" target="classFrame">LocaleSwap_StringSwapTest</a></li>
                 <li><a href="org/apache/juneau/http/header/Location_Test.html#Location_Test" target="classFrame">Location_Test</a></li>
                 <li><a href="org/apache/juneau/http/header/Location_Test.html#Location_Test.A" target="classFrame">Location_Test.A</a></li>
@@ -1398,14 +1398,14 @@
                 <li><a href="org/apache/juneau/http/response/Locked_Test.html#Locked_Test.A" target="classFrame">Locked_Test.A</a></li>
                 <li><a href="org/apache/juneau/microservice/resources/LogsResource_Action_Test.html#LogsResource_Action_Test" target="classFrame">LogsResource_Action_Test</a></li>
                 <li><a href="org/apache/juneau/assertions/LongAssertion_Test.html#LongAssertion_Test" target="classFrame">LongAssertion_Test</a></li>
-                <li><a href="org/apache/juneau/common/collections/LongValue_Test.html#LongValue_Test" target="classFrame">LongValue_Test</a></li>
+                <li><a href="org/apache/juneau/commons/collections/LongValue_Test.html#LongValue_Test" target="classFrame">LongValue_Test</a></li>
                 <li><a href="org/apache/juneau/http/response/LoopDetected_Test.html#LoopDetected_Test" target="classFrame">LoopDetected_Test</a></li>
                 <li><a href="org/apache/juneau/http/response/LoopDetected_Test.html#LoopDetected_Test.A" target="classFrame">LoopDetected_Test.A</a></li>
                 <li><a href="org/apache/juneau/svl/vars/LowerCaseVarTest.html#LowerCaseVarTest" target="classFrame">LowerCaseVarTest</a></li>
                 <li><a href="org/apache/juneau/bean/html5/Main_Test.html#Main_Test" target="classFrame">Main_Test</a></li>
                 <li><a href="org/apache/juneau/utils/ManifestFile_Test.html#ManifestFile_Test" target="classFrame">ManifestFile_Test</a></li>
                 <li><a href="org/apache/juneau/assertions/MapAssertion_Test.html#MapAssertion_Test" target="classFrame">MapAssertion_Test</a></li>
-                <li><a href="org/apache/juneau/common/collections/MapBuilder_Test.html#MapBuilder_Test" target="classFrame">MapBuilder_Test</a></li>
+                <li><a href="org/apache/juneau/commons/collections/MapBuilder_Test.html#MapBuilder_Test" target="classFrame">MapBuilder_Test</a></li>
                 <li><a href="org/apache/juneau/bean/html5/Map_Test.html#Map_Test" target="classFrame">Map_Test</a></li>
                 <li><a href="org/apache/juneau/bean/html5/Mark_Test.html#Mark_Test" target="classFrame">Mark_Test</a></li>
                 <li><a href="org/apache/juneau/marshaller/Marshall_Test.html#Marshall_Test" target="classFrame">Marshall_Test</a></li>
@@ -1435,48 +1435,48 @@
                 <li><a href="org/apache/juneau/mstat/MethodExecStore_Test.html#MethodExecStore_Test.A6a" target="classFrame">MethodExecStore_Test.A6a</a></li>
                 <li><a href="org/apache/juneau/mstat/MethodExecStore_Test.html#MethodExecStore_Test.A6b" target="classFrame">MethodExecStore_Test.A6b</a></li>
                 <li><a href="org/apache/juneau/mstat/MethodExecStore_Test.html#MethodExecStore_Test.A6c" target="classFrame">MethodExecStore_Test.A6c</a></li>
-                <li><a href="org/apache/juneau/common/reflect/MethodInfo_Test.html#MethodInfo_Test" target="classFrame">MethodInfo_Test</a></li>
-                <li><a href="org/apache/juneau/common/reflect/MethodInfo_Test.html#MethodInfo_Test.A" target="classFrame">MethodInfo_Test.A</a></li>
-                <li><a href="org/apache/juneau/common/reflect/MethodInfo_Test.html#MethodInfo_Test.A1" target="classFrame">MethodInfo_Test.A1</a></li>
-                <li><a href="org/apache/juneau/common/reflect/MethodInfo_Test.html#MethodInfo_Test.AConfig" target="classFrame">MethodInfo_Test.AConfig</a></li>
-                <li><a href="org/apache/juneau/common/reflect/MethodInfo_Test.html#MethodInfo_Test.AConfigApply" target="classFrame">MethodInfo_Test.AConfigApply</a></li>
-                <li><a href="org/apache/juneau/common/reflect/MethodInfo_Test.html#MethodInfo_Test.AX" target="classFrame">MethodInfo_Test.AX</a></li>
-                <li><a href="org/apache/juneau/common/reflect/MethodInfo_Test.html#MethodInfo_Test.B1" target="classFrame">MethodInfo_Test.B1</a></li>
-                <li><a href="org/apache/juneau/common/reflect/MethodInfo_Test.html#MethodInfo_Test.B2" target="classFrame">MethodInfo_Test.B2</a></li>
-                <li><a href="org/apache/juneau/common/reflect/MethodInfo_Test.html#MethodInfo_Test.B3" target="classFrame">MethodInfo_Test.B3</a></li>
-                <li><a href="org/apache/juneau/common/reflect/MethodInfo_Test.html#MethodInfo_Test.C1" target="classFrame">MethodInfo_Test.C1</a></li>
-                <li><a href="org/apache/juneau/common/reflect/MethodInfo_Test.html#MethodInfo_Test.C2" target="classFrame">MethodInfo_Test.C2</a></li>
-                <li><a href="org/apache/juneau/common/reflect/MethodInfo_Test.html#MethodInfo_Test.C3" target="classFrame">MethodInfo_Test.C3</a></li>
-                <li><a href="org/apache/juneau/common/reflect/MethodInfo_Test.html#MethodInfo_Test.CB1" target="classFrame">MethodInfo_Test.CB1</a></li>
-                <li><a href="org/apache/juneau/common/reflect/MethodInfo_Test.html#MethodInfo_Test.CB2" target="classFrame">MethodInfo_Test.CB2</a></li>
-                <li><a href="org/apache/juneau/common/reflect/MethodInfo_Test.html#MethodInfo_Test.CB3" target="classFrame">MethodInfo_Test.CB3</a></li>
-                <li><a href="org/apache/juneau/common/reflect/MethodInfo_Test.html#MethodInfo_Test.D" target="classFrame">MethodInfo_Test.D</a></li>
-                <li><a href="org/apache/juneau/common/reflect/MethodInfo_Test.html#MethodInfo_Test.E" target="classFrame">MethodInfo_Test.E</a></li>
-                <li><a href="org/apache/juneau/common/reflect/MethodInfo_Test.html#MethodInfo_Test.F" target="classFrame">MethodInfo_Test.F</a></li>
-                <li><a href="org/apache/juneau/common/reflect/MethodInfo_Test.html#MethodInfo_Test.G" target="classFrame">MethodInfo_Test.G</a></li>
-                <li><a href="org/apache/juneau/common/reflect/MethodInfo_Test.html#MethodInfo_Test.GetMatchingMethodsTests" target="classFrame">MethodInfo_Test.GetMatchingMethodsTests</a></li>
-                <li><a href="org/apache/juneau/common/reflect/MethodInfo_Test.html#MethodInfo_Test.GetMatchingMethodsTests.BM1" target="classFrame">MethodInfo_Test.GetMatchingMethodsTests.BM1</a></li>
-                <li><a href="org/apache/juneau/common/reflect/MethodInfo_Test.html#MethodInfo_Test.GetMatchingMethodsTests.BM10" target="classFrame">MethodInfo_Test.GetMatchingMethodsTests.BM10</a></li>
-                <li><a href="org/apache/juneau/common/reflect/MethodInfo_Test.html#MethodInfo_Test.GetMatchingMethodsTests.BM11" target="classFrame">MethodInfo_Test.GetMatchingMethodsTests.BM11</a></li>
-                <li><a href="org/apache/juneau/common/reflect/MethodInfo_Test.html#MethodInfo_Test.GetMatchingMethodsTests.BM12" target="classFrame">MethodInfo_Test.GetMatchingMethodsTests.BM12</a></li>
-                <li><a href="org/apache/juneau/common/reflect/MethodInfo_Test.html#MethodInfo_Test.GetMatchingMethodsTests.BM13" target="classFrame">MethodInfo_Test.GetMatchingMethodsTests.BM13</a></li>
-                <li><a href="org/apache/juneau/common/reflect/MethodInfo_Test.html#MethodInfo_Test.GetMatchingMethodsTests.BM14" target="classFrame">MethodInfo_Test.GetMatchingMethodsTests.BM14</a></li>
-                <li><a href="org/apache/juneau/common/reflect/MethodInfo_Test.html#MethodInfo_Test.GetMatchingMethodsTests.BM15" target="classFrame">MethodInfo_Test.GetMatchingMethodsTests.BM15</a></li>
-                <li><a href="org/apache/juneau/common/reflect/MethodInfo_Test.html#MethodInfo_Test.GetMatchingMethodsTests.BM16" target="classFrame">MethodInfo_Test.GetMatchingMethodsTests.BM16</a></li>
-                <li><a href="org/apache/juneau/common/reflect/MethodInfo_Test.html#MethodInfo_Test.GetMatchingMethodsTests.BM17" target="classFrame">MethodInfo_Test.GetMatchingMethodsTests.BM17</a></li>
-                <li><a href="org/apache/juneau/common/reflect/MethodInfo_Test.html#MethodInfo_Test.GetMatchingMethodsTests.BM2" target="classFrame">MethodInfo_Test.GetMatchingMethodsTests.BM2</a></li>
-                <li><a href="org/apache/juneau/common/reflect/MethodInfo_Test.html#MethodInfo_Test.GetMatchingMethodsTests.BM3" target="classFrame">MethodInfo_Test.GetMatchingMethodsTests.BM3</a></li>
-                <li><a href="org/apache/juneau/common/reflect/MethodInfo_Test.html#MethodInfo_Test.GetMatchingMethodsTests.BM4" target="classFrame">MethodInfo_Test.GetMatchingMethodsTests.BM4</a></li>
-                <li><a href="org/apache/juneau/common/reflect/MethodInfo_Test.html#MethodInfo_Test.GetMatchingMethodsTests.BM5" target="classFrame">MethodInfo_Test.GetMatchingMethodsTests.BM5</a></li>
-                <li><a href="org/apache/juneau/common/reflect/MethodInfo_Test.html#MethodInfo_Test.GetMatchingMethodsTests.BM6" target="classFrame">MethodInfo_Test.GetMatchingMethodsTests.BM6</a></li>
-                <li><a href="org/apache/juneau/common/reflect/MethodInfo_Test.html#MethodInfo_Test.GetMatchingMethodsTests.BM7" target="classFrame">MethodInfo_Test.GetMatchingMethodsTests.BM7</a></li>
-                <li><a href="org/apache/juneau/common/reflect/MethodInfo_Test.html#MethodInfo_Test.GetMatchingMethodsTests.BM8" target="classFrame">MethodInfo_Test.GetMatchingMethodsTests.BM8</a></li>
-                <li><a href="org/apache/juneau/common/reflect/MethodInfo_Test.html#MethodInfo_Test.GetMatchingMethodsTests.BM9" target="classFrame">MethodInfo_Test.GetMatchingMethodsTests.BM9</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/MethodInfo_Test.html#MethodInfo_Test" target="classFrame">MethodInfo_Test</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/MethodInfo_Test.html#MethodInfo_Test.A" target="classFrame">MethodInfo_Test.A</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/MethodInfo_Test.html#MethodInfo_Test.A1" target="classFrame">MethodInfo_Test.A1</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/MethodInfo_Test.html#MethodInfo_Test.AConfig" target="classFrame">MethodInfo_Test.AConfig</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/MethodInfo_Test.html#MethodInfo_Test.AConfigApply" target="classFrame">MethodInfo_Test.AConfigApply</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/MethodInfo_Test.html#MethodInfo_Test.AX" target="classFrame">MethodInfo_Test.AX</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/MethodInfo_Test.html#MethodInfo_Test.B1" target="classFrame">MethodInfo_Test.B1</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/MethodInfo_Test.html#MethodInfo_Test.B2" target="classFrame">MethodInfo_Test.B2</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/MethodInfo_Test.html#MethodInfo_Test.B3" target="classFrame">MethodInfo_Test.B3</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/MethodInfo_Test.html#MethodInfo_Test.C1" target="classFrame">MethodInfo_Test.C1</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/MethodInfo_Test.html#MethodInfo_Test.C2" target="classFrame">MethodInfo_Test.C2</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/MethodInfo_Test.html#MethodInfo_Test.C3" target="classFrame">MethodInfo_Test.C3</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/MethodInfo_Test.html#MethodInfo_Test.CB1" target="classFrame">MethodInfo_Test.CB1</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/MethodInfo_Test.html#MethodInfo_Test.CB2" target="classFrame">MethodInfo_Test.CB2</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/MethodInfo_Test.html#MethodInfo_Test.CB3" target="classFrame">MethodInfo_Test.CB3</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/MethodInfo_Test.html#MethodInfo_Test.D" target="classFrame">MethodInfo_Test.D</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/MethodInfo_Test.html#MethodInfo_Test.E" target="classFrame">MethodInfo_Test.E</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/MethodInfo_Test.html#MethodInfo_Test.F" target="classFrame">MethodInfo_Test.F</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/MethodInfo_Test.html#MethodInfo_Test.G" target="classFrame">MethodInfo_Test.G</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/MethodInfo_Test.html#MethodInfo_Test.GetMatchingMethodsTests" target="classFrame">MethodInfo_Test.GetMatchingMethodsTests</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/MethodInfo_Test.html#MethodInfo_Test.GetMatchingMethodsTests.BM1" target="classFrame">MethodInfo_Test.GetMatchingMethodsTests.BM1</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/MethodInfo_Test.html#MethodInfo_Test.GetMatchingMethodsTests.BM10" target="classFrame">MethodInfo_Test.GetMatchingMethodsTests.BM10</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/MethodInfo_Test.html#MethodInfo_Test.GetMatchingMethodsTests.BM11" target="classFrame">MethodInfo_Test.GetMatchingMethodsTests.BM11</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/MethodInfo_Test.html#MethodInfo_Test.GetMatchingMethodsTests.BM12" target="classFrame">MethodInfo_Test.GetMatchingMethodsTests.BM12</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/MethodInfo_Test.html#MethodInfo_Test.GetMatchingMethodsTests.BM13" target="classFrame">MethodInfo_Test.GetMatchingMethodsTests.BM13</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/MethodInfo_Test.html#MethodInfo_Test.GetMatchingMethodsTests.BM14" target="classFrame">MethodInfo_Test.GetMatchingMethodsTests.BM14</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/MethodInfo_Test.html#MethodInfo_Test.GetMatchingMethodsTests.BM15" target="classFrame">MethodInfo_Test.GetMatchingMethodsTests.BM15</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/MethodInfo_Test.html#MethodInfo_Test.GetMatchingMethodsTests.BM16" target="classFrame">MethodInfo_Test.GetMatchingMethodsTests.BM16</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/MethodInfo_Test.html#MethodInfo_Test.GetMatchingMethodsTests.BM17" target="classFrame">MethodInfo_Test.GetMatchingMethodsTests.BM17</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/MethodInfo_Test.html#MethodInfo_Test.GetMatchingMethodsTests.BM2" target="classFrame">MethodInfo_Test.GetMatchingMethodsTests.BM2</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/MethodInfo_Test.html#MethodInfo_Test.GetMatchingMethodsTests.BM3" target="classFrame">MethodInfo_Test.GetMatchingMethodsTests.BM3</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/MethodInfo_Test.html#MethodInfo_Test.GetMatchingMethodsTests.BM4" target="classFrame">MethodInfo_Test.GetMatchingMethodsTests.BM4</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/MethodInfo_Test.html#MethodInfo_Test.GetMatchingMethodsTests.BM5" target="classFrame">MethodInfo_Test.GetMatchingMethodsTests.BM5</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/MethodInfo_Test.html#MethodInfo_Test.GetMatchingMethodsTests.BM6" target="classFrame">MethodInfo_Test.GetMatchingMethodsTests.BM6</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/MethodInfo_Test.html#MethodInfo_Test.GetMatchingMethodsTests.BM7" target="classFrame">MethodInfo_Test.GetMatchingMethodsTests.BM7</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/MethodInfo_Test.html#MethodInfo_Test.GetMatchingMethodsTests.BM8" target="classFrame">MethodInfo_Test.GetMatchingMethodsTests.BM8</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/MethodInfo_Test.html#MethodInfo_Test.GetMatchingMethodsTests.BM9" target="classFrame">MethodInfo_Test.GetMatchingMethodsTests.BM9</a></li>
                 <li><a href="org/apache/juneau/utils/MethodInvokerTest.html#MethodInvokerTest" target="classFrame">MethodInvokerTest</a></li>
                 <li><a href="org/apache/juneau/utils/MethodInvokerTest.html#MethodInvokerTest.A" target="classFrame">MethodInvokerTest.A</a></li>
                 <li><a href="org/apache/juneau/http/response/MethodNotAllowed_Test.html#MethodNotAllowed_Test" target="classFrame">MethodNotAllowed_Test</a></li>
                 <li><a href="org/apache/juneau/http/response/MethodNotAllowed_Test.html#MethodNotAllowed_Test.A" target="classFrame">MethodNotAllowed_Test.A</a></li>
-                <li><a href="org/apache/juneau/common/utils/MimeTypeDetector_Test.html#MimeTypeDetector_Test" target="classFrame">MimeTypeDetector_Test</a></li>
+                <li><a href="org/apache/juneau/commons/utils/MimeTypeDetector_Test.html#MimeTypeDetector_Test" target="classFrame">MimeTypeDetector_Test</a></li>
                 <li><a href="org/apache/juneau/http/response/MisdirectedRequest_Test.html#MisdirectedRequest_Test" target="classFrame">MisdirectedRequest_Test</a></li>
                 <li><a href="org/apache/juneau/http/response/MisdirectedRequest_Test.html#MisdirectedRequest_Test.A" target="classFrame">MisdirectedRequest_Test.A</a></li>
                 <li><a href="org/apache/juneau/rest/mock/MockRestClient_PathVars_Test.html#MockRestClient_PathVars_Test" target="classFrame">MockRestClient_PathVars_Test</a></li>
@@ -1492,7 +1492,7 @@
                 <li><a href="org/apache/juneau/msgpack/MsgPackParser_Test.html#MsgPackParser_Test" target="classFrame">MsgPackParser_Test</a></li>
                 <li><a href="org/apache/juneau/msgpack/MsgPackSerializerTest.html#MsgPackSerializerTest" target="classFrame">MsgPackSerializerTest</a></li>
                 <li><a href="org/apache/juneau/marshaller/MsgPack_Test.html#MsgPack_Test" target="classFrame">MsgPack_Test</a></li>
-                <li><a href="org/apache/juneau/common/collections/MultiSet_Test.html#MultiSet_Test" target="classFrame">MultiSet_Test</a></li>
+                <li><a href="org/apache/juneau/commons/collections/MultiSet_Test.html#MultiSet_Test" target="classFrame">MultiSet_Test</a></li>
                 <li><a href="org/apache/juneau/http/response/MultiStatus_Test.html#MultiStatus_Test" target="classFrame">MultiStatus_Test</a></li>
                 <li><a href="org/apache/juneau/http/response/MultiStatus_Test.html#MultiStatus_Test.A" target="classFrame">MultiStatus_Test.A</a></li>
                 <li><a href="org/apache/juneau/http/response/MultipleChoices_Test.html#MultipleChoices_Test" target="classFrame">MultipleChoices_Test</a></li>
@@ -1523,8 +1523,8 @@
                 <li><a href="org/apache/juneau/rest/Nls_Test.html#Nls_Test.A1" target="classFrame">Nls_Test.A1</a></li>
                 <li><a href="org/apache/juneau/rest/Nls_Test.html#Nls_Test.B" target="classFrame">Nls_Test.B</a></li>
                 <li><a href="org/apache/juneau/rest/Nls_Test.html#Nls_Test.C" target="classFrame">Nls_Test.C</a></li>
-                <li><a href="org/apache/juneau/common/io/NoCloseOutputStream_Test.html#NoCloseOutputStream_Test" target="classFrame">NoCloseOutputStream_Test</a></li>
-                <li><a href="org/apache/juneau/common/io/NoCloseWriter_Test.html#NoCloseWriter_Test" target="classFrame">NoCloseWriter_Test</a></li>
+                <li><a href="org/apache/juneau/commons/io/NoCloseOutputStream_Test.html#NoCloseOutputStream_Test" target="classFrame">NoCloseOutputStream_Test</a></li>
+                <li><a href="org/apache/juneau/commons/io/NoCloseWriter_Test.html#NoCloseWriter_Test" target="classFrame">NoCloseWriter_Test</a></li>
                 <li><a href="org/apache/juneau/http/response/NoContent_Test.html#NoContent_Test" target="classFrame">NoContent_Test</a></li>
                 <li><a href="org/apache/juneau/http/response/NoContent_Test.html#NoContent_Test.A" target="classFrame">NoContent_Test.A</a></li>
                 <li><a href="org/apache/juneau/http/header/NoTrace_Test.html#NoTrace_Test" target="classFrame">NoTrace_Test</a></li>
@@ -1644,10 +1644,10 @@
                 <li><a href="org/apache/juneau/http/header/Origin_Test.html#Origin_Test" target="classFrame">Origin_Test</a></li>
                 <li><a href="org/apache/juneau/http/header/Origin_Test.html#Origin_Test.A" target="classFrame">Origin_Test.A</a></li>
                 <li><a href="org/apache/juneau/bean/html5/Output_Test.html#Output_Test" target="classFrame">Output_Test</a></li>
-                <li><a href="org/apache/juneau/common/reflect/PA.html#PA" target="classFrame">PA</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/PA.html#PA" target="classFrame">PA</a></li>
                 <li><a href="org/apache/juneau/bean/html5/P_Test.html#P_Test" target="classFrame">P_Test</a></li>
                 <li><a href="org/apache/juneau/bean/html5/Param_Test.html#Param_Test" target="classFrame">Param_Test</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ParameterInfoTest.html#ParameterInfoTest" target="classFrame">ParameterInfoTest</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ParameterInfoTest.html#ParameterInfoTest" target="classFrame">ParameterInfoTest</a></li>
                 <li><a href="org/apache/juneau/bean/swagger/ParameterInfo_Test.html#ParameterInfo_Test" target="classFrame">ParameterInfo_Test</a></li>
                 <li><a href="org/apache/juneau/bean/swagger/ParameterInfo_Test.html#ParameterInfo_Test.A_basicTests" target="classFrame">ParameterInfo_Test.A_basicTests</a></li>
                 <li><a href="org/apache/juneau/bean/swagger/ParameterInfo_Test.html#ParameterInfo_Test.B_emptyTests" target="classFrame">ParameterInfo_Test.B_emptyTests</a></li>
@@ -1693,7 +1693,7 @@
                 <li><a href="org/apache/juneau/bean/openapi3/PathItem_Test.html#PathItem_Test.A_basicTests" target="classFrame">PathItem_Test.A_basicTests</a></li>
                 <li><a href="org/apache/juneau/bean/openapi3/PathItem_Test.html#PathItem_Test.B_emptyTests" target="classFrame">PathItem_Test.B_emptyTests</a></li>
                 <li><a href="org/apache/juneau/bean/openapi3/PathItem_Test.html#PathItem_Test.C_extraProperties" target="classFrame">PathItem_Test.C_extraProperties</a></li>
-                <li><a href="org/apache/juneau/common/io/PathReaderBuilder_Test.html#PathReaderBuilder_Test" target="classFrame">PathReaderBuilder_Test</a></li>
+                <li><a href="org/apache/juneau/commons/io/PathReaderBuilder_Test.html#PathReaderBuilder_Test" target="classFrame">PathReaderBuilder_Test</a></li>
                 <li><a href="org/apache/juneau/rest/annotation/PathRemainder_Test.html#PathRemainder_Test" target="classFrame">PathRemainder_Test</a></li>
                 <li><a href="org/apache/juneau/rest/annotation/PathRemainder_Test.html#PathRemainder_Test.A" target="classFrame">PathRemainder_Test.A</a></li>
                 <li><a href="org/apache/juneau/rest/annotation/PathRemainder_Test.html#PathRemainder_Test.B" target="classFrame">PathRemainder_Test.B</a></li>
@@ -1767,11 +1767,11 @@
                 <li><a href="org/apache/juneau/http/response/PreconditionFailed_Test.html#PreconditionFailed_Test.A" target="classFrame">PreconditionFailed_Test.A</a></li>
                 <li><a href="org/apache/juneau/http/response/PreconditionRequired_Test.html#PreconditionRequired_Test" target="classFrame">PreconditionRequired_Test</a></li>
                 <li><a href="org/apache/juneau/http/response/PreconditionRequired_Test.html#PreconditionRequired_Test.A" target="classFrame">PreconditionRequired_Test.A</a></li>
-                <li><a href="org/apache/juneau/common/utils/PredicateUtils_Test.html#PredicateUtils_Test" target="classFrame">PredicateUtils_Test</a></li>
-                <li><a href="org/apache/juneau/common/utils/PredicateUtils_Test.html#PredicateUtils_Test.DeprecatedPublicClass" target="classFrame">PredicateUtils_Test.DeprecatedPublicClass</a></li>
-                <li><a href="org/apache/juneau/common/utils/PredicateUtils_Test.html#PredicateUtils_Test.PrivateClass" target="classFrame">PredicateUtils_Test.PrivateClass</a></li>
-                <li><a href="org/apache/juneau/common/utils/PredicateUtils_Test.html#PredicateUtils_Test.PublicClass" target="classFrame">PredicateUtils_Test.PublicClass</a></li>
-                <li><a href="org/apache/juneau/common/utils/PredicateUtils_Test.html#PredicateUtils_Test.PublicFinalClass" target="classFrame">PredicateUtils_Test.PublicFinalClass</a></li>
+                <li><a href="org/apache/juneau/commons/utils/PredicateUtils_Test.html#PredicateUtils_Test" target="classFrame">PredicateUtils_Test</a></li>
+                <li><a href="org/apache/juneau/commons/utils/PredicateUtils_Test.html#PredicateUtils_Test.DeprecatedPublicClass" target="classFrame">PredicateUtils_Test.DeprecatedPublicClass</a></li>
+                <li><a href="org/apache/juneau/commons/utils/PredicateUtils_Test.html#PredicateUtils_Test.PrivateClass" target="classFrame">PredicateUtils_Test.PrivateClass</a></li>
+                <li><a href="org/apache/juneau/commons/utils/PredicateUtils_Test.html#PredicateUtils_Test.PublicClass" target="classFrame">PredicateUtils_Test.PublicClass</a></li>
+                <li><a href="org/apache/juneau/commons/utils/PredicateUtils_Test.html#PredicateUtils_Test.PublicFinalClass" target="classFrame">PredicateUtils_Test.PublicFinalClass</a></li>
                 <li><a href="org/apache/juneau/assertions/PrimitiveArrayAssertion_Test.html#PrimitiveArrayAssertion_Test" target="classFrame">PrimitiveArrayAssertion_Test</a></li>
                 <li><a href="org/apache/juneau/a/rttests/PrimitiveObjectBeans_RoundTripTest.html#PrimitiveObjectBeans_RoundTripTest" target="classFrame">PrimitiveObjectBeans_RoundTripTest</a></li>
                 <li><a href="org/apache/juneau/a/rttests/PrimitivesBeans_RoundTripTest.html#PrimitivesBeans_RoundTripTest" target="classFrame">PrimitivesBeans_RoundTripTest</a></li>
@@ -1845,7 +1845,7 @@
                 <li><a href="org/apache/juneau/ReadWriteOnlyProperties_Test.html#ReadWriteOnlyProperties_Test.Ec" target="classFrame">ReadWriteOnlyProperties_Test.Ec</a></li>
                 <li><a href="org/apache/juneau/ReadWriteOnlyProperties_Test.html#ReadWriteOnlyProperties_Test.EcConfig" target="classFrame">ReadWriteOnlyProperties_Test.EcConfig</a></li>
                 <li><a href="org/apache/juneau/transforms/ReaderFilter_Test.html#ReaderFilter_Test" target="classFrame">ReaderFilter_Test</a></li>
-                <li><a href="org/apache/juneau/common/io/ReaderInputStream_Test.html#ReaderInputStream_Test" target="classFrame">ReaderInputStream_Test</a></li>
+                <li><a href="org/apache/juneau/commons/io/ReaderInputStream_Test.html#ReaderInputStream_Test" target="classFrame">ReaderInputStream_Test</a></li>
                 <li><a href="org/apache/juneau/serializer/ReaderObject_ComboSerializeTest.html#ReaderObject_ComboSerializeTest" target="classFrame">ReaderObject_ComboSerializeTest</a></li>
                 <li><a href="org/apache/juneau/serializer/ReaderObject_ComboSerializeTest.html#ReaderObject_ComboSerializeTest.B" target="classFrame">ReaderObject_ComboSerializeTest.B</a></li>
                 <li><a href="org/apache/juneau/serializer/ReaderObject_ComboSerializeTest.html#ReaderObject_ComboSerializeTest.BeanWithReader1dField" target="classFrame">ReaderObject_ComboSerializeTest.BeanWithReader1dField</a></li>
@@ -1859,30 +1859,30 @@
                 <li><a href="org/apache/juneau/transforms/ReaderSwap_Test.html#ReaderSwap_Test" target="classFrame">ReaderSwap_Test</a></li>
                 <li><a href="org/apache/juneau/http/header/Referer_Test.html#Referer_Test" target="classFrame">Referer_Test</a></li>
                 <li><a href="org/apache/juneau/http/header/Referer_Test.html#Referer_Test.A" target="classFrame">Referer_Test.A</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ReflectionMap_Test.html#ReflectionMap_Test" target="classFrame">ReflectionMap_Test</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ReflectionMap_Test.html#ReflectionMap_Test.A_Class" target="classFrame">ReflectionMap_Test.A_Class</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ReflectionMap_Test.html#ReflectionMap_Test.A_Class.A1" target="classFrame">ReflectionMap_Test.A_Class.A1</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ReflectionMap_Test.html#ReflectionMap_Test.A_Class.A2" target="classFrame">ReflectionMap_Test.A_Class.A2</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ReflectionMap_Test.html#ReflectionMap_Test.A_Class.OuterClass" target="classFrame">ReflectionMap_Test.A_Class.OuterClass</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ReflectionMap_Test.html#ReflectionMap_Test.A_Class.OuterClass.InnerClass1" target="classFrame">ReflectionMap_Test.A_Class.OuterClass.InnerClass1</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ReflectionMap_Test.html#ReflectionMap_Test.A_Class.OuterClass.InnerClass1.InnerClass2" target="classFrame">ReflectionMap_Test.A_Class.OuterClass.InnerClass1.InnerClass2</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ReflectionMap_Test.html#ReflectionMap_Test.B_Method" target="classFrame">ReflectionMap_Test.B_Method</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ReflectionMap_Test.html#ReflectionMap_Test.B_Method.B1" target="classFrame">ReflectionMap_Test.B_Method.B1</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ReflectionMap_Test.html#ReflectionMap_Test.B_Method.B2" target="classFrame">ReflectionMap_Test.B_Method.B2</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ReflectionMap_Test.html#ReflectionMap_Test.B_Method.B2a" target="classFrame">ReflectionMap_Test.B_Method.B2a</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ReflectionMap_Test.html#ReflectionMap_Test.B_Method.B3" target="classFrame">ReflectionMap_Test.B_Method.B3</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ReflectionMap_Test.html#ReflectionMap_Test.B_Method.B4" target="classFrame">ReflectionMap_Test.B_Method.B4</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ReflectionMap_Test.html#ReflectionMap_Test.B_Method.B5" target="classFrame">ReflectionMap_Test.B_Method.B5</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ReflectionMap_Test.html#ReflectionMap_Test.C_Field" target="classFrame">ReflectionMap_Test.C_Field</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ReflectionMap_Test.html#ReflectionMap_Test.C_Field.C1" target="classFrame">ReflectionMap_Test.C_Field.C1</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ReflectionMap_Test.html#ReflectionMap_Test.C_Field.C2" target="classFrame">ReflectionMap_Test.C_Field.C2</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ReflectionMap_Test.html#ReflectionMap_Test.D_Constructor" target="classFrame">ReflectionMap_Test.D_Constructor</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ReflectionMap_Test.html#ReflectionMap_Test.D_Constructor.D1" target="classFrame">ReflectionMap_Test.D_Constructor.D1</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ReflectionMap_Test.html#ReflectionMap_Test.D_Constructor.D2" target="classFrame">ReflectionMap_Test.D_Constructor.D2</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ReflectionMap_Test.html#ReflectionMap_Test.D_Constructor.D3" target="classFrame">ReflectionMap_Test.D_Constructor.D3</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ReflectionMap_Test.html#ReflectionMap_Test.E_InvalidInput" target="classFrame">ReflectionMap_Test.E_InvalidInput</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ReflectionMap_Test.html#ReflectionMap_Test.F_Other" target="classFrame">ReflectionMap_Test.F_Other</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ReflectionMap_Test.html#ReflectionMap_Test.F_Other.F1" target="classFrame">ReflectionMap_Test.F_Other.F1</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ReflectionMap_Test.html#ReflectionMap_Test" target="classFrame">ReflectionMap_Test</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ReflectionMap_Test.html#ReflectionMap_Test.A_Class" target="classFrame">ReflectionMap_Test.A_Class</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ReflectionMap_Test.html#ReflectionMap_Test.A_Class.A1" target="classFrame">ReflectionMap_Test.A_Class.A1</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ReflectionMap_Test.html#ReflectionMap_Test.A_Class.A2" target="classFrame">ReflectionMap_Test.A_Class.A2</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ReflectionMap_Test.html#ReflectionMap_Test.A_Class.OuterClass" target="classFrame">ReflectionMap_Test.A_Class.OuterClass</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ReflectionMap_Test.html#ReflectionMap_Test.A_Class.OuterClass.InnerClass1" target="classFrame">ReflectionMap_Test.A_Class.OuterClass.InnerClass1</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ReflectionMap_Test.html#ReflectionMap_Test.A_Class.OuterClass.InnerClass1.InnerClass2" target="classFrame">ReflectionMap_Test.A_Class.OuterClass.InnerClass1.InnerClass2</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ReflectionMap_Test.html#ReflectionMap_Test.B_Method" target="classFrame">ReflectionMap_Test.B_Method</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ReflectionMap_Test.html#ReflectionMap_Test.B_Method.B1" target="classFrame">ReflectionMap_Test.B_Method.B1</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ReflectionMap_Test.html#ReflectionMap_Test.B_Method.B2" target="classFrame">ReflectionMap_Test.B_Method.B2</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ReflectionMap_Test.html#ReflectionMap_Test.B_Method.B2a" target="classFrame">ReflectionMap_Test.B_Method.B2a</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ReflectionMap_Test.html#ReflectionMap_Test.B_Method.B3" target="classFrame">ReflectionMap_Test.B_Method.B3</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ReflectionMap_Test.html#ReflectionMap_Test.B_Method.B4" target="classFrame">ReflectionMap_Test.B_Method.B4</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ReflectionMap_Test.html#ReflectionMap_Test.B_Method.B5" target="classFrame">ReflectionMap_Test.B_Method.B5</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ReflectionMap_Test.html#ReflectionMap_Test.C_Field" target="classFrame">ReflectionMap_Test.C_Field</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ReflectionMap_Test.html#ReflectionMap_Test.C_Field.C1" target="classFrame">ReflectionMap_Test.C_Field.C1</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ReflectionMap_Test.html#ReflectionMap_Test.C_Field.C2" target="classFrame">ReflectionMap_Test.C_Field.C2</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ReflectionMap_Test.html#ReflectionMap_Test.D_Constructor" target="classFrame">ReflectionMap_Test.D_Constructor</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ReflectionMap_Test.html#ReflectionMap_Test.D_Constructor.D1" target="classFrame">ReflectionMap_Test.D_Constructor.D1</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ReflectionMap_Test.html#ReflectionMap_Test.D_Constructor.D2" target="classFrame">ReflectionMap_Test.D_Constructor.D2</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ReflectionMap_Test.html#ReflectionMap_Test.D_Constructor.D3" target="classFrame">ReflectionMap_Test.D_Constructor.D3</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ReflectionMap_Test.html#ReflectionMap_Test.E_InvalidInput" target="classFrame">ReflectionMap_Test.E_InvalidInput</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ReflectionMap_Test.html#ReflectionMap_Test.F_Other" target="classFrame">ReflectionMap_Test.F_Other</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ReflectionMap_Test.html#ReflectionMap_Test.F_Other.F1" target="classFrame">ReflectionMap_Test.F_Other.F1</a></li>
                 <li><a href="org/apache/juneau/http/remote/Remote_CommonInterfaces_Test.html#Remote_CommonInterfaces_Test" target="classFrame">Remote_CommonInterfaces_Test</a></li>
                 <li><a href="org/apache/juneau/http/remote/Remote_CommonInterfaces_Test.html#Remote_CommonInterfaces_Test.A" target="classFrame">Remote_CommonInterfaces_Test.A</a></li>
                 <li><a href="org/apache/juneau/http/remote/Remote_CommonInterfaces_Test.html#Remote_CommonInterfaces_Test.A1" target="classFrame">Remote_CommonInterfaces_Test.A1</a></li>
@@ -2110,9 +2110,9 @@
                 <li><a href="org/apache/juneau/rest/httppart/RequestHttpPart_FluentSetters_Test.html#RequestHttpPart_FluentSetters_Test" target="classFrame">RequestHttpPart_FluentSetters_Test</a></li>
                 <li><a href="org/apache/juneau/http/response/ResetContent_Test.html#ResetContent_Test" target="classFrame">ResetContent_Test</a></li>
                 <li><a href="org/apache/juneau/http/response/ResetContent_Test.html#ResetContent_Test.A" target="classFrame">ResetContent_Test.A</a></li>
-                <li><a href="org/apache/juneau/common/function/ResettableSupplier_Test.html#ResettableSupplier_Test" target="classFrame">ResettableSupplier_Test</a></li>
+                <li><a href="org/apache/juneau/commons/function/ResettableSupplier_Test.html#ResettableSupplier_Test" target="classFrame">ResettableSupplier_Test</a></li>
                 <li><a href="org/apache/juneau/svl/ResolvingJsonMapTest.html#ResolvingJsonMapTest" target="classFrame">ResolvingJsonMapTest</a></li>
-                <li><a href="org/apache/juneau/common/utils/ResourceBundleUtils_Test.html#ResourceBundleUtils_Test" target="classFrame">ResourceBundleUtils_Test</a></li>
+                <li><a href="org/apache/juneau/commons/utils/ResourceBundleUtils_Test.html#ResourceBundleUtils_Test" target="classFrame">ResourceBundleUtils_Test</a></li>
                 <li><a href="org/apache/juneau/rest/helper/ResourceDescription_Test.html#ResourceDescription_Test" target="classFrame">ResourceDescription_Test</a></li>
                 <li><a href="org/apache/juneau/http/annotation/ResponseAnnotation_Test.html#ResponseAnnotation_Test" target="classFrame">ResponseAnnotation_Test</a></li>
                 <li><a href="org/apache/juneau/http/annotation/ResponseAnnotation_Test.html#ResponseAnnotation_Test.D1" target="classFrame">ResponseAnnotation_Test.D1</a></li>
@@ -2519,7 +2519,7 @@
                 <li><a href="org/apache/juneau/rest/annotation/Restx_Serializers_Test.html#Restx_Serializers_Test.SD" target="classFrame">Restx_Serializers_Test.SD</a></li>
                 <li><a href="org/apache/juneau/http/header/RetryAfter_Test.html#RetryAfter_Test" target="classFrame">RetryAfter_Test</a></li>
                 <li><a href="org/apache/juneau/http/header/RetryAfter_Test.html#RetryAfter_Test.A" target="classFrame">RetryAfter_Test.A</a></li>
-                <li><a href="org/apache/juneau/common/collections/ReversedList_Test.html#ReversedList_Test" target="classFrame">ReversedList_Test</a></li>
+                <li><a href="org/apache/juneau/commons/collections/ReversedList_Test.html#ReversedList_Test" target="classFrame">ReversedList_Test</a></li>
                 <li><a href="org/apache/juneau/rest/guards/RoleMatcher_Test.html#RoleMatcher_Test" target="classFrame">RoleMatcher_Test</a></li>
                 <li><a href="org/apache/juneau/examples/rest/RootContentTest.html#RootContentTest" target="classFrame">RootContentTest</a></li>
                 <li><a href="org/apache/juneau/examples/rest/RootResourcesTest.html#RootResourcesTest" target="classFrame">RootResourcesTest</a></li>
@@ -2616,13 +2616,13 @@
                 <li><a href="org/apache/juneau/bean/openapi3/Server_Test.html#Server_Test.C_extraProperties" target="classFrame">Server_Test.C_extraProperties</a></li>
                 <li><a href="org/apache/juneau/http/response/ServiceUnavailable_Test.html#ServiceUnavailable_Test" target="classFrame">ServiceUnavailable_Test</a></li>
                 <li><a href="org/apache/juneau/http/response/ServiceUnavailable_Test.html#ServiceUnavailable_Test.A" target="classFrame">ServiceUnavailable_Test.A</a></li>
-                <li><a href="org/apache/juneau/common/collections/SetBuilder_Test.html#SetBuilder_Test" target="classFrame">SetBuilder_Test</a></li>
-                <li><a href="org/apache/juneau/common/collections/ShortValue_Test.html#ShortValue_Test" target="classFrame">ShortValue_Test</a></li>
+                <li><a href="org/apache/juneau/commons/collections/SetBuilder_Test.html#SetBuilder_Test" target="classFrame">SetBuilder_Test</a></li>
+                <li><a href="org/apache/juneau/commons/collections/ShortValue_Test.html#ShortValue_Test" target="classFrame">ShortValue_Test</a></li>
                 <li><a href="org/apache/juneau/html/SimpleHtmlWriter_Test.html#SimpleHtmlWriter_Test" target="classFrame">SimpleHtmlWriter_Test</a></li>
-                <li><a href="org/apache/juneau/common/collections/SimpleMap_Test.html#SimpleMap_Test" target="classFrame">SimpleMap_Test</a></li>
+                <li><a href="org/apache/juneau/commons/collections/SimpleMap_Test.html#SimpleMap_Test" target="classFrame">SimpleMap_Test</a></li>
                 <li><a href="org/apache/juneau/a/rttests/SimpleObjects_RoundTripTest.html#SimpleObjects_RoundTripTest" target="classFrame">SimpleObjects_RoundTripTest</a></li>
-                <li><a href="org/apache/juneau/common/utils/SimpleReadWriteLock_Test.html#SimpleReadWriteLock_Test" target="classFrame">SimpleReadWriteLock_Test</a></li>
-                <li><a href="org/apache/juneau/common/collections/SimpleUnmodifiableMap_Test.html#SimpleUnmodifiableMap_Test" target="classFrame">SimpleUnmodifiableMap_Test</a></li>
+                <li><a href="org/apache/juneau/commons/utils/SimpleReadWriteLock_Test.html#SimpleReadWriteLock_Test" target="classFrame">SimpleReadWriteLock_Test</a></li>
+                <li><a href="org/apache/juneau/commons/collections/SimpleUnmodifiableMap_Test.html#SimpleUnmodifiableMap_Test" target="classFrame">SimpleUnmodifiableMap_Test</a></li>
                 <li><a href="org/apache/juneau/bean/html5/Small_Test.html#Small_Test" target="classFrame">Small_Test</a></li>
                 <li><a href="org/apache/juneau/soap/annotation/SoapXmlAnnotation_Test.html#SoapXmlAnnotation_Test" target="classFrame">SoapXmlAnnotation_Test</a></li>
                 <li><a href="org/apache/juneau/soap/SoapXmlConfigAnnotationTest.html#SoapXmlConfigAnnotationTest" target="classFrame">SoapXmlConfigAnnotationTest</a></li>
@@ -2633,12 +2633,12 @@
                 <li><a href="org/apache/juneau/bean/html5/Span_Test.html#Span_Test" target="classFrame">Span_Test</a></li>
                 <li><a href="org/apache/juneau/rest/springboot/SpringBeanStore_Test.html#SpringBeanStore_Test" target="classFrame">SpringBeanStore_Test</a></li>
                 <li><a href="org/apache/juneau/transforms/StackTraceElementSwap_Test.html#StackTraceElementSwap_Test" target="classFrame">StackTraceElementSwap_Test</a></li>
-                <li><a href="org/apache/juneau/common/utils/StateEnum_Test.html#StateEnum_Test" target="classFrame">StateEnum_Test</a></li>
+                <li><a href="org/apache/juneau/commons/utils/StateEnum_Test.html#StateEnum_Test" target="classFrame">StateEnum_Test</a></li>
                 <li><a href="org/apache/juneau/http/resource/StreamResource_Test.html#StreamResource_Test" target="classFrame">StreamResource_Test</a></li>
                 <li><a href="org/apache/juneau/assertions/StringAssertion_Test.html#StringAssertion_Test" target="classFrame">StringAssertion_Test</a></li>
-                <li><a href="org/apache/juneau/common/io/StringBuilderWriter_Test.html#StringBuilderWriter_Test" target="classFrame">StringBuilderWriter_Test</a></li>
+                <li><a href="org/apache/juneau/commons/io/StringBuilderWriter_Test.html#StringBuilderWriter_Test" target="classFrame">StringBuilderWriter_Test</a></li>
                 <li><a href="org/apache/juneau/utils/StringExpressionMatcher_Test.html#StringExpressionMatcher_Test" target="classFrame">StringExpressionMatcher_Test</a></li>
-                <li><a href="org/apache/juneau/common/utils/StringFormat_Test.html#StringFormat_Test" target="classFrame">StringFormat_Test</a></li>
+                <li><a href="org/apache/juneau/commons/utils/StringFormat_Test.html#StringFormat_Test" target="classFrame">StringFormat_Test</a></li>
                 <li><a href="org/apache/juneau/assertions/StringListAssertion_Test.html#StringListAssertion_Test" target="classFrame">StringListAssertion_Test</a></li>
                 <li><a href="org/apache/juneau/http/StringRange_Test.html#StringRange_Test" target="classFrame">StringRange_Test</a></li>
                 <li><a href="org/apache/juneau/http/StringRanges_Test.html#StringRanges_Test" target="classFrame">StringRanges_Test</a></li>
@@ -2646,10 +2646,10 @@
                 <li><a href="org/apache/juneau/transforms/StringSwapTest_Base.html#StringSwapTest_Base" target="classFrame">StringSwapTest_Base</a></li>
                 <li><a href="org/apache/juneau/transforms/StringSwap_Tester.html#StringSwap_Tester" target="classFrame">StringSwap_Tester</a></li>
                 <li><a href="org/apache/juneau/transforms/StringSwap_Tester.html#StringSwap_Tester.Builder" target="classFrame">StringSwap_Tester.Builder</a></li>
-                <li><a href="org/apache/juneau/common/utils/StringUtils_Test.html#StringUtils_Test" target="classFrame">StringUtils_Test</a></li>
-                <li><a href="org/apache/juneau/common/utils/StringUtils_Test.html#StringUtils_Test.BadNumber" target="classFrame">StringUtils_Test.BadNumber</a></li>
-                <li><a href="org/apache/juneau/common/utils/StringUtils_Test.html#StringUtils_Test.TestEnum" target="classFrame">StringUtils_Test.TestEnum</a></li>
-                <li><a href="org/apache/juneau/common/collections/StringValue_Test.html#StringValue_Test" target="classFrame">StringValue_Test</a></li>
+                <li><a href="org/apache/juneau/commons/utils/StringUtils_Test.html#StringUtils_Test" target="classFrame">StringUtils_Test</a></li>
+                <li><a href="org/apache/juneau/commons/utils/StringUtils_Test.html#StringUtils_Test.BadNumber" target="classFrame">StringUtils_Test.BadNumber</a></li>
+                <li><a href="org/apache/juneau/commons/utils/StringUtils_Test.html#StringUtils_Test.TestEnum" target="classFrame">StringUtils_Test.TestEnum</a></li>
+                <li><a href="org/apache/juneau/commons/collections/StringValue_Test.html#StringValue_Test" target="classFrame">StringValue_Test</a></li>
                 <li><a href="org/apache/juneau/utils/StringVarResolver_Test.html#StringVarResolver_Test" target="classFrame">StringVarResolver_Test</a></li>
                 <li><a href="org/apache/juneau/utils/StringVarResolver_Test.html#StringVarResolver_Test.BlankVar" target="classFrame">StringVarResolver_Test.BlankVar</a></li>
                 <li><a href="org/apache/juneau/utils/StringVarResolver_Test.html#StringVarResolver_Test.XMultipartVar" target="classFrame">StringVarResolver_Test.XMultipartVar</a></li>
@@ -2875,7 +2875,7 @@
                 <li><a href="org/apache/juneau/http/response/TemporaryRedirect_Test.html#TemporaryRedirect_Test.A" target="classFrame">TemporaryRedirect_Test.A</a></li>
                 <li><a href="org/apache/juneau/cp/test3/Test1.html#Test1" target="classFrame">Test1</a></li>
                 <li><a href="org/apache/juneau/cp/test4/Test2.html#Test2" target="classFrame">Test2</a></li>
-                <li><a href="org/apache/juneau/common/utils/Utils_Test.html#TestAnnotation" target="classFrame">TestAnnotation</a></li>
+                <li><a href="org/apache/juneau/commons/utils/Utils_Test.html#TestAnnotation" target="classFrame">TestAnnotation</a></li>
                 <li><a href="org/apache/juneau/TestBase.html#TestBase" target="classFrame">TestBase</a></li>
                 <li><a href="org/apache/juneau/testutils/pojos/TestEnum.html#TestEnum" target="classFrame">TestEnum</a></li>
                 <li><a href="org/apache/juneau/testutils/pojos/TestEnumToString.html#TestEnumToString" target="classFrame">TestEnumToString</a></li>
@@ -2923,20 +2923,20 @@
                 <li><a href="org/apache/juneau/rest/test/client/ThirdPartyProxy_Test.html#ThirdPartyProxy_Test.ThirdPartyProxy.ReqBeanQuery6" target="classFrame">ThirdPartyProxy_Test.ThirdPartyProxy.ReqBeanQuery6</a></li>
                 <li><a href="org/apache/juneau/rest/test/client/ThirdPartyProxy_Test.html#ThirdPartyProxy_Test.ThirdPartyProxy.ReqBeanQuery7" target="classFrame">ThirdPartyProxy_Test.ThirdPartyProxy.ReqBeanQuery7</a></li>
                 <li><a href="org/apache/juneau/assertions/ThrowableAssertion_Test.html#ThrowableAssertion_Test" target="classFrame">ThrowableAssertion_Test</a></li>
-                <li><a href="org/apache/juneau/common/utils/ThrowableUtils_Test.html#ThrowableUtils_Test" target="classFrame">ThrowableUtils_Test</a></li>
-                <li><a href="org/apache/juneau/common/function/ThrowingConsumer_Test.html#ThrowingConsumer_Test" target="classFrame">ThrowingConsumer_Test</a></li>
-                <li><a href="org/apache/juneau/common/function/ThrowingConsumer_Test.html#ThrowingConsumer_Test.Counter" target="classFrame">ThrowingConsumer_Test.Counter</a></li>
-                <li><a href="org/apache/juneau/common/function/ThrowingFunction_Test.html#ThrowingFunction_Test" target="classFrame">ThrowingFunction_Test</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ThrowingSupplier_Test.html#ThrowingSupplier_Test" target="classFrame">ThrowingSupplier_Test</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ThrowingSupplier_Test.html#ThrowingSupplier_Test.A_functionalInterfaceCompliance" target="classFrame">ThrowingSupplier_Test.A_functionalInterfaceCompliance</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ThrowingSupplier_Test.html#ThrowingSupplier_Test.B_exceptionHandling" target="classFrame">ThrowingSupplier_Test.B_exceptionHandling</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ThrowingSupplier_Test.html#ThrowingSupplier_Test.C_utilsSafeIntegration" target="classFrame">ThrowingSupplier_Test.C_utilsSafeIntegration</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ThrowingSupplier_Test.html#ThrowingSupplier_Test.D_complexScenarios" target="classFrame">ThrowingSupplier_Test.D_complexScenarios</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ThrowingSupplier_Test.html#ThrowingSupplier_Test.E_performanceAndResources" target="classFrame">ThrowingSupplier_Test.E_performanceAndResources</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ThrowingSupplier_Test.html#ThrowingSupplier_Test.F_concurrency" target="classFrame">ThrowingSupplier_Test.F_concurrency</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ThrowingSupplier_Test.html#ThrowingSupplier_Test.G_genericTypes" target="classFrame">ThrowingSupplier_Test.G_genericTypes</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ThrowingSupplier_Test.html#ThrowingSupplier_Test.SupplierMethods" target="classFrame">ThrowingSupplier_Test.SupplierMethods</a></li>
-                <li><a href="org/apache/juneau/common/reflect/ThrowingSupplier_Test.html#ThrowingSupplier_Test.TestResult" target="classFrame">ThrowingSupplier_Test.TestResult</a></li>
+                <li><a href="org/apache/juneau/commons/utils/ThrowableUtils_Test.html#ThrowableUtils_Test" target="classFrame">ThrowableUtils_Test</a></li>
+                <li><a href="org/apache/juneau/commons/function/ThrowingConsumer_Test.html#ThrowingConsumer_Test" target="classFrame">ThrowingConsumer_Test</a></li>
+                <li><a href="org/apache/juneau/commons/function/ThrowingConsumer_Test.html#ThrowingConsumer_Test.Counter" target="classFrame">ThrowingConsumer_Test.Counter</a></li>
+                <li><a href="org/apache/juneau/commons/function/ThrowingFunction_Test.html#ThrowingFunction_Test" target="classFrame">ThrowingFunction_Test</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ThrowingSupplier_Test.html#ThrowingSupplier_Test" target="classFrame">ThrowingSupplier_Test</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ThrowingSupplier_Test.html#ThrowingSupplier_Test.A_functionalInterfaceCompliance" target="classFrame">ThrowingSupplier_Test.A_functionalInterfaceCompliance</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ThrowingSupplier_Test.html#ThrowingSupplier_Test.B_exceptionHandling" target="classFrame">ThrowingSupplier_Test.B_exceptionHandling</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ThrowingSupplier_Test.html#ThrowingSupplier_Test.C_utilsSafeIntegration" target="classFrame">ThrowingSupplier_Test.C_utilsSafeIntegration</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ThrowingSupplier_Test.html#ThrowingSupplier_Test.D_complexScenarios" target="classFrame">ThrowingSupplier_Test.D_complexScenarios</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ThrowingSupplier_Test.html#ThrowingSupplier_Test.E_performanceAndResources" target="classFrame">ThrowingSupplier_Test.E_performanceAndResources</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ThrowingSupplier_Test.html#ThrowingSupplier_Test.F_concurrency" target="classFrame">ThrowingSupplier_Test.F_concurrency</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ThrowingSupplier_Test.html#ThrowingSupplier_Test.G_genericTypes" target="classFrame">ThrowingSupplier_Test.G_genericTypes</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ThrowingSupplier_Test.html#ThrowingSupplier_Test.SupplierMethods" target="classFrame">ThrowingSupplier_Test.SupplierMethods</a></li>
+                <li><a href="org/apache/juneau/commons/reflect/ThrowingSupplier_Test.html#ThrowingSupplier_Test.TestResult" target="classFrame">ThrowingSupplier_Test.TestResult</a></li>
                 <li><a href="org/apache/juneau/mstat/ThrownStore_Test.html#ThrownStore_Test" target="classFrame">ThrownStore_Test</a></li>
                 <li><a href="org/apache/juneau/mstat/ThrownStore_Test.html#ThrownStore_Test.B1" target="classFrame">ThrownStore_Test.B1</a></li>
                 <li><a href="org/apache/juneau/mstat/ThrownStore_Test.html#ThrownStore_Test.B4" target="classFrame">ThrownStore_Test.B4</a></li>
@@ -2961,14 +2961,14 @@
                 <li><a href="org/apache/juneau/http/header/TransferEncoding_Test.html#TransferEncoding_Test.A" target="classFrame">TransferEncoding_Test.A</a></li>
                 <li><a href="org/apache/juneau/a/rttests/TrimStrings_RoundTripTest.html#TrimStrings_RoundTripTest" target="classFrame">TrimStrings_RoundTripTest</a></li>
                 <li><a href="org/apache/juneau/a/rttests/TrimStrings_RoundTripTest.html#TrimStrings_RoundTripTest.A" target="classFrame">TrimStrings_RoundTripTest.A</a></li>
-                <li><a href="org/apache/juneau/common/function/Tuple1_Test.html#Tuple1_Test" target="classFrame">Tuple1_Test</a></li>
-                <li><a href="org/apache/juneau/common/function/Tuple2_Test.html#Tuple2_Test" target="classFrame">Tuple2_Test</a></li>
+                <li><a href="org/apache/juneau/commons/function/Tuple1_Test.html#Tuple1_Test" target="classFrame">Tuple1_Test</a></li>
+                <li><a href="org/apache/juneau/commons/function/Tuple2_Test.html#Tuple2_Test" target="classFrame">Tuple2_Test</a></li>
                 <li><a href="org/apache/juneau/utils/Tuple2_Test.html#Tuple2_Test" target="classFrame">Tuple2_Test</a></li>
-                <li><a href="org/apache/juneau/common/function/Tuple3_Test.html#Tuple3_Test" target="classFrame">Tuple3_Test</a></li>
+                <li><a href="org/apache/juneau/commons/function/Tuple3_Test.html#Tuple3_Test" target="classFrame">Tuple3_Test</a></li>
                 <li><a href="org/apache/juneau/utils/Tuple3_Test.html#Tuple3_Test" target="classFrame">Tuple3_Test</a></li>
-                <li><a href="org/apache/juneau/common/function/Tuple4_Test.html#Tuple4_Test" target="classFrame">Tuple4_Test</a></li>
+                <li><a href="org/apache/juneau/commons/function/Tuple4_Test.html#Tuple4_Test" target="classFrame">Tuple4_Test</a></li>
                 <li><a href="org/apache/juneau/utils/Tuple4_Test.html#Tuple4_Test" target="classFrame">Tuple4_Test</a></li>
-                <li><a href="org/apache/juneau/common/function/Tuple5_Test.html#Tuple5_Test" target="classFrame">Tuple5_Test</a></li>
+                <li><a href="org/apache/juneau/commons/function/Tuple5_Test.html#Tuple5_Test" target="classFrame">Tuple5_Test</a></li>
                 <li><a href="org/apache/juneau/utils/Tuple5_Test.html#Tuple5_Test" target="classFrame">Tuple5_Test</a></li>
                 <li><a href="org/apache/juneau/testutils/pojos/TypedBeanImpl.html#TypedBeanImpl" target="classFrame">TypedBeanImpl</a></li>
                 <li><a href="org/apache/juneau/bean/html5/U_Test.html#U_Test" target="classFrame">U_Test</a></li>
@@ -3032,17 +3032,17 @@
                 <li><a href="org/apache/juneau/http/response/UseProxy_Test.html#UseProxy_Test.A" target="classFrame">UseProxy_Test.A</a></li>
                 <li><a href="org/apache/juneau/http/header/UserAgent_Test.html#UserAgent_Test" target="classFrame">UserAgent_Test</a></li>
                 <li><a href="org/apache/juneau/http/header/UserAgent_Test.html#UserAgent_Test.A" target="classFrame">UserAgent_Test.A</a></li>
-                <li><a href="org/apache/juneau/common/utils/Utils_Test.html#Utils_Test" target="classFrame">Utils_Test</a></li>
-                <li><a href="org/apache/juneau/common/utils/Utils_Test.html#Utils_Test.Role" target="classFrame">Utils_Test.Role</a></li>
-                <li><a href="org/apache/juneau/common/utils/Utils_Test.html#Utils_Test.T" target="classFrame">Utils_Test.T</a></li>
-                <li><a href="org/apache/juneau/common/utils/Utils_Test.html#Utils_Test.T1" target="classFrame">Utils_Test.T1</a></li>
-                <li><a href="org/apache/juneau/common/utils/Utils_Test.html#Utils_Test.T2" target="classFrame">Utils_Test.T2</a></li>
-                <li><a href="org/apache/juneau/common/utils/Utils_Test.html#Utils_Test.T3" target="classFrame">Utils_Test.T3</a></li>
-                <li><a href="org/apache/juneau/common/utils/Utils_Test.html#Utils_Test.TestEnum" target="classFrame">Utils_Test.TestEnum</a></li>
-                <li><a href="org/apache/juneau/common/utils/Utils_Test.html#Utils_Test.TestUtils" target="classFrame">Utils_Test.TestUtils</a></li>
-                <li><a href="org/apache/juneau/common/collections/Value_Test.html#Value_Test" target="classFrame">Value_Test</a></li>
-                <li><a href="org/apache/juneau/common/collections/Value_Test.html#Value_Test.A" target="classFrame">Value_Test.A</a></li>
-                <li><a href="org/apache/juneau/common/collections/Value_Test.html#Value_Test.A1" target="classFrame">Value_Test.A1</a></li>
+                <li><a href="org/apache/juneau/commons/utils/Utils_Test.html#Utils_Test" target="classFrame">Utils_Test</a></li>
+                <li><a href="org/apache/juneau/commons/utils/Utils_Test.html#Utils_Test.Role" target="classFrame">Utils_Test.Role</a></li>
+                <li><a href="org/apache/juneau/commons/utils/Utils_Test.html#Utils_Test.T" target="classFrame">Utils_Test.T</a></li>
+                <li><a href="org/apache/juneau/commons/utils/Utils_Test.html#Utils_Test.T1" target="classFrame">Utils_Test.T1</a></li>
+                <li><a href="org/apache/juneau/commons/utils/Utils_Test.html#Utils_Test.T2" target="classFrame">Utils_Test.T2</a></li>
+                <li><a href="org/apache/juneau/commons/utils/Utils_Test.html#Utils_Test.T3" target="classFrame">Utils_Test.T3</a></li>
+                <li><a href="org/apache/juneau/commons/utils/Utils_Test.html#Utils_Test.TestEnum" target="classFrame">Utils_Test.TestEnum</a></li>
+                <li><a href="org/apache/juneau/commons/utils/Utils_Test.html#Utils_Test.TestUtils" target="classFrame">Utils_Test.TestUtils</a></li>
+                <li><a href="org/apache/juneau/commons/collections/Value_Test.html#Value_Test" target="classFrame">Value_Test</a></li>
+                <li><a href="org/apache/juneau/commons/collections/Value_Test.html#Value_Test.A" target="classFrame">Value_Test.A</a></li>
+                <li><a href="org/apache/juneau/commons/collections/Value_Test.html#Value_Test.A1" target="classFrame">Value_Test.A1</a></li>
                 <li><a href="org/apache/juneau/bean/html5/Var_Test.html#Var_Test" target="classFrame">Var_Test</a></li>
                 <li><a href="org/apache/juneau/http/response/VariantAlsoNegotiates_Test.html#VariantAlsoNegotiates_Test" target="classFrame">VariantAlsoNegotiates_Test</a></li>
                 <li><a href="org/apache/juneau/http/response/VariantAlsoNegotiates_Test.html#VariantAlsoNegotiates_Test.A" target="classFrame">VariantAlsoNegotiates_Test.A</a></li>
@@ -3050,9 +3050,9 @@
                 <li><a href="org/apache/juneau/http/header/Vary_Test.html#Vary_Test.A" target="classFrame">Vary_Test.A</a></li>
                 <li><a href="org/apache/juneau/assertions/Verify_Test.html#Verify_Test" target="classFrame">Verify_Test</a></li>
                 <li><a href="org/apache/juneau/assertions/VersionAssertion_Test.html#VersionAssertion_Test" target="classFrame">VersionAssertion_Test</a></li>
-                <li><a href="org/apache/juneau/common/utils/VersionRange_Test.html#VersionRange_Test" target="classFrame">VersionRange_Test</a></li>
-                <li><a href="org/apache/juneau/common/utils/VersionRange_Test.html#VersionRange_Test.Input" target="classFrame">VersionRange_Test.Input</a></li>
-                <li><a href="org/apache/juneau/common/utils/Version_Test.html#Version_Test" target="classFrame">Version_Test</a></li>
+                <li><a href="org/apache/juneau/commons/utils/VersionRange_Test.html#VersionRange_Test" target="classFrame">VersionRange_Test</a></li>
+                <li><a href="org/apache/juneau/commons/utils/VersionRange_Test.html#VersionRange_Test.Input" target="classFrame">VersionRange_Test.Input</a></li>
+                <li><a href="org/apache/juneau/commons/utils/Version_Test.html#Version_Test" target="classFrame">Version_Test</a></li>
                 <li><a href="org/apache/juneau/http/header/Via_Test.html#Via_Test" target="classFrame">Via_Test</a></li>
                 <li><a href="org/apache/juneau/http/header/Via_Test.html#Via_Test.A" target="classFrame">Via_Test.A</a></li>
                 <li><a href="org/apache/juneau/bean/html5/Video_Test.html#Video_Test" target="classFrame">Video_Test</a></li>
@@ -3062,7 +3062,7 @@
                 <li><a href="org/apache/juneau/http/header/Warning_Test.html#Warning_Test.A" target="classFrame">Warning_Test.A</a></li>
                 <li><a href="org/apache/juneau/bean/html5/Wbr_Test.html#Wbr_Test" target="classFrame">Wbr_Test</a></li>
                 <li><a href="org/apache/juneau/utils/WeightedAverageTest.html#WeightedAverageTest" target="classFrame">WeightedAverageTest</a></li>
-                <li><a href="org/apache/juneau/common/utils/WeightedAverage_Test.html#WeightedAverage_Test" target="classFrame">WeightedAverage_Test</a></li>
+                <li><a href="org/apache/juneau/commons/utils/WeightedAverage_Test.html#WeightedAverage_Test" target="classFrame">WeightedAverage_Test</a></li>
                 <li><a href="org/apache/juneau/serializer/WriterFluentSetters_Test.html#WriterFluentSetters_Test" target="classFrame">WriterFluentSetters_Test</a></li>
                 <li><a href="org/apache/juneau/http/header/WwwAuthenticate_Test.html#WwwAuthenticate_Test" target="classFrame">WwwAuthenticate_Test</a></li>
                 <li><a href="org/apache/juneau/http/header/WwwAuthenticate_Test.html#WwwAuthenticate_Test.A" target="classFrame">WwwAuthenticate_Test.A</a></li>
diff --git a/site/xref-test/org/apache/juneau/BeanConfig_Test.html b/site/xref-test/org/apache/juneau/BeanConfig_Test.html
index 21a67b323b..0ef76c16c3 100644
--- a/site/xref-test/org/apache/juneau/BeanConfig_Test.html
+++ b/site/xref-test/org/apache/juneau/BeanConfig_Test.html
@@ -24,9 +24,9 @@
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
-<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.reflect.Visibility.*;
-<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.Utils.*;
+<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.reflect.Visibility.*;
+<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.Utils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
@@ -37,7 +37,7 @@
 <a class="jxr_linenumber" name="L29" href="#L29">29</a>  
 <a class="jxr_linenumber" name="L30" href="#L30">30</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.annotation.*;
 <a class="jxr_linenumber" name="L31" href="#L31">31</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.collections.*;
-<a class="jxr_linenumber" name="L32" href="#L32">32</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.common.reflect.*;
+<a class="jxr_linenumber" name="L32" href="#L32">32</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.commons.reflect.*;
 <a class="jxr_linenumber" name="L33" href="#L33">33</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.json.*;
 <a class="jxr_linenumber" name="L34" href="#L34">34</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.parser.*;
 <a class="jxr_linenumber" name="L35" href="#L35">35</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.swap.*;
diff --git a/site/xref-test/org/apache/juneau/BeanContext_Test.html b/site/xref-test/org/apache/juneau/BeanContext_Test.html
index 7d0196ac9a..a5726b0a04 100644
--- a/site/xref-test/org/apache/juneau/BeanContext_Test.html
+++ b/site/xref-test/org/apache/juneau/BeanContext_Test.html
@@ -27,7 +27,7 @@
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  
-<a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.common.reflect.*;
+<a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.commons.reflect.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.json.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.testutils.pojos.*;
 <a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.api.*;
diff --git a/site/xref-test/org/apache/juneau/BeanMap_Test.html b/site/xref-test/org/apache/juneau/BeanMap_Test.html
index 5cdef38383..fbe9fae9c3 100644
--- a/site/xref-test/org/apache/juneau/BeanMap_Test.html
+++ b/site/xref-test/org/apache/juneau/BeanMap_Test.html
@@ -25,7 +25,7 @@
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
-<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  
diff --git a/site/xref-test/org/apache/juneau/BenchmarkRunner.html b/site/xref-test/org/apache/juneau/BenchmarkRunner.html
index 29ff226f63..8070d2d76d 100644
--- a/site/xref-test/org/apache/juneau/BenchmarkRunner.html
+++ b/site/xref-test/org/apache/juneau/BenchmarkRunner.html
@@ -28,7 +28,7 @@
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> java.util.concurrent.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> java.util.function.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  
-<a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.common.function.*;
+<a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.commons.function.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> org.openjdk.jmh.annotations.*;
 <a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> org.openjdk.jmh.infra.*;
 <a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> org.openjdk.jmh.runner.*;
diff --git a/site/xref-test/org/apache/juneau/ClassMeta_Test.html b/site/xref-test/org/apache/juneau/ClassMeta_Test.html
index 16140422ca..6d978c7a29 100644
--- a/site/xref-test/org/apache/juneau/ClassMeta_Test.html
+++ b/site/xref-test/org/apache/juneau/ClassMeta_Test.html
@@ -24,13 +24,13 @@
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
-<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> java.util.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
-<a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.common.reflect.ClassInfo_Test.*;
+<a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.commons.reflect.ClassInfo_Test.*;
 <a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.swap.*;
 <a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.api.*;
 <a class="jxr_linenumber" name="L28" href="#L28">28</a>  
diff --git a/site/xref-test/org/apache/juneau/ComboInput.html b/site/xref-test/org/apache/juneau/ComboInput.html
index c7ffe830cc..286a1ed169 100644
--- a/site/xref-test/org/apache/juneau/ComboInput.html
+++ b/site/xref-test/org/apache/juneau/ComboInput.html
@@ -24,14 +24,14 @@
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
-<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
-<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.Utils.*;
+<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.Utils.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> java.lang.reflect.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> java.util.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> java.util.function.*;
 <a class="jxr_linenumber" name="L25" href="#L25">25</a>  
-<a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.common.function.*;
+<a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.commons.function.*;
 <a class="jxr_linenumber" name="L27" href="#L27">27</a>  
 <a class="jxr_linenumber" name="L28" href="#L28">28</a>  <em class="jxr_javadoccomment">/**</em>
 <a class="jxr_linenumber" name="L29" href="#L29">29</a>  <em class="jxr_javadoccomment"> * Represents the input to a ComboTest.</em>
diff --git a/site/xref-test/org/apache/juneau/ComboRoundTrip_Tester.html b/site/xref-test/org/apache/juneau/ComboRoundTrip_Tester.html
index 589ea5f12b..c49f6e6b38 100644
--- a/site/xref-test/org/apache/juneau/ComboRoundTrip_Tester.html
+++ b/site/xref-test/org/apache/juneau/ComboRoundTrip_Tester.html
@@ -24,8 +24,8 @@
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
-<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
-<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.Utils.*;
+<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.Utils.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  
@@ -33,7 +33,7 @@
 <a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> java.util.*;
 <a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> java.util.function.*;
 <a class="jxr_linenumber" name="L27" href="#L27">27</a>  
-<a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.common.function.*;
+<a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.commons.function.*;
 <a class="jxr_linenumber" name="L29" href="#L29">29</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.html.*;
 <a class="jxr_linenumber" name="L30" href="#L30">30</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.json.*;
 <a class="jxr_linenumber" name="L31" href="#L31">31</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.msgpack.*;
diff --git a/site/xref-test/org/apache/juneau/ComboSerialize_Tester.html b/site/xref-test/org/apache/juneau/ComboSerialize_Tester.html
index 3da19c6e71..11d3d5ea71 100644
--- a/site/xref-test/org/apache/juneau/ComboSerialize_Tester.html
+++ b/site/xref-test/org/apache/juneau/ComboSerialize_Tester.html
@@ -24,16 +24,16 @@
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
-<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
-<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.StringUtils.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.Utils.*;
+<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.StringUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.Utils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
 <a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> java.util.*;
 <a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> java.util.function.*;
 <a class="jxr_linenumber" name="L27" href="#L27">27</a>  
-<a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.common.function.*;
+<a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.commons.function.*;
 <a class="jxr_linenumber" name="L29" href="#L29">29</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.html.*;
 <a class="jxr_linenumber" name="L30" href="#L30">30</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.json.*;
 <a class="jxr_linenumber" name="L31" href="#L31">31</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.msgpack.*;
diff --git a/site/xref-test/org/apache/juneau/DataConversion_Test.html b/site/xref-test/org/apache/juneau/DataConversion_Test.html
index ddfd8d6dcc..38ecde197e 100644
--- a/site/xref-test/org/apache/juneau/DataConversion_Test.html
+++ b/site/xref-test/org/apache/juneau/DataConversion_Test.html
@@ -25,7 +25,7 @@
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
-<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  
diff --git a/site/xref-test/org/apache/juneau/DynaBean_ComboRoundTripTest.html b/site/xref-test/org/apache/juneau/DynaBean_ComboRoundTripTest.html
index 37ded5a299..5a42487c66 100644
--- a/site/xref-test/org/apache/juneau/DynaBean_ComboRoundTripTest.html
+++ b/site/xref-test/org/apache/juneau/DynaBean_ComboRoundTripTest.html
@@ -25,7 +25,7 @@
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.Verify.*;
-<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> java.util.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  
diff --git a/site/xref-test/org/apache/juneau/JacocoDummy_Test.html b/site/xref-test/org/apache/juneau/JacocoDummy_Test.html
index c110898e7d..c0f31bfea4 100644
--- a/site/xref-test/org/apache/juneau/JacocoDummy_Test.html
+++ b/site/xref-test/org/apache/juneau/JacocoDummy_Test.html
@@ -24,11 +24,11 @@
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
-<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  
-<a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.common.reflect.*;
-<a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.common.utils.*;
+<a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.commons.reflect.*;
+<a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.commons.utils.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.internal.*;
 <a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.xml.annotation.*;
 <a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.api.*;
diff --git a/site/xref-test/org/apache/juneau/JsonList_Test.html b/site/xref-test/org/apache/juneau/JsonList_Test.html
index 933eb43ec6..13bb3c9dee 100644
--- a/site/xref-test/org/apache/juneau/JsonList_Test.html
+++ b/site/xref-test/org/apache/juneau/JsonList_Test.html
@@ -25,7 +25,7 @@
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
-<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  
diff --git a/site/xref-test/org/apache/juneau/MaxIndent_Test.html b/site/xref-test/org/apache/juneau/MaxIndent_Test.html
index 8b53c6e584..d708ab1a59 100644
--- a/site/xref-test/org/apache/juneau/MaxIndent_Test.html
+++ b/site/xref-test/org/apache/juneau/MaxIndent_Test.html
@@ -24,7 +24,7 @@
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
-<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.Utils.*;
+<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.Utils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> java.util.*;
diff --git a/site/xref-test/org/apache/juneau/MediaRange_Test.html b/site/xref-test/org/apache/juneau/MediaRange_Test.html
index d1258c3e9d..95e2899311 100644
--- a/site/xref-test/org/apache/juneau/MediaRange_Test.html
+++ b/site/xref-test/org/apache/juneau/MediaRange_Test.html
@@ -24,7 +24,7 @@
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
-<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> java.util.*;
diff --git a/site/xref-test/org/apache/juneau/PojoExamplesTest.html b/site/xref-test/org/apache/juneau/PojoExamplesTest.html
index af625f970d..861453eff7 100644
--- a/site/xref-test/org/apache/juneau/PojoExamplesTest.html
+++ b/site/xref-test/org/apache/juneau/PojoExamplesTest.html
@@ -25,7 +25,7 @@
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
-<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.annotation.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.json.*;
diff --git a/site/xref-test/org/apache/juneau/ReadWriteOnlyProperties_Test.html b/site/xref-test/org/apache/juneau/ReadWriteOnlyProperties_Test.html
index 56db9756f9..b3334a78fd 100644
--- a/site/xref-test/org/apache/juneau/ReadWriteOnlyProperties_Test.html
+++ b/site/xref-test/org/apache/juneau/ReadWriteOnlyProperties_Test.html
@@ -25,7 +25,7 @@
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
-<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.annotation.*;
diff --git a/site/xref-test/org/apache/juneau/SerializerProperties_ComboRoundTripTest.html b/site/xref-test/org/apache/juneau/SerializerProperties_ComboRoundTripTest.html
index 06bc1a3713..700b6afddf 100644
--- a/site/xref-test/org/apache/juneau/SerializerProperties_ComboRoundTripTest.html
+++ b/site/xref-test/org/apache/juneau/SerializerProperties_ComboRoundTripTest.html
@@ -24,7 +24,7 @@
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
-<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> java.lang.reflect.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> java.util.*;
diff --git a/site/xref-test/org/apache/juneau/TestUtils.html b/site/xref-test/org/apache/juneau/TestUtils.html
index 205634bdf1..a81420f0d0 100644
--- a/site/xref-test/org/apache/juneau/TestUtils.html
+++ b/site/xref-test/org/apache/juneau/TestUtils.html
@@ -25,8 +25,8 @@
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> java.util.stream.Collectors.*;
-<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.ThrowableUtils.*;
+<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.ThrowableUtils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> java.io.*;
diff --git a/site/xref-test/org/apache/juneau/Visibility_Test.html b/site/xref-test/org/apache/juneau/Visibility_Test.html
index 60dfa822d7..02e10ae487 100644
--- a/site/xref-test/org/apache/juneau/Visibility_Test.html
+++ b/site/xref-test/org/apache/juneau/Visibility_Test.html
@@ -24,11 +24,11 @@
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
-<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.reflect.Visibility.*;
+<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.reflect.Visibility.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.a.*;
-<a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.common.reflect.*;
+<a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.commons.reflect.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.json.*;
 <a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.api.*;
 <a class="jxr_linenumber" name="L26" href="#L26">26</a>  
diff --git a/site/xref-test/org/apache/juneau/XmlValidatorParser.html b/site/xref-test/org/apache/juneau/XmlValidatorParser.html
index 8d3a9b0a67..50702cd213 100644
--- a/site/xref-test/org/apache/juneau/XmlValidatorParser.html
+++ b/site/xref-test/org/apache/juneau/XmlValidatorParser.html
@@ -32,7 +32,7 @@
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
 <a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> javax.xml.stream.*;
 <a class="jxr_linenumber" name="L26" href="#L26">26</a>  
-<a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.common.reflect.*;
+<a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.commons.reflect.*;
 <a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.parser.*;
 <a class="jxr_linenumber" name="L29" href="#L29">29</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.xml.*;
 <a class="jxr_linenumber" name="L30" href="#L30">30</a>  
diff --git a/site/xref-test/org/apache/juneau/a/rttests/BeanProperties_RoundTripTest.html b/site/xref-test/org/apache/juneau/a/rttests/BeanProperties_RoundTripTest.html
index ebb2dec244..bf3355c378 100644
--- a/site/xref-test/org/apache/juneau/a/rttests/BeanProperties_RoundTripTest.html
+++ b/site/xref-test/org/apache/juneau/a/rttests/BeanProperties_RoundTripTest.html
@@ -24,12 +24,12 @@
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.a.rttests;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
-<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> java.util.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  
-<a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.common.utils.*;
+<a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.commons.utils.*;
 <a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.params.*;
 <a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.params.provider.*;
 <a class="jxr_linenumber" name="L27" href="#L27">27</a>  
diff --git a/site/xref-test/org/apache/juneau/a/rttests/Classes_RoundTripTest.html b/site/xref-test/org/apache/juneau/a/rttests/Classes_RoundTripTest.html
index b2f01b6a86..d12d0fa2d1 100644
--- a/site/xref-test/org/apache/juneau/a/rttests/Classes_RoundTripTest.html
+++ b/site/xref-test/org/apache/juneau/a/rttests/Classes_RoundTripTest.html
@@ -25,7 +25,7 @@
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.a.rttests;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
-<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.params.*;
diff --git a/site/xref-test/org/apache/juneau/a/rttests/Enum_RoundTripTest.html b/site/xref-test/org/apache/juneau/a/rttests/Enum_RoundTripTest.html
index d5d9fd8344..ad121aa560 100644
--- a/site/xref-test/org/apache/juneau/a/rttests/Enum_RoundTripTest.html
+++ b/site/xref-test/org/apache/juneau/a/rttests/Enum_RoundTripTest.html
@@ -25,7 +25,7 @@
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.a.rttests;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
-<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  
diff --git a/site/xref-test/org/apache/juneau/a/rttests/JsonMaps_RoundTripTest.html b/site/xref-test/org/apache/juneau/a/rttests/JsonMaps_RoundTripTest.html
index dcdf40ec0e..23fe2c4e56 100644
--- a/site/xref-test/org/apache/juneau/a/rttests/JsonMaps_RoundTripTest.html
+++ b/site/xref-test/org/apache/juneau/a/rttests/JsonMaps_RoundTripTest.html
@@ -24,7 +24,7 @@
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.a.rttests;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
-<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> java.util.*;
diff --git a/site/xref-test/org/apache/juneau/a/rttests/ObjectsAsStrings_RoundTripTest.html b/site/xref-test/org/apache/juneau/a/rttests/ObjectsAsStrings_RoundTripTest.html
index dc859f316e..dece32cc25 100644
--- a/site/xref-test/org/apache/juneau/a/rttests/ObjectsAsStrings_RoundTripTest.html
+++ b/site/xref-test/org/apache/juneau/a/rttests/ObjectsAsStrings_RoundTripTest.html
@@ -25,7 +25,7 @@
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.a.rttests;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
-<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.IOUtils.*;
+<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.IOUtils.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  
diff --git a/site/xref-test/org/apache/juneau/a/rttests/OptionalObjects_RoundTripTest.html b/site/xref-test/org/apache/juneau/a/rttests/OptionalObjects_RoundTripTest.html
index c05f83c57b..4b61e0050d 100644
--- a/site/xref-test/org/apache/juneau/a/rttests/OptionalObjects_RoundTripTest.html
+++ b/site/xref-test/org/apache/juneau/a/rttests/OptionalObjects_RoundTripTest.html
@@ -24,8 +24,8 @@
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.a.rttests;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
-<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
-<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.Utils.*;
+<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.Utils.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  
diff --git a/site/xref-test/org/apache/juneau/a/rttests/PrimitivesBeans_RoundTripTest.html b/site/xref-test/org/apache/juneau/a/rttests/PrimitivesBeans_RoundTripTest.html
index 12265b69ac..de4f0263bf 100644
--- a/site/xref-test/org/apache/juneau/a/rttests/PrimitivesBeans_RoundTripTest.html
+++ b/site/xref-test/org/apache/juneau/a/rttests/PrimitivesBeans_RoundTripTest.html
@@ -24,7 +24,7 @@
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.a.rttests;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
-<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> java.util.*;
diff --git a/site/xref-test/org/apache/juneau/a/rttests/RoundTripAddClassAttrs_Test.html b/site/xref-test/org/apache/juneau/a/rttests/RoundTripAddClassAttrs_Test.html
index e95ee364d9..d36d590068 100644
--- a/site/xref-test/org/apache/juneau/a/rttests/RoundTripAddClassAttrs_Test.html
+++ b/site/xref-test/org/apache/juneau/a/rttests/RoundTripAddClassAttrs_Test.html
@@ -24,7 +24,7 @@
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.a.rttests;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
-<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  
diff --git a/site/xref-test/org/apache/juneau/a/rttests/RoundTripBeanMaps_Test.html b/site/xref-test/org/apache/juneau/a/rttests/RoundTripBeanMaps_Test.html
index d4652b92eb..2591ef9322 100644
--- a/site/xref-test/org/apache/juneau/a/rttests/RoundTripBeanMaps_Test.html
+++ b/site/xref-test/org/apache/juneau/a/rttests/RoundTripBeanMaps_Test.html
@@ -25,7 +25,7 @@
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.a.rttests;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
-<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  
diff --git a/site/xref-test/org/apache/juneau/a/rttests/RoundTripBeansWithBuilders_Test.html b/site/xref-test/org/apache/juneau/a/rttests/RoundTripBeansWithBuilders_Test.html
index 16609ca3b7..00e31029ab 100644
--- a/site/xref-test/org/apache/juneau/a/rttests/RoundTripBeansWithBuilders_Test.html
+++ b/site/xref-test/org/apache/juneau/a/rttests/RoundTripBeansWithBuilders_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> java.util.Collections.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> java.util.*;
diff --git a/site/xref-test/org/apache/juneau/a/rttests/RoundTripLargeObjects_Test.html b/site/xref-test/org/apache/juneau/a/rttests/RoundTripLargeObjects_Test.html
index fd1268f578..78f23463d6 100644
--- a/site/xref-test/org/apache/juneau/a/rttests/RoundTripLargeObjects_Test.html
+++ b/site/xref-test/org/apache/juneau/a/rttests/RoundTripLargeObjects_Test.html
@@ -24,7 +24,7 @@
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.a.rttests;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
-<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.Utils.*;
+<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.Utils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> java.util.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  
diff --git a/site/xref-test/org/apache/juneau/a/rttests/RoundTripMaps_Test.html b/site/xref-test/org/apache/juneau/a/rttests/RoundTripMaps_Test.html
index 71c167ce4f..29bbab88f6 100644
--- a/site/xref-test/org/apache/juneau/a/rttests/RoundTripMaps_Test.html
+++ b/site/xref-test/org/apache/juneau/a/rttests/RoundTripMaps_Test.html
@@ -24,7 +24,7 @@
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.a.rttests;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
-<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> java.time.*;
diff --git a/site/xref-test/org/apache/juneau/a/rttests/RoundTripTransformBeans_Test.html b/site/xref-test/org/apache/juneau/a/rttests/RoundTripTransformBeans_Test.html
index 6c5ef81d42..0aa0b80228 100644
--- a/site/xref-test/org/apache/juneau/a/rttests/RoundTripTransformBeans_Test.html
+++ b/site/xref-test/org/apache/juneau/a/rttests/RoundTripTransformBeans_Test.html
@@ -25,9 +25,9 @@
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.a.rttests;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
-<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.DateUtils.*;
-<a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.IOUtils.*;
+<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.DateUtils.*;
+<a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.IOUtils.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L25" href="#L25">25</a>  
diff --git a/site/xref-test/org/apache/juneau/a/rttests/RoundTrip_Tester.html b/site/xref-test/org/apache/juneau/a/rttests/RoundTrip_Tester.html
index b26f2e2bd3..4d63dbedba 100644
--- a/site/xref-test/org/apache/juneau/a/rttests/RoundTrip_Tester.html
+++ b/site/xref-test/org/apache/juneau/a/rttests/RoundTrip_Tester.html
@@ -26,8 +26,8 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> java.util.Collections.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
-<a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.StringUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.StringUtils.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> java.lang.reflect.*;
 <a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> java.util.*;
diff --git a/site/xref-test/org/apache/juneau/a/rttests/SimpleObjects_RoundTripTest.html b/site/xref-test/org/apache/juneau/a/rttests/SimpleObjects_RoundTripTest.html
index bb23250d44..4a21fd860d 100644
--- a/site/xref-test/org/apache/juneau/a/rttests/SimpleObjects_RoundTripTest.html
+++ b/site/xref-test/org/apache/juneau/a/rttests/SimpleObjects_RoundTripTest.html
@@ -24,8 +24,8 @@
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.a.rttests;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
-<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
-<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.Utils.*;
+<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.Utils.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> java.util.*;
diff --git a/site/xref-test/org/apache/juneau/a/rttests/TrimStrings_RoundTripTest.html b/site/xref-test/org/apache/juneau/a/rttests/TrimStrings_RoundTripTest.html
index 3cc65e8522..a4cb04dde8 100644
--- a/site/xref-test/org/apache/juneau/a/rttests/TrimStrings_RoundTripTest.html
+++ b/site/xref-test/org/apache/juneau/a/rttests/TrimStrings_RoundTripTest.html
@@ -25,7 +25,7 @@
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.a.rttests;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
-<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.collections.*;
diff --git a/site/xref-test/org/apache/juneau/annotation/BeanConfigAnnotation_Test.html b/site/xref-test/org/apache/juneau/annotation/BeanConfigAnnotation_Test.html
index 27794e2dc3..a9a76e81c5 100644
--- a/site/xref-test/org/apache/juneau/annotation/BeanConfigAnnotation_Test.html
+++ b/site/xref-test/org/apache/juneau/annotation/BeanConfigAnnotation_Test.html
@@ -24,8 +24,8 @@
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.annotation;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
-<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
-<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.Utils.*;
+<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.Utils.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> java.util.*;
@@ -34,9 +34,9 @@
 <a class="jxr_linenumber" name="L26" href="#L26">26</a>  
 <a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.*;
 <a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.collections.*;
-<a class="jxr_linenumber" name="L29" href="#L29">29</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.json.*;
-<a class="jxr_linenumber" name="L30" href="#L30">30</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.marshaller.*;
-<a class="jxr_linenumber" name="L31" href="#L31">31</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.common.reflect.*;
+<a class="jxr_linenumber" name="L29" href="#L29">29</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.commons.reflect.*;
+<a class="jxr_linenumber" name="L30" href="#L30">30</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.json.*;
+<a class="jxr_linenumber" name="L31" href="#L31">31</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.marshaller.*;
 <a class="jxr_linenumber" name="L32" href="#L32">32</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.svl.*;
 <a class="jxr_linenumber" name="L33" href="#L33">33</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.swap.*;
 <a class="jxr_linenumber" name="L34" href="#L34">34</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.api.*;
diff --git a/site/xref-test/org/apache/juneau/annotation/Bean_Test.html b/site/xref-test/org/apache/juneau/annotation/Bean_Test.html
index 5750615d5c..a74963e975 100644
--- a/site/xref-test/org/apache/juneau/annotation/Bean_Test.html
+++ b/site/xref-test/org/apache/juneau/annotation/Bean_Test.html
@@ -24,13 +24,13 @@
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.annotation;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
-<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.*;
-<a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.json.*;
-<a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.marshaller.*;
-<a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.common.reflect.*;
+<a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.commons.reflect.*;
+<a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.json.*;
+<a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.marshaller.*;
 <a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.svl.*;
 <a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.api.*;
 <a class="jxr_linenumber" name="L28" href="#L28">28</a>  
diff --git a/site/xref-test/org/apache/juneau/assertions/AnyAssertion_Test.html b/site/xref-test/org/apache/juneau/assertions/AnyAssertion_Test.html
index c61450a73e..69ea275f42 100644
--- a/site/xref-test/org/apache/juneau/assertions/AnyAssertion_Test.html
+++ b/site/xref-test/org/apache/juneau/assertions/AnyAssertion_Test.html
@@ -28,501 +28,502 @@
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.AssertionPredicates.contains;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.AssertionPredicates.ne;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.Assertions.*;
-<a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
-<a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> java.time.*;
-<a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> java.util.*;
-<a class="jxr_linenumber" name="L26" href="#L26">26</a>  
-<a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.*;
-<a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.json.*;
-<a class="jxr_linenumber" name="L29" href="#L29">29</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.api.*;
-<a class="jxr_linenumber" name="L30" href="#L30">30</a>  
-<a class="jxr_linenumber" name="L31" href="#L31">31</a>  @Deprecated
-<a class="jxr_linenumber" name="L32" href="#L32">32</a>  <strong class="jxr_keyword">class</strong> <a name="AnyAssertion_Test" href="../../../../org/apache/juneau/assertions/AnyAssertion_Test.html#AnyAssertion_Test">AnyAssertion_Test</a> <strong class="jxr_keyword">extends</strong> <a name="TestBase" href="../../../../org/apache/juneau/TestBase.html#TestBase">TestBase</a> {
-<a class="jxr_linenumber" name="L33" href="#L33">33</a>  
-<a class="jxr_linenumber" name="L34" href="#L34">34</a>  	<em class="jxr_comment">//------------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L35" href="#L35">35</a>  	<em class="jxr_comment">// Helpers</em>
-<a class="jxr_linenumber" name="L36" href="#L36">36</a>  	<em class="jxr_comment">//------------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L37" href="#L37">37</a>  
-<a class="jxr_linenumber" name="L38" href="#L38">38</a>  	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> &lt;T&gt; AnyAssertion&lt;T&gt; test(T value) {
-<a class="jxr_linenumber" name="L39" href="#L39">39</a>  		<strong class="jxr_keyword">return</strong> assertAny(value).setSilent();
-<a class="jxr_linenumber" name="L40" href="#L40">40</a>  	}
-<a class="jxr_linenumber" name="L41" href="#L41">41</a>  
-<a class="jxr_linenumber" name="L42" href="#L42">42</a>  	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> ZonedDateTime zdt(String s) {
-<a class="jxr_linenumber" name="L43" href="#L43">43</a>  		<strong class="jxr_keyword">return</strong> ZonedDateTime.parse(s);
-<a class="jxr_linenumber" name="L44" href="#L44">44</a>  	}
-<a class="jxr_linenumber" name="L45" href="#L45">45</a>  
-<a class="jxr_linenumber" name="L46" href="#L46">46</a>  	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> Date date(String s) {
-<a class="jxr_linenumber" name="L47" href="#L47">47</a>  		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> Date(ZonedDateTime.parse(s).toEpochSecond()*1000);
-<a class="jxr_linenumber" name="L48" href="#L48">48</a>  	}
-<a class="jxr_linenumber" name="L49" href="#L49">49</a>  
-<a class="jxr_linenumber" name="L50" href="#L50">50</a>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> A1 A1 = <strong class="jxr_keyword">new</strong> A1();
-<a class="jxr_linenumber" name="L51" href="#L51">51</a>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> A1 {
-<a class="jxr_linenumber" name="L52" href="#L52">52</a>  		<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> a = 1, b = 2;
-<a class="jxr_linenumber" name="L53" href="#L53">53</a>  		@Override <strong class="jxr_keyword">public</strong> String toString() { <strong class="jxr_keyword">return</strong> <span class="jxr_string">"a="</span>+a+<span class="jxr_string">",b="</span>+b; }
-<a class="jxr_linenumber" name="L54" href="#L54">54</a>  	}
-<a class="jxr_linenumber" name="L55" href="#L55">55</a>  
-<a class="jxr_linenumber" name="L56" href="#L56">56</a>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> A2 {
-<a class="jxr_linenumber" name="L57" href="#L57">57</a>  		<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> getFoo() { <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> RuntimeException(<span class="jxr_string">"foo"</span>); }
-<a class="jxr_linenumber" name="L58" href="#L58">58</a>  	}
-<a class="jxr_linenumber" name="L59" href="#L59">59</a>  
-<a class="jxr_linenumber" name="L60" href="#L60">60</a>  	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L61" href="#L61">61</a>  	<em class="jxr_comment">// Basic tests</em>
-<a class="jxr_linenumber" name="L62" href="#L62">62</a>  	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L63" href="#L63">63</a>  
-<a class="jxr_linenumber" name="L64" href="#L64">64</a>  	@Test <strong class="jxr_keyword">void</strong> a01_msg() {
-<a class="jxr_linenumber" name="L65" href="#L65">65</a>  		assertThrowsWithMessage(BasicAssertionError.<strong class="jxr_keyword">class</strong>, <span class="jxr_string">"Foo 1"</span>, ()-&gt;test(<strong class="jxr_keyword">null</strong>).setMsg(<span class="jxr_string">"Foo {0}"</span>, 1).isExists());
-<a class="jxr_linenumber" name="L66" href="#L66">66</a>  		assertThrowsWithMessage(RuntimeException.<strong class="jxr_keyword">class</strong>, <span class="jxr_string">"Foo 1"</span>, ()-&gt;test(<strong class="jxr_keyword">null</strong>).setMsg(<span class="jxr_string">"Foo {0}"</span>, 1).setThrowable(RuntimeException.<strong class="jxr_keyword">class</strong>).isExists());
-<a class="jxr_linenumber" name="L67" href="#L67">67</a>  	}
-<a class="jxr_linenumber" name="L68" href="#L68">68</a>  
-<a class="jxr_linenumber" name="L69" href="#L69">69</a>  	@Test <strong class="jxr_keyword">void</strong> a02_stdout() {
-<a class="jxr_linenumber" name="L70" href="#L70">70</a>  		test(<strong class="jxr_keyword">null</strong>).setStdOut();
-<a class="jxr_linenumber" name="L71" href="#L71">71</a>  	}
-<a class="jxr_linenumber" name="L72" href="#L72">72</a>  
-<a class="jxr_linenumber" name="L73" href="#L73">73</a>  	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L74" href="#L74">74</a>  	<em class="jxr_comment">// Transform tests</em>
-<a class="jxr_linenumber" name="L75" href="#L75">75</a>  	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L76" href="#L76">76</a>  
-<a class="jxr_linenumber" name="L77" href="#L77">77</a>  	@Test <strong class="jxr_keyword">void</strong> ba01a_asString() {
-<a class="jxr_linenumber" name="L78" href="#L78">78</a>  		<strong class="jxr_keyword">var</strong> x = 1;
-<a class="jxr_linenumber" name="L79" href="#L79">79</a>  		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L80" href="#L80">80</a>  		test(x).asString().is(<span class="jxr_string">"1"</span>);
-<a class="jxr_linenumber" name="L81" href="#L81">81</a>  		test(nil).asString().isNull();
-<a class="jxr_linenumber" name="L82" href="#L82">82</a>  	}
-<a class="jxr_linenumber" name="L83" href="#L83">83</a>  
-<a class="jxr_linenumber" name="L84" href="#L84">84</a>  	@Test <strong class="jxr_keyword">void</strong> ba01b_asString_wSerializer() {
-<a class="jxr_linenumber" name="L85" href="#L85">85</a>  		<strong class="jxr_keyword">var</strong> x = 1;
-<a class="jxr_linenumber" name="L86" href="#L86">86</a>  		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L87" href="#L87">87</a>  		<strong class="jxr_keyword">var</strong> s = Json5Serializer.DEFAULT;
-<a class="jxr_linenumber" name="L88" href="#L88">88</a>  		test(x).asString(s).is(<span class="jxr_string">"1"</span>);
-<a class="jxr_linenumber" name="L89" href="#L89">89</a>  		test(nil).asString(s).is(<span class="jxr_string">"null"</span>);
-<a class="jxr_linenumber" name="L90" href="#L90">90</a>  	}
-<a class="jxr_linenumber" name="L91" href="#L91">91</a>  
-<a class="jxr_linenumber" name="L92" href="#L92">92</a>  	@Test <strong class="jxr_keyword">void</strong> ba01c_asString_wPredicate() {
-<a class="jxr_linenumber" name="L93" href="#L93">93</a>  		<strong class="jxr_keyword">var</strong> x1 = 1;
-<a class="jxr_linenumber" name="L94" href="#L94">94</a>  		test(x1).asString(x -&gt; <span class="jxr_string">"foo"</span>).is(<span class="jxr_string">"foo"</span>);
-<a class="jxr_linenumber" name="L95" href="#L95">95</a>  	}
-<a class="jxr_linenumber" name="L96" href="#L96">96</a>  
-<a class="jxr_linenumber" name="L97" href="#L97">97</a>  	@Test <strong class="jxr_keyword">void</strong> ba02_asJson() {
-<a class="jxr_linenumber" name="L98" href="#L98">98</a>  		<strong class="jxr_keyword">var</strong> x = 1;
-<a class="jxr_linenumber" name="L99" href="#L99">99</a>  		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L100" href="#L100">100</a> 		test(x).asJson().is(<span class="jxr_string">"1"</span>);
-<a class="jxr_linenumber" name="L101" href="#L101">101</a> 		test(nil).asJson().is(<span class="jxr_string">"null"</span>);
-<a class="jxr_linenumber" name="L102" href="#L102">102</a> 		assertThrown(()-&gt;test(<strong class="jxr_keyword">new</strong> A2()).asJson()).asMessages().isAny(contains(<span class="jxr_string">"Could not call getValue() on property 'foo'"</span>));
-<a class="jxr_linenumber" name="L103" href="#L103">103</a> 	}
-<a class="jxr_linenumber" name="L104" href="#L104">104</a> 
-<a class="jxr_linenumber" name="L105" href="#L105">105</a> 	@Test <strong class="jxr_keyword">void</strong> ba03_asJsonSorted() {
-<a class="jxr_linenumber" name="L106" href="#L106">106</a> 		<strong class="jxr_keyword">var</strong> x1 = a(2,1);
-<a class="jxr_linenumber" name="L107" href="#L107">107</a> 		<strong class="jxr_keyword">var</strong> nil = na(Integer.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L108" href="#L108">108</a> 		<strong class="jxr_keyword">var</strong> x2 = <strong class="jxr_keyword">new</strong> A1();
-<a class="jxr_linenumber" name="L109" href="#L109">109</a> 		test(x1).asJsonSorted().is(<span class="jxr_string">"[1,2]"</span>);
-<a class="jxr_linenumber" name="L110" href="#L110">110</a> 		test(x2).asJsonSorted().is(<span class="jxr_string">"{a:1,b:2}"</span>);
-<a class="jxr_linenumber" name="L111" href="#L111">111</a> 		test(nil).asJsonSorted().is(<span class="jxr_string">"null"</span>);
-<a class="jxr_linenumber" name="L112" href="#L112">112</a> 	}
-<a class="jxr_linenumber" name="L113" href="#L113">113</a> 
-<a class="jxr_linenumber" name="L114" href="#L114">114</a> 	@Test <strong class="jxr_keyword">void</strong> ba04_apply() {
-<a class="jxr_linenumber" name="L115" href="#L115">115</a> 		<strong class="jxr_keyword">var</strong> x1 = 1;
-<a class="jxr_linenumber" name="L116" href="#L116">116</a> 		<strong class="jxr_keyword">var</strong> x2 = 2;
-<a class="jxr_linenumber" name="L117" href="#L117">117</a> 		test(x1).asTransformed(x -&gt; x2).is(x2);
-<a class="jxr_linenumber" name="L118" href="#L118">118</a> 	}
-<a class="jxr_linenumber" name="L119" href="#L119">119</a> 
-<a class="jxr_linenumber" name="L120" href="#L120">120</a> 	@Test <strong class="jxr_keyword">void</strong> bb01_asArray() {
-<a class="jxr_linenumber" name="L121" href="#L121">121</a> 		<strong class="jxr_keyword">var</strong> x1 = a(1,2);
-<a class="jxr_linenumber" name="L122" href="#L122">122</a> 		<strong class="jxr_keyword">var</strong> nil = na(Integer.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L123" href="#L123">123</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
-<a class="jxr_linenumber" name="L124" href="#L124">124</a> 		test(x1).asArray(Integer.<strong class="jxr_keyword">class</strong>).asItem(0).is(1);
-<a class="jxr_linenumber" name="L125" href="#L125">125</a> 		test(nil).asArray(Integer.<strong class="jxr_keyword">class</strong>).isNull();
-<a class="jxr_linenumber" name="L126" href="#L126">126</a> 		assertThrown(()-&gt;test(x2).asArray(Integer.<strong class="jxr_keyword">class</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'java.lang.Integer[]'.  Actual='java.lang.String'."</span>);
-<a class="jxr_linenumber" name="L127" href="#L127">127</a> 		assertThrown(()-&gt;test(x2).asArray(<strong class="jxr_keyword">null</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Argument 'elementType' cannot be null."</span>);
-<a class="jxr_linenumber" name="L128" href="#L128">128</a> 	}
-<a class="jxr_linenumber" name="L129" href="#L129">129</a> 
-<a class="jxr_linenumber" name="L130" href="#L130">130</a> 	@Test <strong class="jxr_keyword">void</strong> bb02_asIntArray() {
-<a class="jxr_linenumber" name="L131" href="#L131">131</a> 		<strong class="jxr_keyword">int</strong>[] x1 = {1}, nil = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L132" href="#L132">132</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
-<a class="jxr_linenumber" name="L133" href="#L133">133</a> 		test(x1).asIntArray().isString(<span class="jxr_string">"[1]"</span>);
-<a class="jxr_linenumber" name="L134" href="#L134">134</a> 		test(nil).asIntArray().isNull();
-<a class="jxr_linenumber" name="L135" href="#L135">135</a> 		assertThrown(()-&gt;test(x2).asIntArray()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'int[]'.  Actual='java.lang.String'."</span>);
-<a class="jxr_linenumber" name="L136" href="#L136">136</a> 	}
-<a class="jxr_linenumber" name="L137" href="#L137">137</a> 
-<a class="jxr_linenumber" name="L138" href="#L138">138</a> 	@Test <strong class="jxr_keyword">void</strong> bb03_asLongArray() {
-<a class="jxr_linenumber" name="L139" href="#L139">139</a> 		<strong class="jxr_keyword">long</strong>[] x1 = {1}, nil = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L140" href="#L140">140</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
-<a class="jxr_linenumber" name="L141" href="#L141">141</a> 		test(x1).asLongArray().isString(<span class="jxr_string">"[1]"</span>);
-<a class="jxr_linenumber" name="L142" href="#L142">142</a> 		test(nil).asLongArray().isNull();
-<a class="jxr_linenumber" name="L143" href="#L143">143</a> 		assertThrown(()-&gt;test(x2).asLongArray()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'long[]'.  Actual='java.lang.String'."</span>);
-<a class="jxr_linenumber" name="L144" href="#L144">144</a> 	}
-<a class="jxr_linenumber" name="L145" href="#L145">145</a> 
-<a class="jxr_linenumber" name="L146" href="#L146">146</a> 	@Test <strong class="jxr_keyword">void</strong> bb04_asShortArray() {
-<a class="jxr_linenumber" name="L147" href="#L147">147</a> 		<strong class="jxr_keyword">short</strong>[] x1 = {1}, nil = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L148" href="#L148">148</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
-<a class="jxr_linenumber" name="L149" href="#L149">149</a> 		test(x1).asShortArray().isString(<span class="jxr_string">"[1]"</span>);
-<a class="jxr_linenumber" name="L150" href="#L150">150</a> 		test(nil).asShortArray().isNull();
-<a class="jxr_linenumber" name="L151" href="#L151">151</a> 		assertThrown(()-&gt;test(x2).asShortArray()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'short[]'.  Actual='java.lang.String'."</span>);
-<a class="jxr_linenumber" name="L152" href="#L152">152</a> 	}
-<a class="jxr_linenumber" name="L153" href="#L153">153</a> 
-<a class="jxr_linenumber" name="L154" href="#L154">154</a> 	@Test <strong class="jxr_keyword">void</strong> bb05_asFloatArray() {
-<a class="jxr_linenumber" name="L155" href="#L155">155</a> 		<strong class="jxr_keyword">float</strong>[] x1 = {1}, nil = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L156" href="#L156">156</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
-<a class="jxr_linenumber" name="L157" href="#L157">157</a> 		test(x1).asFloatArray().isString(<span class="jxr_string">"[1.0]"</span>);
-<a class="jxr_linenumber" name="L158" href="#L158">158</a> 		test(nil).asFloatArray().isNull();
-<a class="jxr_linenumber" name="L159" href="#L159">159</a> 		assertThrown(()-&gt;test(x2).asFloatArray()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'float[]'.  Actual='java.lang.String'."</span>);
-<a class="jxr_linenumber" name="L160" href="#L160">160</a> 	}
-<a class="jxr_linenumber" name="L161" href="#L161">161</a> 
-<a class="jxr_linenumber" name="L162" href="#L162">162</a> 	@Test <strong class="jxr_keyword">void</strong> bb06_asDoubleArray() {
-<a class="jxr_linenumber" name="L163" href="#L163">163</a> 		<strong class="jxr_keyword">double</strong>[] x1 = {1}, nil = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L164" href="#L164">164</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
-<a class="jxr_linenumber" name="L165" href="#L165">165</a> 		test(x1).asDoubleArray().isString(<span class="jxr_string">"[1.0]"</span>);
-<a class="jxr_linenumber" name="L166" href="#L166">166</a> 		test(nil).asDoubleArray().isNull();
-<a class="jxr_linenumber" name="L167" href="#L167">167</a> 		assertThrown(()-&gt;test(x2).asDoubleArray()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'double[]'.  Actual='java.lang.String'."</span>);
-<a class="jxr_linenumber" name="L168" href="#L168">168</a> 	}
-<a class="jxr_linenumber" name="L169" href="#L169">169</a> 
-<a class="jxr_linenumber" name="L170" href="#L170">170</a> 	@Test <strong class="jxr_keyword">void</strong> bb07_asCharArray() {
-<a class="jxr_linenumber" name="L171" href="#L171">171</a> 		<strong class="jxr_keyword">char</strong>[] x1 = {'a'}, nil = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L172" href="#L172">172</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
-<a class="jxr_linenumber" name="L173" href="#L173">173</a> 		test(x1).asCharArray().isString(<span class="jxr_string">"[a]"</span>);
-<a class="jxr_linenumber" name="L174" href="#L174">174</a> 		test(nil).asCharArray().isNull();
-<a class="jxr_linenumber" name="L175" href="#L175">175</a> 		assertThrown(()-&gt;test(x2).asCharArray()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'char[]'.  Actual='java.lang.String'."</span>);
-<a class="jxr_linenumber" name="L176" href="#L176">176</a> 	}
-<a class="jxr_linenumber" name="L177" href="#L177">177</a> 
-<a class="jxr_linenumber" name="L178" href="#L178">178</a> 	@Test <strong class="jxr_keyword">void</strong> bb08_asByteArray() {
-<a class="jxr_linenumber" name="L179" href="#L179">179</a> 		byte[] x1 = {1}, nil = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L180" href="#L180">180</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
-<a class="jxr_linenumber" name="L181" href="#L181">181</a> 		test(x1).asByteArray().isString(<span class="jxr_string">"01"</span>);
-<a class="jxr_linenumber" name="L182" href="#L182">182</a> 		test(nil).asByteArray().isNull();
-<a class="jxr_linenumber" name="L183" href="#L183">183</a> 		assertThrown(()-&gt;test(x2).asByteArray()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'byte[]'.  Actual='java.lang.String'."</span>);
-<a class="jxr_linenumber" name="L184" href="#L184">184</a> 	}
-<a class="jxr_linenumber" name="L185" href="#L185">185</a> 
-<a class="jxr_linenumber" name="L186" href="#L186">186</a> 	@Test <strong class="jxr_keyword">void</strong> bb09_asBooleanArray() {
-<a class="jxr_linenumber" name="L187" href="#L187">187</a> 		<strong class="jxr_keyword">boolean</strong>[] x1 = {<strong class="jxr_keyword">true</strong>}, nil = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L188" href="#L188">188</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
-<a class="jxr_linenumber" name="L189" href="#L189">189</a> 		test(x1).asBooleanArray().isString(<span class="jxr_string">"[true]"</span>);
-<a class="jxr_linenumber" name="L190" href="#L190">190</a> 		test(nil).asBooleanArray().isNull();
-<a class="jxr_linenumber" name="L191" href="#L191">191</a> 		assertThrown(()-&gt;test(x2).asBooleanArray()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'boolean[]'.  Actual='java.lang.String'."</span>);
-<a class="jxr_linenumber" name="L192" href="#L192">192</a> 	}
-<a class="jxr_linenumber" name="L193" href="#L193">193</a> 
-<a class="jxr_linenumber" name="L194" href="#L194">194</a> 	@Test <strong class="jxr_keyword">void</strong> bb10_asBoolean() {
-<a class="jxr_linenumber" name="L195" href="#L195">195</a> 		<strong class="jxr_keyword">var</strong> x1 = <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L196" href="#L196">196</a> 		<strong class="jxr_keyword">var</strong> nil = n(Boolean.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L197" href="#L197">197</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
-<a class="jxr_linenumber" name="L198" href="#L198">198</a> 		test(x1).asBoolean().isString(<span class="jxr_string">"true"</span>);
-<a class="jxr_linenumber" name="L199" href="#L199">199</a> 		test(nil).asBoolean().isNull();
-<a class="jxr_linenumber" name="L200" href="#L200">200</a> 		assertThrown(()-&gt;test(x2).asBoolean()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'java.lang.Boolean'.  Actual='java.lang.String'."</span>);
-<a class="jxr_linenumber" name="L201" href="#L201">201</a> 	}
-<a class="jxr_linenumber" name="L202" href="#L202">202</a> 
-<a class="jxr_linenumber" name="L203" href="#L203">203</a> 	@Test <strong class="jxr_keyword">void</strong> bb11_asBytes() {
-<a class="jxr_linenumber" name="L204" href="#L204">204</a> 		byte[] x1 = {'a'}, nil = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L205" href="#L205">205</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
-<a class="jxr_linenumber" name="L206" href="#L206">206</a> 		test(x1).asBytes().isString(<span class="jxr_string">"a"</span>);
-<a class="jxr_linenumber" name="L207" href="#L207">207</a> 		test(nil).asBytes().isNull();
-<a class="jxr_linenumber" name="L208" href="#L208">208</a> 		assertThrown(()-&gt;test(x2).asBytes()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'byte[]'.  Actual='java.lang.String'."</span>);
-<a class="jxr_linenumber" name="L209" href="#L209">209</a> 	}
-<a class="jxr_linenumber" name="L210" href="#L210">210</a> 
-<a class="jxr_linenumber" name="L211" href="#L211">211</a> 	@Test <strong class="jxr_keyword">void</strong> bb12_asCollection() {
-<a class="jxr_linenumber" name="L212" href="#L212">212</a> 		<strong class="jxr_keyword">var</strong> x1 = l(1);
-<a class="jxr_linenumber" name="L213" href="#L213">213</a> 		<strong class="jxr_keyword">var</strong> nil = listn(Integer.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L214" href="#L214">214</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
-<a class="jxr_linenumber" name="L215" href="#L215">215</a> 		test(x1).asCollection().isString(<span class="jxr_string">"[1]"</span>);
-<a class="jxr_linenumber" name="L216" href="#L216">216</a> 		test(nil).asCollection().isNull();
-<a class="jxr_linenumber" name="L217" href="#L217">217</a> 		assertThrown(()-&gt;test(x2).asCollection()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'java.util.Collection'.  Actual='java.lang.String'."</span>);
-<a class="jxr_linenumber" name="L218" href="#L218">218</a> 	}
-<a class="jxr_linenumber" name="L219" href="#L219">219</a> 
-<a class="jxr_linenumber" name="L220" href="#L220">220</a> 	@Test <strong class="jxr_keyword">void</strong> bb13_asCollection_wType() {
-<a class="jxr_linenumber" name="L221" href="#L221">221</a> 		<strong class="jxr_keyword">var</strong> x1 = l(1);
-<a class="jxr_linenumber" name="L222" href="#L222">222</a> 		<strong class="jxr_keyword">var</strong> nil = listn(Integer.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L223" href="#L223">223</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
-<a class="jxr_linenumber" name="L224" href="#L224">224</a> 		test(x1).asCollection(Integer.<strong class="jxr_keyword">class</strong>).isString(<span class="jxr_string">"[1]"</span>);
-<a class="jxr_linenumber" name="L225" href="#L225">225</a> 		test(nil).asCollection(Integer.<strong class="jxr_keyword">class</strong>).isNull();
-<a class="jxr_linenumber" name="L226" href="#L226">226</a> 		assertThrown(()-&gt;test(x2).asCollection(Integer.<strong class="jxr_keyword">class</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'java.util.Collection'.  Actual='java.lang.String'."</span>);
-<a class="jxr_linenumber" name="L227" href="#L227">227</a> 		assertThrowsWithMessage(IllegalArgumentException.<strong class="jxr_keyword">class</strong>, <span class="jxr_string">"Argument 'elementType' cannot be null."</span>, ()-&gt;test(x1).asCollection(<strong class="jxr_keyword">null</strong>));
-<a class="jxr_linenumber" name="L228" href="#L228">228</a> 	}
-<a class="jxr_linenumber" name="L229" href="#L229">229</a> 
-<a class="jxr_linenumber" name="L230" href="#L230">230</a> 	@Test <strong class="jxr_keyword">void</strong> bb14_asComparable() {
-<a class="jxr_linenumber" name="L231" href="#L231">231</a> 		<strong class="jxr_keyword">var</strong> x1 = 1;
-<a class="jxr_linenumber" name="L232" href="#L232">232</a> 		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L233" href="#L233">233</a> 		<strong class="jxr_keyword">var</strong> x2 = list();
-<a class="jxr_linenumber" name="L234" href="#L234">234</a> 		test(x1).asComparable().isString(<span class="jxr_string">"1"</span>);
-<a class="jxr_linenumber" name="L235" href="#L235">235</a> 		test(nil).asComparable().isNull();
-<a class="jxr_linenumber" name="L236" href="#L236">236</a> 		assertThrown(()-&gt;test(x2).asComparable()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'java.lang.Comparable'.  Actual='java.util.ArrayList'."</span>);
-<a class="jxr_linenumber" name="L237" href="#L237">237</a> 	}
-<a class="jxr_linenumber" name="L238" href="#L238">238</a> 
-<a class="jxr_linenumber" name="L239" href="#L239">239</a> 	@Test <strong class="jxr_keyword">void</strong> bb15_asDate() {
-<a class="jxr_linenumber" name="L240" href="#L240">240</a> 		<strong class="jxr_keyword">var</strong> x1 = date(<span class="jxr_string">"2000-06-01T12:34:56Z"</span>);
-<a class="jxr_linenumber" name="L241" href="#L241">241</a> 		<strong class="jxr_keyword">var</strong> nil = n(Date.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L242" href="#L242">242</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
-<a class="jxr_linenumber" name="L243" href="#L243">243</a> 		test(x1).asDate().asString().isMatches(<span class="jxr_string">"*2000*"</span>);
-<a class="jxr_linenumber" name="L244" href="#L244">244</a> 		test(nil).asDate().isNull();
-<a class="jxr_linenumber" name="L245" href="#L245">245</a> 		assertThrown(()-&gt;test(x2).asDate()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'java.util.Date'.  Actual='java.lang.String'."</span>);
-<a class="jxr_linenumber" name="L246" href="#L246">246</a> 	}
-<a class="jxr_linenumber" name="L247" href="#L247">247</a> 
-<a class="jxr_linenumber" name="L248" href="#L248">248</a> 	@Test <strong class="jxr_keyword">void</strong> bb16_asInteger() {
-<a class="jxr_linenumber" name="L249" href="#L249">249</a> 		<strong class="jxr_keyword">var</strong> x1 = 1;
-<a class="jxr_linenumber" name="L250" href="#L250">250</a> 		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L251" href="#L251">251</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
-<a class="jxr_linenumber" name="L252" href="#L252">252</a> 		test(x1).asInteger().isString(<span class="jxr_string">"1"</span>);
-<a class="jxr_linenumber" name="L253" href="#L253">253</a> 		test(nil).asInteger().isNull();
-<a class="jxr_linenumber" name="L254" href="#L254">254</a> 		assertThrown(()-&gt;test(x2).asInteger()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'java.lang.Integer'.  Actual='java.lang.String'."</span>);
-<a class="jxr_linenumber" name="L255" href="#L255">255</a> 	}
-<a class="jxr_linenumber" name="L256" href="#L256">256</a> 
-<a class="jxr_linenumber" name="L257" href="#L257">257</a> 	@Test <strong class="jxr_keyword">void</strong> bb17_asLong() {
-<a class="jxr_linenumber" name="L258" href="#L258">258</a> 		<strong class="jxr_keyword">var</strong> x1 = 1L;
-<a class="jxr_linenumber" name="L259" href="#L259">259</a> 		<strong class="jxr_keyword">var</strong> nil = n(Long.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L260" href="#L260">260</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
-<a class="jxr_linenumber" name="L261" href="#L261">261</a> 		test(x1).asLong().isString(<span class="jxr_string">"1"</span>);
-<a class="jxr_linenumber" name="L262" href="#L262">262</a> 		test(nil).asLong().isNull();
-<a class="jxr_linenumber" name="L263" href="#L263">263</a> 		assertThrown(()-&gt;test(x2).asLong()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'java.lang.Long'.  Actual='java.lang.String'."</span>);
-<a class="jxr_linenumber" name="L264" href="#L264">264</a> 	}
-<a class="jxr_linenumber" name="L265" href="#L265">265</a> 
-<a class="jxr_linenumber" name="L266" href="#L266">266</a> 	@Test <strong class="jxr_keyword">void</strong> bb18_asList() {
-<a class="jxr_linenumber" name="L267" href="#L267">267</a> 		<strong class="jxr_keyword">var</strong> x1 = l(1);
-<a class="jxr_linenumber" name="L268" href="#L268">268</a> 		<strong class="jxr_keyword">var</strong> nil = listn(Integer.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L269" href="#L269">269</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
-<a class="jxr_linenumber" name="L270" href="#L270">270</a> 		test(x1).asList().isString(<span class="jxr_string">"[1]"</span>);
-<a class="jxr_linenumber" name="L271" href="#L271">271</a> 		test(nil).asList().isNull();
-<a class="jxr_linenumber" name="L272" href="#L272">272</a> 		assertThrown(()-&gt;test(x2).asList()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'java.util.List'.  Actual='java.lang.String'."</span>);
-<a class="jxr_linenumber" name="L273" href="#L273">273</a> 	}
-<a class="jxr_linenumber" name="L274" href="#L274">274</a> 
-<a class="jxr_linenumber" name="L275" href="#L275">275</a> 	@Test <strong class="jxr_keyword">void</strong> bb19_asList_wType() {
-<a class="jxr_linenumber" name="L276" href="#L276">276</a> 		<strong class="jxr_keyword">var</strong> x1 = l(1);
-<a class="jxr_linenumber" name="L277" href="#L277">277</a> 		<strong class="jxr_keyword">var</strong> nil = listn(Integer.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L278" href="#L278">278</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
-<a class="jxr_linenumber" name="L279" href="#L279">279</a> 		test(x1).asList(Integer.<strong class="jxr_keyword">class</strong>).isString(<span class="jxr_string">"[1]"</span>);
-<a class="jxr_linenumber" name="L280" href="#L280">280</a> 		test(nil).asList(Integer.<strong class="jxr_keyword">class</strong>).isNull();
-<a class="jxr_linenumber" name="L281" href="#L281">281</a> 		assertThrown(()-&gt;test(x2).asList(Integer.<strong class="jxr_keyword">class</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'java.util.List'.  Actual='java.lang.String'."</span>);
-<a class="jxr_linenumber" name="L282" href="#L282">282</a> 		assertThrowsWithMessage(IllegalArgumentException.<strong class="jxr_keyword">class</strong>, <span class="jxr_string">"Argument 'elementType' cannot be null."</span>, ()-&gt;test(x1).asCollection(<strong class="jxr_keyword">null</strong>));
-<a class="jxr_linenumber" name="L283" href="#L283">283</a> 	}
-<a class="jxr_linenumber" name="L284" href="#L284">284</a> 
-<a class="jxr_linenumber" name="L285" href="#L285">285</a> 	@Test <strong class="jxr_keyword">void</strong> bb20_asMap() {
-<a class="jxr_linenumber" name="L286" href="#L286">286</a> 		<strong class="jxr_keyword">var</strong> x1 = m(<span class="jxr_string">"a"</span>,2);
-<a class="jxr_linenumber" name="L287" href="#L287">287</a> 		<strong class="jxr_keyword">var</strong> nil = (Map&lt;String,Integer&gt;)<strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L288" href="#L288">288</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
-<a class="jxr_linenumber" name="L289" href="#L289">289</a> 		test(x1).asMap().isString(<span class="jxr_string">"{a=2}"</span>);
-<a class="jxr_linenumber" name="L290" href="#L290">290</a> 		test(nil).asMap().isNull();
-<a class="jxr_linenumber" name="L291" href="#L291">291</a> 		assertThrown(()-&gt;test(x2).asMap()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'java.util.Map'.  Actual='java.lang.String'."</span>);
-<a class="jxr_linenumber" name="L292" href="#L292">292</a> 	}
-<a class="jxr_linenumber" name="L293" href="#L293">293</a> 
-<a class="jxr_linenumber" name="L294" href="#L294">294</a> 	@Test <strong class="jxr_keyword">void</strong> bb21_asMap_wTypes() {
-<a class="jxr_linenumber" name="L295" href="#L295">295</a> 		<strong class="jxr_keyword">var</strong> x1 = m(<span class="jxr_string">"a"</span>,2);
-<a class="jxr_linenumber" name="L296" href="#L296">296</a> 		<strong class="jxr_keyword">var</strong> nil = (Map&lt;String,Integer&gt;)<strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L297" href="#L297">297</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
-<a class="jxr_linenumber" name="L298" href="#L298">298</a> 		test(x1).asMap(String.<strong class="jxr_keyword">class</strong>,Integer.<strong class="jxr_keyword">class</strong>).isString(<span class="jxr_string">"{a=2}"</span>);
-<a class="jxr_linenumber" name="L299" href="#L299">299</a> 		test(nil).asMap(String.<strong class="jxr_keyword">class</strong>,Integer.<strong class="jxr_keyword">class</strong>).isNull();
-<a class="jxr_linenumber" name="L300" href="#L300">300</a> 		assertThrown(()-&gt;test(x2).asMap(String.<strong class="jxr_keyword">class</strong>,Integer.<strong class="jxr_keyword">class</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'java.util.Map'.  Actual='java.lang.String'."</span>);
-<a class="jxr_linenumber" name="L301" href="#L301">301</a> 		assertThrowsWithMessage(IllegalArgumentException.<strong class="jxr_keyword">class</strong>, <span class="jxr_string">"Argument 'keyType' cannot be null."</span>, ()-&gt;test(x1).asMap(<strong class="jxr_keyword">null</strong>,Integer.<strong class="jxr_keyword">class</strong>));
-<a class="jxr_linenumber" name="L302" href="#L302">302</a> 		assertThrowsWithMessage(IllegalArgumentException.<strong class="jxr_keyword">class</strong>, <span class="jxr_string">"Argument 'valueType' cannot be null."</span>, ()-&gt;test(x1).asMap(String.<strong class="jxr_keyword">class</strong>,<strong class="jxr_keyword">null</strong>));
-<a class="jxr_linenumber" name="L303" href="#L303">303</a> 	}
-<a class="jxr_linenumber" name="L304" href="#L304">304</a> 
-<a class="jxr_linenumber" name="L305" href="#L305">305</a> 	@Test <strong class="jxr_keyword">void</strong> bb22_asBean() {
-<a class="jxr_linenumber" name="L306" href="#L306">306</a> 		<strong class="jxr_keyword">var</strong> x1 = A1;
-<a class="jxr_linenumber" name="L307" href="#L307">307</a> 		<strong class="jxr_keyword">var</strong> nil = (A1)<strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L308" href="#L308">308</a> 		test(x1).asBean().isString(<span class="jxr_string">"a=1,b=2"</span>);
-<a class="jxr_linenumber" name="L309" href="#L309">309</a> 		test(nil).asBean().isNull();
-<a class="jxr_linenumber" name="L310" href="#L310">310</a> 	}
-<a class="jxr_linenumber" name="L311" href="#L311">311</a> 
-<a class="jxr_linenumber" name="L312" href="#L312">312</a> 	@Test <strong class="jxr_keyword">void</strong> bb23_asBean_wType() {
-<a class="jxr_linenumber" name="L313" href="#L313">313</a> 		<strong class="jxr_keyword">var</strong> x1 = A1;
-<a class="jxr_linenumber" name="L314" href="#L314">314</a> 		<strong class="jxr_keyword">var</strong> nil = n(A1.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L315" href="#L315">315</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
-<a class="jxr_linenumber" name="L316" href="#L316">316</a> 		test(x1).asBean().isString(<span class="jxr_string">"a=1,b=2"</span>);
-<a class="jxr_linenumber" name="L317" href="#L317">317</a> 		test(nil).asBean(A1.<strong class="jxr_keyword">class</strong>).isNull();
-<a class="jxr_linenumber" name="L318" href="#L318">318</a> 		assertThrown(()-&gt;test(x2).asBean(A2.<strong class="jxr_keyword">class</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'org.apache.juneau.assertions.AnyAssertion_Test$A2'.  Actual='java.lang.String'."</span>);
-<a class="jxr_linenumber" name="L319" href="#L319">319</a> 		assertThrowsWithMessage(IllegalArgumentException.<strong class="jxr_keyword">class</strong>, <span class="jxr_string">"Argument 'beanType' cannot be null."</span>, ()-&gt;test(x1).asBean(<strong class="jxr_keyword">null</strong>));
-<a class="jxr_linenumber" name="L320" href="#L320">320</a> 	}
-<a class="jxr_linenumber" name="L321" href="#L321">321</a> 
-<a class="jxr_linenumber" name="L322" href="#L322">322</a> 	@Test <strong class="jxr_keyword">void</strong> bb24_asBeanList() {
-<a class="jxr_linenumber" name="L323" href="#L323">323</a> 		<strong class="jxr_keyword">var</strong> x1 = l(A1);
-<a class="jxr_linenumber" name="L324" href="#L324">324</a> 		<strong class="jxr_keyword">var</strong> nil = listn(A1.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L325" href="#L325">325</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
-<a class="jxr_linenumber" name="L326" href="#L326">326</a> 		test(x1).asBeanList(A1.<strong class="jxr_keyword">class</strong>).isString(<span class="jxr_string">"[a=1,b=2]"</span>);
-<a class="jxr_linenumber" name="L327" href="#L327">327</a> 		test(nil).asBeanList(A1.<strong class="jxr_keyword">class</strong>).isNull();
-<a class="jxr_linenumber" name="L328" href="#L328">328</a> 		assertThrown(()-&gt;test(x2).asBeanList(A2.<strong class="jxr_keyword">class</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'java.util.List'.  Actual='java.lang.String'."</span>);
-<a class="jxr_linenumber" name="L329" href="#L329">329</a> 		assertThrowsWithMessage(IllegalArgumentException.<strong class="jxr_keyword">class</strong>, <span class="jxr_string">"Argument 'beanType' cannot be null."</span>, ()-&gt;test(x1).asBeanList(<strong class="jxr_keyword">null</strong>));
-<a class="jxr_linenumber" name="L330" href="#L330">330</a> 	}
-<a class="jxr_linenumber" name="L331" href="#L331">331</a> 
-<a class="jxr_linenumber" name="L332" href="#L332">332</a> 	@Test <strong class="jxr_keyword">void</strong> bb25_asZonedDateTime() {
-<a class="jxr_linenumber" name="L333" href="#L333">333</a> 		<strong class="jxr_keyword">var</strong> x1 = zdt(<span class="jxr_string">"2000-06-01T12:34:56Z"</span>);
-<a class="jxr_linenumber" name="L334" href="#L334">334</a> 		<strong class="jxr_keyword">var</strong> nil = n(Object.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L335" href="#L335">335</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
-<a class="jxr_linenumber" name="L336" href="#L336">336</a> 		test(x1).asZonedDateTime().asString().isMatches(<span class="jxr_string">"2000*"</span>);
-<a class="jxr_linenumber" name="L337" href="#L337">337</a> 		test(nil).asZonedDateTime().isNull();
-<a class="jxr_linenumber" name="L338" href="#L338">338</a> 		assertThrown(()-&gt;test(x2).asZonedDateTime()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'java.time.ZonedDateTime'.  Actual='java.lang.String'."</span>);
-<a class="jxr_linenumber" name="L339" href="#L339">339</a> 	}
-<a class="jxr_linenumber" name="L340" href="#L340">340</a> 
-<a class="jxr_linenumber" name="L341" href="#L341">341</a> 	@Test <strong class="jxr_keyword">void</strong> bb26_asStringList() {
-<a class="jxr_linenumber" name="L342" href="#L342">342</a> 		<strong class="jxr_keyword">var</strong> x1 = l(<span class="jxr_string">"1"</span>);
-<a class="jxr_linenumber" name="L343" href="#L343">343</a> 		<strong class="jxr_keyword">var</strong> nil = listn(String.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L344" href="#L344">344</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
-<a class="jxr_linenumber" name="L345" href="#L345">345</a> 		test(x1).asStringList().isString(<span class="jxr_string">"[1]"</span>);
-<a class="jxr_linenumber" name="L346" href="#L346">346</a> 		test(nil).asStringList().isNull();
-<a class="jxr_linenumber" name="L347" href="#L347">347</a> 		assertThrown(()-&gt;test(x2).asStringList()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'java.util.List'.  Actual='java.lang.String'."</span>);
-<a class="jxr_linenumber" name="L348" href="#L348">348</a> 	}
-<a class="jxr_linenumber" name="L349" href="#L349">349</a> 
-<a class="jxr_linenumber" name="L350" href="#L350">350</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L351" href="#L351">351</a> 	<em class="jxr_comment">// Test tests</em>
-<a class="jxr_linenumber" name="L352" href="#L352">352</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L353" href="#L353">353</a> 
-<a class="jxr_linenumber" name="L354" href="#L354">354</a> 	@Test <strong class="jxr_keyword">void</strong> ca01_exists() {
-<a class="jxr_linenumber" name="L355" href="#L355">355</a> 		<strong class="jxr_keyword">var</strong> x = 1;
-<a class="jxr_linenumber" name="L356" href="#L356">356</a> 		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L357" href="#L357">357</a> 		test(x).isExists().isExists();
-<a class="jxr_linenumber" name="L358" href="#L358">358</a> 		assertThrowsWithMessage(BasicAssertionError.<strong class="jxr_keyword">class</strong>, <span class="jxr_string">"Value was null."</span>, ()-&gt;test(nil).isExists());
-<a class="jxr_linenumber" name="L359" href="#L359">359</a> 	}
-<a class="jxr_linenumber" name="L360" href="#L360">360</a> 
-<a class="jxr_linenumber" name="L361" href="#L361">361</a> 	@Test <strong class="jxr_keyword">void</strong> ca02_isNull() {
-<a class="jxr_linenumber" name="L362" href="#L362">362</a> 		<strong class="jxr_keyword">var</strong> x = 1;
-<a class="jxr_linenumber" name="L363" href="#L363">363</a> 		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L364" href="#L364">364</a> 		test(nil).isNull();
-<a class="jxr_linenumber" name="L365" href="#L365">365</a> 		assertThrowsWithMessage(BasicAssertionError.<strong class="jxr_keyword">class</strong>, <span class="jxr_string">"Value was not null."</span>, ()-&gt;test(x).isNull());
-<a class="jxr_linenumber" name="L366" href="#L366">366</a> 	}
-<a class="jxr_linenumber" name="L367" href="#L367">367</a> 
-<a class="jxr_linenumber" name="L368" href="#L368">368</a> 	@Test <strong class="jxr_keyword">void</strong> ca03_isNotNull() {
-<a class="jxr_linenumber" name="L369" href="#L369">369</a> 		<strong class="jxr_keyword">var</strong> x = 1;
-<a class="jxr_linenumber" name="L370" href="#L370">370</a> 		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L371" href="#L371">371</a> 		test(x).isNotNull();
-<a class="jxr_linenumber" name="L372" href="#L372">372</a> 		assertThrowsWithMessage(BasicAssertionError.<strong class="jxr_keyword">class</strong>, <span class="jxr_string">"Value was null."</span>, ()-&gt;test(nil).isNotNull());
-<a class="jxr_linenumber" name="L373" href="#L373">373</a> 	}
-<a class="jxr_linenumber" name="L374" href="#L374">374</a> 
-<a class="jxr_linenumber" name="L375" href="#L375">375</a> 	@Test <strong class="jxr_keyword">void</strong> ca04a_is_T() {
-<a class="jxr_linenumber" name="L376" href="#L376">376</a> 		<strong class="jxr_keyword">var</strong> x1 = 1;
-<a class="jxr_linenumber" name="L377" href="#L377">377</a> 		<strong class="jxr_keyword">var</strong> x1a = 1;
-<a class="jxr_linenumber" name="L378" href="#L378">378</a> 		<strong class="jxr_keyword">var</strong> x2 = 2;
-<a class="jxr_linenumber" name="L379" href="#L379">379</a> 		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L380" href="#L380">380</a> 		test(x1).is(x1);
-<a class="jxr_linenumber" name="L381" href="#L381">381</a> 		test(x1).is(x1a);
-<a class="jxr_linenumber" name="L382" href="#L382">382</a> 		test(nil).is(nil);
-<a class="jxr_linenumber" name="L383" href="#L383">383</a> 		assertThrown(()-&gt;test(x1).is(x2)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected value.  Expect='2'.  Actual='1'."</span>);
-<a class="jxr_linenumber" name="L384" href="#L384">384</a> 		assertThrown(()-&gt;test(x1).is(nil)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected value.  Expect='null'.  Actual='1'."</span>);
-<a class="jxr_linenumber" name="L385" href="#L385">385</a> 		assertThrown(()-&gt;test(nil).is(x2)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected value.  Expect='2'.  Actual='null'."</span>);
-<a class="jxr_linenumber" name="L386" href="#L386">386</a> 	}
-<a class="jxr_linenumber" name="L387" href="#L387">387</a> 
-<a class="jxr_linenumber" name="L388" href="#L388">388</a> 	@Test <strong class="jxr_keyword">void</strong> ca04b_is_predicate() {
-<a class="jxr_linenumber" name="L389" href="#L389">389</a> 		<strong class="jxr_keyword">var</strong> x1 = 1;
-<a class="jxr_linenumber" name="L390" href="#L390">390</a> 		test(x1).is(x-&gt;x==1);
-<a class="jxr_linenumber" name="L391" href="#L391">391</a> 		assertThrown(()-&gt;test(x1).is(x-&gt;x==2)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected value: '1'."</span>);
-<a class="jxr_linenumber" name="L392" href="#L392">392</a> 		assertThrown(()-&gt;test(x1).is(ne(x1))).asMessage().asOneLine().is(<span class="jxr_string">"Value unexpectedly matched.  Value='1'."</span>);
-<a class="jxr_linenumber" name="L393" href="#L393">393</a> 	}
-<a class="jxr_linenumber" name="L394" href="#L394">394</a> 
-<a class="jxr_linenumber" name="L395" href="#L395">395</a> 	@Test <strong class="jxr_keyword">void</strong> ca05_isNot() {
-<a class="jxr_linenumber" name="L396" href="#L396">396</a> 		<strong class="jxr_keyword">var</strong> x1 = 1;
-<a class="jxr_linenumber" name="L397" href="#L397">397</a> 		<strong class="jxr_keyword">var</strong> x1a = 1;
-<a class="jxr_linenumber" name="L398" href="#L398">398</a> 		<strong class="jxr_keyword">var</strong> x2 = 2;
-<a class="jxr_linenumber" name="L399" href="#L399">399</a> 		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L400" href="#L400">400</a> 		test(x1).isNot(x2);
-<a class="jxr_linenumber" name="L401" href="#L401">401</a> 		test(x1).isNot(nil);
-<a class="jxr_linenumber" name="L402" href="#L402">402</a> 		test(nil).isNot(x1);
-<a class="jxr_linenumber" name="L403" href="#L403">403</a> 		assertThrown(()-&gt;test(x1).isNot(x1a)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected value.  Did not expect='1'.  Actual='1'."</span>);
-<a class="jxr_linenumber" name="L404" href="#L404">404</a> 		assertThrown(()-&gt;test(nil).isNot(nil)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected value.  Did not expect='null'.  Actual='null'."</span>);
-<a class="jxr_linenumber" name="L405" href="#L405">405</a> 	}
-<a class="jxr_linenumber" name="L406" href="#L406">406</a> 
-<a class="jxr_linenumber" name="L407" href="#L407">407</a> 	@Test <strong class="jxr_keyword">void</strong> ca06_isAny() {
-<a class="jxr_linenumber" name="L408" href="#L408">408</a> 		<strong class="jxr_keyword">var</strong> x1 = 1;
-<a class="jxr_linenumber" name="L409" href="#L409">409</a> 		<strong class="jxr_keyword">var</strong> x1a = 1;
-<a class="jxr_linenumber" name="L410" href="#L410">410</a> 		<strong class="jxr_keyword">var</strong> x2 = 2;
-<a class="jxr_linenumber" name="L411" href="#L411">411</a> 		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L412" href="#L412">412</a> 		test(x1).isAny(x1a, x2);
-<a class="jxr_linenumber" name="L413" href="#L413">413</a> 		assertThrown(()-&gt;test(x1).isAny(x2)).asMessage().asOneLine().is(<span class="jxr_string">"Expected value not found.  Expect='[2]'.  Actual='1'."</span>);
-<a class="jxr_linenumber" name="L414" href="#L414">414</a> 		assertThrown(()-&gt;test(x1).isAny()).asMessage().asOneLine().is(<span class="jxr_string">"Expected value not found.  Expect='[]'.  Actual='1'."</span>);
-<a class="jxr_linenumber" name="L415" href="#L415">415</a> 		assertThrown(()-&gt;test(nil).isAny(x2)).asMessage().asOneLine().is(<span class="jxr_string">"Expected value not found.  Expect='[2]'.  Actual='null'."</span>);
-<a class="jxr_linenumber" name="L416" href="#L416">416</a> 	}
-<a class="jxr_linenumber" name="L417" href="#L417">417</a> 
-<a class="jxr_linenumber" name="L418" href="#L418">418</a> 	@Test <strong class="jxr_keyword">void</strong> ca07_isNotAny() {
-<a class="jxr_linenumber" name="L419" href="#L419">419</a> 		<strong class="jxr_keyword">var</strong> x1 = 1;
-<a class="jxr_linenumber" name="L420" href="#L420">420</a> 		<strong class="jxr_keyword">var</strong> x1a = 1;
-<a class="jxr_linenumber" name="L421" href="#L421">421</a> 		<strong class="jxr_keyword">var</strong> x2 = 2;
-<a class="jxr_linenumber" name="L422" href="#L422">422</a> 		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L423" href="#L423">423</a> 		test(x1).isNotAny(x2);
-<a class="jxr_linenumber" name="L424" href="#L424">424</a> 		test(x1).isNotAny();
-<a class="jxr_linenumber" name="L425" href="#L425">425</a> 		test(nil).isNotAny(x2);
-<a class="jxr_linenumber" name="L426" href="#L426">426</a> 		assertThrown(()-&gt;test(x1).isNotAny(x1a)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected value found.  Unexpected='1'.  Actual='1'."</span>);
-<a class="jxr_linenumber" name="L427" href="#L427">427</a> 		assertThrown(()-&gt;test(nil).isNotAny(nil)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected value found.  Unexpected='null'.  Actual='null'."</span>);
-<a class="jxr_linenumber" name="L428" href="#L428">428</a> 	}
-<a class="jxr_linenumber" name="L429" href="#L429">429</a> 
-<a class="jxr_linenumber" name="L430" href="#L430">430</a> 	@Test <strong class="jxr_keyword">void</strong> ca08_isSame() {
-<a class="jxr_linenumber" name="L431" href="#L431">431</a> 		<strong class="jxr_keyword">var</strong> x1 = Integer.valueOf(999);
-<a class="jxr_linenumber" name="L432" href="#L432">432</a> 		<strong class="jxr_keyword">var</strong> x1a = Integer.valueOf(999);
-<a class="jxr_linenumber" name="L433" href="#L433">433</a> 		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L434" href="#L434">434</a> 		test(x1).isSame(x1);
-<a class="jxr_linenumber" name="L435" href="#L435">435</a> 		test(nil).isSame(nil);
-<a class="jxr_linenumber" name="L436" href="#L436">436</a> 		assertThrown(()-&gt;test(x1).isSame(x1a)).asMessage().asOneLine().isMatches(<span class="jxr_string">"Not the same value.  Expect='999(Integer@*)'.  Actual='999(Integer@*)'."</span>);
-<a class="jxr_linenumber" name="L437" href="#L437">437</a> 		assertThrown(()-&gt;test(nil).isSame(x1a)).asMessage().asOneLine().isMatches(<span class="jxr_string">"Not the same value.  Expect='999(Integer@*)'.  Actual='null(null)'."</span>);
-<a class="jxr_linenumber" name="L438" href="#L438">438</a> 		assertThrown(()-&gt;test(x1).isSame(nil)).asMessage().asOneLine().isMatches(<span class="jxr_string">"Not the same value.  Expect='null(null)'.  Actual='999(Integer@*)'."</span>);
-<a class="jxr_linenumber" name="L439" href="#L439">439</a> 	}
-<a class="jxr_linenumber" name="L440" href="#L440">440</a> 
-<a class="jxr_linenumber" name="L441" href="#L441">441</a> 	@Test <strong class="jxr_keyword">void</strong> ca09_isSameJsonAs() {
-<a class="jxr_linenumber" name="L442" href="#L442">442</a> 		<strong class="jxr_keyword">var</strong> x1 = 1;
-<a class="jxr_linenumber" name="L443" href="#L443">443</a> 		<strong class="jxr_keyword">var</strong> x1a = 1;
-<a class="jxr_linenumber" name="L444" href="#L444">444</a> 		<strong class="jxr_keyword">var</strong> x2 = 2;
-<a class="jxr_linenumber" name="L445" href="#L445">445</a> 		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L446" href="#L446">446</a> 		test(x1).isSameJsonAs(x1a);
-<a class="jxr_linenumber" name="L447" href="#L447">447</a> 		test(nil).isSameJsonAs(nil);
-<a class="jxr_linenumber" name="L448" href="#L448">448</a> 		assertThrown(()-&gt;test(x1a).isSameJsonAs(x2)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected comparison.  Expect='2'.  Actual='1'."</span>);
-<a class="jxr_linenumber" name="L449" href="#L449">449</a> 		assertThrown(()-&gt;test(nil).isSameJsonAs(x2)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected comparison.  Expect='2'.  Actual='null'."</span>);
-<a class="jxr_linenumber" name="L450" href="#L450">450</a> 		assertThrown(()-&gt;test(x1).isSameJsonAs(nil)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected comparison.  Expect='null'.  Actual='1'."</span>);
-<a class="jxr_linenumber" name="L451" href="#L451">451</a> 	}
-<a class="jxr_linenumber" name="L452" href="#L452">452</a> 
-<a class="jxr_linenumber" name="L453" href="#L453">453</a> 	@Test <strong class="jxr_keyword">void</strong> ca10_isSameSortedJsonAs() {
-<a class="jxr_linenumber" name="L454" href="#L454">454</a> 		<strong class="jxr_keyword">var</strong> x1 = 1;
-<a class="jxr_linenumber" name="L455" href="#L455">455</a> 		<strong class="jxr_keyword">var</strong> x1a = 1;
-<a class="jxr_linenumber" name="L456" href="#L456">456</a> 		<strong class="jxr_keyword">var</strong> x2 = 2;
-<a class="jxr_linenumber" name="L457" href="#L457">457</a> 		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L458" href="#L458">458</a> 		test(x1).isSameSortedJsonAs(x1a);
-<a class="jxr_linenumber" name="L459" href="#L459">459</a> 		test(nil).isSameSortedJsonAs(nil);
-<a class="jxr_linenumber" name="L460" href="#L460">460</a> 		assertThrown(()-&gt;test(x1a).isSameSortedJsonAs(x2)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected comparison.  Expect='2'.  Actual='1'."</span>);
-<a class="jxr_linenumber" name="L461" href="#L461">461</a> 		assertThrown(()-&gt;test(nil).isSameSortedJsonAs(x2)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected comparison.  Expect='2'.  Actual='null'."</span>);
-<a class="jxr_linenumber" name="L462" href="#L462">462</a> 		assertThrown(()-&gt;test(x1).isSameSortedJsonAs(nil)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected comparison.  Expect='null'.  Actual='1'."</span>);
-<a class="jxr_linenumber" name="L463" href="#L463">463</a> 	}
-<a class="jxr_linenumber" name="L464" href="#L464">464</a> 
-<a class="jxr_linenumber" name="L465" href="#L465">465</a> 	@Test <strong class="jxr_keyword">void</strong> ca11_isSameSerializedAs() {
-<a class="jxr_linenumber" name="L466" href="#L466">466</a> 		<strong class="jxr_keyword">var</strong> x1 = 1;
-<a class="jxr_linenumber" name="L467" href="#L467">467</a> 		<strong class="jxr_keyword">var</strong> x1a = 1;
-<a class="jxr_linenumber" name="L468" href="#L468">468</a> 		<strong class="jxr_keyword">var</strong> x2 = 2;
-<a class="jxr_linenumber" name="L469" href="#L469">469</a> 		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L470" href="#L470">470</a> 		<strong class="jxr_keyword">var</strong> s = Json5Serializer.DEFAULT;
-<a class="jxr_linenumber" name="L471" href="#L471">471</a> 		test(x1).isSameSerializedAs(x1a, s);
-<a class="jxr_linenumber" name="L472" href="#L472">472</a> 		test(nil).isSameSerializedAs(nil, s);
-<a class="jxr_linenumber" name="L473" href="#L473">473</a> 		assertThrown(()-&gt;test(x1a).isSameSerializedAs(x2, s)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected comparison.  Expect='2'.  Actual='1'."</span>);
-<a class="jxr_linenumber" name="L474" href="#L474">474</a> 		assertThrown(()-&gt;test(nil).isSameSerializedAs(x2, s)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected comparison.  Expect='2'.  Actual='null'."</span>);
-<a class="jxr_linenumber" name="L475" href="#L475">475</a> 		assertThrown(()-&gt;test(x1).isSameSerializedAs(nil, s)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected comparison.  Expect='null'.  Actual='1'."</span>);
-<a class="jxr_linenumber" name="L476" href="#L476">476</a> 	}
-<a class="jxr_linenumber" name="L477" href="#L477">477</a> 
-<a class="jxr_linenumber" name="L478" href="#L478">478</a> 	@Test <strong class="jxr_keyword">void</strong> ca12_isType() {
-<a class="jxr_linenumber" name="L479" href="#L479">479</a> 		<strong class="jxr_keyword">var</strong> x = 1;
-<a class="jxr_linenumber" name="L480" href="#L480">480</a> 		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L481" href="#L481">481</a> 		test(x).isType(Integer.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L482" href="#L482">482</a> 		test(x).isType(Object.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L483" href="#L483">483</a> 		assertThrown(()-&gt;test(x).isType(String.<strong class="jxr_keyword">class</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected type.  Expect='java.lang.String'.  Actual='java.lang.Integer'."</span>);
-<a class="jxr_linenumber" name="L484" href="#L484">484</a> 		assertThrown(()-&gt;test(nil).isType(String.<strong class="jxr_keyword">class</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Value was null."</span>);
-<a class="jxr_linenumber" name="L485" href="#L485">485</a> 		assertThrown(()-&gt;test(x).isType(<strong class="jxr_keyword">null</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Argument 'parent' cannot be null."</span>);
-<a class="jxr_linenumber" name="L486" href="#L486">486</a> 	}
-<a class="jxr_linenumber" name="L487" href="#L487">487</a> 
-<a class="jxr_linenumber" name="L488" href="#L488">488</a> 	@Test <strong class="jxr_keyword">void</strong> ca13_isExactType() {
-<a class="jxr_linenumber" name="L489" href="#L489">489</a> 		<strong class="jxr_keyword">var</strong> x = 1;
-<a class="jxr_linenumber" name="L490" href="#L490">490</a> 		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L491" href="#L491">491</a> 		test(x).isExactType(Integer.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L492" href="#L492">492</a> 		assertThrown(()-&gt;test(x).isExactType(Object.<strong class="jxr_keyword">class</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected type.  Expect='java.lang.Object'.  Actual='java.lang.Integer'."</span>);
-<a class="jxr_linenumber" name="L493" href="#L493">493</a> 		assertThrown(()-&gt;test(x).isExactType(String.<strong class="jxr_keyword">class</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected type.  Expect='java.lang.String'.  Actual='java.lang.Integer'."</span>);
-<a class="jxr_linenumber" name="L494" href="#L494">494</a> 		assertThrown(()-&gt;test(nil).isExactType(String.<strong class="jxr_keyword">class</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Value was null."</span>);
-<a class="jxr_linenumber" name="L495" href="#L495">495</a> 		assertThrown(()-&gt;test(x).isExactType(<strong class="jxr_keyword">null</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Argument 'parent' cannot be null."</span>);
-<a class="jxr_linenumber" name="L496" href="#L496">496</a> 	}
-<a class="jxr_linenumber" name="L497" href="#L497">497</a> 
-<a class="jxr_linenumber" name="L498" href="#L498">498</a> 	@Test <strong class="jxr_keyword">void</strong> ca14_isString() {
-<a class="jxr_linenumber" name="L499" href="#L499">499</a> 		<strong class="jxr_keyword">var</strong> x = 1;
-<a class="jxr_linenumber" name="L500" href="#L500">500</a> 		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L501" href="#L501">501</a> 		test(x).isString(<span class="jxr_string">"1"</span>);
-<a class="jxr_linenumber" name="L502" href="#L502">502</a> 		test(nil).isString(<strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="L503" href="#L503">503</a> 		assertThrown(()-&gt;test(x).isString(<span class="jxr_string">"bad"</span>)).asMessage().asOneLine().is(<span class="jxr_string">"String differed at position 0.  Expect='bad'.  Actual='1'."</span>);
-<a class="jxr_linenumber" name="L504" href="#L504">504</a> 		assertThrown(()-&gt;test(x).isString(<strong class="jxr_keyword">null</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"String differed at position 0.  Expect='null'.  Actual='1'."</span>);
-<a class="jxr_linenumber" name="L505" href="#L505">505</a> 		assertThrown(()-&gt;test(nil).isString(<span class="jxr_string">"bad"</span>)).asMessage().asOneLine().is(<span class="jxr_string">"String differed at position 0.  Expect='bad'.  Actual='null'."</span>);
-<a class="jxr_linenumber" name="L506" href="#L506">506</a> 	}
-<a class="jxr_linenumber" name="L507" href="#L507">507</a> 
-<a class="jxr_linenumber" name="L508" href="#L508">508</a> 	@Test <strong class="jxr_keyword">void</strong> ca15_isJson() {
-<a class="jxr_linenumber" name="L509" href="#L509">509</a> 		<strong class="jxr_keyword">var</strong> x = 1;
-<a class="jxr_linenumber" name="L510" href="#L510">510</a> 		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L511" href="#L511">511</a> 		test(x).isJson(<span class="jxr_string">"1"</span>);
-<a class="jxr_linenumber" name="L512" href="#L512">512</a> 		test(nil).isJson(<span class="jxr_string">"null"</span>);
-<a class="jxr_linenumber" name="L513" href="#L513">513</a> 		assertThrown(()-&gt;test(x).isJson(<span class="jxr_string">"bad"</span>)).asMessage().asOneLine().is(<span class="jxr_string">"String differed at position 0.  Expect='bad'.  Actual='1'."</span>);
-<a class="jxr_linenumber" name="L514" href="#L514">514</a> 		assertThrown(()-&gt;test(x).isJson(<strong class="jxr_keyword">null</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"String differed at position 0.  Expect='null'.  Actual='1'."</span>);
-<a class="jxr_linenumber" name="L515" href="#L515">515</a> 		assertThrown(()-&gt;test(nil).isJson(<span class="jxr_string">"bad"</span>)).asMessage().asOneLine().is(<span class="jxr_string">"String differed at position 0.  Expect='bad'.  Actual='null'."</span>);
-<a class="jxr_linenumber" name="L516" href="#L516">516</a> 	}
-<a class="jxr_linenumber" name="L517" href="#L517">517</a> }
+<a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L24" href="#L24">24</a>  
+<a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> java.time.*;
+<a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> java.util.*;
+<a class="jxr_linenumber" name="L27" href="#L27">27</a>  
+<a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.*;
+<a class="jxr_linenumber" name="L29" href="#L29">29</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.json.*;
+<a class="jxr_linenumber" name="L30" href="#L30">30</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.api.*;
+<a class="jxr_linenumber" name="L31" href="#L31">31</a>  
+<a class="jxr_linenumber" name="L32" href="#L32">32</a>  @Deprecated
+<a class="jxr_linenumber" name="L33" href="#L33">33</a>  <strong class="jxr_keyword">class</strong> <a name="AnyAssertion_Test" href="../../../../org/apache/juneau/assertions/AnyAssertion_Test.html#AnyAssertion_Test">AnyAssertion_Test</a> <strong class="jxr_keyword">extends</strong> <a name="TestBase" href="../../../../org/apache/juneau/TestBase.html#TestBase">TestBase</a> {
+<a class="jxr_linenumber" name="L34" href="#L34">34</a>  
+<a class="jxr_linenumber" name="L35" href="#L35">35</a>  	<em class="jxr_comment">//------------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L36" href="#L36">36</a>  	<em class="jxr_comment">// Helpers</em>
+<a class="jxr_linenumber" name="L37" href="#L37">37</a>  	<em class="jxr_comment">//------------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L38" href="#L38">38</a>  
+<a class="jxr_linenumber" name="L39" href="#L39">39</a>  	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> &lt;T&gt; AnyAssertion&lt;T&gt; test(T value) {
+<a class="jxr_linenumber" name="L40" href="#L40">40</a>  		<strong class="jxr_keyword">return</strong> assertAny(value).setSilent();
+<a class="jxr_linenumber" name="L41" href="#L41">41</a>  	}
+<a class="jxr_linenumber" name="L42" href="#L42">42</a>  
+<a class="jxr_linenumber" name="L43" href="#L43">43</a>  	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> ZonedDateTime zdt(String s) {
+<a class="jxr_linenumber" name="L44" href="#L44">44</a>  		<strong class="jxr_keyword">return</strong> ZonedDateTime.parse(s);
+<a class="jxr_linenumber" name="L45" href="#L45">45</a>  	}
+<a class="jxr_linenumber" name="L46" href="#L46">46</a>  
+<a class="jxr_linenumber" name="L47" href="#L47">47</a>  	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> Date date(String s) {
+<a class="jxr_linenumber" name="L48" href="#L48">48</a>  		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> Date(ZonedDateTime.parse(s).toEpochSecond()*1000);
+<a class="jxr_linenumber" name="L49" href="#L49">49</a>  	}
+<a class="jxr_linenumber" name="L50" href="#L50">50</a>  
+<a class="jxr_linenumber" name="L51" href="#L51">51</a>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> A1 A1 = <strong class="jxr_keyword">new</strong> A1();
+<a class="jxr_linenumber" name="L52" href="#L52">52</a>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> A1 {
+<a class="jxr_linenumber" name="L53" href="#L53">53</a>  		<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> a = 1, b = 2;
+<a class="jxr_linenumber" name="L54" href="#L54">54</a>  		@Override <strong class="jxr_keyword">public</strong> String toString() { <strong class="jxr_keyword">return</strong> <span class="jxr_string">"a="</span>+a+<span class="jxr_string">",b="</span>+b; }
+<a class="jxr_linenumber" name="L55" href="#L55">55</a>  	}
+<a class="jxr_linenumber" name="L56" href="#L56">56</a>  
+<a class="jxr_linenumber" name="L57" href="#L57">57</a>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> A2 {
+<a class="jxr_linenumber" name="L58" href="#L58">58</a>  		<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> getFoo() { <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> RuntimeException(<span class="jxr_string">"foo"</span>); }
+<a class="jxr_linenumber" name="L59" href="#L59">59</a>  	}
+<a class="jxr_linenumber" name="L60" href="#L60">60</a>  
+<a class="jxr_linenumber" name="L61" href="#L61">61</a>  	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L62" href="#L62">62</a>  	<em class="jxr_comment">// Basic tests</em>
+<a class="jxr_linenumber" name="L63" href="#L63">63</a>  	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L64" href="#L64">64</a>  
+<a class="jxr_linenumber" name="L65" href="#L65">65</a>  	@Test <strong class="jxr_keyword">void</strong> a01_msg() {
+<a class="jxr_linenumber" name="L66" href="#L66">66</a>  		assertThrowsWithMessage(BasicAssertionError.<strong class="jxr_keyword">class</strong>, <span class="jxr_string">"Foo 1"</span>, ()-&gt;test(<strong class="jxr_keyword">null</strong>).setMsg(<span class="jxr_string">"Foo {0}"</span>, 1).isExists());
+<a class="jxr_linenumber" name="L67" href="#L67">67</a>  		assertThrowsWithMessage(RuntimeException.<strong class="jxr_keyword">class</strong>, <span class="jxr_string">"Foo 1"</span>, ()-&gt;test(<strong class="jxr_keyword">null</strong>).setMsg(<span class="jxr_string">"Foo {0}"</span>, 1).setThrowable(RuntimeException.<strong class="jxr_keyword">class</strong>).isExists());
+<a class="jxr_linenumber" name="L68" href="#L68">68</a>  	}
+<a class="jxr_linenumber" name="L69" href="#L69">69</a>  
+<a class="jxr_linenumber" name="L70" href="#L70">70</a>  	@Test <strong class="jxr_keyword">void</strong> a02_stdout() {
+<a class="jxr_linenumber" name="L71" href="#L71">71</a>  		test(<strong class="jxr_keyword">null</strong>).setStdOut();
+<a class="jxr_linenumber" name="L72" href="#L72">72</a>  	}
+<a class="jxr_linenumber" name="L73" href="#L73">73</a>  
+<a class="jxr_linenumber" name="L74" href="#L74">74</a>  	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L75" href="#L75">75</a>  	<em class="jxr_comment">// Transform tests</em>
+<a class="jxr_linenumber" name="L76" href="#L76">76</a>  	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L77" href="#L77">77</a>  
+<a class="jxr_linenumber" name="L78" href="#L78">78</a>  	@Test <strong class="jxr_keyword">void</strong> ba01a_asString() {
+<a class="jxr_linenumber" name="L79" href="#L79">79</a>  		<strong class="jxr_keyword">var</strong> x = 1;
+<a class="jxr_linenumber" name="L80" href="#L80">80</a>  		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L81" href="#L81">81</a>  		test(x).asString().is(<span class="jxr_string">"1"</span>);
+<a class="jxr_linenumber" name="L82" href="#L82">82</a>  		test(nil).asString().isNull();
+<a class="jxr_linenumber" name="L83" href="#L83">83</a>  	}
+<a class="jxr_linenumber" name="L84" href="#L84">84</a>  
+<a class="jxr_linenumber" name="L85" href="#L85">85</a>  	@Test <strong class="jxr_keyword">void</strong> ba01b_asString_wSerializer() {
+<a class="jxr_linenumber" name="L86" href="#L86">86</a>  		<strong class="jxr_keyword">var</strong> x = 1;
+<a class="jxr_linenumber" name="L87" href="#L87">87</a>  		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L88" href="#L88">88</a>  		<strong class="jxr_keyword">var</strong> s = Json5Serializer.DEFAULT;
+<a class="jxr_linenumber" name="L89" href="#L89">89</a>  		test(x).asString(s).is(<span class="jxr_string">"1"</span>);
+<a class="jxr_linenumber" name="L90" href="#L90">90</a>  		test(nil).asString(s).is(<span class="jxr_string">"null"</span>);
+<a class="jxr_linenumber" name="L91" href="#L91">91</a>  	}
+<a class="jxr_linenumber" name="L92" href="#L92">92</a>  
+<a class="jxr_linenumber" name="L93" href="#L93">93</a>  	@Test <strong class="jxr_keyword">void</strong> ba01c_asString_wPredicate() {
+<a class="jxr_linenumber" name="L94" href="#L94">94</a>  		<strong class="jxr_keyword">var</strong> x1 = 1;
+<a class="jxr_linenumber" name="L95" href="#L95">95</a>  		test(x1).asString(x -&gt; <span class="jxr_string">"foo"</span>).is(<span class="jxr_string">"foo"</span>);
+<a class="jxr_linenumber" name="L96" href="#L96">96</a>  	}
+<a class="jxr_linenumber" name="L97" href="#L97">97</a>  
+<a class="jxr_linenumber" name="L98" href="#L98">98</a>  	@Test <strong class="jxr_keyword">void</strong> ba02_asJson() {
+<a class="jxr_linenumber" name="L99" href="#L99">99</a>  		<strong class="jxr_keyword">var</strong> x = 1;
+<a class="jxr_linenumber" name="L100" href="#L100">100</a> 		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L101" href="#L101">101</a> 		test(x).asJson().is(<span class="jxr_string">"1"</span>);
+<a class="jxr_linenumber" name="L102" href="#L102">102</a> 		test(nil).asJson().is(<span class="jxr_string">"null"</span>);
+<a class="jxr_linenumber" name="L103" href="#L103">103</a> 		assertThrown(()-&gt;test(<strong class="jxr_keyword">new</strong> A2()).asJson()).asMessages().isAny(contains(<span class="jxr_string">"Could not call getValue() on property 'foo'"</span>));
+<a class="jxr_linenumber" name="L104" href="#L104">104</a> 	}
+<a class="jxr_linenumber" name="L105" href="#L105">105</a> 
+<a class="jxr_linenumber" name="L106" href="#L106">106</a> 	@Test <strong class="jxr_keyword">void</strong> ba03_asJsonSorted() {
+<a class="jxr_linenumber" name="L107" href="#L107">107</a> 		<strong class="jxr_keyword">var</strong> x1 = a(2,1);
+<a class="jxr_linenumber" name="L108" href="#L108">108</a> 		<strong class="jxr_keyword">var</strong> nil = na(Integer.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L109" href="#L109">109</a> 		<strong class="jxr_keyword">var</strong> x2 = <strong class="jxr_keyword">new</strong> A1();
+<a class="jxr_linenumber" name="L110" href="#L110">110</a> 		test(x1).asJsonSorted().is(<span class="jxr_string">"[1,2]"</span>);
+<a class="jxr_linenumber" name="L111" href="#L111">111</a> 		test(x2).asJsonSorted().is(<span class="jxr_string">"{a:1,b:2}"</span>);
+<a class="jxr_linenumber" name="L112" href="#L112">112</a> 		test(nil).asJsonSorted().is(<span class="jxr_string">"null"</span>);
+<a class="jxr_linenumber" name="L113" href="#L113">113</a> 	}
+<a class="jxr_linenumber" name="L114" href="#L114">114</a> 
+<a class="jxr_linenumber" name="L115" href="#L115">115</a> 	@Test <strong class="jxr_keyword">void</strong> ba04_apply() {
+<a class="jxr_linenumber" name="L116" href="#L116">116</a> 		<strong class="jxr_keyword">var</strong> x1 = 1;
+<a class="jxr_linenumber" name="L117" href="#L117">117</a> 		<strong class="jxr_keyword">var</strong> x2 = 2;
+<a class="jxr_linenumber" name="L118" href="#L118">118</a> 		test(x1).asTransformed(x -&gt; x2).is(x2);
+<a class="jxr_linenumber" name="L119" href="#L119">119</a> 	}
+<a class="jxr_linenumber" name="L120" href="#L120">120</a> 
+<a class="jxr_linenumber" name="L121" href="#L121">121</a> 	@Test <strong class="jxr_keyword">void</strong> bb01_asArray() {
+<a class="jxr_linenumber" name="L122" href="#L122">122</a> 		<strong class="jxr_keyword">var</strong> x1 = a(1,2);
+<a class="jxr_linenumber" name="L123" href="#L123">123</a> 		<strong class="jxr_keyword">var</strong> nil = na(Integer.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L124" href="#L124">124</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
+<a class="jxr_linenumber" name="L125" href="#L125">125</a> 		test(x1).asArray(Integer.<strong class="jxr_keyword">class</strong>).asItem(0).is(1);
+<a class="jxr_linenumber" name="L126" href="#L126">126</a> 		test(nil).asArray(Integer.<strong class="jxr_keyword">class</strong>).isNull();
+<a class="jxr_linenumber" name="L127" href="#L127">127</a> 		assertThrown(()-&gt;test(x2).asArray(Integer.<strong class="jxr_keyword">class</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'java.lang.Integer[]'.  Actual='java.lang.String'."</span>);
+<a class="jxr_linenumber" name="L128" href="#L128">128</a> 		assertThrown(()-&gt;test(x2).asArray(<strong class="jxr_keyword">null</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Argument 'elementType' cannot be null."</span>);
+<a class="jxr_linenumber" name="L129" href="#L129">129</a> 	}
+<a class="jxr_linenumber" name="L130" href="#L130">130</a> 
+<a class="jxr_linenumber" name="L131" href="#L131">131</a> 	@Test <strong class="jxr_keyword">void</strong> bb02_asIntArray() {
+<a class="jxr_linenumber" name="L132" href="#L132">132</a> 		<strong class="jxr_keyword">int</strong>[] x1 = {1}, nil = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L133" href="#L133">133</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
+<a class="jxr_linenumber" name="L134" href="#L134">134</a> 		test(x1).asIntArray().isString(<span class="jxr_string">"[1]"</span>);
+<a class="jxr_linenumber" name="L135" href="#L135">135</a> 		test(nil).asIntArray().isNull();
+<a class="jxr_linenumber" name="L136" href="#L136">136</a> 		assertThrown(()-&gt;test(x2).asIntArray()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'int[]'.  Actual='java.lang.String'."</span>);
+<a class="jxr_linenumber" name="L137" href="#L137">137</a> 	}
+<a class="jxr_linenumber" name="L138" href="#L138">138</a> 
+<a class="jxr_linenumber" name="L139" href="#L139">139</a> 	@Test <strong class="jxr_keyword">void</strong> bb03_asLongArray() {
+<a class="jxr_linenumber" name="L140" href="#L140">140</a> 		<strong class="jxr_keyword">long</strong>[] x1 = {1}, nil = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L141" href="#L141">141</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
+<a class="jxr_linenumber" name="L142" href="#L142">142</a> 		test(x1).asLongArray().isString(<span class="jxr_string">"[1]"</span>);
+<a class="jxr_linenumber" name="L143" href="#L143">143</a> 		test(nil).asLongArray().isNull();
+<a class="jxr_linenumber" name="L144" href="#L144">144</a> 		assertThrown(()-&gt;test(x2).asLongArray()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'long[]'.  Actual='java.lang.String'."</span>);
+<a class="jxr_linenumber" name="L145" href="#L145">145</a> 	}
+<a class="jxr_linenumber" name="L146" href="#L146">146</a> 
+<a class="jxr_linenumber" name="L147" href="#L147">147</a> 	@Test <strong class="jxr_keyword">void</strong> bb04_asShortArray() {
+<a class="jxr_linenumber" name="L148" href="#L148">148</a> 		<strong class="jxr_keyword">short</strong>[] x1 = {1}, nil = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L149" href="#L149">149</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
+<a class="jxr_linenumber" name="L150" href="#L150">150</a> 		test(x1).asShortArray().isString(<span class="jxr_string">"[1]"</span>);
+<a class="jxr_linenumber" name="L151" href="#L151">151</a> 		test(nil).asShortArray().isNull();
+<a class="jxr_linenumber" name="L152" href="#L152">152</a> 		assertThrown(()-&gt;test(x2).asShortArray()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'short[]'.  Actual='java.lang.String'."</span>);
+<a class="jxr_linenumber" name="L153" href="#L153">153</a> 	}
+<a class="jxr_linenumber" name="L154" href="#L154">154</a> 
+<a class="jxr_linenumber" name="L155" href="#L155">155</a> 	@Test <strong class="jxr_keyword">void</strong> bb05_asFloatArray() {
+<a class="jxr_linenumber" name="L156" href="#L156">156</a> 		<strong class="jxr_keyword">float</strong>[] x1 = {1}, nil = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L157" href="#L157">157</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
+<a class="jxr_linenumber" name="L158" href="#L158">158</a> 		test(x1).asFloatArray().isString(<span class="jxr_string">"[1.0]"</span>);
+<a class="jxr_linenumber" name="L159" href="#L159">159</a> 		test(nil).asFloatArray().isNull();
+<a class="jxr_linenumber" name="L160" href="#L160">160</a> 		assertThrown(()-&gt;test(x2).asFloatArray()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'float[]'.  Actual='java.lang.String'."</span>);
+<a class="jxr_linenumber" name="L161" href="#L161">161</a> 	}
+<a class="jxr_linenumber" name="L162" href="#L162">162</a> 
+<a class="jxr_linenumber" name="L163" href="#L163">163</a> 	@Test <strong class="jxr_keyword">void</strong> bb06_asDoubleArray() {
+<a class="jxr_linenumber" name="L164" href="#L164">164</a> 		<strong class="jxr_keyword">double</strong>[] x1 = {1}, nil = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L165" href="#L165">165</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
+<a class="jxr_linenumber" name="L166" href="#L166">166</a> 		test(x1).asDoubleArray().isString(<span class="jxr_string">"[1.0]"</span>);
+<a class="jxr_linenumber" name="L167" href="#L167">167</a> 		test(nil).asDoubleArray().isNull();
+<a class="jxr_linenumber" name="L168" href="#L168">168</a> 		assertThrown(()-&gt;test(x2).asDoubleArray()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'double[]'.  Actual='java.lang.String'."</span>);
+<a class="jxr_linenumber" name="L169" href="#L169">169</a> 	}
+<a class="jxr_linenumber" name="L170" href="#L170">170</a> 
+<a class="jxr_linenumber" name="L171" href="#L171">171</a> 	@Test <strong class="jxr_keyword">void</strong> bb07_asCharArray() {
+<a class="jxr_linenumber" name="L172" href="#L172">172</a> 		<strong class="jxr_keyword">char</strong>[] x1 = {'a'}, nil = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L173" href="#L173">173</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
+<a class="jxr_linenumber" name="L174" href="#L174">174</a> 		test(x1).asCharArray().isString(<span class="jxr_string">"[a]"</span>);
+<a class="jxr_linenumber" name="L175" href="#L175">175</a> 		test(nil).asCharArray().isNull();
+<a class="jxr_linenumber" name="L176" href="#L176">176</a> 		assertThrown(()-&gt;test(x2).asCharArray()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'char[]'.  Actual='java.lang.String'."</span>);
+<a class="jxr_linenumber" name="L177" href="#L177">177</a> 	}
+<a class="jxr_linenumber" name="L178" href="#L178">178</a> 
+<a class="jxr_linenumber" name="L179" href="#L179">179</a> 	@Test <strong class="jxr_keyword">void</strong> bb08_asByteArray() {
+<a class="jxr_linenumber" name="L180" href="#L180">180</a> 		byte[] x1 = {1}, nil = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L181" href="#L181">181</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
+<a class="jxr_linenumber" name="L182" href="#L182">182</a> 		test(x1).asByteArray().isString(<span class="jxr_string">"01"</span>);
+<a class="jxr_linenumber" name="L183" href="#L183">183</a> 		test(nil).asByteArray().isNull();
+<a class="jxr_linenumber" name="L184" href="#L184">184</a> 		assertThrown(()-&gt;test(x2).asByteArray()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'byte[]'.  Actual='java.lang.String'."</span>);
+<a class="jxr_linenumber" name="L185" href="#L185">185</a> 	}
+<a class="jxr_linenumber" name="L186" href="#L186">186</a> 
+<a class="jxr_linenumber" name="L187" href="#L187">187</a> 	@Test <strong class="jxr_keyword">void</strong> bb09_asBooleanArray() {
+<a class="jxr_linenumber" name="L188" href="#L188">188</a> 		<strong class="jxr_keyword">boolean</strong>[] x1 = {<strong class="jxr_keyword">true</strong>}, nil = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L189" href="#L189">189</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
+<a class="jxr_linenumber" name="L190" href="#L190">190</a> 		test(x1).asBooleanArray().isString(<span class="jxr_string">"[true]"</span>);
+<a class="jxr_linenumber" name="L191" href="#L191">191</a> 		test(nil).asBooleanArray().isNull();
+<a class="jxr_linenumber" name="L192" href="#L192">192</a> 		assertThrown(()-&gt;test(x2).asBooleanArray()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'boolean[]'.  Actual='java.lang.String'."</span>);
+<a class="jxr_linenumber" name="L193" href="#L193">193</a> 	}
+<a class="jxr_linenumber" name="L194" href="#L194">194</a> 
+<a class="jxr_linenumber" name="L195" href="#L195">195</a> 	@Test <strong class="jxr_keyword">void</strong> bb10_asBoolean() {
+<a class="jxr_linenumber" name="L196" href="#L196">196</a> 		<strong class="jxr_keyword">var</strong> x1 = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L197" href="#L197">197</a> 		<strong class="jxr_keyword">var</strong> nil = n(Boolean.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L198" href="#L198">198</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
+<a class="jxr_linenumber" name="L199" href="#L199">199</a> 		test(x1).asBoolean().isString(<span class="jxr_string">"true"</span>);
+<a class="jxr_linenumber" name="L200" href="#L200">200</a> 		test(nil).asBoolean().isNull();
+<a class="jxr_linenumber" name="L201" href="#L201">201</a> 		assertThrown(()-&gt;test(x2).asBoolean()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'java.lang.Boolean'.  Actual='java.lang.String'."</span>);
+<a class="jxr_linenumber" name="L202" href="#L202">202</a> 	}
+<a class="jxr_linenumber" name="L203" href="#L203">203</a> 
+<a class="jxr_linenumber" name="L204" href="#L204">204</a> 	@Test <strong class="jxr_keyword">void</strong> bb11_asBytes() {
+<a class="jxr_linenumber" name="L205" href="#L205">205</a> 		byte[] x1 = {'a'}, nil = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L206" href="#L206">206</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
+<a class="jxr_linenumber" name="L207" href="#L207">207</a> 		test(x1).asBytes().isString(<span class="jxr_string">"a"</span>);
+<a class="jxr_linenumber" name="L208" href="#L208">208</a> 		test(nil).asBytes().isNull();
+<a class="jxr_linenumber" name="L209" href="#L209">209</a> 		assertThrown(()-&gt;test(x2).asBytes()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'byte[]'.  Actual='java.lang.String'."</span>);
+<a class="jxr_linenumber" name="L210" href="#L210">210</a> 	}
+<a class="jxr_linenumber" name="L211" href="#L211">211</a> 
+<a class="jxr_linenumber" name="L212" href="#L212">212</a> 	@Test <strong class="jxr_keyword">void</strong> bb12_asCollection() {
+<a class="jxr_linenumber" name="L213" href="#L213">213</a> 		<strong class="jxr_keyword">var</strong> x1 = l(1);
+<a class="jxr_linenumber" name="L214" href="#L214">214</a> 		<strong class="jxr_keyword">var</strong> nil = listn(Integer.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L215" href="#L215">215</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
+<a class="jxr_linenumber" name="L216" href="#L216">216</a> 		test(x1).asCollection().isString(<span class="jxr_string">"[1]"</span>);
+<a class="jxr_linenumber" name="L217" href="#L217">217</a> 		test(nil).asCollection().isNull();
+<a class="jxr_linenumber" name="L218" href="#L218">218</a> 		assertThrown(()-&gt;test(x2).asCollection()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'java.util.Collection'.  Actual='java.lang.String'."</span>);
+<a class="jxr_linenumber" name="L219" href="#L219">219</a> 	}
+<a class="jxr_linenumber" name="L220" href="#L220">220</a> 
+<a class="jxr_linenumber" name="L221" href="#L221">221</a> 	@Test <strong class="jxr_keyword">void</strong> bb13_asCollection_wType() {
+<a class="jxr_linenumber" name="L222" href="#L222">222</a> 		<strong class="jxr_keyword">var</strong> x1 = l(1);
+<a class="jxr_linenumber" name="L223" href="#L223">223</a> 		<strong class="jxr_keyword">var</strong> nil = listn(Integer.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L224" href="#L224">224</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
+<a class="jxr_linenumber" name="L225" href="#L225">225</a> 		test(x1).asCollection(Integer.<strong class="jxr_keyword">class</strong>).isString(<span class="jxr_string">"[1]"</span>);
+<a class="jxr_linenumber" name="L226" href="#L226">226</a> 		test(nil).asCollection(Integer.<strong class="jxr_keyword">class</strong>).isNull();
+<a class="jxr_linenumber" name="L227" href="#L227">227</a> 		assertThrown(()-&gt;test(x2).asCollection(Integer.<strong class="jxr_keyword">class</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'java.util.Collection'.  Actual='java.lang.String'."</span>);
+<a class="jxr_linenumber" name="L228" href="#L228">228</a> 		assertThrowsWithMessage(IllegalArgumentException.<strong class="jxr_keyword">class</strong>, <span class="jxr_string">"Argument 'elementType' cannot be null."</span>, ()-&gt;test(x1).asCollection(<strong class="jxr_keyword">null</strong>));
+<a class="jxr_linenumber" name="L229" href="#L229">229</a> 	}
+<a class="jxr_linenumber" name="L230" href="#L230">230</a> 
+<a class="jxr_linenumber" name="L231" href="#L231">231</a> 	@Test <strong class="jxr_keyword">void</strong> bb14_asComparable() {
+<a class="jxr_linenumber" name="L232" href="#L232">232</a> 		<strong class="jxr_keyword">var</strong> x1 = 1;
+<a class="jxr_linenumber" name="L233" href="#L233">233</a> 		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L234" href="#L234">234</a> 		<strong class="jxr_keyword">var</strong> x2 = list();
+<a class="jxr_linenumber" name="L235" href="#L235">235</a> 		test(x1).asComparable().isString(<span class="jxr_string">"1"</span>);
+<a class="jxr_linenumber" name="L236" href="#L236">236</a> 		test(nil).asComparable().isNull();
+<a class="jxr_linenumber" name="L237" href="#L237">237</a> 		assertThrown(()-&gt;test(x2).asComparable()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'java.lang.Comparable'.  Actual='java.util.ArrayList'."</span>);
+<a class="jxr_linenumber" name="L238" href="#L238">238</a> 	}
+<a class="jxr_linenumber" name="L239" href="#L239">239</a> 
+<a class="jxr_linenumber" name="L240" href="#L240">240</a> 	@Test <strong class="jxr_keyword">void</strong> bb15_asDate() {
+<a class="jxr_linenumber" name="L241" href="#L241">241</a> 		<strong class="jxr_keyword">var</strong> x1 = date(<span class="jxr_string">"2000-06-01T12:34:56Z"</span>);
+<a class="jxr_linenumber" name="L242" href="#L242">242</a> 		<strong class="jxr_keyword">var</strong> nil = n(Date.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L243" href="#L243">243</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
+<a class="jxr_linenumber" name="L244" href="#L244">244</a> 		test(x1).asDate().asString().isMatches(<span class="jxr_string">"*2000*"</span>);
+<a class="jxr_linenumber" name="L245" href="#L245">245</a> 		test(nil).asDate().isNull();
+<a class="jxr_linenumber" name="L246" href="#L246">246</a> 		assertThrown(()-&gt;test(x2).asDate()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'java.util.Date'.  Actual='java.lang.String'."</span>);
+<a class="jxr_linenumber" name="L247" href="#L247">247</a> 	}
+<a class="jxr_linenumber" name="L248" href="#L248">248</a> 
+<a class="jxr_linenumber" name="L249" href="#L249">249</a> 	@Test <strong class="jxr_keyword">void</strong> bb16_asInteger() {
+<a class="jxr_linenumber" name="L250" href="#L250">250</a> 		<strong class="jxr_keyword">var</strong> x1 = 1;
+<a class="jxr_linenumber" name="L251" href="#L251">251</a> 		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L252" href="#L252">252</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
+<a class="jxr_linenumber" name="L253" href="#L253">253</a> 		test(x1).asInteger().isString(<span class="jxr_string">"1"</span>);
+<a class="jxr_linenumber" name="L254" href="#L254">254</a> 		test(nil).asInteger().isNull();
+<a class="jxr_linenumber" name="L255" href="#L255">255</a> 		assertThrown(()-&gt;test(x2).asInteger()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'java.lang.Integer'.  Actual='java.lang.String'."</span>);
+<a class="jxr_linenumber" name="L256" href="#L256">256</a> 	}
+<a class="jxr_linenumber" name="L257" href="#L257">257</a> 
+<a class="jxr_linenumber" name="L258" href="#L258">258</a> 	@Test <strong class="jxr_keyword">void</strong> bb17_asLong() {
+<a class="jxr_linenumber" name="L259" href="#L259">259</a> 		<strong class="jxr_keyword">var</strong> x1 = 1L;
+<a class="jxr_linenumber" name="L260" href="#L260">260</a> 		<strong class="jxr_keyword">var</strong> nil = n(Long.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L261" href="#L261">261</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
+<a class="jxr_linenumber" name="L262" href="#L262">262</a> 		test(x1).asLong().isString(<span class="jxr_string">"1"</span>);
+<a class="jxr_linenumber" name="L263" href="#L263">263</a> 		test(nil).asLong().isNull();
+<a class="jxr_linenumber" name="L264" href="#L264">264</a> 		assertThrown(()-&gt;test(x2).asLong()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'java.lang.Long'.  Actual='java.lang.String'."</span>);
+<a class="jxr_linenumber" name="L265" href="#L265">265</a> 	}
+<a class="jxr_linenumber" name="L266" href="#L266">266</a> 
+<a class="jxr_linenumber" name="L267" href="#L267">267</a> 	@Test <strong class="jxr_keyword">void</strong> bb18_asList() {
+<a class="jxr_linenumber" name="L268" href="#L268">268</a> 		<strong class="jxr_keyword">var</strong> x1 = l(1);
+<a class="jxr_linenumber" name="L269" href="#L269">269</a> 		<strong class="jxr_keyword">var</strong> nil = listn(Integer.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L270" href="#L270">270</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
+<a class="jxr_linenumber" name="L271" href="#L271">271</a> 		test(x1).asList().isString(<span class="jxr_string">"[1]"</span>);
+<a class="jxr_linenumber" name="L272" href="#L272">272</a> 		test(nil).asList().isNull();
+<a class="jxr_linenumber" name="L273" href="#L273">273</a> 		assertThrown(()-&gt;test(x2).asList()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'java.util.List'.  Actual='java.lang.String'."</span>);
+<a class="jxr_linenumber" name="L274" href="#L274">274</a> 	}
+<a class="jxr_linenumber" name="L275" href="#L275">275</a> 
+<a class="jxr_linenumber" name="L276" href="#L276">276</a> 	@Test <strong class="jxr_keyword">void</strong> bb19_asList_wType() {
+<a class="jxr_linenumber" name="L277" href="#L277">277</a> 		<strong class="jxr_keyword">var</strong> x1 = l(1);
+<a class="jxr_linenumber" name="L278" href="#L278">278</a> 		<strong class="jxr_keyword">var</strong> nil = listn(Integer.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L279" href="#L279">279</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
+<a class="jxr_linenumber" name="L280" href="#L280">280</a> 		test(x1).asList(Integer.<strong class="jxr_keyword">class</strong>).isString(<span class="jxr_string">"[1]"</span>);
+<a class="jxr_linenumber" name="L281" href="#L281">281</a> 		test(nil).asList(Integer.<strong class="jxr_keyword">class</strong>).isNull();
+<a class="jxr_linenumber" name="L282" href="#L282">282</a> 		assertThrown(()-&gt;test(x2).asList(Integer.<strong class="jxr_keyword">class</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'java.util.List'.  Actual='java.lang.String'."</span>);
+<a class="jxr_linenumber" name="L283" href="#L283">283</a> 		assertThrowsWithMessage(IllegalArgumentException.<strong class="jxr_keyword">class</strong>, <span class="jxr_string">"Argument 'elementType' cannot be null."</span>, ()-&gt;test(x1).asCollection(<strong class="jxr_keyword">null</strong>));
+<a class="jxr_linenumber" name="L284" href="#L284">284</a> 	}
+<a class="jxr_linenumber" name="L285" href="#L285">285</a> 
+<a class="jxr_linenumber" name="L286" href="#L286">286</a> 	@Test <strong class="jxr_keyword">void</strong> bb20_asMap() {
+<a class="jxr_linenumber" name="L287" href="#L287">287</a> 		<strong class="jxr_keyword">var</strong> x1 = m(<span class="jxr_string">"a"</span>,2);
+<a class="jxr_linenumber" name="L288" href="#L288">288</a> 		<strong class="jxr_keyword">var</strong> nil = (Map&lt;String,Integer&gt;)<strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L289" href="#L289">289</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
+<a class="jxr_linenumber" name="L290" href="#L290">290</a> 		test(x1).asMap().isString(<span class="jxr_string">"{a=2}"</span>);
+<a class="jxr_linenumber" name="L291" href="#L291">291</a> 		test(nil).asMap().isNull();
+<a class="jxr_linenumber" name="L292" href="#L292">292</a> 		assertThrown(()-&gt;test(x2).asMap()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'java.util.Map'.  Actual='java.lang.String'."</span>);
+<a class="jxr_linenumber" name="L293" href="#L293">293</a> 	}
+<a class="jxr_linenumber" name="L294" href="#L294">294</a> 
+<a class="jxr_linenumber" name="L295" href="#L295">295</a> 	@Test <strong class="jxr_keyword">void</strong> bb21_asMap_wTypes() {
+<a class="jxr_linenumber" name="L296" href="#L296">296</a> 		<strong class="jxr_keyword">var</strong> x1 = m(<span class="jxr_string">"a"</span>,2);
+<a class="jxr_linenumber" name="L297" href="#L297">297</a> 		<strong class="jxr_keyword">var</strong> nil = (Map&lt;String,Integer&gt;)<strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L298" href="#L298">298</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
+<a class="jxr_linenumber" name="L299" href="#L299">299</a> 		test(x1).asMap(String.<strong class="jxr_keyword">class</strong>,Integer.<strong class="jxr_keyword">class</strong>).isString(<span class="jxr_string">"{a=2}"</span>);
+<a class="jxr_linenumber" name="L300" href="#L300">300</a> 		test(nil).asMap(String.<strong class="jxr_keyword">class</strong>,Integer.<strong class="jxr_keyword">class</strong>).isNull();
+<a class="jxr_linenumber" name="L301" href="#L301">301</a> 		assertThrown(()-&gt;test(x2).asMap(String.<strong class="jxr_keyword">class</strong>,Integer.<strong class="jxr_keyword">class</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'java.util.Map'.  Actual='java.lang.String'."</span>);
+<a class="jxr_linenumber" name="L302" href="#L302">302</a> 		assertThrowsWithMessage(IllegalArgumentException.<strong class="jxr_keyword">class</strong>, <span class="jxr_string">"Argument 'keyType' cannot be null."</span>, ()-&gt;test(x1).asMap(<strong class="jxr_keyword">null</strong>,Integer.<strong class="jxr_keyword">class</strong>));
+<a class="jxr_linenumber" name="L303" href="#L303">303</a> 		assertThrowsWithMessage(IllegalArgumentException.<strong class="jxr_keyword">class</strong>, <span class="jxr_string">"Argument 'valueType' cannot be null."</span>, ()-&gt;test(x1).asMap(String.<strong class="jxr_keyword">class</strong>,<strong class="jxr_keyword">null</strong>));
+<a class="jxr_linenumber" name="L304" href="#L304">304</a> 	}
+<a class="jxr_linenumber" name="L305" href="#L305">305</a> 
+<a class="jxr_linenumber" name="L306" href="#L306">306</a> 	@Test <strong class="jxr_keyword">void</strong> bb22_asBean() {
+<a class="jxr_linenumber" name="L307" href="#L307">307</a> 		<strong class="jxr_keyword">var</strong> x1 = A1;
+<a class="jxr_linenumber" name="L308" href="#L308">308</a> 		<strong class="jxr_keyword">var</strong> nil = (A1)<strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L309" href="#L309">309</a> 		test(x1).asBean().isString(<span class="jxr_string">"a=1,b=2"</span>);
+<a class="jxr_linenumber" name="L310" href="#L310">310</a> 		test(nil).asBean().isNull();
+<a class="jxr_linenumber" name="L311" href="#L311">311</a> 	}
+<a class="jxr_linenumber" name="L312" href="#L312">312</a> 
+<a class="jxr_linenumber" name="L313" href="#L313">313</a> 	@Test <strong class="jxr_keyword">void</strong> bb23_asBean_wType() {
+<a class="jxr_linenumber" name="L314" href="#L314">314</a> 		<strong class="jxr_keyword">var</strong> x1 = A1;
+<a class="jxr_linenumber" name="L315" href="#L315">315</a> 		<strong class="jxr_keyword">var</strong> nil = n(A1.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L316" href="#L316">316</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
+<a class="jxr_linenumber" name="L317" href="#L317">317</a> 		test(x1).asBean().isString(<span class="jxr_string">"a=1,b=2"</span>);
+<a class="jxr_linenumber" name="L318" href="#L318">318</a> 		test(nil).asBean(A1.<strong class="jxr_keyword">class</strong>).isNull();
+<a class="jxr_linenumber" name="L319" href="#L319">319</a> 		assertThrown(()-&gt;test(x2).asBean(A2.<strong class="jxr_keyword">class</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'org.apache.juneau.assertions.AnyAssertion_Test$A2'.  Actual='java.lang.String'."</span>);
+<a class="jxr_linenumber" name="L320" href="#L320">320</a> 		assertThrowsWithMessage(IllegalArgumentException.<strong class="jxr_keyword">class</strong>, <span class="jxr_string">"Argument 'beanType' cannot be null."</span>, ()-&gt;test(x1).asBean(<strong class="jxr_keyword">null</strong>));
+<a class="jxr_linenumber" name="L321" href="#L321">321</a> 	}
+<a class="jxr_linenumber" name="L322" href="#L322">322</a> 
+<a class="jxr_linenumber" name="L323" href="#L323">323</a> 	@Test <strong class="jxr_keyword">void</strong> bb24_asBeanList() {
+<a class="jxr_linenumber" name="L324" href="#L324">324</a> 		<strong class="jxr_keyword">var</strong> x1 = l(A1);
+<a class="jxr_linenumber" name="L325" href="#L325">325</a> 		<strong class="jxr_keyword">var</strong> nil = listn(A1.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L326" href="#L326">326</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
+<a class="jxr_linenumber" name="L327" href="#L327">327</a> 		test(x1).asBeanList(A1.<strong class="jxr_keyword">class</strong>).isString(<span class="jxr_string">"[a=1,b=2]"</span>);
+<a class="jxr_linenumber" name="L328" href="#L328">328</a> 		test(nil).asBeanList(A1.<strong class="jxr_keyword">class</strong>).isNull();
+<a class="jxr_linenumber" name="L329" href="#L329">329</a> 		assertThrown(()-&gt;test(x2).asBeanList(A2.<strong class="jxr_keyword">class</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'java.util.List'.  Actual='java.lang.String'."</span>);
+<a class="jxr_linenumber" name="L330" href="#L330">330</a> 		assertThrowsWithMessage(IllegalArgumentException.<strong class="jxr_keyword">class</strong>, <span class="jxr_string">"Argument 'beanType' cannot be null."</span>, ()-&gt;test(x1).asBeanList(<strong class="jxr_keyword">null</strong>));
+<a class="jxr_linenumber" name="L331" href="#L331">331</a> 	}
+<a class="jxr_linenumber" name="L332" href="#L332">332</a> 
+<a class="jxr_linenumber" name="L333" href="#L333">333</a> 	@Test <strong class="jxr_keyword">void</strong> bb25_asZonedDateTime() {
+<a class="jxr_linenumber" name="L334" href="#L334">334</a> 		<strong class="jxr_keyword">var</strong> x1 = zdt(<span class="jxr_string">"2000-06-01T12:34:56Z"</span>);
+<a class="jxr_linenumber" name="L335" href="#L335">335</a> 		<strong class="jxr_keyword">var</strong> nil = n(Object.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L336" href="#L336">336</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
+<a class="jxr_linenumber" name="L337" href="#L337">337</a> 		test(x1).asZonedDateTime().asString().isMatches(<span class="jxr_string">"2000*"</span>);
+<a class="jxr_linenumber" name="L338" href="#L338">338</a> 		test(nil).asZonedDateTime().isNull();
+<a class="jxr_linenumber" name="L339" href="#L339">339</a> 		assertThrown(()-&gt;test(x2).asZonedDateTime()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'java.time.ZonedDateTime'.  Actual='java.lang.String'."</span>);
+<a class="jxr_linenumber" name="L340" href="#L340">340</a> 	}
+<a class="jxr_linenumber" name="L341" href="#L341">341</a> 
+<a class="jxr_linenumber" name="L342" href="#L342">342</a> 	@Test <strong class="jxr_keyword">void</strong> bb26_asStringList() {
+<a class="jxr_linenumber" name="L343" href="#L343">343</a> 		<strong class="jxr_keyword">var</strong> x1 = l(<span class="jxr_string">"1"</span>);
+<a class="jxr_linenumber" name="L344" href="#L344">344</a> 		<strong class="jxr_keyword">var</strong> nil = listn(String.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L345" href="#L345">345</a> 		<strong class="jxr_keyword">var</strong> x2 = <span class="jxr_string">""</span>;
+<a class="jxr_linenumber" name="L346" href="#L346">346</a> 		test(x1).asStringList().isString(<span class="jxr_string">"[1]"</span>);
+<a class="jxr_linenumber" name="L347" href="#L347">347</a> 		test(nil).asStringList().isNull();
+<a class="jxr_linenumber" name="L348" href="#L348">348</a> 		assertThrown(()-&gt;test(x2).asStringList()).asMessage().asOneLine().is(<span class="jxr_string">"Object was not type 'java.util.List'.  Actual='java.lang.String'."</span>);
+<a class="jxr_linenumber" name="L349" href="#L349">349</a> 	}
+<a class="jxr_linenumber" name="L350" href="#L350">350</a> 
+<a class="jxr_linenumber" name="L351" href="#L351">351</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L352" href="#L352">352</a> 	<em class="jxr_comment">// Test tests</em>
+<a class="jxr_linenumber" name="L353" href="#L353">353</a> 	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L354" href="#L354">354</a> 
+<a class="jxr_linenumber" name="L355" href="#L355">355</a> 	@Test <strong class="jxr_keyword">void</strong> ca01_exists() {
+<a class="jxr_linenumber" name="L356" href="#L356">356</a> 		<strong class="jxr_keyword">var</strong> x = 1;
+<a class="jxr_linenumber" name="L357" href="#L357">357</a> 		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L358" href="#L358">358</a> 		test(x).isExists().isExists();
+<a class="jxr_linenumber" name="L359" href="#L359">359</a> 		assertThrowsWithMessage(BasicAssertionError.<strong class="jxr_keyword">class</strong>, <span class="jxr_string">"Value was null."</span>, ()-&gt;test(nil).isExists());
+<a class="jxr_linenumber" name="L360" href="#L360">360</a> 	}
+<a class="jxr_linenumber" name="L361" href="#L361">361</a> 
+<a class="jxr_linenumber" name="L362" href="#L362">362</a> 	@Test <strong class="jxr_keyword">void</strong> ca02_isNull() {
+<a class="jxr_linenumber" name="L363" href="#L363">363</a> 		<strong class="jxr_keyword">var</strong> x = 1;
+<a class="jxr_linenumber" name="L364" href="#L364">364</a> 		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L365" href="#L365">365</a> 		test(nil).isNull();
+<a class="jxr_linenumber" name="L366" href="#L366">366</a> 		assertThrowsWithMessage(BasicAssertionError.<strong class="jxr_keyword">class</strong>, <span class="jxr_string">"Value was not null."</span>, ()-&gt;test(x).isNull());
+<a class="jxr_linenumber" name="L367" href="#L367">367</a> 	}
+<a class="jxr_linenumber" name="L368" href="#L368">368</a> 
+<a class="jxr_linenumber" name="L369" href="#L369">369</a> 	@Test <strong class="jxr_keyword">void</strong> ca03_isNotNull() {
+<a class="jxr_linenumber" name="L370" href="#L370">370</a> 		<strong class="jxr_keyword">var</strong> x = 1;
+<a class="jxr_linenumber" name="L371" href="#L371">371</a> 		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L372" href="#L372">372</a> 		test(x).isNotNull();
+<a class="jxr_linenumber" name="L373" href="#L373">373</a> 		assertThrowsWithMessage(BasicAssertionError.<strong class="jxr_keyword">class</strong>, <span class="jxr_string">"Value was null."</span>, ()-&gt;test(nil).isNotNull());
+<a class="jxr_linenumber" name="L374" href="#L374">374</a> 	}
+<a class="jxr_linenumber" name="L375" href="#L375">375</a> 
+<a class="jxr_linenumber" name="L376" href="#L376">376</a> 	@Test <strong class="jxr_keyword">void</strong> ca04a_is_T() {
+<a class="jxr_linenumber" name="L377" href="#L377">377</a> 		<strong class="jxr_keyword">var</strong> x1 = 1;
+<a class="jxr_linenumber" name="L378" href="#L378">378</a> 		<strong class="jxr_keyword">var</strong> x1a = 1;
+<a class="jxr_linenumber" name="L379" href="#L379">379</a> 		<strong class="jxr_keyword">var</strong> x2 = 2;
+<a class="jxr_linenumber" name="L380" href="#L380">380</a> 		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L381" href="#L381">381</a> 		test(x1).is(x1);
+<a class="jxr_linenumber" name="L382" href="#L382">382</a> 		test(x1).is(x1a);
+<a class="jxr_linenumber" name="L383" href="#L383">383</a> 		test(nil).is(nil);
+<a class="jxr_linenumber" name="L384" href="#L384">384</a> 		assertThrown(()-&gt;test(x1).is(x2)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected value.  Expect='2'.  Actual='1'."</span>);
+<a class="jxr_linenumber" name="L385" href="#L385">385</a> 		assertThrown(()-&gt;test(x1).is(nil)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected value.  Expect='null'.  Actual='1'."</span>);
+<a class="jxr_linenumber" name="L386" href="#L386">386</a> 		assertThrown(()-&gt;test(nil).is(x2)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected value.  Expect='2'.  Actual='null'."</span>);
+<a class="jxr_linenumber" name="L387" href="#L387">387</a> 	}
+<a class="jxr_linenumber" name="L388" href="#L388">388</a> 
+<a class="jxr_linenumber" name="L389" href="#L389">389</a> 	@Test <strong class="jxr_keyword">void</strong> ca04b_is_predicate() {
+<a class="jxr_linenumber" name="L390" href="#L390">390</a> 		<strong class="jxr_keyword">var</strong> x1 = 1;
+<a class="jxr_linenumber" name="L391" href="#L391">391</a> 		test(x1).is(x-&gt;x==1);
+<a class="jxr_linenumber" name="L392" href="#L392">392</a> 		assertThrown(()-&gt;test(x1).is(x-&gt;x==2)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected value: '1'."</span>);
+<a class="jxr_linenumber" name="L393" href="#L393">393</a> 		assertThrown(()-&gt;test(x1).is(ne(x1))).asMessage().asOneLine().is(<span class="jxr_string">"Value unexpectedly matched.  Value='1'."</span>);
+<a class="jxr_linenumber" name="L394" href="#L394">394</a> 	}
+<a class="jxr_linenumber" name="L395" href="#L395">395</a> 
+<a class="jxr_linenumber" name="L396" href="#L396">396</a> 	@Test <strong class="jxr_keyword">void</strong> ca05_isNot() {
+<a class="jxr_linenumber" name="L397" href="#L397">397</a> 		<strong class="jxr_keyword">var</strong> x1 = 1;
+<a class="jxr_linenumber" name="L398" href="#L398">398</a> 		<strong class="jxr_keyword">var</strong> x1a = 1;
+<a class="jxr_linenumber" name="L399" href="#L399">399</a> 		<strong class="jxr_keyword">var</strong> x2 = 2;
+<a class="jxr_linenumber" name="L400" href="#L400">400</a> 		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L401" href="#L401">401</a> 		test(x1).isNot(x2);
+<a class="jxr_linenumber" name="L402" href="#L402">402</a> 		test(x1).isNot(nil);
+<a class="jxr_linenumber" name="L403" href="#L403">403</a> 		test(nil).isNot(x1);
+<a class="jxr_linenumber" name="L404" href="#L404">404</a> 		assertThrown(()-&gt;test(x1).isNot(x1a)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected value.  Did not expect='1'.  Actual='1'."</span>);
+<a class="jxr_linenumber" name="L405" href="#L405">405</a> 		assertThrown(()-&gt;test(nil).isNot(nil)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected value.  Did not expect='null'.  Actual='null'."</span>);
+<a class="jxr_linenumber" name="L406" href="#L406">406</a> 	}
+<a class="jxr_linenumber" name="L407" href="#L407">407</a> 
+<a class="jxr_linenumber" name="L408" href="#L408">408</a> 	@Test <strong class="jxr_keyword">void</strong> ca06_isAny() {
+<a class="jxr_linenumber" name="L409" href="#L409">409</a> 		<strong class="jxr_keyword">var</strong> x1 = 1;
+<a class="jxr_linenumber" name="L410" href="#L410">410</a> 		<strong class="jxr_keyword">var</strong> x1a = 1;
+<a class="jxr_linenumber" name="L411" href="#L411">411</a> 		<strong class="jxr_keyword">var</strong> x2 = 2;
+<a class="jxr_linenumber" name="L412" href="#L412">412</a> 		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L413" href="#L413">413</a> 		test(x1).isAny(x1a, x2);
+<a class="jxr_linenumber" name="L414" href="#L414">414</a> 		assertThrown(()-&gt;test(x1).isAny(x2)).asMessage().asOneLine().is(<span class="jxr_string">"Expected value not found.  Expect='[2]'.  Actual='1'."</span>);
+<a class="jxr_linenumber" name="L415" href="#L415">415</a> 		assertThrown(()-&gt;test(x1).isAny()).asMessage().asOneLine().is(<span class="jxr_string">"Expected value not found.  Expect='[]'.  Actual='1'."</span>);
+<a class="jxr_linenumber" name="L416" href="#L416">416</a> 		assertThrown(()-&gt;test(nil).isAny(x2)).asMessage().asOneLine().is(<span class="jxr_string">"Expected value not found.  Expect='[2]'.  Actual='null'."</span>);
+<a class="jxr_linenumber" name="L417" href="#L417">417</a> 	}
+<a class="jxr_linenumber" name="L418" href="#L418">418</a> 
+<a class="jxr_linenumber" name="L419" href="#L419">419</a> 	@Test <strong class="jxr_keyword">void</strong> ca07_isNotAny() {
+<a class="jxr_linenumber" name="L420" href="#L420">420</a> 		<strong class="jxr_keyword">var</strong> x1 = 1;
+<a class="jxr_linenumber" name="L421" href="#L421">421</a> 		<strong class="jxr_keyword">var</strong> x1a = 1;
+<a class="jxr_linenumber" name="L422" href="#L422">422</a> 		<strong class="jxr_keyword">var</strong> x2 = 2;
+<a class="jxr_linenumber" name="L423" href="#L423">423</a> 		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L424" href="#L424">424</a> 		test(x1).isNotAny(x2);
+<a class="jxr_linenumber" name="L425" href="#L425">425</a> 		test(x1).isNotAny();
+<a class="jxr_linenumber" name="L426" href="#L426">426</a> 		test(nil).isNotAny(x2);
+<a class="jxr_linenumber" name="L427" href="#L427">427</a> 		assertThrown(()-&gt;test(x1).isNotAny(x1a)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected value found.  Unexpected='1'.  Actual='1'."</span>);
+<a class="jxr_linenumber" name="L428" href="#L428">428</a> 		assertThrown(()-&gt;test(nil).isNotAny(nil)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected value found.  Unexpected='null'.  Actual='null'."</span>);
+<a class="jxr_linenumber" name="L429" href="#L429">429</a> 	}
+<a class="jxr_linenumber" name="L430" href="#L430">430</a> 
+<a class="jxr_linenumber" name="L431" href="#L431">431</a> 	@Test <strong class="jxr_keyword">void</strong> ca08_isSame() {
+<a class="jxr_linenumber" name="L432" href="#L432">432</a> 		<strong class="jxr_keyword">var</strong> x1 = Integer.valueOf(999);
+<a class="jxr_linenumber" name="L433" href="#L433">433</a> 		<strong class="jxr_keyword">var</strong> x1a = Integer.valueOf(999);
+<a class="jxr_linenumber" name="L434" href="#L434">434</a> 		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L435" href="#L435">435</a> 		test(x1).isSame(x1);
+<a class="jxr_linenumber" name="L436" href="#L436">436</a> 		test(nil).isSame(nil);
+<a class="jxr_linenumber" name="L437" href="#L437">437</a> 		assertThrown(()-&gt;test(x1).isSame(x1a)).asMessage().asOneLine().isMatches(<span class="jxr_string">"Not the same value.  Expect='999(Integer@*)'.  Actual='999(Integer@*)'."</span>);
+<a class="jxr_linenumber" name="L438" href="#L438">438</a> 		assertThrown(()-&gt;test(nil).isSame(x1a)).asMessage().asOneLine().isMatches(<span class="jxr_string">"Not the same value.  Expect='999(Integer@*)'.  Actual='null(null)'."</span>);
+<a class="jxr_linenumber" name="L439" href="#L439">439</a> 		assertThrown(()-&gt;test(x1).isSame(nil)).asMessage().asOneLine().isMatches(<span class="jxr_string">"Not the same value.  Expect='null(null)'.  Actual='999(Integer@*)'."</span>);
+<a class="jxr_linenumber" name="L440" href="#L440">440</a> 	}
+<a class="jxr_linenumber" name="L441" href="#L441">441</a> 
+<a class="jxr_linenumber" name="L442" href="#L442">442</a> 	@Test <strong class="jxr_keyword">void</strong> ca09_isSameJsonAs() {
+<a class="jxr_linenumber" name="L443" href="#L443">443</a> 		<strong class="jxr_keyword">var</strong> x1 = 1;
+<a class="jxr_linenumber" name="L444" href="#L444">444</a> 		<strong class="jxr_keyword">var</strong> x1a = 1;
+<a class="jxr_linenumber" name="L445" href="#L445">445</a> 		<strong class="jxr_keyword">var</strong> x2 = 2;
+<a class="jxr_linenumber" name="L446" href="#L446">446</a> 		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L447" href="#L447">447</a> 		test(x1).isSameJsonAs(x1a);
+<a class="jxr_linenumber" name="L448" href="#L448">448</a> 		test(nil).isSameJsonAs(nil);
+<a class="jxr_linenumber" name="L449" href="#L449">449</a> 		assertThrown(()-&gt;test(x1a).isSameJsonAs(x2)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected comparison.  Expect='2'.  Actual='1'."</span>);
+<a class="jxr_linenumber" name="L450" href="#L450">450</a> 		assertThrown(()-&gt;test(nil).isSameJsonAs(x2)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected comparison.  Expect='2'.  Actual='null'."</span>);
+<a class="jxr_linenumber" name="L451" href="#L451">451</a> 		assertThrown(()-&gt;test(x1).isSameJsonAs(nil)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected comparison.  Expect='null'.  Actual='1'."</span>);
+<a class="jxr_linenumber" name="L452" href="#L452">452</a> 	}
+<a class="jxr_linenumber" name="L453" href="#L453">453</a> 
+<a class="jxr_linenumber" name="L454" href="#L454">454</a> 	@Test <strong class="jxr_keyword">void</strong> ca10_isSameSortedJsonAs() {
+<a class="jxr_linenumber" name="L455" href="#L455">455</a> 		<strong class="jxr_keyword">var</strong> x1 = 1;
+<a class="jxr_linenumber" name="L456" href="#L456">456</a> 		<strong class="jxr_keyword">var</strong> x1a = 1;
+<a class="jxr_linenumber" name="L457" href="#L457">457</a> 		<strong class="jxr_keyword">var</strong> x2 = 2;
+<a class="jxr_linenumber" name="L458" href="#L458">458</a> 		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L459" href="#L459">459</a> 		test(x1).isSameSortedJsonAs(x1a);
+<a class="jxr_linenumber" name="L460" href="#L460">460</a> 		test(nil).isSameSortedJsonAs(nil);
+<a class="jxr_linenumber" name="L461" href="#L461">461</a> 		assertThrown(()-&gt;test(x1a).isSameSortedJsonAs(x2)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected comparison.  Expect='2'.  Actual='1'."</span>);
+<a class="jxr_linenumber" name="L462" href="#L462">462</a> 		assertThrown(()-&gt;test(nil).isSameSortedJsonAs(x2)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected comparison.  Expect='2'.  Actual='null'."</span>);
+<a class="jxr_linenumber" name="L463" href="#L463">463</a> 		assertThrown(()-&gt;test(x1).isSameSortedJsonAs(nil)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected comparison.  Expect='null'.  Actual='1'."</span>);
+<a class="jxr_linenumber" name="L464" href="#L464">464</a> 	}
+<a class="jxr_linenumber" name="L465" href="#L465">465</a> 
+<a class="jxr_linenumber" name="L466" href="#L466">466</a> 	@Test <strong class="jxr_keyword">void</strong> ca11_isSameSerializedAs() {
+<a class="jxr_linenumber" name="L467" href="#L467">467</a> 		<strong class="jxr_keyword">var</strong> x1 = 1;
+<a class="jxr_linenumber" name="L468" href="#L468">468</a> 		<strong class="jxr_keyword">var</strong> x1a = 1;
+<a class="jxr_linenumber" name="L469" href="#L469">469</a> 		<strong class="jxr_keyword">var</strong> x2 = 2;
+<a class="jxr_linenumber" name="L470" href="#L470">470</a> 		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L471" href="#L471">471</a> 		<strong class="jxr_keyword">var</strong> s = Json5Serializer.DEFAULT;
+<a class="jxr_linenumber" name="L472" href="#L472">472</a> 		test(x1).isSameSerializedAs(x1a, s);
+<a class="jxr_linenumber" name="L473" href="#L473">473</a> 		test(nil).isSameSerializedAs(nil, s);
+<a class="jxr_linenumber" name="L474" href="#L474">474</a> 		assertThrown(()-&gt;test(x1a).isSameSerializedAs(x2, s)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected comparison.  Expect='2'.  Actual='1'."</span>);
+<a class="jxr_linenumber" name="L475" href="#L475">475</a> 		assertThrown(()-&gt;test(nil).isSameSerializedAs(x2, s)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected comparison.  Expect='2'.  Actual='null'."</span>);
+<a class="jxr_linenumber" name="L476" href="#L476">476</a> 		assertThrown(()-&gt;test(x1).isSameSerializedAs(nil, s)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected comparison.  Expect='null'.  Actual='1'."</span>);
+<a class="jxr_linenumber" name="L477" href="#L477">477</a> 	}
+<a class="jxr_linenumber" name="L478" href="#L478">478</a> 
+<a class="jxr_linenumber" name="L479" href="#L479">479</a> 	@Test <strong class="jxr_keyword">void</strong> ca12_isType() {
+<a class="jxr_linenumber" name="L480" href="#L480">480</a> 		<strong class="jxr_keyword">var</strong> x = 1;
+<a class="jxr_linenumber" name="L481" href="#L481">481</a> 		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L482" href="#L482">482</a> 		test(x).isType(Integer.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L483" href="#L483">483</a> 		test(x).isType(Object.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L484" href="#L484">484</a> 		assertThrown(()-&gt;test(x).isType(String.<strong class="jxr_keyword">class</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected type.  Expect='java.lang.String'.  Actual='java.lang.Integer'."</span>);
+<a class="jxr_linenumber" name="L485" href="#L485">485</a> 		assertThrown(()-&gt;test(nil).isType(String.<strong class="jxr_keyword">class</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Value was null."</span>);
+<a class="jxr_linenumber" name="L486" href="#L486">486</a> 		assertThrown(()-&gt;test(x).isType(<strong class="jxr_keyword">null</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Argument 'parent' cannot be null."</span>);
+<a class="jxr_linenumber" name="L487" href="#L487">487</a> 	}
+<a class="jxr_linenumber" name="L488" href="#L488">488</a> 
+<a class="jxr_linenumber" name="L489" href="#L489">489</a> 	@Test <strong class="jxr_keyword">void</strong> ca13_isExactType() {
+<a class="jxr_linenumber" name="L490" href="#L490">490</a> 		<strong class="jxr_keyword">var</strong> x = 1;
+<a class="jxr_linenumber" name="L491" href="#L491">491</a> 		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L492" href="#L492">492</a> 		test(x).isExactType(Integer.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L493" href="#L493">493</a> 		assertThrown(()-&gt;test(x).isExactType(Object.<strong class="jxr_keyword">class</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected type.  Expect='java.lang.Object'.  Actual='java.lang.Integer'."</span>);
+<a class="jxr_linenumber" name="L494" href="#L494">494</a> 		assertThrown(()-&gt;test(x).isExactType(String.<strong class="jxr_keyword">class</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected type.  Expect='java.lang.String'.  Actual='java.lang.Integer'."</span>);
+<a class="jxr_linenumber" name="L495" href="#L495">495</a> 		assertThrown(()-&gt;test(nil).isExactType(String.<strong class="jxr_keyword">class</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Value was null."</span>);
+<a class="jxr_linenumber" name="L496" href="#L496">496</a> 		assertThrown(()-&gt;test(x).isExactType(<strong class="jxr_keyword">null</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Argument 'parent' cannot be null."</span>);
+<a class="jxr_linenumber" name="L497" href="#L497">497</a> 	}
+<a class="jxr_linenumber" name="L498" href="#L498">498</a> 
+<a class="jxr_linenumber" name="L499" href="#L499">499</a> 	@Test <strong class="jxr_keyword">void</strong> ca14_isString() {
+<a class="jxr_linenumber" name="L500" href="#L500">500</a> 		<strong class="jxr_keyword">var</strong> x = 1;
+<a class="jxr_linenumber" name="L501" href="#L501">501</a> 		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L502" href="#L502">502</a> 		test(x).isString(<span class="jxr_string">"1"</span>);
+<a class="jxr_linenumber" name="L503" href="#L503">503</a> 		test(nil).isString(<strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="L504" href="#L504">504</a> 		assertThrown(()-&gt;test(x).isString(<span class="jxr_string">"bad"</span>)).asMessage().asOneLine().is(<span class="jxr_string">"String differed at position 0.  Expect='bad'.  Actual='1'."</span>);
+<a class="jxr_linenumber" name="L505" href="#L505">505</a> 		assertThrown(()-&gt;test(x).isString(<strong class="jxr_keyword">null</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"String differed at position 0.  Expect='null'.  Actual='1'."</span>);
+<a class="jxr_linenumber" name="L506" href="#L506">506</a> 		assertThrown(()-&gt;test(nil).isString(<span class="jxr_string">"bad"</span>)).asMessage().asOneLine().is(<span class="jxr_string">"String differed at position 0.  Expect='bad'.  Actual='null'."</span>);
+<a class="jxr_linenumber" name="L507" href="#L507">507</a> 	}
+<a class="jxr_linenumber" name="L508" href="#L508">508</a> 
+<a class="jxr_linenumber" name="L509" href="#L509">509</a> 	@Test <strong class="jxr_keyword">void</strong> ca15_isJson() {
+<a class="jxr_linenumber" name="L510" href="#L510">510</a> 		<strong class="jxr_keyword">var</strong> x = 1;
+<a class="jxr_linenumber" name="L511" href="#L511">511</a> 		<strong class="jxr_keyword">var</strong> nil = n(Integer.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L512" href="#L512">512</a> 		test(x).isJson(<span class="jxr_string">"1"</span>);
+<a class="jxr_linenumber" name="L513" href="#L513">513</a> 		test(nil).isJson(<span class="jxr_string">"null"</span>);
+<a class="jxr_linenumber" name="L514" href="#L514">514</a> 		assertThrown(()-&gt;test(x).isJson(<span class="jxr_string">"bad"</span>)).asMessage().asOneLine().is(<span class="jxr_string">"String differed at position 0.  Expect='bad'.  Actual='1'."</span>);
+<a class="jxr_linenumber" name="L515" href="#L515">515</a> 		assertThrown(()-&gt;test(x).isJson(<strong class="jxr_keyword">null</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"String differed at position 0.  Expect='null'.  Actual='1'."</span>);
+<a class="jxr_linenumber" name="L516" href="#L516">516</a> 		assertThrown(()-&gt;test(nil).isJson(<span class="jxr_string">"bad"</span>)).asMessage().asOneLine().is(<span class="jxr_string">"String differed at position 0.  Expect='bad'.  Actual='null'."</span>);
+<a class="jxr_linenumber" name="L517" href="#L517">517</a> 	}
+<a class="jxr_linenumber" name="L518" href="#L518">518</a> }
 </pre>
 <hr/>
 <div id="footer">© 2016–2025 <a href="https://www.apache.org/">The Apache Software Foundation</a></div>
diff --git a/site/xref-test/org/apache/juneau/assertions/ArrayAssertion_Test.html b/site/xref-test/org/apache/juneau/assertions/ArrayAssertion_Test.html
index 2875af9e22..7c3f168b4e 100644
--- a/site/xref-test/org/apache/juneau/assertions/ArrayAssertion_Test.html
+++ b/site/xref-test/org/apache/juneau/assertions/ArrayAssertion_Test.html
@@ -28,8 +28,8 @@
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.AssertionPredicates.eq;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.AssertionPredicates.ne;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.Assertions.*;
-<a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
-<a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.Utils.*;
+<a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.Utils.*;
 <a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L26" href="#L26">26</a>  
 <a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">import</strong> java.util.*;
diff --git a/site/xref-test/org/apache/juneau/assertions/AssertionPredicates_Test.html b/site/xref-test/org/apache/juneau/assertions/AssertionPredicates_Test.html
index 5ab33d9475..b391580d21 100644
--- a/site/xref-test/org/apache/juneau/assertions/AssertionPredicates_Test.html
+++ b/site/xref-test/org/apache/juneau/assertions/AssertionPredicates_Test.html
@@ -30,7 +30,7 @@
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.AssertionPredicates.eqic;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.AssertionPredicates.ne;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.Assertions.*;
-<a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.Utils.*;
+<a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.Utils.*;
 <a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L27" href="#L27">27</a>  
 <a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong class="jxr_keyword">import</strong> java.util.regex.*;
diff --git a/site/xref-test/org/apache/juneau/assertions/Assertions_Test.html b/site/xref-test/org/apache/juneau/assertions/Assertions_Test.html
index 9cedcfc952..4b49d2cdfc 100644
--- a/site/xref-test/org/apache/juneau/assertions/Assertions_Test.html
+++ b/site/xref-test/org/apache/juneau/assertions/Assertions_Test.html
@@ -27,7 +27,7 @@
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.Assertions.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.Assertions.assertThrowable;
-<a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
 <a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> java.io.*;
@@ -35,7 +35,7 @@
 <a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">import</strong> java.util.*;
 <a class="jxr_linenumber" name="L28" href="#L28">28</a>  
 <a class="jxr_linenumber" name="L29" href="#L29">29</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.*;
-<a class="jxr_linenumber" name="L30" href="#L30">30</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.common.utils.*;
+<a class="jxr_linenumber" name="L30" href="#L30">30</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.commons.utils.*;
 <a class="jxr_linenumber" name="L31" href="#L31">31</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.testutils.pojos.*;
 <a class="jxr_linenumber" name="L32" href="#L32">32</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.api.*;
 <a class="jxr_linenumber" name="L33" href="#L33">33</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.api.MethodOrderer.*;
diff --git a/site/xref-test/org/apache/juneau/assertions/BeanAssertion_Test.html b/site/xref-test/org/apache/juneau/assertions/BeanAssertion_Test.html
index 1a68753f7c..88ac00171c 100644
--- a/site/xref-test/org/apache/juneau/assertions/BeanAssertion_Test.html
+++ b/site/xref-test/org/apache/juneau/assertions/BeanAssertion_Test.html
@@ -26,8 +26,8 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.AssertionPredicates.ne;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.Assertions.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
-<a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.Utils.eq;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.Utils.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
 <a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.*;
diff --git a/site/xref-test/org/apache/juneau/assertions/BeanListAssertion_Test.html b/site/xref-test/org/apache/juneau/assertions/BeanListAssertion_Test.html
index af74ff2965..577c1fc385 100644
--- a/site/xref-test/org/apache/juneau/assertions/BeanListAssertion_Test.html
+++ b/site/xref-test/org/apache/juneau/assertions/BeanListAssertion_Test.html
@@ -26,14 +26,14 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.AssertionPredicates.ne;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.Assertions.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
-<a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.Utils.eq;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.Utils.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
 <a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> java.util.*;
 <a class="jxr_linenumber" name="L26" href="#L26">26</a>  
 <a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.*;
-<a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.common.utils.*;
+<a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.commons.utils.*;
 <a class="jxr_linenumber" name="L29" href="#L29">29</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.json.*;
 <a class="jxr_linenumber" name="L30" href="#L30">30</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.api.*;
 <a class="jxr_linenumber" name="L31" href="#L31">31</a>  
diff --git a/site/xref-test/org/apache/juneau/assertions/BooleanAssertion_Test.html b/site/xref-test/org/apache/juneau/assertions/BooleanAssertion_Test.html
index 56c93f5ed4..427538b71e 100644
--- a/site/xref-test/org/apache/juneau/assertions/BooleanAssertion_Test.html
+++ b/site/xref-test/org/apache/juneau/assertions/BooleanAssertion_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.AssertionPredicates.ne;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.Assertions.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.Utils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.Utils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.*;
diff --git a/site/xref-test/org/apache/juneau/assertions/ByteArrayAssertion_Test.html b/site/xref-test/org/apache/juneau/assertions/ByteArrayAssertion_Test.html
index 9afd10b2d5..dc70891311 100644
--- a/site/xref-test/org/apache/juneau/assertions/ByteArrayAssertion_Test.html
+++ b/site/xref-test/org/apache/juneau/assertions/ByteArrayAssertion_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.AssertionPredicates.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.Assertions.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.IOUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.IOUtils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.*;
diff --git a/site/xref-test/org/apache/juneau/assertions/CollectionAssertion_Test.html b/site/xref-test/org/apache/juneau/assertions/CollectionAssertion_Test.html
index 5232aa370a..171529258d 100644
--- a/site/xref-test/org/apache/juneau/assertions/CollectionAssertion_Test.html
+++ b/site/xref-test/org/apache/juneau/assertions/CollectionAssertion_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.AssertionPredicates.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.Assertions.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> java.util.*;
diff --git a/site/xref-test/org/apache/juneau/assertions/ComparableAssertion_Test.html b/site/xref-test/org/apache/juneau/assertions/ComparableAssertion_Test.html
index e7275fe821..01256146b1 100644
--- a/site/xref-test/org/apache/juneau/assertions/ComparableAssertion_Test.html
+++ b/site/xref-test/org/apache/juneau/assertions/ComparableAssertion_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.AssertionPredicates.ne;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.Assertions.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.Utils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.Utils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.*;
diff --git a/site/xref-test/org/apache/juneau/assertions/DateAssertion_Test.html b/site/xref-test/org/apache/juneau/assertions/DateAssertion_Test.html
index 4c492ae104..bad26cdfdf 100644
--- a/site/xref-test/org/apache/juneau/assertions/DateAssertion_Test.html
+++ b/site/xref-test/org/apache/juneau/assertions/DateAssertion_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.AssertionPredicates.ne;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.Assertions.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.Utils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.Utils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> java.time.*;
diff --git a/site/xref-test/org/apache/juneau/assertions/IntegerAssertion_Test.html b/site/xref-test/org/apache/juneau/assertions/IntegerAssertion_Test.html
index 1baaa2187c..2697e584d5 100644
--- a/site/xref-test/org/apache/juneau/assertions/IntegerAssertion_Test.html
+++ b/site/xref-test/org/apache/juneau/assertions/IntegerAssertion_Test.html
@@ -25,7 +25,7 @@
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.assertions;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.Assertions.*;
-<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.Utils.*;
+<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.Utils.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.*;
diff --git a/site/xref-test/org/apache/juneau/assertions/ListAssertion_Test.html b/site/xref-test/org/apache/juneau/assertions/ListAssertion_Test.html
index 89991a9f4f..90c690b020 100644
--- a/site/xref-test/org/apache/juneau/assertions/ListAssertion_Test.html
+++ b/site/xref-test/org/apache/juneau/assertions/ListAssertion_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.AssertionPredicates.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.Assertions.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> java.util.*;
diff --git a/site/xref-test/org/apache/juneau/assertions/LongAssertion_Test.html b/site/xref-test/org/apache/juneau/assertions/LongAssertion_Test.html
index 3909fc2dad..9bd3922904 100644
--- a/site/xref-test/org/apache/juneau/assertions/LongAssertion_Test.html
+++ b/site/xref-test/org/apache/juneau/assertions/LongAssertion_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.AssertionPredicates.ne;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.Assertions.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.Utils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.Utils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.*;
diff --git a/site/xref-test/org/apache/juneau/assertions/MapAssertion_Test.html b/site/xref-test/org/apache/juneau/assertions/MapAssertion_Test.html
index c40da331af..e21b3c71bb 100644
--- a/site/xref-test/org/apache/juneau/assertions/MapAssertion_Test.html
+++ b/site/xref-test/org/apache/juneau/assertions/MapAssertion_Test.html
@@ -26,13 +26,13 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.AssertionPredicates.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.Assertions.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> java.util.*;
 <a class="jxr_linenumber" name="L25" href="#L25">25</a>  
 <a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.*;
-<a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.common.collections.*;
+<a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.commons.collections.*;
 <a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.json.*;
 <a class="jxr_linenumber" name="L29" href="#L29">29</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.api.*;
 <a class="jxr_linenumber" name="L30" href="#L30">30</a>  
diff --git a/site/xref-test/org/apache/juneau/assertions/ObjectAssertion_Test.html b/site/xref-test/org/apache/juneau/assertions/ObjectAssertion_Test.html
index f87cbca560..9d04824aac 100644
--- a/site/xref-test/org/apache/juneau/assertions/ObjectAssertion_Test.html
+++ b/site/xref-test/org/apache/juneau/assertions/ObjectAssertion_Test.html
@@ -27,8 +27,8 @@
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.AssertionPredicates.contains;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.AssertionPredicates.ne;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.Assertions.*;
-<a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
-<a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.Utils.*;
+<a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.Utils.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L25" href="#L25">25</a>  
 <a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> java.util.function.*;
diff --git a/site/xref-test/org/apache/juneau/assertions/StringAssertion_Test.html b/site/xref-test/org/apache/juneau/assertions/StringAssertion_Test.html
index b059afa61a..0cd5ac46a3 100644
--- a/site/xref-test/org/apache/juneau/assertions/StringAssertion_Test.html
+++ b/site/xref-test/org/apache/juneau/assertions/StringAssertion_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.AssertionPredicates.ne;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.Assertions.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.Utils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.Utils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> java.util.regex.*;
diff --git a/site/xref-test/org/apache/juneau/assertions/StringListAssertion_Test.html b/site/xref-test/org/apache/juneau/assertions/StringListAssertion_Test.html
index 5721707a94..d1c8280ab9 100644
--- a/site/xref-test/org/apache/juneau/assertions/StringListAssertion_Test.html
+++ b/site/xref-test/org/apache/juneau/assertions/StringListAssertion_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.AssertionPredicates.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.Assertions.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> java.util.*;
diff --git a/site/xref-test/org/apache/juneau/assertions/ThrowableAssertion_Test.html b/site/xref-test/org/apache/juneau/assertions/ThrowableAssertion_Test.html
index d48703cde0..cd8cd97a5e 100644
--- a/site/xref-test/org/apache/juneau/assertions/ThrowableAssertion_Test.html
+++ b/site/xref-test/org/apache/juneau/assertions/ThrowableAssertion_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.AssertionPredicates.ne;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.Assertions.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.Utils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.Utils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> java.io.*;
diff --git a/site/xref-test/org/apache/juneau/assertions/VersionAssertion_Test.html b/site/xref-test/org/apache/juneau/assertions/VersionAssertion_Test.html
index 771646f87d..037225e274 100644
--- a/site/xref-test/org/apache/juneau/assertions/VersionAssertion_Test.html
+++ b/site/xref-test/org/apache/juneau/assertions/VersionAssertion_Test.html
@@ -26,12 +26,12 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.AssertionPredicates.ne;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.Assertions.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.Utils.*;
-<a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.Version.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.Utils.*;
+<a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.Version.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
 <a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.*;
-<a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.common.utils.*;
+<a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.commons.utils.*;
 <a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.json.*;
 <a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.api.*;
 <a class="jxr_linenumber" name="L29" href="#L29">29</a>  
@@ -268,7 +268,7 @@
 <a class="jxr_linenumber" name="L260" href="#L260">260</a> 		<strong class="jxr_keyword">var</strong> nil = n(Version.<strong class="jxr_keyword">class</strong>);
 <a class="jxr_linenumber" name="L261" href="#L261">261</a> 		test(x).isType(Version.<strong class="jxr_keyword">class</strong>);
 <a class="jxr_linenumber" name="L262" href="#L262">262</a> 		test(x).isType(Object.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L263" href="#L263">263</a> 		assertThrown(()-&gt;test(x).isType(String.<strong class="jxr_keyword">class</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected type.  Expect='java.lang.String'.  Actual='org.apache.juneau.common.utils.Version'."</span>);
+<a class="jxr_linenumber" name="L263" href="#L263">263</a> 		assertThrown(()-&gt;test(x).isType(String.<strong class="jxr_keyword">class</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected type.  Expect='java.lang.String'.  Actual='org.apache.juneau.commons.utils.Version'."</span>);
 <a class="jxr_linenumber" name="L264" href="#L264">264</a> 		assertThrown(()-&gt;test(nil).isType(String.<strong class="jxr_keyword">class</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Value was null."</span>);
 <a class="jxr_linenumber" name="L265" href="#L265">265</a> 		assertThrown(()-&gt;test(x).isType(<strong class="jxr_keyword">null</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Argument 'parent' cannot be null."</span>);
 <a class="jxr_linenumber" name="L266" href="#L266">266</a> 	}
@@ -277,8 +277,8 @@
 <a class="jxr_linenumber" name="L269" href="#L269">269</a> 		<strong class="jxr_keyword">var</strong> x = of(<span class="jxr_string">"1"</span>);
 <a class="jxr_linenumber" name="L270" href="#L270">270</a> 		<strong class="jxr_keyword">var</strong> nil = n(Version.<strong class="jxr_keyword">class</strong>);
 <a class="jxr_linenumber" name="L271" href="#L271">271</a> 		test(x).isExactType(Version.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L272" href="#L272">272</a> 		assertThrown(()-&gt;test(x).isExactType(Object.<strong class="jxr_keyword">class</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected type.  Expect='java.lang.Object'.  Actual='org.apache.juneau.common.utils.Version'."</span>);
-<a class="jxr_linenumber" name="L273" href="#L273">273</a> 		assertThrown(()-&gt;test(x).isExactType(String.<strong class="jxr_keyword">class</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected type.  Expect='java.lang.String'.  Actual='org.apache.juneau.common.utils.Version'."</span>);
+<a class="jxr_linenumber" name="L272" href="#L272">272</a> 		assertThrown(()-&gt;test(x).isExactType(Object.<strong class="jxr_keyword">class</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected type.  Expect='java.lang.Object'.  Actual='org.apache.juneau.commons.utils.Version'."</span>);
+<a class="jxr_linenumber" name="L273" href="#L273">273</a> 		assertThrown(()-&gt;test(x).isExactType(String.<strong class="jxr_keyword">class</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Unexpected type.  Expect='java.lang.String'.  Actual='org.apache.juneau.commons.utils.Version'."</span>);
 <a class="jxr_linenumber" name="L274" href="#L274">274</a> 		assertThrown(()-&gt;test(nil).isExactType(String.<strong class="jxr_keyword">class</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Value was null."</span>);
 <a class="jxr_linenumber" name="L275" href="#L275">275</a> 		assertThrown(()-&gt;test(x).isExactType(<strong class="jxr_keyword">null</strong>)).asMessage().asOneLine().is(<span class="jxr_string">"Argument 'parent' cannot be null."</span>);
 <a class="jxr_linenumber" name="L276" href="#L276">276</a> 	}
diff --git a/site/xref-test/org/apache/juneau/assertions/ZonedDateTimeAssertion_Test.html b/site/xref-test/org/apache/juneau/assertions/ZonedDateTimeAssertion_Test.html
index 431cf80b78..d5083cb725 100644
--- a/site/xref-test/org/apache/juneau/assertions/ZonedDateTimeAssertion_Test.html
+++ b/site/xref-test/org/apache/juneau/assertions/ZonedDateTimeAssertion_Test.html
@@ -27,7 +27,7 @@
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> java.time.temporal.ChronoUnit.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.AssertionPredicates.ne;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.assertions.Assertions.*;
-<a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.Utils.*;
+<a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.Utils.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
 <a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> java.time.*;
diff --git a/site/xref-test/org/apache/juneau/bean/html5/A_Test.html b/site/xref-test/org/apache/juneau/bean/html5/A_Test.html
index b63debabaf..49bd73f7f9 100644
--- a/site/xref-test/org/apache/juneau/bean/html5/A_Test.html
+++ b/site/xref-test/org/apache/juneau/bean/html5/A_Test.html
@@ -28,7 +28,7 @@
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.*;
-<a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.common.utils.*;
+<a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.commons.utils.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.api.*;
 <a class="jxr_linenumber" name="L25" href="#L25">25</a>  
 <a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">class</strong> <a name="A_Test" href="../../../../../org/apache/juneau/bean/html5/A_Test.html#A_Test">A_Test</a> <strong class="jxr_keyword">extends</strong> <a name="TestBase" href="../../../../../org/apache/juneau/TestBase.html#TestBase">TestBase</a> {
diff --git a/site/xref-test/org/apache/juneau/bean/html5/Html5_ComboRoundTripTest.html b/site/xref-test/org/apache/juneau/bean/html5/Html5_ComboRoundTripTest.html
index 7b372098a6..75640f6a0c 100644
--- a/site/xref-test/org/apache/juneau/bean/html5/Html5_ComboRoundTripTest.html
+++ b/site/xref-test/org/apache/juneau/bean/html5/Html5_ComboRoundTripTest.html
@@ -28,8 +28,8 @@
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.bean.html5.HtmlBuilder.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.bean.html5.HtmlBuilder.map;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.bean.html5.HtmlBuilder.u;
-<a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
-<a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.a;
+<a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.a;
 <a class="jxr_linenumber" name="L25" href="#L25">25</a>  
 <a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> java.lang.reflect.*;
 <a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">import</strong> java.util.*;
diff --git a/site/xref-test/org/apache/juneau/bean/html5/HtmlElementContainer_Test.html b/site/xref-test/org/apache/juneau/bean/html5/HtmlElementContainer_Test.html
index 2e6de3b6a2..da9c0b8a1e 100644
--- a/site/xref-test/org/apache/juneau/bean/html5/HtmlElementContainer_Test.html
+++ b/site/xref-test/org/apache/juneau/bean/html5/HtmlElementContainer_Test.html
@@ -25,7 +25,7 @@
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.bean.html5;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.bean.html5.HtmlBuilder.*;
-<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  
diff --git a/site/xref-test/org/apache/juneau/bean/html5/HtmlElementMixed_Test.html b/site/xref-test/org/apache/juneau/bean/html5/HtmlElementMixed_Test.html
index 4f1b72ca90..883eb9ecf4 100644
--- a/site/xref-test/org/apache/juneau/bean/html5/HtmlElementMixed_Test.html
+++ b/site/xref-test/org/apache/juneau/bean/html5/HtmlElementMixed_Test.html
@@ -25,7 +25,7 @@
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.bean.html5;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.bean.html5.HtmlBuilder.*;
-<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  
diff --git a/site/xref-test/org/apache/juneau/bean/jsonschema/JsonSchemaPropertySimpleArray_Test.html b/site/xref-test/org/apache/juneau/bean/jsonschema/JsonSchemaPropertySimpleArray_Test.html
index e0291e0953..2181bde961 100644
--- a/site/xref-test/org/apache/juneau/bean/jsonschema/JsonSchemaPropertySimpleArray_Test.html
+++ b/site/xref-test/org/apache/juneau/bean/jsonschema/JsonSchemaPropertySimpleArray_Test.html
@@ -20,7 +20,7 @@
 <a class="jxr_linenumber" name="L12" href="#L12">12</a>  <em class="jxr_comment">// ***************************************************************************************************************************</em>
 <a class="jxr_linenumber" name="L13" href="#L13">13</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.bean.jsonschema;
 <a class="jxr_linenumber" name="L14" href="#L14">14</a>  
-<a class="jxr_linenumber" name="L15" href="#L15">15</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L15" href="#L15">15</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  <strong class="jxr_keyword">import</strong> java.util.*;
diff --git a/site/xref-test/org/apache/juneau/bean/jsonschema/JsonSchemaProperty_Test.html b/site/xref-test/org/apache/juneau/bean/jsonschema/JsonSchemaProperty_Test.html
index 78aa2b6d31..8d8e5eee57 100644
--- a/site/xref-test/org/apache/juneau/bean/jsonschema/JsonSchemaProperty_Test.html
+++ b/site/xref-test/org/apache/juneau/bean/jsonschema/JsonSchemaProperty_Test.html
@@ -20,7 +20,7 @@
 <a class="jxr_linenumber" name="L12" href="#L12">12</a>  <em class="jxr_comment">// ***************************************************************************************************************************</em>
 <a class="jxr_linenumber" name="L13" href="#L13">13</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.bean.jsonschema;
 <a class="jxr_linenumber" name="L14" href="#L14">14</a>  
-<a class="jxr_linenumber" name="L15" href="#L15">15</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L15" href="#L15">15</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  <strong class="jxr_keyword">import</strong> java.util.*;
diff --git a/site/xref-test/org/apache/juneau/bean/jsonschema/JsonSchemaRef_Test.html b/site/xref-test/org/apache/juneau/bean/jsonschema/JsonSchemaRef_Test.html
index ffff2ef1c6..5e9d601d1e 100644
--- a/site/xref-test/org/apache/juneau/bean/jsonschema/JsonSchemaRef_Test.html
+++ b/site/xref-test/org/apache/juneau/bean/jsonschema/JsonSchemaRef_Test.html
@@ -20,7 +20,7 @@
 <a class="jxr_linenumber" name="L12" href="#L12">12</a>  <em class="jxr_comment">// ***************************************************************************************************************************</em>
 <a class="jxr_linenumber" name="L13" href="#L13">13</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.bean.jsonschema;
 <a class="jxr_linenumber" name="L14" href="#L14">14</a>  
-<a class="jxr_linenumber" name="L15" href="#L15">15</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L15" href="#L15">15</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  <strong class="jxr_keyword">import</strong> java.util.*;
diff --git a/site/xref-test/org/apache/juneau/bean/openapi3/Callback_Test.html b/site/xref-test/org/apache/juneau/bean/openapi3/Callback_Test.html
index e6253c4446..d94558aea7 100644
--- a/site/xref-test/org/apache/juneau/bean/openapi3/Callback_Test.html
+++ b/site/xref-test/org/apache/juneau/bean/openapi3/Callback_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.bean.openapi3.OpenApiBuilder.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
diff --git a/site/xref-test/org/apache/juneau/bean/openapi3/Components_Test.html b/site/xref-test/org/apache/juneau/bean/openapi3/Components_Test.html
index 38b564ca0d..ec407d5479 100644
--- a/site/xref-test/org/apache/juneau/bean/openapi3/Components_Test.html
+++ b/site/xref-test/org/apache/juneau/bean/openapi3/Components_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.bean.openapi3.OpenApiBuilder.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
diff --git a/site/xref-test/org/apache/juneau/bean/openapi3/Discriminator_Test.html b/site/xref-test/org/apache/juneau/bean/openapi3/Discriminator_Test.html
index 9ae2660f2c..a4cbde7f1b 100644
--- a/site/xref-test/org/apache/juneau/bean/openapi3/Discriminator_Test.html
+++ b/site/xref-test/org/apache/juneau/bean/openapi3/Discriminator_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.bean.openapi3.OpenApiBuilder.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
diff --git a/site/xref-test/org/apache/juneau/bean/openapi3/Encoding_Test.html b/site/xref-test/org/apache/juneau/bean/openapi3/Encoding_Test.html
index 42e45e8475..b2ccbb96cd 100644
--- a/site/xref-test/org/apache/juneau/bean/openapi3/Encoding_Test.html
+++ b/site/xref-test/org/apache/juneau/bean/openapi3/Encoding_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.bean.openapi3.OpenApiBuilder.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
diff --git a/site/xref-test/org/apache/juneau/bean/openapi3/HeaderInfo_Test.html b/site/xref-test/org/apache/juneau/bean/openapi3/HeaderInfo_Test.html
index e7ea630d28..fd67f81acd 100644
--- a/site/xref-test/org/apache/juneau/bean/openapi3/HeaderInfo_Test.html
+++ b/site/xref-test/org/apache/juneau/bean/openapi3/HeaderInfo_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.bean.openapi3.OpenApiBuilder.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
diff --git a/site/xref-test/org/apache/juneau/bean/openapi3/Items_Test.html b/site/xref-test/org/apache/juneau/bean/openapi3/Items_Test.html
index e06d263a07..73916d6095 100644
--- a/site/xref-test/org/apache/juneau/bean/openapi3/Items_Test.html
+++ b/site/xref-test/org/apache/juneau/bean/openapi3/Items_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.bean.openapi3.OpenApiBuilder.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
diff --git a/site/xref-test/org/apache/juneau/bean/openapi3/Link_Test.html b/site/xref-test/org/apache/juneau/bean/openapi3/Link_Test.html
index a861c1bfb1..0da7bb75d1 100644
--- a/site/xref-test/org/apache/juneau/bean/openapi3/Link_Test.html
+++ b/site/xref-test/org/apache/juneau/bean/openapi3/Link_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.bean.openapi3.OpenApiBuilder.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
diff --git a/site/xref-test/org/apache/juneau/bean/openapi3/MediaType_Test.html b/site/xref-test/org/apache/juneau/bean/openapi3/MediaType_Test.html
index 0d88bab705..a695a1c09c 100644
--- a/site/xref-test/org/apache/juneau/bean/openapi3/MediaType_Test.html
+++ b/site/xref-test/org/apache/juneau/bean/openapi3/MediaType_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.bean.openapi3.OpenApiBuilder.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
diff --git a/site/xref-test/org/apache/juneau/bean/openapi3/OAuthFlow_Test.html b/site/xref-test/org/apache/juneau/bean/openapi3/OAuthFlow_Test.html
index 41a9ac1ae1..0d2f190562 100644
--- a/site/xref-test/org/apache/juneau/bean/openapi3/OAuthFlow_Test.html
+++ b/site/xref-test/org/apache/juneau/bean/openapi3/OAuthFlow_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.bean.openapi3.OpenApiBuilder.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
diff --git a/site/xref-test/org/apache/juneau/bean/openapi3/OpenApiBuilder_Test.html b/site/xref-test/org/apache/juneau/bean/openapi3/OpenApiBuilder_Test.html
index 7ed71137bf..06a38dbaaf 100644
--- a/site/xref-test/org/apache/juneau/bean/openapi3/OpenApiBuilder_Test.html
+++ b/site/xref-test/org/apache/juneau/bean/openapi3/OpenApiBuilder_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.bean.openapi3.OpenApiBuilder.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> java.net.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
diff --git a/site/xref-test/org/apache/juneau/bean/openapi3/OpenApi_Test.html b/site/xref-test/org/apache/juneau/bean/openapi3/OpenApi_Test.html
index aef825d6fd..5ac7b8855e 100644
--- a/site/xref-test/org/apache/juneau/bean/openapi3/OpenApi_Test.html
+++ b/site/xref-test/org/apache/juneau/bean/openapi3/OpenApi_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.bean.openapi3.OpenApiBuilder.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
diff --git a/site/xref-test/org/apache/juneau/bean/openapi3/Operation_Test.html b/site/xref-test/org/apache/juneau/bean/openapi3/Operation_Test.html
index 875b48fb0f..b3fc0b5f88 100644
--- a/site/xref-test/org/apache/juneau/bean/openapi3/Operation_Test.html
+++ b/site/xref-test/org/apache/juneau/bean/openapi3/Operation_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.bean.openapi3.OpenApiBuilder.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
diff --git a/site/xref-test/org/apache/juneau/bean/openapi3/Parameter_Test.html b/site/xref-test/org/apache/juneau/bean/openapi3/Parameter_Test.html
index c0d9d2401c..f938760168 100644
--- a/site/xref-test/org/apache/juneau/bean/openapi3/Parameter_Test.html
+++ b/site/xref-test/org/apache/juneau/bean/openapi3/Parameter_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.bean.openapi3.OpenApiBuilder.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
diff --git a/site/xref-test/org/apache/juneau/bean/openapi3/PathItem_Test.html b/site/xref-test/org/apache/juneau/bean/openapi3/PathItem_Test.html
index 270bdf86ed..fe50e4c0de 100644
--- a/site/xref-test/org/apache/juneau/bean/openapi3/PathItem_Test.html
+++ b/site/xref-test/org/apache/juneau/bean/openapi3/PathItem_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.bean.openapi3.OpenApiBuilder.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
diff --git a/site/xref-test/org/apache/juneau/bean/openapi3/RequestBodyInfo_Test.html b/site/xref-test/org/apache/juneau/bean/openapi3/RequestBodyInfo_Test.html
index 6f6b61a6d8..96db1d31d1 100644
--- a/site/xref-test/org/apache/juneau/bean/openapi3/RequestBodyInfo_Test.html
+++ b/site/xref-test/org/apache/juneau/bean/openapi3/RequestBodyInfo_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.bean.openapi3.OpenApiBuilder.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
diff --git a/site/xref-test/org/apache/juneau/bean/openapi3/Response_Test.html b/site/xref-test/org/apache/juneau/bean/openapi3/Response_Test.html
index 997552b756..a364e58662 100644
--- a/site/xref-test/org/apache/juneau/bean/openapi3/Response_Test.html
+++ b/site/xref-test/org/apache/juneau/bean/openapi3/Response_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.bean.openapi3.OpenApiBuilder.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
diff --git a/site/xref-test/org/apache/juneau/bean/openapi3/SchemaInfo_Test.html b/site/xref-test/org/apache/juneau/bean/openapi3/SchemaInfo_Test.html
index d6669992b9..9c79bc67f1 100644
--- a/site/xref-test/org/apache/juneau/bean/openapi3/SchemaInfo_Test.html
+++ b/site/xref-test/org/apache/juneau/bean/openapi3/SchemaInfo_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.bean.openapi3.OpenApiBuilder.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
diff --git a/site/xref-test/org/apache/juneau/bean/openapi3/SecurityRequirement_Test.html b/site/xref-test/org/apache/juneau/bean/openapi3/SecurityRequirement_Test.html
index 3a78dd8f54..f700868b2e 100644
--- a/site/xref-test/org/apache/juneau/bean/openapi3/SecurityRequirement_Test.html
+++ b/site/xref-test/org/apache/juneau/bean/openapi3/SecurityRequirement_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.bean.openapi3.OpenApiBuilder.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
diff --git a/site/xref-test/org/apache/juneau/bean/openapi3/ServerVariable_Test.html b/site/xref-test/org/apache/juneau/bean/openapi3/ServerVariable_Test.html
index 245198dd2c..50fdebea55 100644
--- a/site/xref-test/org/apache/juneau/bean/openapi3/ServerVariable_Test.html
+++ b/site/xref-test/org/apache/juneau/bean/openapi3/ServerVariable_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.bean.openapi3.OpenApiBuilder.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
diff --git a/site/xref-test/org/apache/juneau/bean/openapi3/Server_Test.html b/site/xref-test/org/apache/juneau/bean/openapi3/Server_Test.html
index 8f5b8f649e..ce210437bf 100644
--- a/site/xref-test/org/apache/juneau/bean/openapi3/Server_Test.html
+++ b/site/xref-test/org/apache/juneau/bean/openapi3/Server_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.bean.openapi3.OpenApiBuilder.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
diff --git a/site/xref-test/org/apache/juneau/bean/swagger/HeaderInfo_Test.html b/site/xref-test/org/apache/juneau/bean/swagger/HeaderInfo_Test.html
index 2c0d2a43c4..907ae543bc 100644
--- a/site/xref-test/org/apache/juneau/bean/swagger/HeaderInfo_Test.html
+++ b/site/xref-test/org/apache/juneau/bean/swagger/HeaderInfo_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.bean.swagger.SwaggerBuilder.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
diff --git a/site/xref-test/org/apache/juneau/bean/swagger/Items_Test.html b/site/xref-test/org/apache/juneau/bean/swagger/Items_Test.html
index b91d679132..8154945604 100644
--- a/site/xref-test/org/apache/juneau/bean/swagger/Items_Test.html
+++ b/site/xref-test/org/apache/juneau/bean/swagger/Items_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.bean.swagger.SwaggerBuilder.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
diff --git a/site/xref-test/org/apache/juneau/bean/swagger/Operation_Test.html b/site/xref-test/org/apache/juneau/bean/swagger/Operation_Test.html
index b7e3701db1..ef35419ebe 100644
--- a/site/xref-test/org/apache/juneau/bean/swagger/Operation_Test.html
+++ b/site/xref-test/org/apache/juneau/bean/swagger/Operation_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.bean.swagger.SwaggerBuilder.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
diff --git a/site/xref-test/org/apache/juneau/bean/swagger/ParameterInfo_Test.html b/site/xref-test/org/apache/juneau/bean/swagger/ParameterInfo_Test.html
index 84fd7f7781..04c5213399 100644
--- a/site/xref-test/org/apache/juneau/bean/swagger/ParameterInfo_Test.html
+++ b/site/xref-test/org/apache/juneau/bean/swagger/ParameterInfo_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.bean.swagger.SwaggerBuilder.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
diff --git a/site/xref-test/org/apache/juneau/bean/swagger/ResponseInfo_Test.html b/site/xref-test/org/apache/juneau/bean/swagger/ResponseInfo_Test.html
index b256026b8e..570163f5cf 100644
--- a/site/xref-test/org/apache/juneau/bean/swagger/ResponseInfo_Test.html
+++ b/site/xref-test/org/apache/juneau/bean/swagger/ResponseInfo_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.bean.swagger.SwaggerBuilder.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
diff --git a/site/xref-test/org/apache/juneau/bean/swagger/SchemaInfo_Test.html b/site/xref-test/org/apache/juneau/bean/swagger/SchemaInfo_Test.html
index b62acbafee..ce3324406c 100644
--- a/site/xref-test/org/apache/juneau/bean/swagger/SchemaInfo_Test.html
+++ b/site/xref-test/org/apache/juneau/bean/swagger/SchemaInfo_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.bean.swagger.SwaggerBuilder.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
diff --git a/site/xref-test/org/apache/juneau/bean/swagger/SecurityScheme_Test.html b/site/xref-test/org/apache/juneau/bean/swagger/SecurityScheme_Test.html
index 5b8e54a587..5fbcd7e46f 100644
--- a/site/xref-test/org/apache/juneau/bean/swagger/SecurityScheme_Test.html
+++ b/site/xref-test/org/apache/juneau/bean/swagger/SecurityScheme_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.bean.swagger.SwaggerBuilder.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
diff --git a/site/xref-test/org/apache/juneau/bean/swagger/Swagger_Test.html b/site/xref-test/org/apache/juneau/bean/swagger/Swagger_Test.html
index 9be2d00212..95f781ce5d 100644
--- a/site/xref-test/org/apache/juneau/bean/swagger/Swagger_Test.html
+++ b/site/xref-test/org/apache/juneau/bean/swagger/Swagger_Test.html
@@ -26,7 +26,7 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.TestUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.bean.swagger.SwaggerBuilder.*;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
diff --git a/site/xref-test/org/apache/juneau/bean/swagger/ui/SwaggerUI_Test.html b/site/xref-test/org/apache/juneau/bean/swagger/ui/SwaggerUI_Test.html
index 6b28910c3b..33d131dac7 100644
--- a/site/xref-test/org/apache/juneau/bean/swagger/ui/SwaggerUI_Test.html
+++ b/site/xref-test/org/apache/juneau/bean/swagger/ui/SwaggerUI_Test.html
@@ -25,7 +25,7 @@
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.bean.swagger.ui;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.bean.swagger.SwaggerBuilder.*;
-<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  
diff --git a/site/xref-test/org/apache/juneau/collections/package-frame.html b/site/xref-test/org/apache/juneau/collections/package-frame.html
deleted file mode 100644
index b11bb69261..0000000000
--- a/site/xref-test/org/apache/juneau/collections/package-frame.html
+++ /dev/null
@@ -1,21 +0,0 @@
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xml:lang="en" lang="en">
-    <!-- generated by Apache Maven JXR (jdk8) -->
-    <head>
-        <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-        <title>Apache Juneau 9.2.0-SNAPSHOT Reference Package org.apache.juneau.collections</title>
-        <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="style" />
-    </head>
-    <body>
-        <h1 class="bar"><a href="package-summary.html" target="classFrame">org.apache.juneau.collections</a></h1>
-        <div class="indexContainer">
-            <h2 title="Classes">Classes</h2>
-            <ul title="Classes">
-                <li>
-                    <a href="Args_Test.html#Args_Test" target="classFrame">Args_Test</a>
-                </li>
-            </ul>
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/site/xref-test/org/apache/juneau/collections/package-summary.html b/site/xref-test/org/apache/juneau/collections/package-summary.html
deleted file mode 100644
index c5af8218a5..0000000000
--- a/site/xref-test/org/apache/juneau/collections/package-summary.html
+++ /dev/null
@@ -1,107 +0,0 @@
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xml:lang="en" lang="en">
-    <!-- generated by Apache Maven JXR (jdk8) -->
-    <head>
-        <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-        <title>Apache Juneau 9.2.0-SNAPSHOT Reference Package org.apache.juneau.collections</title>
-        <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="style" />
-    </head>
-
-    <body>
-                <div class="topNav">
-            <a name="navbar_top"><!--   --></a>
-            <a href="#skip-navbar_top" title="Skip navigation links"></a>
-            <a name="navbar_top_firstrow"><!--   --></a>
-            <ul class="navList" title="Navigation">
-                <li><a href="../../../../overview-summary.html">Overview</a></li>
-                <li class="navBarCell1Rev">Package</li>
-                <li>Class</li>
-                <li>Use</li>
-                <li>Tree</li>
-                <li>Deprecated</li>
-                <li>Index</li>
-                <li>Help</li>
-            </ul>
-            <div class="aboutLanguage"><em><strong>Apache Juneau 9.2.0-SNAPSHOT Reference</strong></em></div>
-        </div>
-        <div class="subNav">
-            <ul class="navList">
-                <li>Prev</li>
-                <li>Next</li>
-            </ul>
-            <ul class="navList">
-                <li><a href="../../../../index.html?overview-summary.html" target="_top">Frames</a></li>
-                <li><a href="package-summary.html" target="_top">No Frames</a></li>
-            </ul>
-            <ul class="navList" id="allclasses_navbar_top">
-                <li>All Classes</li>
-            </ul>
-            <div>
-            </div>
-            <a name="skip-navbar_top"><!--   --></a>
-        </div>
-        
-                <div class="header">
-            <h1 title="Package" class="title">Package org.apache.juneau.collections</h1>
-        </div>
-        <div class="contentContainer">
-            <ul class="blockList">
-                <li class="blockList">
-                    <table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
-                        <caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
-                        <thead>
-                            <tr>
-                                <th class="colFirst colLast" scope="col">Class</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <tr class="altColor">
-                                <td class="colFirst colLast">
-                                    <a href="Args_Test.html#Args_Test" target="classFrame" title="class in org.apache.juneau.collections">Args_Test</a>
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </li>
-            </ul>
-        </div>
-        
-                <div class="bottomNav">
-            <a name="navbar_bottom"><!--   --></a>
-            <a href="#skip-navbar_bottom" title="Skip navigation links"></a>
-            <a name="navbar_bottom_firstrow"><!--   --></a>
-            <ul class="navList" title="Navigation">
-                <li><a href="../../../../overview-summary.html">Overview</a></li>
-                <li class="navBarCell1Rev">Package</li>
-                <li>Class</li>
-                <li>Use</li>
-                <li>Tree</li>
-                <li>Deprecated</li>
-                <li>Index</li>
-                <li>Help</li>
-            </ul>
-            <div class="aboutLanguage"><em><strong>Apache Juneau 9.2.0-SNAPSHOT Reference</strong></em></div>
-        </div>
-        <div class="subNav">
-            <ul class="navList">
-                <li>Prev</li>
-                <li>Next</li>
-            </ul>
-            <ul class="navList">
-                <li><a href="../../../../index.html?overview-summary.html" target="_top">Frames</a></li>
-                <li><a href="package-summary.html" target="_top">No Frames</a></li>
-            </ul>
-            <ul class="navList" id="allclasses_navbar_bottom">
-                <li>All Classes</li>
-            </ul>
-            <div>
-            </div>
-            <a name="skip-navbar_bottom"><!--   --></a>
-        </div>
-        
-        <div id="footer">
-            © 2016–2025 <a href="https://www.apache.org/">The Apache Software Foundation</a>
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/site/xref-test/org/apache/juneau/common/annotation/AnnotationObject_Test.html b/site/xref-test/org/apache/juneau/commons/annotation/AnnotationObject_Test.html
similarity index 98%
rename from site/xref-test/org/apache/juneau/common/annotation/AnnotationObject_Test.html
rename to site/xref-test/org/apache/juneau/commons/annotation/AnnotationObject_Test.html
index a305200d2e..0a01121b06 100644
--- a/site/xref-test/org/apache/juneau/common/annotation/AnnotationObject_Test.html
+++ b/site/xref-test/org/apache/juneau/commons/annotation/AnnotationObject_Test.html
@@ -5,7 +5,7 @@
 <link type="text/css" rel="stylesheet" href="../../../../../stylesheet.css" />
 </head>
 <body>
-<div id="overview"><a href="../../../../../../testapidocs/org/apache/juneau/common/annotation/AnnotationObject_Test.html">View Javadoc</a></div><pre>
+<div id="overview"><a href="../../../../../../testapidocs/org/apache/juneau/commons/annotation/AnnotationObject_Test.html">View Javadoc</a></div><pre>
 <a class="jxr_linenumber" name="L1" href="#L1">1</a>   <em class="jxr_comment">/*</em>
 <a class="jxr_linenumber" name="L2" href="#L2">2</a>   <em class="jxr_comment"> * Licensed to the Apache Software Foundation (ASF) under one or more</em>
 <a class="jxr_linenumber" name="L3" href="#L3">3</a>   <em class="jxr_comment"> * contributor license agreements.  See the NOTICE file distributed with</em>
@@ -22,7 +22,7 @@
 <a class="jxr_linenumber" name="L14" href="#L14">14</a>  <em class="jxr_comment"> * See the License for the specific language governing permissions and</em>
 <a class="jxr_linenumber" name="L15" href="#L15">15</a>  <em class="jxr_comment"> * limitations under the License.</em>
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
-<a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.common.annotation;
+<a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.commons.annotation;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
@@ -33,7 +33,7 @@
 <a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.*;
 <a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.api.*;
 <a class="jxr_linenumber" name="L27" href="#L27">27</a>  
-<a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong class="jxr_keyword">class</strong> <a name="AnnotationObject_Test" href="../../../../../org/apache/juneau/common/annotation/AnnotationObject_Test.html#AnnotationObject_Test">AnnotationObject_Test</a> <strong class="jxr_keyword">extends</strong> <a name="TestBase" href="../../../../../org/apache/juneau/TestBase.html#TestBase">TestBase</a> {
+<a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong class="jxr_keyword">class</strong> <a name="AnnotationObject_Test" href="../../../../../org/apache/juneau/commons/annotation/AnnotationObject_Test.html#AnnotationObject_Test">AnnotationObject_Test</a> <strong class="jxr_keyword">extends</strong> <a name="TestBase" href="../../../../../org/apache/juneau/TestBase.html#TestBase">TestBase</a> {
 <a class="jxr_linenumber" name="L29" href="#L29">29</a>  
 <a class="jxr_linenumber" name="L30" href="#L30">30</a>  	<em class="jxr_comment">//------------------------------------------------------------------------------------------------------------------</em>
 <a class="jxr_linenumber" name="L31" href="#L31">31</a>  	<em class="jxr_comment">// Test annotation for testing purposes</em>
diff --git a/site/xref-test/org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html b/site/xref-test/org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html
similarity index 99%
rename from site/xref-test/org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html
rename to site/xref-test/org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html
index afdf1b4436..2d5e4f3add 100644
--- a/site/xref-test/org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html
+++ b/site/xref-test/org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html
@@ -5,7 +5,7 @@
 <link type="text/css" rel="stylesheet" href="../../../../../stylesheet.css" />
 </head>
 <body>
-<div id="overview"><a href="../../../../../../testapidocs/org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html">View Javadoc</a></div><pre>
+<div id="overview"><a href="../../../../../../testapidocs/org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html">View Javadoc</a></div><pre>
 <a class="jxr_linenumber" name="L1" href="#L1">1</a>   <em class="jxr_comment">/*</em>
 <a class="jxr_linenumber" name="L2" href="#L2">2</a>   <em class="jxr_comment"> * Licensed to the Apache Software Foundation (ASF) under one or more</em>
 <a class="jxr_linenumber" name="L3" href="#L3">3</a>   <em class="jxr_comment"> * contributor license agreements.  See the NOTICE file distributed with</em>
@@ -22,7 +22,7 @@
 <a class="jxr_linenumber" name="L14" href="#L14">14</a>  <em class="jxr_comment"> * See the License for the specific language governing permissions and</em>
 <a class="jxr_linenumber" name="L15" href="#L15">15</a>  <em class="jxr_comment"> * limitations under the License.</em>
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
-<a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.common.annotation;
+<a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.commons.annotation;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
@@ -31,10 +31,10 @@
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> java.lang.reflect.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
 <a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.*;
-<a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.common.reflect.*;
+<a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.commons.reflect.*;
 <a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.api.*;
 <a class="jxr_linenumber" name="L28" href="#L28">28</a>  
-<a class="jxr_linenumber" name="L29" href="#L29">29</a>  <strong class="jxr_keyword">class</strong> <a name="AppliedAnnotationObject_Test" href="../../../../../org/apache/juneau/common/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test">AppliedAnnotationObject_Test</a> <strong class="jxr_keyword">extends</strong> <a name="TestBase" href="../../../../../org/apache/juneau/TestBase.html#TestBase">TestBase</a> {
+<a class="jxr_linenumber" name="L29" href="#L29">29</a>  <strong class="jxr_keyword">class</strong> <a name="AppliedAnnotationObject_Test" href="../../../../../org/apache/juneau/commons/annotation/AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test">AppliedAnnotationObject_Test</a> <strong class="jxr_keyword">extends</strong> <a name="TestBase" href="../../../../../org/apache/juneau/TestBase.html#TestBase">TestBase</a> {
 <a class="jxr_linenumber" name="L30" href="#L30">30</a>  
 <a class="jxr_linenumber" name="L31" href="#L31">31</a>  	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String CNAME = AppliedAnnotationObject_Test.<strong class="jxr_keyword">class</strong>.getName();
 <a class="jxr_linenumber" name="L32" href="#L32">32</a>  
diff --git a/site/xref-test/org/apache/juneau/common/annotation/AppliedOnClassAnnotationObject_Test.html b/site/xref-test/org/apache/juneau/commons/annotation/AppliedOnClassAnnotationObject_Test.html
similarity index 98%
rename from site/xref-test/org/apache/juneau/common/annotation/AppliedOnClassAnnotationObject_Test.html
rename to site/xref-test/org/apache/juneau/commons/annotation/AppliedOnClassAnnotationObject_Test.html
index 8c7aea1925..181d29e933 100644
--- a/site/xref-test/org/apache/juneau/common/annotation/AppliedOnClassAnnotationObject_Test.html
+++ b/site/xref-test/org/apache/juneau/commons/annotation/AppliedOnClassAnnotationObject_Test.html
@@ -5,7 +5,7 @@
 <link type="text/css" rel="stylesheet" href="../../../../../stylesheet.css" />
 </head>
 <body>
-<div id="overview"><a href="../../../../../../testapidocs/org/apache/juneau/common/annotation/AppliedOnClassAnnotationObject_Test.html">View Javadoc</a></div><pre>
+<div id="overview"><a href="../../../../../../testapidocs/org/apache/juneau/commons/annotation/AppliedOnClassAnnotationObject_Test.html">View Javadoc</a></div><pre>
 <a class="jxr_linenumber" name="L1" href="#L1">1</a>   <em class="jxr_comment">/*</em>
 <a class="jxr_linenumber" name="L2" href="#L2">2</a>   <em class="jxr_comment"> * Licensed to the Apache Software Foundation (ASF) under one or more</em>
 <a class="jxr_linenumber" name="L3" href="#L3">3</a>   <em class="jxr_comment"> * contributor license agreements.  See the NOTICE file distributed with</em>
@@ -22,7 +22,7 @@
 <a class="jxr_linenumber" name="L14" href="#L14">14</a>  <em class="jxr_comment"> * See the License for the specific language governing permissions and</em>
 <a class="jxr_linenumber" name="L15" href="#L15">15</a>  <em class="jxr_comment"> * limitations under the License.</em>
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
-<a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.common.annotation;
+<a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.commons.annotation;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
@@ -30,10 +30,10 @@
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> java.lang.annotation.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.*;
-<a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.common.reflect.*;
+<a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.commons.reflect.*;
 <a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.api.*;
 <a class="jxr_linenumber" name="L27" href="#L27">27</a>  
-<a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong class="jxr_keyword">class</strong> <a name="AppliedOnClassAnnotationObject_Test" href="../../../../../org/apache/juneau/common/annotation/AppliedOnClassAnnotationObject_Test.html#AppliedOnClassAnnotationObject_Test">AppliedOnClassAnnotationObject_Test</a> <strong class="jxr_keyword">extends</strong> <a name="TestBase" href="../../../../../org/apache/juneau/TestBase.html#TestBase">TestBase</a> {
+<a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong class="jxr_keyword">class</strong> <a name="AppliedOnClassAnnotationObject_Test" href="../../../../../org/apache/juneau/commons/annotation/AppliedOnClassAnnotationObject_Test.html#AppliedOnClassAnnotationObject_Test">AppliedOnClassAnnotationObject_Test</a> <strong class="jxr_keyword">extends</strong> <a name="TestBase" href="../../../../../org/apache/juneau/TestBase.html#TestBase">TestBase</a> {
 <a class="jxr_linenumber" name="L29" href="#L29">29</a>  
 <a class="jxr_linenumber" name="L30" href="#L30">30</a>  	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String CNAME = AppliedOnClassAnnotationObject_Test.<strong class="jxr_keyword">class</strong>.getName();
 <a class="jxr_linenumber" name="L31" href="#L31">31</a>  
diff --git a/site/xref-test/org/apache/juneau/common/annotation/package-frame.html b/site/xref-test/org/apache/juneau/commons/annotation/package-frame.html
similarity index 97%
rename from site/xref-test/org/apache/juneau/common/annotation/package-frame.html
rename to site/xref-test/org/apache/juneau/commons/annotation/package-frame.html
index 6b7087a882..8da3a7049b 100644
--- a/site/xref-test/org/apache/juneau/common/annotation/package-frame.html
+++ b/site/xref-test/org/apache/juneau/commons/annotation/package-frame.html
@@ -4,11 +4,11 @@
     <!-- generated by Apache Maven JXR (jdk8) -->
     <head>
         <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-        <title>Apache Juneau 9.2.0-SNAPSHOT Reference Package org.apache.juneau.common.annotation</title>
+        <title>Apache Juneau 9.2.0-SNAPSHOT Reference Package org.apache.juneau.commons.annotation</title>
         <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
     </head>
     <body>
-        <h1 class="bar"><a href="package-summary.html" target="classFrame">org.apache.juneau.common.annotation</a></h1>
+        <h1 class="bar"><a href="package-summary.html" target="classFrame">org.apache.juneau.commons.annotation</a></h1>
         <div class="indexContainer">
             <h2 title="Classes">Classes</h2>
             <ul title="Classes">
diff --git a/site/xref-test/org/apache/juneau/common/annotation/package-summary.html b/site/xref-test/org/apache/juneau/commons/annotation/package-summary.html
similarity index 78%
rename from site/xref-test/org/apache/juneau/common/annotation/package-summary.html
rename to site/xref-test/org/apache/juneau/commons/annotation/package-summary.html
index 60e42a51b8..52cc85ea4c 100644
--- a/site/xref-test/org/apache/juneau/common/annotation/package-summary.html
+++ b/site/xref-test/org/apache/juneau/commons/annotation/package-summary.html
@@ -4,7 +4,7 @@
     <!-- generated by Apache Maven JXR (jdk8) -->
     <head>
         <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-        <title>Apache Juneau 9.2.0-SNAPSHOT Reference Package org.apache.juneau.common.annotation</title>
+        <title>Apache Juneau 9.2.0-SNAPSHOT Reference Package org.apache.juneau.commons.annotation</title>
         <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
     </head>
 
@@ -43,7 +43,7 @@
         </div>
         
                 <div class="header">
-            <h1 title="Package" class="title">Package org.apache.juneau.common.annotation</h1>
+            <h1 title="Package" class="title">Package org.apache.juneau.commons.annotation</h1>
         </div>
         <div class="contentContainer">
             <ul class="blockList">
@@ -58,232 +58,232 @@
                         <tbody>
                             <tr class="altColor">
                                 <td class="colFirst colLast">
-                                    <a href="AnnotationObject_Test.html#AnnotationObject_Test" target="classFrame" title="class in org.apache.juneau.common.annotation">AnnotationObject_Test</a>
+                                    <a href="AnnotationObject_Test.html#AnnotationObject_Test" target="classFrame" title="class in org.apache.juneau.commons.annotation">AnnotationObject_Test</a>
                                 </td>
                             </tr>
                             <tr class="rowColor">
                                 <td class="colFirst colLast">
-                                    <a href="AnnotationObject_Test.html#AnnotationObject_Test.B" target="classFrame" title="class in org.apache.juneau.common.annotation">AnnotationObject_Test.B</a>
+                                    <a href="AnnotationObject_Test.html#AnnotationObject_Test.B" target="classFrame" title="class in org.apache.juneau.commons.annotation">AnnotationObject_Test.B</a>
                                 </td>
                             </tr>
                             <tr class="altColor">
                                 <td class="colFirst colLast">
-                                    <a href="AnnotationObject_Test.html#AnnotationObject_Test.T" target="classFrame" title="class in org.apache.juneau.common.annotation">AnnotationObject_Test.T</a>
+                                    <a href="AnnotationObject_Test.html#AnnotationObject_Test.T" target="classFrame" title="class in org.apache.juneau.commons.annotation">AnnotationObject_Test.T</a>
                                 </td>
                             </tr>
                             <tr class="rowColor">
                                 <td class="colFirst colLast">
-                                    <a href="AnnotationObject_Test.html#AnnotationObject_Test.T.Builder" target="classFrame" title="class in org.apache.juneau.common.annotation">AnnotationObject_Test.T.Builder</a>
+                                    <a href="AnnotationObject_Test.html#AnnotationObject_Test.T.Builder" target="classFrame" title="class in org.apache.juneau.commons.annotation">AnnotationObject_Test.T.Builder</a>
                                 </td>
                             </tr>
                             <tr class="altColor">
                                 <td class="colFirst colLast">
-                                    <a href="AnnotationObject_Test.html#AnnotationObject_Test.TA" target="classFrame" title="class in org.apache.juneau.common.annotation">AnnotationObject_Test.TA</a>
+                                    <a href="AnnotationObject_Test.html#AnnotationObject_Test.TA" target="classFrame" title="class in org.apache.juneau.commons.annotation">AnnotationObject_Test.TA</a>
                                 </td>
                             </tr>
                             <tr class="rowColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedAnnotationObject_Test</a>
+                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedAnnotationObject_Test</a>
                                 </td>
                             </tr>
                             <tr class="altColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.A_BasicOnTests" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedAnnotationObject_Test.A_BasicOnTests</a>
+                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.A_BasicOnTests" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedAnnotationObject_Test.A_BasicOnTests</a>
                                 </td>
                             </tr>
                             <tr class="rowColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.B_EqualityAndHashCodeTests" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedAnnotationObject_Test.B_EqualityAndHashCodeTests</a>
+                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.B_EqualityAndHashCodeTests" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedAnnotationObject_Test.B_EqualityAndHashCodeTests</a>
                                 </td>
                             </tr>
                             <tr class="altColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.C_BuilderTTests" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedAnnotationObject_Test.C_BuilderTTests</a>
+                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.C_BuilderTTests" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedAnnotationObject_Test.C_BuilderTTests</a>
                                 </td>
                             </tr>
                             <tr class="rowColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.C_BuilderTTests.C" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedAnnotationObject_Test.C_BuilderTTests.C</a>
+                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.C_BuilderTTests.C" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedAnnotationObject_Test.C_BuilderTTests.C</a>
                                 </td>
                             </tr>
                             <tr class="altColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.C_BuilderTTests.C.Builder" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedAnnotationObject_Test.C_BuilderTTests.C.Builder</a>
+                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.C_BuilderTTests.C.Builder" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedAnnotationObject_Test.C_BuilderTTests.C.Builder</a>
                                 </td>
                             </tr>
                             <tr class="rowColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.D_BuilderMTests" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedAnnotationObject_Test.D_BuilderMTests</a>
+                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.D_BuilderMTests" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedAnnotationObject_Test.D_BuilderMTests</a>
                                 </td>
                             </tr>
                             <tr class="altColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.D_BuilderMTests.D" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedAnnotationObject_Test.D_BuilderMTests.D</a>
+                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.D_BuilderMTests.D" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedAnnotationObject_Test.D_BuilderMTests.D</a>
                                 </td>
                             </tr>
                             <tr class="rowColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.D_BuilderMTests.D.Builder" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedAnnotationObject_Test.D_BuilderMTests.D.Builder</a>
+                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.D_BuilderMTests.D.Builder" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedAnnotationObject_Test.D_BuilderMTests.D.Builder</a>
                                 </td>
                             </tr>
                             <tr class="altColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.E_BuilderCTests" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedAnnotationObject_Test.E_BuilderCTests</a>
+                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.E_BuilderCTests" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedAnnotationObject_Test.E_BuilderCTests</a>
                                 </td>
                             </tr>
                             <tr class="rowColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.E_BuilderCTests.E" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedAnnotationObject_Test.E_BuilderCTests.E</a>
+                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.E_BuilderCTests.E" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedAnnotationObject_Test.E_BuilderCTests.E</a>
                                 </td>
                             </tr>
                             <tr class="altColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.E_BuilderCTests.E.Builder" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedAnnotationObject_Test.E_BuilderCTests.E.Builder</a>
+                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.E_BuilderCTests.E.Builder" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedAnnotationObject_Test.E_BuilderCTests.E.Builder</a>
                                 </td>
                             </tr>
                             <tr class="rowColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.F_BuilderMFTests" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedAnnotationObject_Test.F_BuilderMFTests</a>
+                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.F_BuilderMFTests" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedAnnotationObject_Test.F_BuilderMFTests</a>
                                 </td>
                             </tr>
                             <tr class="altColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.F_BuilderMFTests.F" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedAnnotationObject_Test.F_BuilderMFTests.F</a>
+                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.F_BuilderMFTests.F" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedAnnotationObject_Test.F_BuilderMFTests.F</a>
                                 </td>
                             </tr>
                             <tr class="rowColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.F_BuilderMFTests.F.Builder" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedAnnotationObject_Test.F_BuilderMFTests.F.Builder</a>
+                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.F_BuilderMFTests.F.Builder" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedAnnotationObject_Test.F_BuilderMFTests.F.Builder</a>
                                 </td>
                             </tr>
                             <tr class="altColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.G_BuilderTMTests" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedAnnotationObject_Test.G_BuilderTMTests</a>
+                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.G_BuilderTMTests" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedAnnotationObject_Test.G_BuilderTMTests</a>
                                 </td>
                             </tr>
                             <tr class="rowColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.G_BuilderTMTests.G" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedAnnotationObject_Test.G_BuilderTMTests.G</a>
+                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.G_BuilderTMTests.G" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedAnnotationObject_Test.G_BuilderTMTests.G</a>
                                 </td>
                             </tr>
                             <tr class="altColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.G_BuilderTMTests.G.Builder" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedAnnotationObject_Test.G_BuilderTMTests.G.Builder</a>
+                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.G_BuilderTMTests.G.Builder" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedAnnotationObject_Test.G_BuilderTMTests.G.Builder</a>
                                 </td>
                             </tr>
                             <tr class="rowColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.H_BuilderTMFTests" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedAnnotationObject_Test.H_BuilderTMFTests</a>
+                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.H_BuilderTMFTests" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedAnnotationObject_Test.H_BuilderTMFTests</a>
                                 </td>
                             </tr>
                             <tr class="altColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.H_BuilderTMFTests.H" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedAnnotationObject_Test.H_BuilderTMFTests.H</a>
+                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.H_BuilderTMFTests.H" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedAnnotationObject_Test.H_BuilderTMFTests.H</a>
                                 </td>
                             </tr>
                             <tr class="rowColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.H_BuilderTMFTests.H.Builder" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedAnnotationObject_Test.H_BuilderTMFTests.H.Builder</a>
+                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.H_BuilderTMFTests.H.Builder" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedAnnotationObject_Test.H_BuilderTMFTests.H.Builder</a>
                                 </td>
                             </tr>
                             <tr class="altColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.I_BuilderTMFCTests" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedAnnotationObject_Test.I_BuilderTMFCTests</a>
+                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.I_BuilderTMFCTests" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedAnnotationObject_Test.I_BuilderTMFCTests</a>
                                 </td>
                             </tr>
                             <tr class="rowColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.I_BuilderTMFCTests.I" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedAnnotationObject_Test.I_BuilderTMFCTests.I</a>
+                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.I_BuilderTMFCTests.I" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedAnnotationObject_Test.I_BuilderTMFCTests.I</a>
                                 </td>
                             </tr>
                             <tr class="altColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.I_BuilderTMFCTests.I.Builder" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedAnnotationObject_Test.I_BuilderTMFCTests.I.Builder</a>
+                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.I_BuilderTMFCTests.I.Builder" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedAnnotationObject_Test.I_BuilderTMFCTests.I.Builder</a>
                                 </td>
                             </tr>
                             <tr class="rowColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.J_FluentApiTests" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedAnnotationObject_Test.J_FluentApiTests</a>
+                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.J_FluentApiTests" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedAnnotationObject_Test.J_FluentApiTests</a>
                                 </td>
                             </tr>
                             <tr class="altColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.K_ToMapTests" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedAnnotationObject_Test.K_ToMapTests</a>
+                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.K_ToMapTests" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedAnnotationObject_Test.K_ToMapTests</a>
                                 </td>
                             </tr>
                             <tr class="rowColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.L_EdgeCaseTests" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedAnnotationObject_Test.L_EdgeCaseTests</a>
+                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.L_EdgeCaseTests" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedAnnotationObject_Test.L_EdgeCaseTests</a>
                                 </td>
                             </tr>
                             <tr class="altColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.M_NullValidationTests" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedAnnotationObject_Test.M_NullValidationTests</a>
+                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.M_NullValidationTests" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedAnnotationObject_Test.M_NullValidationTests</a>
                                 </td>
                             </tr>
                             <tr class="rowColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.TA" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedAnnotationObject_Test.TA</a>
+                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.TA" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedAnnotationObject_Test.TA</a>
                                 </td>
                             </tr>
                             <tr class="altColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.TAO" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedAnnotationObject_Test.TAO</a>
+                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.TAO" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedAnnotationObject_Test.TAO</a>
                                 </td>
                             </tr>
                             <tr class="rowColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.TAO.Builder" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedAnnotationObject_Test.TAO.Builder</a>
+                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.TAO.Builder" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedAnnotationObject_Test.TAO.Builder</a>
                                 </td>
                             </tr>
                             <tr class="altColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.TC" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedAnnotationObject_Test.TC</a>
+                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.TC" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedAnnotationObject_Test.TC</a>
                                 </td>
                             </tr>
                             <tr class="rowColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.TC2" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedAnnotationObject_Test.TC2</a>
+                                    <a href="AppliedAnnotationObject_Test.html#AppliedAnnotationObject_Test.TC2" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedAnnotationObject_Test.TC2</a>
                                 </td>
                             </tr>
                             <tr class="altColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedOnClassAnnotationObject_Test.html#AppliedOnClassAnnotationObject_Test" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedOnClassAnnotationObject_Test</a>
+                                    <a href="AppliedOnClassAnnotationObject_Test.html#AppliedOnClassAnnotationObject_Test" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedOnClassAnnotationObject_Test</a>
                                 </td>
                             </tr>
                             <tr class="rowColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedOnClassAnnotationObject_Test.html#AppliedOnClassAnnotationObject_Test.T" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedOnClassAnnotationObject_Test.T</a>
+                                    <a href="AppliedOnClassAnnotationObject_Test.html#AppliedOnClassAnnotationObject_Test.T" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedOnClassAnnotationObject_Test.T</a>
                                 </td>
                             </tr>
                             <tr class="altColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedOnClassAnnotationObject_Test.html#AppliedOnClassAnnotationObject_Test.T.Builder" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedOnClassAnnotationObject_Test.T.Builder</a>
+                                    <a href="AppliedOnClassAnnotationObject_Test.html#AppliedOnClassAnnotationObject_Test.T.Builder" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedOnClassAnnotationObject_Test.T.Builder</a>
                                 </td>
                             </tr>
                             <tr class="rowColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedOnClassAnnotationObject_Test.html#AppliedOnClassAnnotationObject_Test.TA" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedOnClassAnnotationObject_Test.TA</a>
+                                    <a href="AppliedOnClassAnnotationObject_Test.html#AppliedOnClassAnnotationObject_Test.TA" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedOnClassAnnotationObject_Test.TA</a>
                                 </td>
                             </tr>
                             <tr class="altColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedOnClassAnnotationObject_Test.html#AppliedOnClassAnnotationObject_Test.TC1" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedOnClassAnnotationObject_Test.TC1</a>
+                                    <a href="AppliedOnClassAnnotationObject_Test.html#AppliedOnClassAnnotationObject_Test.TC1" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedOnClassAnnotationObject_Test.TC1</a>
                                 </td>
                             </tr>
                             <tr class="rowColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedOnClassAnnotationObject_Test.html#AppliedOnClassAnnotationObject_Test.TC2" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedOnClassAnnotationObject_Test.TC2</a>
+                                    <a href="AppliedOnClassAnnotationObject_Test.html#AppliedOnClassAnnotationObject_Test.TC2" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedOnClassAnnotationObject_Test.TC2</a>
                                 </td>
                             </tr>
                             <tr class="altColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedOnClassAnnotationObject_Test.html#AppliedOnClassAnnotationObject_Test.TC3" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedOnClassAnnotationObject_Test.TC3</a>
+                                    <a href="AppliedOnClassAnnotationObject_Test.html#AppliedOnClassAnnotationObject_Test.TC3" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedOnClassAnnotationObject_Test.TC3</a>
                                 </td>
                             </tr>
                             <tr class="rowColor">
                                 <td class="colFirst colLast">
-                                    <a href="AppliedOnClassAnnotationObject_Test.html#AppliedOnClassAnnotationObject_Test.TestClass" target="classFrame" title="class in org.apache.juneau.common.annotation">AppliedOnClassAnnotationObject_Test.TestClass</a>
+                                    <a href="AppliedOnClassAnnotationObject_Test.html#AppliedOnClassAnnotationObject_Test.TestClass" target="classFrame" title="class in org.apache.juneau.commons.annotation">AppliedOnClassAnnotationObject_Test.TestClass</a>
                                 </td>
                             </tr>
                         </tbody>
diff --git a/site/xref-test/org/apache/juneau/collections/Args_Test.html b/site/xref-test/org/apache/juneau/commons/collections/Args_Test.html
similarity index 70%
rename from site/xref-test/org/apache/juneau/collections/Args_Test.html
rename to site/xref-test/org/apache/juneau/commons/collections/Args_Test.html
index fbf3a0b5cf..1396c09dd9 100644
--- a/site/xref-test/org/apache/juneau/collections/Args_Test.html
+++ b/site/xref-test/org/apache/juneau/commons/collections/Args_Test.html
@@ -2,10 +2,10 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="" lang="">
 <head><meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 <title>Args_Test xref</title>
-<link type="text/css" rel="stylesheet" href="../../../../stylesheet.css" />
+<link type="text/css" rel="stylesheet" href="../../../../../stylesheet.css" />
 </head>
 <body>
-<div id="overview"><a href="../../../../../testapidocs/org/apache/juneau/collections/Args_Test.html">View Javadoc</a></div><pre>
+<div id="overview"><a href="../../../../../../testapidocs/org/apache/juneau/commons/collections/Args_Test.html">View Javadoc</a></div><pre>
 <a class="jxr_linenumber" name="L1" href="#L1">1</a>   <em class="jxr_comment">/*</em>
 <a class="jxr_linenumber" name="L2" href="#L2">2</a>   <em class="jxr_comment"> * Licensed to the Apache Software Foundation (ASF) under one or more</em>
 <a class="jxr_linenumber" name="L3" href="#L3">3</a>   <em class="jxr_comment"> * contributor license agreements.  See the NOTICE file distributed with</em>
@@ -22,126 +22,127 @@
 <a class="jxr_linenumber" name="L14" href="#L14">14</a>  <em class="jxr_comment"> * See the License for the specific language governing permissions and</em>
 <a class="jxr_linenumber" name="L15" href="#L15">15</a>  <em class="jxr_comment"> * limitations under the License.</em>
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
-<a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.collections;
+<a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.commons.collections;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
-<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> java.util.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
 <a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.*;
-<a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.api.*;
-<a class="jxr_linenumber" name="L27" href="#L27">27</a>  
-<a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong class="jxr_keyword">class</strong> <a name="Args_Test" href="../../../../org/apache/juneau/collections/Args_Test.html#Args_Test">Args_Test</a> <strong class="jxr_keyword">extends</strong> <a name="TestBase" href="../../../../org/apache/juneau/TestBase.html#TestBase">TestBase</a> {
-<a class="jxr_linenumber" name="L29" href="#L29">29</a>  
-<a class="jxr_linenumber" name="L30" href="#L30">30</a>  	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L31" href="#L31">31</a>  	<em class="jxr_comment">// test - Basic tests</em>
-<a class="jxr_linenumber" name="L32" href="#L32">32</a>  	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L33" href="#L33">33</a>  	@Test <strong class="jxr_keyword">void</strong> basic() {
-<a class="jxr_linenumber" name="L34" href="#L34">34</a>  		<strong class="jxr_keyword">var</strong> a = <strong class="jxr_keyword">new</strong> Args(a());
-<a class="jxr_linenumber" name="L35" href="#L35">35</a>  
-<a class="jxr_linenumber" name="L36" href="#L36">36</a>  	<em class="jxr_comment">// Empty args</em>
-<a class="jxr_linenumber" name="L37" href="#L37">37</a>  	assertNull(a.getArg(0));
-<a class="jxr_linenumber" name="L38" href="#L38">38</a>  	assertNull(a.getArg(1));
-<a class="jxr_linenumber" name="L39" href="#L39">39</a>  	assertNull(a.getArg(-1));
-<a class="jxr_linenumber" name="L40" href="#L40">40</a>  	assertNull(a.getArg(<span class="jxr_string">"foo"</span>));
-<a class="jxr_linenumber" name="L41" href="#L41">41</a>  	assertEmpty(a.getArgs(<span class="jxr_string">"foo"</span>));
-<a class="jxr_linenumber" name="L42" href="#L42">42</a>  	assertFalse(a.containsKey(<span class="jxr_string">"foo"</span>));
-<a class="jxr_linenumber" name="L43" href="#L43">43</a>  
-<a class="jxr_linenumber" name="L44" href="#L44">44</a>  	a = <strong class="jxr_keyword">new</strong> Args(a(<span class="jxr_string">"foo"</span>));
-<a class="jxr_linenumber" name="L45" href="#L45">45</a>  	assertEquals(<span class="jxr_string">"foo"</span>, a.getArg(0));
-<a class="jxr_linenumber" name="L46" href="#L46">46</a>  	assertNull(a.getArg(1));
-<a class="jxr_linenumber" name="L47" href="#L47">47</a>  	assertNull(a.getArg(-1));
-<a class="jxr_linenumber" name="L48" href="#L48">48</a>  	assertNull(a.getArg(<span class="jxr_string">"foo"</span>));
-<a class="jxr_linenumber" name="L49" href="#L49">49</a>  	assertEmpty(a.getArgs(<span class="jxr_string">"foo"</span>));
-<a class="jxr_linenumber" name="L50" href="#L50">50</a>  	assertFalse(a.containsKey(<span class="jxr_string">"foo"</span>));
-<a class="jxr_linenumber" name="L51" href="#L51">51</a>  
-<a class="jxr_linenumber" name="L52" href="#L52">52</a>  	a = <strong class="jxr_keyword">new</strong> Args(a(<span class="jxr_string">"foo"</span>, <span class="jxr_string">"bar bar"</span>));
-<a class="jxr_linenumber" name="L53" href="#L53">53</a>  	assertEquals(<span class="jxr_string">"foo"</span>, a.getArg(0));
-<a class="jxr_linenumber" name="L54" href="#L54">54</a>  	assertEquals(<span class="jxr_string">"bar bar"</span>, a.getArg(1));
-<a class="jxr_linenumber" name="L55" href="#L55">55</a>  	assertNull(a.getArg(-1));
-<a class="jxr_linenumber" name="L56" href="#L56">56</a>  	assertNull(a.getArg(<span class="jxr_string">"foo"</span>));
-<a class="jxr_linenumber" name="L57" href="#L57">57</a>  	assertEmpty(a.getArgs(<span class="jxr_string">"foo"</span>));
-<a class="jxr_linenumber" name="L58" href="#L58">58</a>  	assertFalse(a.containsKey(<span class="jxr_string">"foo"</span>));
-<a class="jxr_linenumber" name="L59" href="#L59">59</a>  
-<a class="jxr_linenumber" name="L60" href="#L60">60</a>  	a = <strong class="jxr_keyword">new</strong> Args(a(<span class="jxr_string">"foo"</span>, <span class="jxr_string">"bar bar"</span>, <span class="jxr_string">"-foo"</span>));
-<a class="jxr_linenumber" name="L61" href="#L61">61</a>  	assertEquals(<span class="jxr_string">"foo"</span>, a.getArg(0));
-<a class="jxr_linenumber" name="L62" href="#L62">62</a>  	assertEquals(<span class="jxr_string">"bar bar"</span>, a.getArg(1));
-<a class="jxr_linenumber" name="L63" href="#L63">63</a>  	assertNull(a.getArg(-1));
-<a class="jxr_linenumber" name="L64" href="#L64">64</a>  	assertNull(a.getArg(<span class="jxr_string">"foo"</span>));
-<a class="jxr_linenumber" name="L65" href="#L65">65</a>  	assertEmpty(a.getArgs(<span class="jxr_string">"foo"</span>));
-<a class="jxr_linenumber" name="L66" href="#L66">66</a>  	assertTrue(a.containsKey(<span class="jxr_string">"foo"</span>));
-<a class="jxr_linenumber" name="L67" href="#L67">67</a>  
-<a class="jxr_linenumber" name="L68" href="#L68">68</a>  	a = <strong class="jxr_keyword">new</strong> Args(a(<span class="jxr_string">"foo"</span>, <span class="jxr_string">"bar bar"</span>, <span class="jxr_string">"-foo"</span>, <span class="jxr_string">"bar bar"</span>));
-<a class="jxr_linenumber" name="L69" href="#L69">69</a>  	assertEquals(<span class="jxr_string">"foo"</span>, a.getArg(0));
-<a class="jxr_linenumber" name="L70" href="#L70">70</a>  	assertEquals(<span class="jxr_string">"bar bar"</span>, a.getArg(1));
-<a class="jxr_linenumber" name="L71" href="#L71">71</a>  	assertNull(a.getArg(-1));
-<a class="jxr_linenumber" name="L72" href="#L72">72</a>  	assertEquals(<span class="jxr_string">"bar bar"</span>, a.getArg(<span class="jxr_string">"foo"</span>));
-<a class="jxr_linenumber" name="L73" href="#L73">73</a>  	assertSize(1, a.getArgs(<span class="jxr_string">"foo"</span>));
-<a class="jxr_linenumber" name="L74" href="#L74">74</a>  		assertEquals(<span class="jxr_string">"bar bar"</span>, a.getArgs(<span class="jxr_string">"foo"</span>).get(0));
-<a class="jxr_linenumber" name="L75" href="#L75">75</a>  		assertTrue(a.containsKey(<span class="jxr_string">"foo"</span>));
-<a class="jxr_linenumber" name="L76" href="#L76">76</a>  	}
-<a class="jxr_linenumber" name="L77" href="#L77">77</a>  
-<a class="jxr_linenumber" name="L78" href="#L78">78</a>  	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L79" href="#L79">79</a>  	<em class="jxr_comment">// test - Fluent setters</em>
-<a class="jxr_linenumber" name="L80" href="#L80">80</a>  	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L81" href="#L81">81</a>  	@Test <strong class="jxr_keyword">void</strong> fluentSetters() {
-<a class="jxr_linenumber" name="L82" href="#L82">82</a>  		<strong class="jxr_keyword">var</strong> a = <strong class="jxr_keyword">new</strong> Args(a(<span class="jxr_string">"main1"</span>));
-<a class="jxr_linenumber" name="L83" href="#L83">83</a>  
-<a class="jxr_linenumber" name="L84" href="#L84">84</a>  		<em class="jxr_comment">// Test inner() returns same instance for fluent chaining</em>
-<a class="jxr_linenumber" name="L85" href="#L85">85</a>  		<strong class="jxr_keyword">var</strong> innerMap = <strong class="jxr_keyword">new</strong> HashMap&lt;String,Object&gt;();
-<a class="jxr_linenumber" name="L86" href="#L86">86</a>  		innerMap.put(<span class="jxr_string">"test"</span>, <span class="jxr_string">"value"</span>);
-<a class="jxr_linenumber" name="L87" href="#L87">87</a>  		assertSame(a, a.<strong class="jxr_keyword">inner</strong>(innerMap));
-<a class="jxr_linenumber" name="L88" href="#L88">88</a>  
-<a class="jxr_linenumber" name="L89" href="#L89">89</a>  		<em class="jxr_comment">// Test session() returns same instance</em>
-<a class="jxr_linenumber" name="L90" href="#L90">90</a>  		BeanSession session = BeanContext.DEFAULT.getSession();
-<a class="jxr_linenumber" name="L91" href="#L91">91</a>  		assertSame(a, a.session(session));
-<a class="jxr_linenumber" name="L92" href="#L92">92</a>  
-<a class="jxr_linenumber" name="L93" href="#L93">93</a>  		<em class="jxr_comment">// Test append(String, Object) returns same instance</em>
-<a class="jxr_linenumber" name="L94" href="#L94">94</a>  		assertSame(a, a.append(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>));
-<a class="jxr_linenumber" name="L95" href="#L95">95</a>  		assertEquals(<span class="jxr_string">"value1"</span>, a.get(<span class="jxr_string">"key1"</span>));
-<a class="jxr_linenumber" name="L96" href="#L96">96</a>  
-<a class="jxr_linenumber" name="L97" href="#L97">97</a>  		<em class="jxr_comment">// Test append(Map) returns same instance</em>
-<a class="jxr_linenumber" name="L98" href="#L98">98</a>  		<strong class="jxr_keyword">var</strong> appendMap = <strong class="jxr_keyword">new</strong> HashMap&lt;String,Object&gt;();
-<a class="jxr_linenumber" name="L99" href="#L99">99</a>  		appendMap.put(<span class="jxr_string">"key2"</span>, <span class="jxr_string">"value2"</span>);
-<a class="jxr_linenumber" name="L100" href="#L100">100</a> 		assertSame(a, a.append(appendMap));
-<a class="jxr_linenumber" name="L101" href="#L101">101</a> 		assertEquals(<span class="jxr_string">"value2"</span>, a.get(<span class="jxr_string">"key2"</span>));
-<a class="jxr_linenumber" name="L102" href="#L102">102</a> 
-<a class="jxr_linenumber" name="L103" href="#L103">103</a> 		<em class="jxr_comment">// Test appendIf() returns same instance</em>
-<a class="jxr_linenumber" name="L104" href="#L104">104</a> 		assertSame(a, a.appendIf(<strong class="jxr_keyword">true</strong>, <span class="jxr_string">"key3"</span>, <span class="jxr_string">"value3"</span>));
-<a class="jxr_linenumber" name="L105" href="#L105">105</a> 		assertEquals(<span class="jxr_string">"value3"</span>, a.get(<span class="jxr_string">"key3"</span>));
-<a class="jxr_linenumber" name="L106" href="#L106">106</a> 		assertSame(a, a.appendIf(false, <span class="jxr_string">"key4"</span>, <span class="jxr_string">"value4"</span>));
-<a class="jxr_linenumber" name="L107" href="#L107">107</a> 		assertNull(a.get(<span class="jxr_string">"key4"</span>));
-<a class="jxr_linenumber" name="L108" href="#L108">108</a> 
-<a class="jxr_linenumber" name="L109" href="#L109">109</a> 		<em class="jxr_comment">// Test filtered() returns same instance</em>
-<a class="jxr_linenumber" name="L110" href="#L110">110</a> 		assertSame(a, a.filtered(x -&gt; x != <strong class="jxr_keyword">null</strong>));
-<a class="jxr_linenumber" name="L111" href="#L111">111</a> 
-<a class="jxr_linenumber" name="L112" href="#L112">112</a> 		<em class="jxr_comment">// Test keepAll() returns same instance</em>
-<a class="jxr_linenumber" name="L113" href="#L113">113</a> 		assertSame(a, a.keepAll(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"key2"</span>));
-<a class="jxr_linenumber" name="L114" href="#L114">114</a> 
-<a class="jxr_linenumber" name="L115" href="#L115">115</a> 		<em class="jxr_comment">// Test setBeanSession() returns same instance</em>
-<a class="jxr_linenumber" name="L116" href="#L116">116</a> 		assertSame(a, a.setBeanSession(session));
-<a class="jxr_linenumber" name="L117" href="#L117">117</a> 
-<a class="jxr_linenumber" name="L118" href="#L118">118</a> 		<em class="jxr_comment">// Test modifiable() returns same instance</em>
-<a class="jxr_linenumber" name="L119" href="#L119">119</a> 		assertSame(a, a.modifiable());
-<a class="jxr_linenumber" name="L120" href="#L120">120</a> 
-<a class="jxr_linenumber" name="L121" href="#L121">121</a> 		<em class="jxr_comment">// Test unmodifiable() returns same instance</em>
-<a class="jxr_linenumber" name="L122" href="#L122">122</a> 		assertSame(a, a.unmodifiable());
-<a class="jxr_linenumber" name="L123" href="#L123">123</a> 	}
-<a class="jxr_linenumber" name="L124" href="#L124">124</a> 
-<a class="jxr_linenumber" name="L125" href="#L125">125</a> 	@Test <strong class="jxr_keyword">void</strong> fluentChaining() {
-<a class="jxr_linenumber" name="L126" href="#L126">126</a> 		<em class="jxr_comment">// Test multiple fluent calls can be chained</em>
-<a class="jxr_linenumber" name="L127" href="#L127">127</a> 		<strong class="jxr_keyword">var</strong> a = <strong class="jxr_keyword">new</strong> Args(a(<span class="jxr_string">"main1"</span>))
-<a class="jxr_linenumber" name="L128" href="#L128">128</a> 			.append(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>)
-<a class="jxr_linenumber" name="L129" href="#L129">129</a> 			.append(<span class="jxr_string">"key2"</span>, <span class="jxr_string">"value2"</span>)
-<a class="jxr_linenumber" name="L130" href="#L130">130</a> 			.appendIf(<strong class="jxr_keyword">true</strong>, <span class="jxr_string">"key3"</span>, <span class="jxr_string">"value3"</span>);
-<a class="jxr_linenumber" name="L131" href="#L131">131</a> 
-<a class="jxr_linenumber" name="L132" href="#L132">132</a> 		assertEquals(<span class="jxr_string">"value1"</span>, a.get(<span class="jxr_string">"key1"</span>));
-<a class="jxr_linenumber" name="L133" href="#L133">133</a> 		assertEquals(<span class="jxr_string">"value2"</span>, a.get(<span class="jxr_string">"key2"</span>));
-<a class="jxr_linenumber" name="L134" href="#L134">134</a> 		assertEquals(<span class="jxr_string">"value3"</span>, a.get(<span class="jxr_string">"key3"</span>));
-<a class="jxr_linenumber" name="L135" href="#L135">135</a> 	}
-<a class="jxr_linenumber" name="L136" href="#L136">136</a> }
+<a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.collections.*;
+<a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.api.*;
+<a class="jxr_linenumber" name="L28" href="#L28">28</a>  
+<a class="jxr_linenumber" name="L29" href="#L29">29</a>  <strong class="jxr_keyword">class</strong> <a name="Args_Test" href="../../../../../org/apache/juneau/commons/collections/Args_Test.html#Args_Test">Args_Test</a> <strong class="jxr_keyword">extends</strong> <a name="TestBase" href="../../../../../org/apache/juneau/TestBase.html#TestBase">TestBase</a> {
+<a class="jxr_linenumber" name="L30" href="#L30">30</a>  
+<a class="jxr_linenumber" name="L31" href="#L31">31</a>  	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L32" href="#L32">32</a>  	<em class="jxr_comment">// test - Basic tests</em>
+<a class="jxr_linenumber" name="L33" href="#L33">33</a>  	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L34" href="#L34">34</a>  	@Test <strong class="jxr_keyword">void</strong> basic() {
+<a class="jxr_linenumber" name="L35" href="#L35">35</a>  		<strong class="jxr_keyword">var</strong> a = <strong class="jxr_keyword">new</strong> Args(a());
+<a class="jxr_linenumber" name="L36" href="#L36">36</a>  
+<a class="jxr_linenumber" name="L37" href="#L37">37</a>  	<em class="jxr_comment">// Empty args</em>
+<a class="jxr_linenumber" name="L38" href="#L38">38</a>  	assertNull(a.getArg(0));
+<a class="jxr_linenumber" name="L39" href="#L39">39</a>  	assertNull(a.getArg(1));
+<a class="jxr_linenumber" name="L40" href="#L40">40</a>  	assertNull(a.getArg(-1));
+<a class="jxr_linenumber" name="L41" href="#L41">41</a>  	assertNull(a.getArg(<span class="jxr_string">"foo"</span>));
+<a class="jxr_linenumber" name="L42" href="#L42">42</a>  	assertEmpty(a.getArgs(<span class="jxr_string">"foo"</span>));
+<a class="jxr_linenumber" name="L43" href="#L43">43</a>  	assertFalse(a.containsKey(<span class="jxr_string">"foo"</span>));
+<a class="jxr_linenumber" name="L44" href="#L44">44</a>  
+<a class="jxr_linenumber" name="L45" href="#L45">45</a>  	a = <strong class="jxr_keyword">new</strong> Args(a(<span class="jxr_string">"foo"</span>));
+<a class="jxr_linenumber" name="L46" href="#L46">46</a>  	assertEquals(<span class="jxr_string">"foo"</span>, a.getArg(0));
+<a class="jxr_linenumber" name="L47" href="#L47">47</a>  	assertNull(a.getArg(1));
+<a class="jxr_linenumber" name="L48" href="#L48">48</a>  	assertNull(a.getArg(-1));
+<a class="jxr_linenumber" name="L49" href="#L49">49</a>  	assertNull(a.getArg(<span class="jxr_string">"foo"</span>));
+<a class="jxr_linenumber" name="L50" href="#L50">50</a>  	assertEmpty(a.getArgs(<span class="jxr_string">"foo"</span>));
+<a class="jxr_linenumber" name="L51" href="#L51">51</a>  	assertFalse(a.containsKey(<span class="jxr_string">"foo"</span>));
+<a class="jxr_linenumber" name="L52" href="#L52">52</a>  
+<a class="jxr_linenumber" name="L53" href="#L53">53</a>  	a = <strong class="jxr_keyword">new</strong> Args(a(<span class="jxr_string">"foo"</span>, <span class="jxr_string">"bar bar"</span>));
+<a class="jxr_linenumber" name="L54" href="#L54">54</a>  	assertEquals(<span class="jxr_string">"foo"</span>, a.getArg(0));
+<a class="jxr_linenumber" name="L55" href="#L55">55</a>  	assertEquals(<span class="jxr_string">"bar bar"</span>, a.getArg(1));
+<a class="jxr_linenumber" name="L56" href="#L56">56</a>  	assertNull(a.getArg(-1));
+<a class="jxr_linenumber" name="L57" href="#L57">57</a>  	assertNull(a.getArg(<span class="jxr_string">"foo"</span>));
+<a class="jxr_linenumber" name="L58" href="#L58">58</a>  	assertEmpty(a.getArgs(<span class="jxr_string">"foo"</span>));
+<a class="jxr_linenumber" name="L59" href="#L59">59</a>  	assertFalse(a.containsKey(<span class="jxr_string">"foo"</span>));
+<a class="jxr_linenumber" name="L60" href="#L60">60</a>  
+<a class="jxr_linenumber" name="L61" href="#L61">61</a>  	a = <strong class="jxr_keyword">new</strong> Args(a(<span class="jxr_string">"foo"</span>, <span class="jxr_string">"bar bar"</span>, <span class="jxr_string">"-foo"</span>));
+<a class="jxr_linenumber" name="L62" href="#L62">62</a>  	assertEquals(<span class="jxr_string">"foo"</span>, a.getArg(0));
+<a class="jxr_linenumber" name="L63" href="#L63">63</a>  	assertEquals(<span class="jxr_string">"bar bar"</span>, a.getArg(1));
+<a class="jxr_linenumber" name="L64" href="#L64">64</a>  	assertNull(a.getArg(-1));
+<a class="jxr_linenumber" name="L65" href="#L65">65</a>  	assertNull(a.getArg(<span class="jxr_string">"foo"</span>));
+<a class="jxr_linenumber" name="L66" href="#L66">66</a>  	assertEmpty(a.getArgs(<span class="jxr_string">"foo"</span>));
+<a class="jxr_linenumber" name="L67" href="#L67">67</a>  	assertTrue(a.containsKey(<span class="jxr_string">"foo"</span>));
+<a class="jxr_linenumber" name="L68" href="#L68">68</a>  
+<a class="jxr_linenumber" name="L69" href="#L69">69</a>  	a = <strong class="jxr_keyword">new</strong> Args(a(<span class="jxr_string">"foo"</span>, <span class="jxr_string">"bar bar"</span>, <span class="jxr_string">"-foo"</span>, <span class="jxr_string">"bar bar"</span>));
+<a class="jxr_linenumber" name="L70" href="#L70">70</a>  	assertEquals(<span class="jxr_string">"foo"</span>, a.getArg(0));
+<a class="jxr_linenumber" name="L71" href="#L71">71</a>  	assertEquals(<span class="jxr_string">"bar bar"</span>, a.getArg(1));
+<a class="jxr_linenumber" name="L72" href="#L72">72</a>  	assertNull(a.getArg(-1));
+<a class="jxr_linenumber" name="L73" href="#L73">73</a>  	assertEquals(<span class="jxr_string">"bar bar"</span>, a.getArg(<span class="jxr_string">"foo"</span>));
+<a class="jxr_linenumber" name="L74" href="#L74">74</a>  	assertSize(1, a.getArgs(<span class="jxr_string">"foo"</span>));
+<a class="jxr_linenumber" name="L75" href="#L75">75</a>  		assertEquals(<span class="jxr_string">"bar bar"</span>, a.getArgs(<span class="jxr_string">"foo"</span>).get(0));
+<a class="jxr_linenumber" name="L76" href="#L76">76</a>  		assertTrue(a.containsKey(<span class="jxr_string">"foo"</span>));
+<a class="jxr_linenumber" name="L77" href="#L77">77</a>  	}
+<a class="jxr_linenumber" name="L78" href="#L78">78</a>  
+<a class="jxr_linenumber" name="L79" href="#L79">79</a>  	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L80" href="#L80">80</a>  	<em class="jxr_comment">// test - Fluent setters</em>
+<a class="jxr_linenumber" name="L81" href="#L81">81</a>  	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L82" href="#L82">82</a>  	@Test <strong class="jxr_keyword">void</strong> fluentSetters() {
+<a class="jxr_linenumber" name="L83" href="#L83">83</a>  		<strong class="jxr_keyword">var</strong> a = <strong class="jxr_keyword">new</strong> Args(a(<span class="jxr_string">"main1"</span>));
+<a class="jxr_linenumber" name="L84" href="#L84">84</a>  
+<a class="jxr_linenumber" name="L85" href="#L85">85</a>  		<em class="jxr_comment">// Test inner() returns same instance for fluent chaining</em>
+<a class="jxr_linenumber" name="L86" href="#L86">86</a>  		<strong class="jxr_keyword">var</strong> innerMap = <strong class="jxr_keyword">new</strong> HashMap&lt;String,Object&gt;();
+<a class="jxr_linenumber" name="L87" href="#L87">87</a>  		innerMap.put(<span class="jxr_string">"test"</span>, <span class="jxr_string">"value"</span>);
+<a class="jxr_linenumber" name="L88" href="#L88">88</a>  		assertSame(a, a.<strong class="jxr_keyword">inner</strong>(innerMap));
+<a class="jxr_linenumber" name="L89" href="#L89">89</a>  
+<a class="jxr_linenumber" name="L90" href="#L90">90</a>  		<em class="jxr_comment">// Test session() returns same instance</em>
+<a class="jxr_linenumber" name="L91" href="#L91">91</a>  		BeanSession session = BeanContext.DEFAULT.getSession();
+<a class="jxr_linenumber" name="L92" href="#L92">92</a>  		assertSame(a, a.session(session));
+<a class="jxr_linenumber" name="L93" href="#L93">93</a>  
+<a class="jxr_linenumber" name="L94" href="#L94">94</a>  		<em class="jxr_comment">// Test append(String, Object) returns same instance</em>
+<a class="jxr_linenumber" name="L95" href="#L95">95</a>  		assertSame(a, a.append(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>));
+<a class="jxr_linenumber" name="L96" href="#L96">96</a>  		assertEquals(<span class="jxr_string">"value1"</span>, a.get(<span class="jxr_string">"key1"</span>));
+<a class="jxr_linenumber" name="L97" href="#L97">97</a>  
+<a class="jxr_linenumber" name="L98" href="#L98">98</a>  		<em class="jxr_comment">// Test append(Map) returns same instance</em>
+<a class="jxr_linenumber" name="L99" href="#L99">99</a>  		<strong class="jxr_keyword">var</strong> appendMap = <strong class="jxr_keyword">new</strong> HashMap&lt;String,Object&gt;();
+<a class="jxr_linenumber" name="L100" href="#L100">100</a> 		appendMap.put(<span class="jxr_string">"key2"</span>, <span class="jxr_string">"value2"</span>);
+<a class="jxr_linenumber" name="L101" href="#L101">101</a> 		assertSame(a, a.append(appendMap));
+<a class="jxr_linenumber" name="L102" href="#L102">102</a> 		assertEquals(<span class="jxr_string">"value2"</span>, a.get(<span class="jxr_string">"key2"</span>));
+<a class="jxr_linenumber" name="L103" href="#L103">103</a> 
+<a class="jxr_linenumber" name="L104" href="#L104">104</a> 		<em class="jxr_comment">// Test appendIf() returns same instance</em>
+<a class="jxr_linenumber" name="L105" href="#L105">105</a> 		assertSame(a, a.appendIf(<strong class="jxr_keyword">true</strong>, <span class="jxr_string">"key3"</span>, <span class="jxr_string">"value3"</span>));
+<a class="jxr_linenumber" name="L106" href="#L106">106</a> 		assertEquals(<span class="jxr_string">"value3"</span>, a.get(<span class="jxr_string">"key3"</span>));
+<a class="jxr_linenumber" name="L107" href="#L107">107</a> 		assertSame(a, a.appendIf(false, <span class="jxr_string">"key4"</span>, <span class="jxr_string">"value4"</span>));
+<a class="jxr_linenumber" name="L108" href="#L108">108</a> 		assertNull(a.get(<span class="jxr_string">"key4"</span>));
+<a class="jxr_linenumber" name="L109" href="#L109">109</a> 
+<a class="jxr_linenumber" name="L110" href="#L110">110</a> 		<em class="jxr_comment">// Test filtered() returns same instance</em>
+<a class="jxr_linenumber" name="L111" href="#L111">111</a> 		assertSame(a, a.filtered(x -&gt; x != <strong class="jxr_keyword">null</strong>));
+<a class="jxr_linenumber" name="L112" href="#L112">112</a> 
+<a class="jxr_linenumber" name="L113" href="#L113">113</a> 		<em class="jxr_comment">// Test keepAll() returns same instance</em>
+<a class="jxr_linenumber" name="L114" href="#L114">114</a> 		assertSame(a, a.keepAll(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"key2"</span>));
+<a class="jxr_linenumber" name="L115" href="#L115">115</a> 
+<a class="jxr_linenumber" name="L116" href="#L116">116</a> 		<em class="jxr_comment">// Test setBeanSession() returns same instance</em>
+<a class="jxr_linenumber" name="L117" href="#L117">117</a> 		assertSame(a, a.setBeanSession(session));
+<a class="jxr_linenumber" name="L118" href="#L118">118</a> 
+<a class="jxr_linenumber" name="L119" href="#L119">119</a> 		<em class="jxr_comment">// Test modifiable() returns same instance</em>
+<a class="jxr_linenumber" name="L120" href="#L120">120</a> 		assertSame(a, a.modifiable());
+<a class="jxr_linenumber" name="L121" href="#L121">121</a> 
+<a class="jxr_linenumber" name="L122" href="#L122">122</a> 		<em class="jxr_comment">// Test unmodifiable() returns same instance</em>
+<a class="jxr_linenumber" name="L123" href="#L123">123</a> 		assertSame(a, a.unmodifiable());
+<a class="jxr_linenumber" name="L124" href="#L124">124</a> 	}
+<a class="jxr_linenumber" name="L125" href="#L125">125</a> 
+<a class="jxr_linenumber" name="L126" href="#L126">126</a> 	@Test <strong class="jxr_keyword">void</strong> fluentChaining() {
+<a class="jxr_linenumber" name="L127" href="#L127">127</a> 		<em class="jxr_comment">// Test multiple fluent calls can be chained</em>
+<a class="jxr_linenumber" name="L128" href="#L128">128</a> 		<strong class="jxr_keyword">var</strong> a = <strong class="jxr_keyword">new</strong> Args(a(<span class="jxr_string">"main1"</span>))
+<a class="jxr_linenumber" name="L129" href="#L129">129</a> 			.append(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>)
+<a class="jxr_linenumber" name="L130" href="#L130">130</a> 			.append(<span class="jxr_string">"key2"</span>, <span class="jxr_string">"value2"</span>)
+<a class="jxr_linenumber" name="L131" href="#L131">131</a> 			.appendIf(<strong class="jxr_keyword">true</strong>, <span class="jxr_string">"key3"</span>, <span class="jxr_string">"value3"</span>);
+<a class="jxr_linenumber" name="L132" href="#L132">132</a> 
+<a class="jxr_linenumber" name="L133" href="#L133">133</a> 		assertEquals(<span class="jxr_string">"value1"</span>, a.get(<span class="jxr_string">"key1"</span>));
+<a class="jxr_linenumber" name="L134" href="#L134">134</a> 		assertEquals(<span class="jxr_string">"value2"</span>, a.get(<span class="jxr_string">"key2"</span>));
+<a class="jxr_linenumber" name="L135" href="#L135">135</a> 		assertEquals(<span class="jxr_string">"value3"</span>, a.get(<span class="jxr_string">"key3"</span>));
+<a class="jxr_linenumber" name="L136" href="#L136">136</a> 	}
+<a class="jxr_linenumber" name="L137" href="#L137">137</a> }
 </pre>
 <hr/>
 <div id="footer">© 2016–2025 <a href="https://www.apache.org/">The Apache Software Foundation</a></div>
diff --git a/site/xref-test/org/apache/juneau/common/collections/BidiMap_Test.html b/site/xref-test/org/apache/juneau/commons/collections/BidiMap_Test.html
similarity index 99%
rename from site/xref-test/org/apache/juneau/common/collections/BidiMap_Test.html
rename to site/xref-test/org/apache/juneau/commons/collections/BidiMap_Test.html
index d7a5402d9d..8c0ebba7d2 100644
--- a/site/xref-test/org/apache/juneau/common/collections/BidiMap_Test.html
+++ b/site/xref-test/org/apache/juneau/commons/collections/BidiMap_Test.html
@@ -5,7 +5,7 @@
 <link type="text/css" rel="stylesheet" href="../../../../../stylesheet.css" />
 </head>
 <body>
-<div id="overview"><a href="../../../../../../testapidocs/org/apache/juneau/common/collections/BidiMap_Test.html">View Javadoc</a></div><pre>
+<div id="overview"><a href="../../../../../../testapidocs/org/apache/juneau/commons/collections/BidiMap_Test.html">View Javadoc</a></div><pre>
 <a class="jxr_linenumber" name="L1" href="#L1">1</a>   <em class="jxr_comment">/*</em>
 <a class="jxr_linenumber" name="L2" href="#L2">2</a>   <em class="jxr_comment"> * Licensed to the Apache Software Foundation (ASF) under one or more</em>
 <a class="jxr_linenumber" name="L3" href="#L3">3</a>   <em class="jxr_comment"> * contributor license agreements.  See the NOTICE file distributed with</em>
@@ -22,7 +22,7 @@
 <a class="jxr_linenumber" name="L14" href="#L14">14</a>  <em class="jxr_comment"> * See the License for the specific language governing permissions and</em>
 <a class="jxr_linenumber" name="L15" href="#L15">15</a>  <em class="jxr_comment"> * limitations under the License.</em>
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
-<a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.common.collections;
+<a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.commons.collections;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
@@ -32,7 +32,7 @@
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.*;
 <a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.api.*;
 <a class="jxr_linenumber" name="L26" href="#L26">26</a>  
-<a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">class</strong> <a name="BidiMap_Test" href="../../../../../org/apache/juneau/common/collections/BidiMap_Test.html#BidiMap_Test">BidiMap_Test</a> <strong class="jxr_keyword">extends</strong> <a name="TestBase" href="../../../../../org/apache/juneau/TestBase.html#TestBase">TestBase</a> {
+<a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">class</strong> <a name="BidiMap_Test" href="../../../../../org/apache/juneau/commons/collections/BidiMap_Test.html#BidiMap_Test">BidiMap_Test</a> <strong class="jxr_keyword">extends</strong> <a name="TestBase" href="../../../../../org/apache/juneau/TestBase.html#TestBase">TestBase</a> {
 <a class="jxr_linenumber" name="L28" href="#L28">28</a>  
 <a class="jxr_linenumber" name="L29" href="#L29">29</a>  	<em class="jxr_comment">//====================================================================================================</em>
 <a class="jxr_linenumber" name="L30" href="#L30">30</a>  	<em class="jxr_comment">// Basic forward and reverse lookups</em>
diff --git a/site/xref-test/org/apache/juneau/common/collections/BooleanValue_Test.html b/site/xref-test/org/apache/juneau/commons/collections/BooleanValue_Test.html
similarity index 98%
rename from site/xref-test/org/apache/juneau/common/collections/BooleanValue_Test.html
rename to site/xref-test/org/apache/juneau/commons/collections/BooleanValue_Test.html
index acff25cfc8..af6c9ea4ea 100644
--- a/site/xref-test/org/apache/juneau/common/collections/BooleanValue_Test.html
+++ b/site/xref-test/org/apache/juneau/commons/collections/BooleanValue_Test.html
@@ -5,7 +5,7 @@
 <link type="text/css" rel="stylesheet" href="../../../../../stylesheet.css" />
 </head>
 <body>
-<div id="overview"><a href="../../../../../../testapidocs/org/apache/juneau/common/collections/BooleanValue_Test.html">View Javadoc</a></div><pre>
+<div id="overview"><a href="../../../../../../testapidocs/org/apache/juneau/commons/collections/BooleanValue_Test.html">View Javadoc</a></div><pre>
 <a class="jxr_linenumber" name="L1" href="#L1">1</a>   <em class="jxr_comment">/*</em>
 <a class="jxr_linenumber" name="L2" href="#L2">2</a>   <em class="jxr_comment"> * Licensed to the Apache Software Foundation (ASF) under one or more</em>
 <a class="jxr_linenumber" name="L3" href="#L3">3</a>   <em class="jxr_comment"> * contributor license agreements.  See the NOTICE file distributed with</em>
@@ -22,16 +22,16 @@
 <a class="jxr_linenumber" name="L14" href="#L14">14</a>  <em class="jxr_comment"> * See the License for the specific language governing permissions and</em>
 <a class="jxr_linenumber" name="L15" href="#L15">15</a>  <em class="jxr_comment"> * limitations under the License.</em>
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
-<a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.common.collections;
+<a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.commons.collections;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
-<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.api.*;
 <a class="jxr_linenumber" name="L25" href="#L25">25</a>  
-<a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">class</strong> <a name="BooleanValue_Test" href="../../../../../org/apache/juneau/common/collections/BooleanValue_Test.html#BooleanValue_Test">BooleanValue_Test</a> <strong class="jxr_keyword">extends</strong> <a name="TestBase" href="../../../../../org/apache/juneau/TestBase.html#TestBase">TestBase</a> {
+<a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">class</strong> <a name="BooleanValue_Test" href="../../../../../org/apache/juneau/commons/collections/BooleanValue_Test.html#BooleanValue_Test">BooleanValue_Test</a> <strong class="jxr_keyword">extends</strong> <a name="TestBase" href="../../../../../org/apache/juneau/TestBase.html#TestBase">TestBase</a> {
 <a class="jxr_linenumber" name="L27" href="#L27">27</a>  
 <a class="jxr_linenumber" name="L28" href="#L28">28</a>  	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
 <a class="jxr_linenumber" name="L29" href="#L29">29</a>  	<em class="jxr_comment">// Basic tests</em>
diff --git a/site/xref-test/org/apache/juneau/common/collections/ByteValue_Test.html b/site/xref-test/org/apache/juneau/commons/collections/ByteValue_Test.html
similarity index 98%
rename from site/xref-test/org/apache/juneau/common/collections/ByteValue_Test.html
rename to site/xref-test/org/apache/juneau/commons/collections/ByteValue_Test.html
index 678ca1380e..a1138f3790 100644
--- a/site/xref-test/org/apache/juneau/common/collections/ByteValue_Test.html
+++ b/site/xref-test/org/apache/juneau/commons/collections/ByteValue_Test.html
@@ -5,7 +5,7 @@
 <link type="text/css" rel="stylesheet" href="../../../../../stylesheet.css" />
 </head>
 <body>
-<div id="overview"><a href="../../../../../../testapidocs/org/apache/juneau/common/collections/ByteValue_Test.html">View Javadoc</a></div><pre>
+<div id="overview"><a href="../../../../../../testapidocs/org/apache/juneau/commons/collections/ByteValue_Test.html">View Javadoc</a></div><pre>
 <a class="jxr_linenumber" name="L1" href="#L1">1</a>   <em class="jxr_comment">/*</em>
 <a class="jxr_linenumber" name="L2" href="#L2">2</a>   <em class="jxr_comment"> * Licensed to the Apache Software Foundation (ASF) under one or more</em>
 <a class="jxr_linenumber" name="L3" href="#L3">3</a>   <em class="jxr_comment"> * contributor license agreements.  See the NOTICE file distributed with</em>
@@ -22,15 +22,15 @@
 <a class="jxr_linenumber" name="L14" href="#L14">14</a>  <em class="jxr_comment"> * See the License for the specific language governing permissions and</em>
 <a class="jxr_linenumber" name="L15" href="#L15">15</a>  <em class="jxr_comment"> * limitations under the License.</em>
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
-<a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.common.collections;
+<a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.commons.collections;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
-<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.utils.CollectionUtils.*;
+<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.utils.CollectionUtils.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.api.*;
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
-<a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">class</strong> <a name="ByteValue_Test" href="../../../../../org/apache/juneau/common/collections/ByteValue_Test.html#ByteValue_Test">ByteValue_Test</a> <strong class="jxr_keyword">extends</strong> <a name="TestBase" href="../../../../../org/apache/juneau/TestBase.html#TestBase">TestBase</a> {
+<a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">class</strong> <a name="ByteValue_Test" href="../../../../../org/apache/juneau/commons/collections/ByteValue_Test.html#ByteValue_Test">ByteValue_Test</a> <strong class="jxr_keyword">extends</strong> <a name="TestBase" href="../../../../../org/apache/juneau/TestBase.html#TestBase">TestBase</a> {
 <a class="jxr_linenumber" name="L26" href="#L26">26</a>  
 <a class="jxr_linenumber" name="L27" href="#L27">27</a>  	<em class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
 <a class="jxr_linenumber" name="L28" href="#L28">28</a>  	<em class="jxr_comment">// Basic tests</em>
diff --git a/site/xref-test/org/apache/juneau/common/collections/Cache2_Test.html b/site/xref-test/org/apache/juneau/commons/collections/Cache2_Test.html
similarity index 58%
rename from site/xref-test/org/apache/juneau/common/collections/Cache2_Test.html
rename to site/xref-test/org/apache/juneau/commons/collections/Cache2_Test.html
index 2463960da5..a85353baa2 100644
--- a/site/xref-test/org/apache/juneau/common/collections/Cache2_Test.html
+++ b/site/xref-test/org/apache/juneau/commons/collections/Cache2_Test.html
@@ -5,7 +5,7 @@
 <link type="text/css" rel="stylesheet" href="../../../../../stylesheet.css" />
 </head>
 <body>
-<div id="overview"><a href="../../../../../../testapidocs/org/apache/juneau/common/collections/Cache2_Test.html">View Javadoc</a></div><pre>
+<div id="overview"><a href="../../../../../../testapidocs/org/apache/juneau/commons/collections/Cache2_Test.html">View Javadoc</a></div><pre>
 <a class="jxr_linenumber" name="L1" href="#L1">1</a>   <em class="jxr_comment">/*</em>
 <a class="jxr_linenumber" name="L2" href="#L2">2</a>   <em class="jxr_comment"> * Licensed to the Apache Software Foundation (ASF) under one or more</em>
 <a class="jxr_linenumber" name="L3" href="#L3">3</a>   <em class="jxr_comment"> * contributor license agreements.  See the NOTICE file distributed with</em>
@@ -22,611 +22,610 @@
 <a class="jxr_linenumber" name="L14" href="#L14">14</a>  <em class="jxr_comment"> * See the License for the specific language governing permissions and</em>
 <a class="jxr_linenumber" name="L15" href="#L15">15</a>  <em class="jxr_comment"> * limitations under the License.</em>
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
-<a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.common.collections;
+<a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.commons.collections;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
-<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.collections.CacheMode.*;
-<a class="jxr_linenumber" name="L20" href="#L20">20</a>  
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
-<a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
-<a class="jxr_linenumber" name="L23" href="#L23">23</a>  
-<a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> java.util.concurrent.atomic.*;
-<a class="jxr_linenumber" name="L25" href="#L25">25</a>  
-<a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.*;
-<a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.api.*;
-<a class="jxr_linenumber" name="L28" href="#L28">28</a>  
-<a class="jxr_linenumber" name="L29" href="#L29">29</a>  <strong class="jxr_keyword">class</strong> <a name="Cache2_Test" href="../../../../../org/apache/juneau/common/collections/Cache2_Test.html#Cache2_Test">Cache2_Test</a> <strong class="jxr_keyword">extends</strong> <a name="TestBase" href="../../../../../org/apache/juneau/TestBase.html#TestBase">TestBase</a> {
-<a class="jxr_linenumber" name="L30" href="#L30">30</a>  
-<a class="jxr_linenumber" name="L31" href="#L31">31</a>  	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L32" href="#L32">32</a>  	<em class="jxr_comment">// a - Basic cache operations with default supplier</em>
-<a class="jxr_linenumber" name="L33" href="#L33">33</a>  	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L34" href="#L34">34</a>  
-<a class="jxr_linenumber" name="L35" href="#L35">35</a>  	@Test
-<a class="jxr_linenumber" name="L36" href="#L36">36</a>  	<strong class="jxr_keyword">void</strong> a01_defaultSupplier_cacheMiss() {
-<a class="jxr_linenumber" name="L37" href="#L37">37</a>  		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
-<a class="jxr_linenumber" name="L38" href="#L38">38</a>  		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L39" href="#L39">39</a>  			.supplier((k1, k2) -&gt; {
-<a class="jxr_linenumber" name="L40" href="#L40">40</a>  				callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L41" href="#L41">41</a>  				<strong class="jxr_keyword">return</strong> k1 + <span class="jxr_string">":"</span> + k2;
-<a class="jxr_linenumber" name="L42" href="#L42">42</a>  			})
-<a class="jxr_linenumber" name="L43" href="#L43">43</a>  			.build();
-<a class="jxr_linenumber" name="L44" href="#L44">44</a>  
-<a class="jxr_linenumber" name="L45" href="#L45">45</a>  		<strong class="jxr_keyword">var</strong> result = x.get(<span class="jxr_string">"user"</span>, 123);
-<a class="jxr_linenumber" name="L46" href="#L46">46</a>  
-<a class="jxr_linenumber" name="L47" href="#L47">47</a>  		assertEquals(<span class="jxr_string">"user:123"</span>, result);
-<a class="jxr_linenumber" name="L48" href="#L48">48</a>  		assertEquals(1, callCount.get());
-<a class="jxr_linenumber" name="L49" href="#L49">49</a>  		assertSize(1, x);
-<a class="jxr_linenumber" name="L50" href="#L50">50</a>  		assertEquals(0, x.getCacheHits());
-<a class="jxr_linenumber" name="L51" href="#L51">51</a>  	}
-<a class="jxr_linenumber" name="L52" href="#L52">52</a>  
-<a class="jxr_linenumber" name="L53" href="#L53">53</a>  	@Test
-<a class="jxr_linenumber" name="L54" href="#L54">54</a>  	<strong class="jxr_keyword">void</strong> a02_defaultSupplier_cacheHit() {
-<a class="jxr_linenumber" name="L55" href="#L55">55</a>  		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
-<a class="jxr_linenumber" name="L56" href="#L56">56</a>  		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L57" href="#L57">57</a>  			.supplier((k1, k2) -&gt; {
-<a class="jxr_linenumber" name="L58" href="#L58">58</a>  				callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L59" href="#L59">59</a>  				<strong class="jxr_keyword">return</strong> k1 + <span class="jxr_string">":"</span> + k2;
-<a class="jxr_linenumber" name="L60" href="#L60">60</a>  			})
-<a class="jxr_linenumber" name="L61" href="#L61">61</a>  			.build();
-<a class="jxr_linenumber" name="L62" href="#L62">62</a>  
-<a class="jxr_linenumber" name="L63" href="#L63">63</a>  		<em class="jxr_comment">// First call - cache miss</em>
-<a class="jxr_linenumber" name="L64" href="#L64">64</a>  		<strong class="jxr_keyword">var</strong> result1 = x.get(<span class="jxr_string">"user"</span>, 123);
-<a class="jxr_linenumber" name="L65" href="#L65">65</a>  
-<a class="jxr_linenumber" name="L66" href="#L66">66</a>  		<em class="jxr_comment">// Second call - cache hit</em>
-<a class="jxr_linenumber" name="L67" href="#L67">67</a>  		<strong class="jxr_keyword">var</strong> result2 = x.get(<span class="jxr_string">"user"</span>, 123);
-<a class="jxr_linenumber" name="L68" href="#L68">68</a>  
-<a class="jxr_linenumber" name="L69" href="#L69">69</a>  		assertEquals(<span class="jxr_string">"user:123"</span>, result1);
-<a class="jxr_linenumber" name="L70" href="#L70">70</a>  		assertEquals(<span class="jxr_string">"user:123"</span>, result2);
-<a class="jxr_linenumber" name="L71" href="#L71">71</a>  		assertSame(result1, result2);
-<a class="jxr_linenumber" name="L72" href="#L72">72</a>  		assertEquals(1, callCount.get()); <em class="jxr_comment">// Supplier only called once</em>
-<a class="jxr_linenumber" name="L73" href="#L73">73</a>  		assertSize(1, x);
-<a class="jxr_linenumber" name="L74" href="#L74">74</a>  		assertEquals(1, x.getCacheHits());
-<a class="jxr_linenumber" name="L75" href="#L75">75</a>  	}
-<a class="jxr_linenumber" name="L76" href="#L76">76</a>  
-<a class="jxr_linenumber" name="L77" href="#L77">77</a>  	@Test
-<a class="jxr_linenumber" name="L78" href="#L78">78</a>  	<strong class="jxr_keyword">void</strong> a03_multipleKeys() {
-<a class="jxr_linenumber" name="L79" href="#L79">79</a>  		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
-<a class="jxr_linenumber" name="L80" href="#L80">80</a>  		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L81" href="#L81">81</a>  			.supplier((k1, k2) -&gt; {
-<a class="jxr_linenumber" name="L82" href="#L82">82</a>  				callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L83" href="#L83">83</a>  				<strong class="jxr_keyword">return</strong> k1 + <span class="jxr_string">":"</span> + k2;
-<a class="jxr_linenumber" name="L84" href="#L84">84</a>  			})
-<a class="jxr_linenumber" name="L85" href="#L85">85</a>  			.build();
-<a class="jxr_linenumber" name="L86" href="#L86">86</a>  
-<a class="jxr_linenumber" name="L87" href="#L87">87</a>  		<strong class="jxr_keyword">var</strong> v1 = x.get(<span class="jxr_string">"user"</span>, 123);
-<a class="jxr_linenumber" name="L88" href="#L88">88</a>  		<strong class="jxr_keyword">var</strong> v2 = x.get(<span class="jxr_string">"admin"</span>, 456);
-<a class="jxr_linenumber" name="L89" href="#L89">89</a>  		<strong class="jxr_keyword">var</strong> v3 = x.get(<span class="jxr_string">"guest"</span>, 789);
-<a class="jxr_linenumber" name="L90" href="#L90">90</a>  
-<a class="jxr_linenumber" name="L91" href="#L91">91</a>  		assertEquals(<span class="jxr_string">"user:123"</span>, v1);
-<a class="jxr_linenumber" name="L92" href="#L92">92</a>  		assertEquals(<span class="jxr_string">"admin:456"</span>, v2);
-<a class="jxr_linenumber" name="L93" href="#L93">93</a>  		assertEquals(<span class="jxr_string">"guest:789"</span>, v3);
-<a class="jxr_linenumber" name="L94" href="#L94">94</a>  		assertEquals(3, callCount.get());
-<a class="jxr_linenumber" name="L95" href="#L95">95</a>  		assertSize(3, x);
-<a class="jxr_linenumber" name="L96" href="#L96">96</a>  		assertEquals(0, x.getCacheHits());
-<a class="jxr_linenumber" name="L97" href="#L97">97</a>  	}
-<a class="jxr_linenumber" name="L98" href="#L98">98</a>  
-<a class="jxr_linenumber" name="L99" href="#L99">99</a>  	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L100" href="#L100">100</a> 	<em class="jxr_comment">// b - Override supplier</em>
-<a class="jxr_linenumber" name="L101" href="#L101">101</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L102" href="#L102">102</a> 
-<a class="jxr_linenumber" name="L103" href="#L103">103</a> 	@Test
-<a class="jxr_linenumber" name="L104" href="#L104">104</a> 	<strong class="jxr_keyword">void</strong> b01_overrideSupplier() {
-<a class="jxr_linenumber" name="L105" href="#L105">105</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L106" href="#L106">106</a> 			.supplier((k1, k2) -&gt; k1 + <span class="jxr_string">":"</span> + k2) <em class="jxr_comment">// Default</em>
-<a class="jxr_linenumber" name="L107" href="#L107">107</a> 			.build();
-<a class="jxr_linenumber" name="L108" href="#L108">108</a> 
-<a class="jxr_linenumber" name="L109" href="#L109">109</a> 		<em class="jxr_comment">// Use override supplier</em>
-<a class="jxr_linenumber" name="L110" href="#L110">110</a> 		<strong class="jxr_keyword">var</strong> result = x.get(<span class="jxr_string">"user"</span>, 123, () -&gt; <span class="jxr_string">"OVERRIDE"</span>);
-<a class="jxr_linenumber" name="L111" href="#L111">111</a> 
-<a class="jxr_linenumber" name="L112" href="#L112">112</a> 		assertEquals(<span class="jxr_string">"OVERRIDE"</span>, result);
-<a class="jxr_linenumber" name="L113" href="#L113">113</a> 		assertSize(1, x);
-<a class="jxr_linenumber" name="L114" href="#L114">114</a> 	}
-<a class="jxr_linenumber" name="L115" href="#L115">115</a> 
-<a class="jxr_linenumber" name="L116" href="#L116">116</a> 	@Test
-<a class="jxr_linenumber" name="L117" href="#L117">117</a> 	<strong class="jxr_keyword">void</strong> b02_overrideSupplier_cachesResult() {
-<a class="jxr_linenumber" name="L118" href="#L118">118</a> 		<strong class="jxr_keyword">var</strong> defaultCalls = <strong class="jxr_keyword">new</strong> AtomicInteger();
-<a class="jxr_linenumber" name="L119" href="#L119">119</a> 		<strong class="jxr_keyword">var</strong> overrideCalls = <strong class="jxr_keyword">new</strong> AtomicInteger();
-<a class="jxr_linenumber" name="L120" href="#L120">120</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L121" href="#L121">121</a> 			.supplier((k1, k2) -&gt; {
-<a class="jxr_linenumber" name="L122" href="#L122">122</a> 				defaultCalls.incrementAndGet();
-<a class="jxr_linenumber" name="L123" href="#L123">123</a> 				<strong class="jxr_keyword">return</strong> <span class="jxr_string">"DEFAULT"</span>;
-<a class="jxr_linenumber" name="L124" href="#L124">124</a> 			})
-<a class="jxr_linenumber" name="L125" href="#L125">125</a> 			.build();
-<a class="jxr_linenumber" name="L126" href="#L126">126</a> 
-<a class="jxr_linenumber" name="L127" href="#L127">127</a> 		<em class="jxr_comment">// First call with override</em>
-<a class="jxr_linenumber" name="L128" href="#L128">128</a> 		<strong class="jxr_keyword">var</strong> result1 = x.get(<span class="jxr_string">"user"</span>, 123, () -&gt; {
-<a class="jxr_linenumber" name="L129" href="#L129">129</a> 			overrideCalls.incrementAndGet();
-<a class="jxr_linenumber" name="L130" href="#L130">130</a> 			<strong class="jxr_keyword">return</strong> <span class="jxr_string">"OVERRIDE"</span>;
-<a class="jxr_linenumber" name="L131" href="#L131">131</a> 		});
-<a class="jxr_linenumber" name="L132" href="#L132">132</a> 
-<a class="jxr_linenumber" name="L133" href="#L133">133</a> 		<em class="jxr_comment">// Second call with default supplier - should use cached value</em>
-<a class="jxr_linenumber" name="L134" href="#L134">134</a> 		<strong class="jxr_keyword">var</strong> result2 = x.get(<span class="jxr_string">"user"</span>, 123);
-<a class="jxr_linenumber" name="L135" href="#L135">135</a> 
-<a class="jxr_linenumber" name="L136" href="#L136">136</a> 		assertEquals(<span class="jxr_string">"OVERRIDE"</span>, result1);
-<a class="jxr_linenumber" name="L137" href="#L137">137</a> 		assertEquals(<span class="jxr_string">"OVERRIDE"</span>, result2); <em class="jxr_comment">// Cached value, not default</em>
-<a class="jxr_linenumber" name="L138" href="#L138">138</a> 		assertEquals(0, defaultCalls.get());
-<a class="jxr_linenumber" name="L139" href="#L139">139</a> 		assertEquals(1, overrideCalls.get());
-<a class="jxr_linenumber" name="L140" href="#L140">140</a> 		assertEquals(1, x.getCacheHits());
-<a class="jxr_linenumber" name="L141" href="#L141">141</a> 	}
-<a class="jxr_linenumber" name="L142" href="#L142">142</a> 
-<a class="jxr_linenumber" name="L143" href="#L143">143</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L144" href="#L144">144</a> 	<em class="jxr_comment">// c - Null key validation</em>
-<a class="jxr_linenumber" name="L145" href="#L145">145</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L146" href="#L146">146</a> 
-<a class="jxr_linenumber" name="L147" href="#L147">147</a> 	@Test
-<a class="jxr_linenumber" name="L148" href="#L148">148</a> 	<strong class="jxr_keyword">void</strong> c01_nullKeys_defaultSupplier() {
-<a class="jxr_linenumber" name="L149" href="#L149">149</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L150" href="#L150">150</a> 			.supplier((k1, k2) -&gt; <span class="jxr_string">"value-"</span> + k1 + <span class="jxr_string">"-"</span> + k2)
-<a class="jxr_linenumber" name="L151" href="#L151">151</a> 			.build();
-<a class="jxr_linenumber" name="L152" href="#L152">152</a> 
-<a class="jxr_linenumber" name="L153" href="#L153">153</a> 		<em class="jxr_comment">// Null keys are now allowed</em>
-<a class="jxr_linenumber" name="L154" href="#L154">154</a> 		assertEquals(<span class="jxr_string">"value-null-123"</span>, x.get(<strong class="jxr_keyword">null</strong>, 123));
-<a class="jxr_linenumber" name="L155" href="#L155">155</a> 		assertEquals(<span class="jxr_string">"value-user-null"</span>, x.get(<span class="jxr_string">"user"</span>, <strong class="jxr_keyword">null</strong>));
-<a class="jxr_linenumber" name="L156" href="#L156">156</a> 		assertEquals(<span class="jxr_string">"value-null-null"</span>, x.get(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>));
-<a class="jxr_linenumber" name="L157" href="#L157">157</a> 
-<a class="jxr_linenumber" name="L158" href="#L158">158</a> 		<em class="jxr_comment">// Cached values should be returned on subsequent calls</em>
-<a class="jxr_linenumber" name="L159" href="#L159">159</a> 		assertEquals(<span class="jxr_string">"value-null-123"</span>, x.get(<strong class="jxr_keyword">null</strong>, 123));
-<a class="jxr_linenumber" name="L160" href="#L160">160</a> 		assertEquals(<span class="jxr_string">"value-user-null"</span>, x.get(<span class="jxr_string">"user"</span>, <strong class="jxr_keyword">null</strong>));
-<a class="jxr_linenumber" name="L161" href="#L161">161</a> 	}
-<a class="jxr_linenumber" name="L162" href="#L162">162</a> 
-<a class="jxr_linenumber" name="L163" href="#L163">163</a> 	@Test
-<a class="jxr_linenumber" name="L164" href="#L164">164</a> 	<strong class="jxr_keyword">void</strong> c02_nullKeys_overrideSupplier() {
-<a class="jxr_linenumber" name="L165" href="#L165">165</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L166" href="#L166">166</a> 
-<a class="jxr_linenumber" name="L167" href="#L167">167</a> 		<em class="jxr_comment">// Null keys are now allowed</em>
-<a class="jxr_linenumber" name="L168" href="#L168">168</a> 		assertEquals(<span class="jxr_string">"value"</span>, x.get(<strong class="jxr_keyword">null</strong>, 123, () -&gt; <span class="jxr_string">"value"</span>));
-<a class="jxr_linenumber" name="L169" href="#L169">169</a> 		assertEquals(<span class="jxr_string">"value"</span>, x.get(<span class="jxr_string">"user"</span>, <strong class="jxr_keyword">null</strong>, () -&gt; <span class="jxr_string">"value"</span>));
-<a class="jxr_linenumber" name="L170" href="#L170">170</a> 		assertEquals(<span class="jxr_string">"value"</span>, x.get(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, () -&gt; <span class="jxr_string">"value"</span>));
-<a class="jxr_linenumber" name="L171" href="#L171">171</a> 
-<a class="jxr_linenumber" name="L172" href="#L172">172</a> 		<em class="jxr_comment">// Cached values should be returned on subsequent calls</em>
-<a class="jxr_linenumber" name="L173" href="#L173">173</a> 		assertEquals(<span class="jxr_string">"value"</span>, x.get(<strong class="jxr_keyword">null</strong>, 123, () -&gt; <span class="jxr_string">"should-not-be-called"</span>));
-<a class="jxr_linenumber" name="L174" href="#L174">174</a> 		assertEquals(<span class="jxr_string">"value"</span>, x.get(<span class="jxr_string">"user"</span>, <strong class="jxr_keyword">null</strong>, () -&gt; <span class="jxr_string">"should-not-be-called"</span>));
-<a class="jxr_linenumber" name="L175" href="#L175">175</a> 	}
-<a class="jxr_linenumber" name="L176" href="#L176">176</a> 
-<a class="jxr_linenumber" name="L177" href="#L177">177</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L178" href="#L178">178</a> 	<em class="jxr_comment">// d - Disabled caching</em>
-<a class="jxr_linenumber" name="L179" href="#L179">179</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L180" href="#L180">180</a> 
-<a class="jxr_linenumber" name="L181" href="#L181">181</a> 	@Test
-<a class="jxr_linenumber" name="L182" href="#L182">182</a> 	<strong class="jxr_keyword">void</strong> d01_disableCaching_alwaysCallsSupplier() {
-<a class="jxr_linenumber" name="L183" href="#L183">183</a> 		<strong class="jxr_keyword">var</strong> defaultCallCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
-<a class="jxr_linenumber" name="L184" href="#L184">184</a> 		<strong class="jxr_keyword">var</strong> overrideCallCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
-<a class="jxr_linenumber" name="L185" href="#L185">185</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L186" href="#L186">186</a> 			.cacheMode(NONE)
-<a class="jxr_linenumber" name="L187" href="#L187">187</a> 			.supplier((k1, k2) -&gt; {
-<a class="jxr_linenumber" name="L188" href="#L188">188</a> 				defaultCallCount.incrementAndGet();
-<a class="jxr_linenumber" name="L189" href="#L189">189</a> 				<strong class="jxr_keyword">return</strong> k1 + <span class="jxr_string">":"</span> + k2;
-<a class="jxr_linenumber" name="L190" href="#L190">190</a> 			})
-<a class="jxr_linenumber" name="L191" href="#L191">191</a> 			.build();
-<a class="jxr_linenumber" name="L192" href="#L192">192</a> 
-<a class="jxr_linenumber" name="L193" href="#L193">193</a> 		<em class="jxr_comment">// First call with override supplier</em>
-<a class="jxr_linenumber" name="L194" href="#L194">194</a> 		assertEquals(<span class="jxr_string">"user:123"</span>, x.get(<span class="jxr_string">"user"</span>, 123, () -&gt; {
-<a class="jxr_linenumber" name="L195" href="#L195">195</a> 			overrideCallCount.incrementAndGet();
-<a class="jxr_linenumber" name="L196" href="#L196">196</a> 			<strong class="jxr_keyword">return</strong> <span class="jxr_string">"user:123"</span>;
-<a class="jxr_linenumber" name="L197" href="#L197">197</a> 		}));
-<a class="jxr_linenumber" name="L198" href="#L198">198</a> 		assertEquals(0, defaultCallCount.get());
-<a class="jxr_linenumber" name="L199" href="#L199">199</a> 		assertEquals(1, overrideCallCount.get());
-<a class="jxr_linenumber" name="L200" href="#L200">200</a> 
-<a class="jxr_linenumber" name="L201" href="#L201">201</a> 		<em class="jxr_comment">// Second call with override - supplier called again (no caching)</em>
-<a class="jxr_linenumber" name="L202" href="#L202">202</a> 		assertEquals(<span class="jxr_string">"user:123"</span>, x.get(<span class="jxr_string">"user"</span>, 123, () -&gt; {
-<a class="jxr_linenumber" name="L203" href="#L203">203</a> 			overrideCallCount.incrementAndGet();
-<a class="jxr_linenumber" name="L204" href="#L204">204</a> 			<strong class="jxr_keyword">return</strong> <span class="jxr_string">"user:123"</span>;
-<a class="jxr_linenumber" name="L205" href="#L205">205</a> 		}));
-<a class="jxr_linenumber" name="L206" href="#L206">206</a> 		assertEquals(0, defaultCallCount.get());
-<a class="jxr_linenumber" name="L207" href="#L207">207</a> 		assertEquals(2, overrideCallCount.get());
-<a class="jxr_linenumber" name="L208" href="#L208">208</a> 
-<a class="jxr_linenumber" name="L209" href="#L209">209</a> 		<em class="jxr_comment">// Using default supplier</em>
-<a class="jxr_linenumber" name="L210" href="#L210">210</a> 		assertEquals(<span class="jxr_string">"user:456"</span>, x.get(<span class="jxr_string">"user"</span>, 456));
-<a class="jxr_linenumber" name="L211" href="#L211">211</a> 		assertEquals(1, defaultCallCount.get());
-<a class="jxr_linenumber" name="L212" href="#L212">212</a> 
-<a class="jxr_linenumber" name="L213" href="#L213">213</a> 		assertEquals(<span class="jxr_string">"user:456"</span>, x.get(<span class="jxr_string">"user"</span>, 456));
-<a class="jxr_linenumber" name="L214" href="#L214">214</a> 		assertEquals(2, defaultCallCount.get()); <em class="jxr_comment">// Called again</em>
-<a class="jxr_linenumber" name="L215" href="#L215">215</a> 
-<a class="jxr_linenumber" name="L216" href="#L216">216</a> 		assertEmpty(x); <em class="jxr_comment">// Nothing cached</em>
-<a class="jxr_linenumber" name="L217" href="#L217">217</a> 	}
-<a class="jxr_linenumber" name="L218" href="#L218">218</a> 
-<a class="jxr_linenumber" name="L219" href="#L219">219</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L220" href="#L220">220</a> 	<em class="jxr_comment">// d2 - Weak cache mode</em>
-<a class="jxr_linenumber" name="L221" href="#L221">221</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L222" href="#L222">222</a> 
-<a class="jxr_linenumber" name="L223" href="#L223">223</a> 	@Test
-<a class="jxr_linenumber" name="L224" href="#L224">224</a> 	<strong class="jxr_keyword">void</strong> d02_weakMode_basicCaching() {
-<a class="jxr_linenumber" name="L225" href="#L225">225</a> 		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
-<a class="jxr_linenumber" name="L226" href="#L226">226</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L227" href="#L227">227</a> 			.cacheMode(WEAK)
-<a class="jxr_linenumber" name="L228" href="#L228">228</a> 			.supplier((k1, k2) -&gt; {
-<a class="jxr_linenumber" name="L229" href="#L229">229</a> 				callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L230" href="#L230">230</a> 				<strong class="jxr_keyword">return</strong> k1 + <span class="jxr_string">":"</span> + k2;
-<a class="jxr_linenumber" name="L231" href="#L231">231</a> 			})
-<a class="jxr_linenumber" name="L232" href="#L232">232</a> 			.build();
-<a class="jxr_linenumber" name="L233" href="#L233">233</a> 
-<a class="jxr_linenumber" name="L234" href="#L234">234</a> 		<em class="jxr_comment">// First call - cache miss</em>
-<a class="jxr_linenumber" name="L235" href="#L235">235</a> 		<strong class="jxr_keyword">var</strong> result1 = x.get(<span class="jxr_string">"user"</span>, 123);
-<a class="jxr_linenumber" name="L236" href="#L236">236</a> 
-<a class="jxr_linenumber" name="L237" href="#L237">237</a> 		<em class="jxr_comment">// Second call - cache hit</em>
-<a class="jxr_linenumber" name="L238" href="#L238">238</a> 		<strong class="jxr_keyword">var</strong> result2 = x.get(<span class="jxr_string">"user"</span>, 123);
-<a class="jxr_linenumber" name="L239" href="#L239">239</a> 
-<a class="jxr_linenumber" name="L240" href="#L240">240</a> 		assertEquals(<span class="jxr_string">"user:123"</span>, result1);
-<a class="jxr_linenumber" name="L241" href="#L241">241</a> 		assertEquals(<span class="jxr_string">"user:123"</span>, result2);
-<a class="jxr_linenumber" name="L242" href="#L242">242</a> 		assertSame(result1, result2);
-<a class="jxr_linenumber" name="L243" href="#L243">243</a> 		assertEquals(1, callCount.get()); <em class="jxr_comment">// Supplier only called once</em>
-<a class="jxr_linenumber" name="L244" href="#L244">244</a> 		assertSize(1, x);
-<a class="jxr_linenumber" name="L245" href="#L245">245</a> 		assertEquals(1, x.getCacheHits());
-<a class="jxr_linenumber" name="L246" href="#L246">246</a> 	}
-<a class="jxr_linenumber" name="L247" href="#L247">247</a> 
-<a class="jxr_linenumber" name="L248" href="#L248">248</a> 	@Test
-<a class="jxr_linenumber" name="L249" href="#L249">249</a> 	<strong class="jxr_keyword">void</strong> d03_weakMode_multipleKeys() {
-<a class="jxr_linenumber" name="L250" href="#L250">250</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L251" href="#L251">251</a> 			.cacheMode(WEAK)
-<a class="jxr_linenumber" name="L252" href="#L252">252</a> 			.supplier((k1, k2) -&gt; k1 + <span class="jxr_string">":"</span> + k2)
-<a class="jxr_linenumber" name="L253" href="#L253">253</a> 			.build();
-<a class="jxr_linenumber" name="L254" href="#L254">254</a> 
-<a class="jxr_linenumber" name="L255" href="#L255">255</a> 		x.get(<span class="jxr_string">"user"</span>, 123);
-<a class="jxr_linenumber" name="L256" href="#L256">256</a> 		x.get(<span class="jxr_string">"admin"</span>, 456);
-<a class="jxr_linenumber" name="L257" href="#L257">257</a> 		x.get(<span class="jxr_string">"guest"</span>, 789);
-<a class="jxr_linenumber" name="L258" href="#L258">258</a> 
-<a class="jxr_linenumber" name="L259" href="#L259">259</a> 		assertSize(3, x);
-<a class="jxr_linenumber" name="L260" href="#L260">260</a> 		assertEquals(0, x.getCacheHits());
-<a class="jxr_linenumber" name="L261" href="#L261">261</a> 
-<a class="jxr_linenumber" name="L262" href="#L262">262</a> 		<em class="jxr_comment">// Verify all cached</em>
-<a class="jxr_linenumber" name="L263" href="#L263">263</a> 		assertEquals(<span class="jxr_string">"user:123"</span>, x.get(<span class="jxr_string">"user"</span>, 123));
-<a class="jxr_linenumber" name="L264" href="#L264">264</a> 		assertEquals(<span class="jxr_string">"admin:456"</span>, x.get(<span class="jxr_string">"admin"</span>, 456));
-<a class="jxr_linenumber" name="L265" href="#L265">265</a> 		assertEquals(<span class="jxr_string">"guest:789"</span>, x.get(<span class="jxr_string">"guest"</span>, 789));
-<a class="jxr_linenumber" name="L266" href="#L266">266</a> 		assertEquals(3, x.getCacheHits());
-<a class="jxr_linenumber" name="L267" href="#L267">267</a> 	}
-<a class="jxr_linenumber" name="L268" href="#L268">268</a> 
-<a class="jxr_linenumber" name="L269" href="#L269">269</a> 	@Test
-<a class="jxr_linenumber" name="L270" href="#L270">270</a> 	<strong class="jxr_keyword">void</strong> d04_weakMode_clear() {
-<a class="jxr_linenumber" name="L271" href="#L271">271</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L272" href="#L272">272</a> 			.cacheMode(WEAK)
-<a class="jxr_linenumber" name="L273" href="#L273">273</a> 			.supplier((k1, k2) -&gt; k1 + <span class="jxr_string">":"</span> + k2)
-<a class="jxr_linenumber" name="L274" href="#L274">274</a> 			.build();
-<a class="jxr_linenumber" name="L275" href="#L275">275</a> 
-<a class="jxr_linenumber" name="L276" href="#L276">276</a> 		x.get(<span class="jxr_string">"user"</span>, 123);
-<a class="jxr_linenumber" name="L277" href="#L277">277</a> 		x.get(<span class="jxr_string">"admin"</span>, 456);
-<a class="jxr_linenumber" name="L278" href="#L278">278</a> 		assertSize(2, x);
-<a class="jxr_linenumber" name="L279" href="#L279">279</a> 
-<a class="jxr_linenumber" name="L280" href="#L280">280</a> 		x.clear();
-<a class="jxr_linenumber" name="L281" href="#L281">281</a> 		assertEmpty(x);
-<a class="jxr_linenumber" name="L282" href="#L282">282</a> 	}
-<a class="jxr_linenumber" name="L283" href="#L283">283</a> 
-<a class="jxr_linenumber" name="L284" href="#L284">284</a> 	@Test
-<a class="jxr_linenumber" name="L285" href="#L285">285</a> 	<strong class="jxr_keyword">void</strong> d05_weakMode_maxSize() {
-<a class="jxr_linenumber" name="L286" href="#L286">286</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L287" href="#L287">287</a> 			.cacheMode(WEAK)
-<a class="jxr_linenumber" name="L288" href="#L288">288</a> 			.maxSize(2)
-<a class="jxr_linenumber" name="L289" href="#L289">289</a> 			.supplier((k1, k2) -&gt; k1 + <span class="jxr_string">":"</span> + k2)
-<a class="jxr_linenumber" name="L290" href="#L290">290</a> 			.build();
-<a class="jxr_linenumber" name="L291" href="#L291">291</a> 
-<a class="jxr_linenumber" name="L292" href="#L292">292</a> 		x.get(<span class="jxr_string">"k1"</span>, 1);
-<a class="jxr_linenumber" name="L293" href="#L293">293</a> 		x.get(<span class="jxr_string">"k2"</span>, 2);
-<a class="jxr_linenumber" name="L294" href="#L294">294</a> 		assertSize(2, x);
-<a class="jxr_linenumber" name="L295" href="#L295">295</a> 
-<a class="jxr_linenumber" name="L296" href="#L296">296</a> 		<em class="jxr_comment">// 3rd item doesn't trigger eviction yet</em>
-<a class="jxr_linenumber" name="L297" href="#L297">297</a> 		x.get(<span class="jxr_string">"k3"</span>, 3);
-<a class="jxr_linenumber" name="L298" href="#L298">298</a> 		assertSize(3, x);
-<a class="jxr_linenumber" name="L299" href="#L299">299</a> 
-<a class="jxr_linenumber" name="L300" href="#L300">300</a> 		<em class="jxr_comment">// 4th item triggers eviction</em>
-<a class="jxr_linenumber" name="L301" href="#L301">301</a> 		x.get(<span class="jxr_string">"k4"</span>, 4);
-<a class="jxr_linenumber" name="L302" href="#L302">302</a> 		assertSize(1, x);
-<a class="jxr_linenumber" name="L303" href="#L303">303</a> 	}
-<a class="jxr_linenumber" name="L304" href="#L304">304</a> 
-<a class="jxr_linenumber" name="L305" href="#L305">305</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L306" href="#L306">306</a> 	<em class="jxr_comment">// e - Max size and eviction</em>
-<a class="jxr_linenumber" name="L307" href="#L307">307</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L308" href="#L308">308</a> 
-<a class="jxr_linenumber" name="L309" href="#L309">309</a> 	@Test
-<a class="jxr_linenumber" name="L310" href="#L310">310</a> 	<strong class="jxr_keyword">void</strong> e01_maxSize_clearsWhenExceeded() {
-<a class="jxr_linenumber" name="L311" href="#L311">311</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L312" href="#L312">312</a> 			.maxSize(2)
-<a class="jxr_linenumber" name="L313" href="#L313">313</a> 			.supplier((k1, k2) -&gt; k1 + <span class="jxr_string">":"</span> + k2)
-<a class="jxr_linenumber" name="L314" href="#L314">314</a> 			.build();
-<a class="jxr_linenumber" name="L315" href="#L315">315</a> 
-<a class="jxr_linenumber" name="L316" href="#L316">316</a> 		x.get(<span class="jxr_string">"k1"</span>, 1);
-<a class="jxr_linenumber" name="L317" href="#L317">317</a> 		x.get(<span class="jxr_string">"k2"</span>, 2);
-<a class="jxr_linenumber" name="L318" href="#L318">318</a> 		assertSize(2, x);
-<a class="jxr_linenumber" name="L319" href="#L319">319</a> 
-<a class="jxr_linenumber" name="L320" href="#L320">320</a> 		<em class="jxr_comment">// Adding a third entry doesn't exceed maxSize (2 &gt; 2 is false)</em>
-<a class="jxr_linenumber" name="L321" href="#L321">321</a> 		x.get(<span class="jxr_string">"k3"</span>, 3);
-<a class="jxr_linenumber" name="L322" href="#L322">322</a> 		assertSize(3, x);
-<a class="jxr_linenumber" name="L323" href="#L323">323</a> 
-<a class="jxr_linenumber" name="L324" href="#L324">324</a> 		<em class="jxr_comment">// Fourth entry triggers clear (3 &gt; 2 is true)</em>
-<a class="jxr_linenumber" name="L325" href="#L325">325</a> 		x.get(<span class="jxr_string">"k4"</span>, 4);
-<a class="jxr_linenumber" name="L326" href="#L326">326</a> 		assertSize(1, x); <em class="jxr_comment">// Only the new entry</em>
-<a class="jxr_linenumber" name="L327" href="#L327">327</a> 	}
-<a class="jxr_linenumber" name="L328" href="#L328">328</a> 
-<a class="jxr_linenumber" name="L329" href="#L329">329</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L330" href="#L330">330</a> 	<em class="jxr_comment">// f - Cache hits tracking</em>
-<a class="jxr_linenumber" name="L331" href="#L331">331</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L332" href="#L332">332</a> 
-<a class="jxr_linenumber" name="L333" href="#L333">333</a> 	@Test
-<a class="jxr_linenumber" name="L334" href="#L334">334</a> 	<strong class="jxr_keyword">void</strong> f01_cacheHitsTracking() {
-<a class="jxr_linenumber" name="L335" href="#L335">335</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L336" href="#L336">336</a> 			.supplier((k1, k2) -&gt; k1 + <span class="jxr_string">":"</span> + k2)
-<a class="jxr_linenumber" name="L337" href="#L337">337</a> 			.build();
-<a class="jxr_linenumber" name="L338" href="#L338">338</a> 
-<a class="jxr_linenumber" name="L339" href="#L339">339</a> 		assertEquals(0, x.getCacheHits());
-<a class="jxr_linenumber" name="L340" href="#L340">340</a> 
-<a class="jxr_linenumber" name="L341" href="#L341">341</a> 		x.get(<span class="jxr_string">"user"</span>, 123); <em class="jxr_comment">// Miss</em>
-<a class="jxr_linenumber" name="L342" href="#L342">342</a> 		assertEquals(0, x.getCacheHits());
-<a class="jxr_linenumber" name="L343" href="#L343">343</a> 
-<a class="jxr_linenumber" name="L344" href="#L344">344</a> 		x.get(<span class="jxr_string">"user"</span>, 123); <em class="jxr_comment">// Hit</em>
-<a class="jxr_linenumber" name="L345" href="#L345">345</a> 		assertEquals(1, x.getCacheHits());
-<a class="jxr_linenumber" name="L346" href="#L346">346</a> 
-<a class="jxr_linenumber" name="L347" href="#L347">347</a> 		x.get(<span class="jxr_string">"admin"</span>, 456); <em class="jxr_comment">// Miss</em>
-<a class="jxr_linenumber" name="L348" href="#L348">348</a> 		assertEquals(1, x.getCacheHits());
-<a class="jxr_linenumber" name="L349" href="#L349">349</a> 
-<a class="jxr_linenumber" name="L350" href="#L350">350</a> 		x.get(<span class="jxr_string">"user"</span>, 123); <em class="jxr_comment">// Hit</em>
-<a class="jxr_linenumber" name="L351" href="#L351">351</a> 		x.get(<span class="jxr_string">"admin"</span>, 456); <em class="jxr_comment">// Hit</em>
-<a class="jxr_linenumber" name="L352" href="#L352">352</a> 		assertEquals(3, x.getCacheHits());
-<a class="jxr_linenumber" name="L353" href="#L353">353</a> 	}
-<a class="jxr_linenumber" name="L354" href="#L354">354</a> 
-<a class="jxr_linenumber" name="L355" href="#L355">355</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L356" href="#L356">356</a> 	<em class="jxr_comment">// g - Clear operation</em>
-<a class="jxr_linenumber" name="L357" href="#L357">357</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L358" href="#L358">358</a> 
-<a class="jxr_linenumber" name="L359" href="#L359">359</a> 	@Test
-<a class="jxr_linenumber" name="L360" href="#L360">360</a> 	<strong class="jxr_keyword">void</strong> g01_clear() {
-<a class="jxr_linenumber" name="L361" href="#L361">361</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L362" href="#L362">362</a> 			.supplier((k1, k2) -&gt; k1 + <span class="jxr_string">":"</span> + k2)
-<a class="jxr_linenumber" name="L363" href="#L363">363</a> 			.build();
-<a class="jxr_linenumber" name="L364" href="#L364">364</a> 
-<a class="jxr_linenumber" name="L365" href="#L365">365</a> 		x.get(<span class="jxr_string">"user"</span>, 123);
-<a class="jxr_linenumber" name="L366" href="#L366">366</a> 		x.get(<span class="jxr_string">"admin"</span>, 456);
-<a class="jxr_linenumber" name="L367" href="#L367">367</a> 		assertSize(2, x);
-<a class="jxr_linenumber" name="L368" href="#L368">368</a> 
-<a class="jxr_linenumber" name="L369" href="#L369">369</a> 		x.clear();
-<a class="jxr_linenumber" name="L370" href="#L370">370</a> 
-<a class="jxr_linenumber" name="L371" href="#L371">371</a> 		assertEmpty(x);
-<a class="jxr_linenumber" name="L372" href="#L372">372</a> 	}
-<a class="jxr_linenumber" name="L373" href="#L373">373</a> 
-<a class="jxr_linenumber" name="L374" href="#L374">374</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L375" href="#L375">375</a> 	<em class="jxr_comment">// h - No default supplier</em>
-<a class="jxr_linenumber" name="L376" href="#L376">376</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L377" href="#L377">377</a> 
-<a class="jxr_linenumber" name="L378" href="#L378">378</a> 	@Test
-<a class="jxr_linenumber" name="L379" href="#L379">379</a> 	<strong class="jxr_keyword">void</strong> h01_noDefaultSupplier_requiresOverride() {
-<a class="jxr_linenumber" name="L380" href="#L380">380</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L381" href="#L381">381</a> 
-<a class="jxr_linenumber" name="L382" href="#L382">382</a> 		assertThrows(NullPointerException.<strong class="jxr_keyword">class</strong>, () -&gt; x.get(<span class="jxr_string">"user"</span>, 123));
-<a class="jxr_linenumber" name="L383" href="#L383">383</a> 	}
-<a class="jxr_linenumber" name="L384" href="#L384">384</a> 
-<a class="jxr_linenumber" name="L385" href="#L385">385</a> 	@Test
-<a class="jxr_linenumber" name="L386" href="#L386">386</a> 	<strong class="jxr_keyword">void</strong> h02_noDefaultSupplier_worksWithOverride() {
-<a class="jxr_linenumber" name="L387" href="#L387">387</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L388" href="#L388">388</a> 
-<a class="jxr_linenumber" name="L389" href="#L389">389</a> 		<strong class="jxr_keyword">var</strong> result = x.get(<span class="jxr_string">"user"</span>, 123, () -&gt; <span class="jxr_string">"CUSTOM"</span>);
-<a class="jxr_linenumber" name="L390" href="#L390">390</a> 
-<a class="jxr_linenumber" name="L391" href="#L391">391</a> 		assertEquals(<span class="jxr_string">"CUSTOM"</span>, result);
-<a class="jxr_linenumber" name="L392" href="#L392">392</a> 		assertSize(1, x);
-<a class="jxr_linenumber" name="L393" href="#L393">393</a> 	}
-<a class="jxr_linenumber" name="L394" href="#L394">394</a> 
-<a class="jxr_linenumber" name="L395" href="#L395">395</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L396" href="#L396">396</a> 	<em class="jxr_comment">// i - put() method</em>
-<a class="jxr_linenumber" name="L397" href="#L397">397</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L398" href="#L398">398</a> 
-<a class="jxr_linenumber" name="L399" href="#L399">399</a> 	@Test
-<a class="jxr_linenumber" name="L400" href="#L400">400</a> 	<strong class="jxr_keyword">void</strong> i01_put_directInsertion() {
-<a class="jxr_linenumber" name="L401" href="#L401">401</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L402" href="#L402">402</a> 		<strong class="jxr_keyword">var</strong> previous = x.put(<span class="jxr_string">"user"</span>, 123, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L403" href="#L403">403</a> 		assertNull(previous);
-<a class="jxr_linenumber" name="L404" href="#L404">404</a> 		assertEquals(<span class="jxr_string">"value1"</span>, x.get(<span class="jxr_string">"user"</span>, 123, () -&gt; <span class="jxr_string">"should not be called"</span>));
-<a class="jxr_linenumber" name="L405" href="#L405">405</a> 		assertSize(1, x);
-<a class="jxr_linenumber" name="L406" href="#L406">406</a> 	}
-<a class="jxr_linenumber" name="L407" href="#L407">407</a> 
-<a class="jxr_linenumber" name="L408" href="#L408">408</a> 	@Test
-<a class="jxr_linenumber" name="L409" href="#L409">409</a> 	<strong class="jxr_keyword">void</strong> i02_put_overwritesExisting() {
-<a class="jxr_linenumber" name="L410" href="#L410">410</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L411" href="#L411">411</a> 		x.put(<span class="jxr_string">"user"</span>, 123, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L412" href="#L412">412</a> 		<strong class="jxr_keyword">var</strong> previous = x.put(<span class="jxr_string">"user"</span>, 123, <span class="jxr_string">"value2"</span>);
-<a class="jxr_linenumber" name="L413" href="#L413">413</a> 		assertEquals(<span class="jxr_string">"value1"</span>, previous);
-<a class="jxr_linenumber" name="L414" href="#L414">414</a> 		assertEquals(<span class="jxr_string">"value2"</span>, x.get(<span class="jxr_string">"user"</span>, 123, () -&gt; <span class="jxr_string">"should not be called"</span>));
-<a class="jxr_linenumber" name="L415" href="#L415">415</a> 	}
-<a class="jxr_linenumber" name="L416" href="#L416">416</a> 
-<a class="jxr_linenumber" name="L417" href="#L417">417</a> 	@Test
-<a class="jxr_linenumber" name="L418" href="#L418">418</a> 	<strong class="jxr_keyword">void</strong> i03_put_withNullValue() {
-<a class="jxr_linenumber" name="L419" href="#L419">419</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L420" href="#L420">420</a> 		x.put(<span class="jxr_string">"user"</span>, 123, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L421" href="#L421">421</a> 		<strong class="jxr_keyword">var</strong> previous = x.put(<span class="jxr_string">"user"</span>, 123, <strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="L422" href="#L422">422</a> 		assertEquals(<span class="jxr_string">"value1"</span>, previous);
-<a class="jxr_linenumber" name="L423" href="#L423">423</a> 		assertFalse(x.containsKey(<span class="jxr_string">"user"</span>, 123));
-<a class="jxr_linenumber" name="L424" href="#L424">424</a> 	}
-<a class="jxr_linenumber" name="L425" href="#L425">425</a> 
-<a class="jxr_linenumber" name="L426" href="#L426">426</a> 	@Test
-<a class="jxr_linenumber" name="L427" href="#L427">427</a> 	<strong class="jxr_keyword">void</strong> i04_put_withNullValue_newKey() {
-<a class="jxr_linenumber" name="L428" href="#L428">428</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L429" href="#L429">429</a> 		<strong class="jxr_keyword">var</strong> previous = x.put(<span class="jxr_string">"user"</span>, 123, <strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="L430" href="#L430">430</a> 		assertNull(previous);
-<a class="jxr_linenumber" name="L431" href="#L431">431</a> 		assertFalse(x.containsKey(<span class="jxr_string">"user"</span>, 123));
-<a class="jxr_linenumber" name="L432" href="#L432">432</a> 		assertTrue(x.isEmpty());
-<a class="jxr_linenumber" name="L433" href="#L433">433</a> 	}
-<a class="jxr_linenumber" name="L434" href="#L434">434</a> 
-<a class="jxr_linenumber" name="L435" href="#L435">435</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L436" href="#L436">436</a> 	<em class="jxr_comment">// j - isEmpty() method</em>
-<a class="jxr_linenumber" name="L437" href="#L437">437</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L438" href="#L438">438</a> 
-<a class="jxr_linenumber" name="L439" href="#L439">439</a> 	@Test
-<a class="jxr_linenumber" name="L440" href="#L440">440</a> 	<strong class="jxr_keyword">void</strong> j01_isEmpty_newCache() {
-<a class="jxr_linenumber" name="L441" href="#L441">441</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L442" href="#L442">442</a> 		assertTrue(x.isEmpty());
-<a class="jxr_linenumber" name="L443" href="#L443">443</a> 	}
-<a class="jxr_linenumber" name="L444" href="#L444">444</a> 
-<a class="jxr_linenumber" name="L445" href="#L445">445</a> 	@Test
-<a class="jxr_linenumber" name="L446" href="#L446">446</a> 	<strong class="jxr_keyword">void</strong> j02_isEmpty_afterPut() {
-<a class="jxr_linenumber" name="L447" href="#L447">447</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L448" href="#L448">448</a> 		x.put(<span class="jxr_string">"user"</span>, 123, <span class="jxr_string">"value"</span>);
-<a class="jxr_linenumber" name="L449" href="#L449">449</a> 		assertFalse(x.isEmpty());
-<a class="jxr_linenumber" name="L450" href="#L450">450</a> 	}
-<a class="jxr_linenumber" name="L451" href="#L451">451</a> 
-<a class="jxr_linenumber" name="L452" href="#L452">452</a> 	@Test
-<a class="jxr_linenumber" name="L453" href="#L453">453</a> 	<strong class="jxr_keyword">void</strong> j03_isEmpty_afterClear() {
-<a class="jxr_linenumber" name="L454" href="#L454">454</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L455" href="#L455">455</a> 		x.put(<span class="jxr_string">"user"</span>, 123, <span class="jxr_string">"value"</span>);
-<a class="jxr_linenumber" name="L456" href="#L456">456</a> 		x.clear();
-<a class="jxr_linenumber" name="L457" href="#L457">457</a> 		assertTrue(x.isEmpty());
-<a class="jxr_linenumber" name="L458" href="#L458">458</a> 	}
-<a class="jxr_linenumber" name="L459" href="#L459">459</a> 
-<a class="jxr_linenumber" name="L460" href="#L460">460</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L461" href="#L461">461</a> 	<em class="jxr_comment">// k - containsKey() method</em>
-<a class="jxr_linenumber" name="L462" href="#L462">462</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L463" href="#L463">463</a> 
-<a class="jxr_linenumber" name="L464" href="#L464">464</a> 	@Test
-<a class="jxr_linenumber" name="L465" href="#L465">465</a> 	<strong class="jxr_keyword">void</strong> k01_containsKey_notPresent() {
-<a class="jxr_linenumber" name="L466" href="#L466">466</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L467" href="#L467">467</a> 		assertFalse(x.containsKey(<span class="jxr_string">"user"</span>, 123));
-<a class="jxr_linenumber" name="L468" href="#L468">468</a> 	}
-<a class="jxr_linenumber" name="L469" href="#L469">469</a> 
-<a class="jxr_linenumber" name="L470" href="#L470">470</a> 	@Test
-<a class="jxr_linenumber" name="L471" href="#L471">471</a> 	<strong class="jxr_keyword">void</strong> k02_containsKey_afterPut() {
-<a class="jxr_linenumber" name="L472" href="#L472">472</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L473" href="#L473">473</a> 		x.put(<span class="jxr_string">"user"</span>, 123, <span class="jxr_string">"value"</span>);
-<a class="jxr_linenumber" name="L474" href="#L474">474</a> 		assertTrue(x.containsKey(<span class="jxr_string">"user"</span>, 123));
-<a class="jxr_linenumber" name="L475" href="#L475">475</a> 		assertFalse(x.containsKey(<span class="jxr_string">"user"</span>, 456));
-<a class="jxr_linenumber" name="L476" href="#L476">476</a> 	}
-<a class="jxr_linenumber" name="L477" href="#L477">477</a> 
-<a class="jxr_linenumber" name="L478" href="#L478">478</a> 	@Test
-<a class="jxr_linenumber" name="L479" href="#L479">479</a> 	<strong class="jxr_keyword">void</strong> k03_containsKey_afterGet() {
-<a class="jxr_linenumber" name="L480" href="#L480">480</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L481" href="#L481">481</a> 			.supplier((k1, k2) -&gt; k1 + <span class="jxr_string">":"</span> + k2)
-<a class="jxr_linenumber" name="L482" href="#L482">482</a> 			.build();
-<a class="jxr_linenumber" name="L483" href="#L483">483</a> 		x.get(<span class="jxr_string">"user"</span>, 123);
-<a class="jxr_linenumber" name="L484" href="#L484">484</a> 		assertTrue(x.containsKey(<span class="jxr_string">"user"</span>, 123));
-<a class="jxr_linenumber" name="L485" href="#L485">485</a> 	}
-<a class="jxr_linenumber" name="L486" href="#L486">486</a> 
-<a class="jxr_linenumber" name="L487" href="#L487">487</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L488" href="#L488">488</a> 	<em class="jxr_comment">// l - remove() method</em>
-<a class="jxr_linenumber" name="L489" href="#L489">489</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L490" href="#L490">490</a> 
-<a class="jxr_linenumber" name="L491" href="#L491">491</a> 	@Test
-<a class="jxr_linenumber" name="L492" href="#L492">492</a> 	<strong class="jxr_keyword">void</strong> l02_remove_existingKey() {
-<a class="jxr_linenumber" name="L493" href="#L493">493</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L494" href="#L494">494</a> 		x.put(<span class="jxr_string">"user"</span>, 123, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L495" href="#L495">495</a> 		<strong class="jxr_keyword">var</strong> removed = x.remove(<span class="jxr_string">"user"</span>, 123);
-<a class="jxr_linenumber" name="L496" href="#L496">496</a> 		assertEquals(<span class="jxr_string">"value1"</span>, removed);
-<a class="jxr_linenumber" name="L497" href="#L497">497</a> 		assertFalse(x.containsKey(<span class="jxr_string">"user"</span>, 123));
-<a class="jxr_linenumber" name="L498" href="#L498">498</a> 	}
-<a class="jxr_linenumber" name="L499" href="#L499">499</a> 
-<a class="jxr_linenumber" name="L500" href="#L500">500</a> 	@Test
-<a class="jxr_linenumber" name="L501" href="#L501">501</a> 	<strong class="jxr_keyword">void</strong> l03_remove_nonExistentKey() {
-<a class="jxr_linenumber" name="L502" href="#L502">502</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L503" href="#L503">503</a> 		<strong class="jxr_keyword">var</strong> removed = x.remove(<span class="jxr_string">"user"</span>, 123);
-<a class="jxr_linenumber" name="L504" href="#L504">504</a> 		assertNull(removed);
-<a class="jxr_linenumber" name="L505" href="#L505">505</a> 	}
-<a class="jxr_linenumber" name="L506" href="#L506">506</a> 
-<a class="jxr_linenumber" name="L507" href="#L507">507</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L508" href="#L508">508</a> 	<em class="jxr_comment">// m - containsValue() method</em>
-<a class="jxr_linenumber" name="L509" href="#L509">509</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L510" href="#L510">510</a> 
-<a class="jxr_linenumber" name="L511" href="#L511">511</a> 	@Test
-<a class="jxr_linenumber" name="L512" href="#L512">512</a> 	<strong class="jxr_keyword">void</strong> m02_containsValue_present() {
-<a class="jxr_linenumber" name="L513" href="#L513">513</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L514" href="#L514">514</a> 		x.put(<span class="jxr_string">"user"</span>, 123, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L515" href="#L515">515</a> 		x.put(<span class="jxr_string">"admin"</span>, 456, <span class="jxr_string">"value2"</span>);
-<a class="jxr_linenumber" name="L516" href="#L516">516</a> 		assertTrue(x.containsValue(<span class="jxr_string">"value1"</span>));
-<a class="jxr_linenumber" name="L517" href="#L517">517</a> 		assertTrue(x.containsValue(<span class="jxr_string">"value2"</span>));
-<a class="jxr_linenumber" name="L518" href="#L518">518</a> 		assertFalse(x.containsValue(<span class="jxr_string">"value3"</span>));
-<a class="jxr_linenumber" name="L519" href="#L519">519</a> 	}
-<a class="jxr_linenumber" name="L520" href="#L520">520</a> 
-<a class="jxr_linenumber" name="L521" href="#L521">521</a> 	@Test
-<a class="jxr_linenumber" name="L522" href="#L522">522</a> 	<strong class="jxr_keyword">void</strong> m03_containsValue_notPresent() {
-<a class="jxr_linenumber" name="L523" href="#L523">523</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L524" href="#L524">524</a> 		assertFalse(x.containsValue(<span class="jxr_string">"value1"</span>));
-<a class="jxr_linenumber" name="L525" href="#L525">525</a> 	}
-<a class="jxr_linenumber" name="L526" href="#L526">526</a> 
-<a class="jxr_linenumber" name="L527" href="#L527">527</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L528" href="#L528">528</a> 	<em class="jxr_comment">// n - logOnExit() builder methods</em>
-<a class="jxr_linenumber" name="L529" href="#L529">529</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L530" href="#L530">530</a> 
-<a class="jxr_linenumber" name="L531" href="#L531">531</a> 	@Test
-<a class="jxr_linenumber" name="L532" href="#L532">532</a> 	<strong class="jxr_keyword">void</strong> n02_logOnExit_withStringId() {
-<a class="jxr_linenumber" name="L533" href="#L533">533</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L534" href="#L534">534</a> 			.logOnExit(<span class="jxr_string">"TestCache2"</span>)
-<a class="jxr_linenumber" name="L535" href="#L535">535</a> 			.supplier((k1, k2) -&gt; k1 + <span class="jxr_string">":"</span> + k2)
-<a class="jxr_linenumber" name="L536" href="#L536">536</a> 			.build();
-<a class="jxr_linenumber" name="L537" href="#L537">537</a> 		x.get(<span class="jxr_string">"user"</span>, 123);
-<a class="jxr_linenumber" name="L538" href="#L538">538</a> 		assertSize(1, x);
-<a class="jxr_linenumber" name="L539" href="#L539">539</a> 	}
-<a class="jxr_linenumber" name="L540" href="#L540">540</a> 
-<a class="jxr_linenumber" name="L541" href="#L541">541</a> 	@Test
-<a class="jxr_linenumber" name="L542" href="#L542">542</a> 	<strong class="jxr_keyword">void</strong> n03_logOnExit_withBooleanTrue() {
-<a class="jxr_linenumber" name="L543" href="#L543">543</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L544" href="#L544">544</a> 			.logOnExit(<strong class="jxr_keyword">true</strong>, <span class="jxr_string">"MyCache2"</span>)
-<a class="jxr_linenumber" name="L545" href="#L545">545</a> 			.supplier((k1, k2) -&gt; k1 + <span class="jxr_string">":"</span> + k2)
-<a class="jxr_linenumber" name="L546" href="#L546">546</a> 			.build();
-<a class="jxr_linenumber" name="L547" href="#L547">547</a> 		x.get(<span class="jxr_string">"user"</span>, 123);
-<a class="jxr_linenumber" name="L548" href="#L548">548</a> 		assertSize(1, x);
-<a class="jxr_linenumber" name="L549" href="#L549">549</a> 	}
-<a class="jxr_linenumber" name="L550" href="#L550">550</a> 
-<a class="jxr_linenumber" name="L551" href="#L551">551</a> 	@Test
-<a class="jxr_linenumber" name="L552" href="#L552">552</a> 	<strong class="jxr_keyword">void</strong> n04_logOnExit_withBooleanFalse() {
-<a class="jxr_linenumber" name="L553" href="#L553">553</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L554" href="#L554">554</a> 			.logOnExit(false, <span class="jxr_string">"DisabledCache2"</span>)
-<a class="jxr_linenumber" name="L555" href="#L555">555</a> 			.supplier((k1, k2) -&gt; k1 + <span class="jxr_string">":"</span> + k2)
-<a class="jxr_linenumber" name="L556" href="#L556">556</a> 			.build();
-<a class="jxr_linenumber" name="L557" href="#L557">557</a> 		x.get(<span class="jxr_string">"user"</span>, 123);
-<a class="jxr_linenumber" name="L558" href="#L558">558</a> 		assertSize(1, x);
-<a class="jxr_linenumber" name="L559" href="#L559">559</a> 	}
-<a class="jxr_linenumber" name="L560" href="#L560">560</a> 
-<a class="jxr_linenumber" name="L561" href="#L561">561</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L562" href="#L562">562</a> 	<em class="jxr_comment">// l - create() static method</em>
-<a class="jxr_linenumber" name="L563" href="#L563">563</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L564" href="#L564">564</a> 
-<a class="jxr_linenumber" name="L565" href="#L565">565</a> 	@Test
-<a class="jxr_linenumber" name="L566" href="#L566">566</a> 	<strong class="jxr_keyword">void</strong> l01_create_basic() {
-<a class="jxr_linenumber" name="L567" href="#L567">567</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.&lt;String, Integer, String&gt;create()
-<a class="jxr_linenumber" name="L568" href="#L568">568</a> 			.supplier((k1, k2) -&gt; k1 + <span class="jxr_string">":"</span> + k2)
-<a class="jxr_linenumber" name="L569" href="#L569">569</a> 			.build();
-<a class="jxr_linenumber" name="L570" href="#L570">570</a> 
-<a class="jxr_linenumber" name="L571" href="#L571">571</a> 		<strong class="jxr_keyword">var</strong> result = x.get(<span class="jxr_string">"user"</span>, 123);
-<a class="jxr_linenumber" name="L572" href="#L572">572</a> 		assertEquals(<span class="jxr_string">"user:123"</span>, result);
-<a class="jxr_linenumber" name="L573" href="#L573">573</a> 		assertSize(1, x);
-<a class="jxr_linenumber" name="L574" href="#L574">574</a> 	}
-<a class="jxr_linenumber" name="L575" href="#L575">575</a> 
-<a class="jxr_linenumber" name="L576" href="#L576">576</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L577" href="#L577">577</a> 	<em class="jxr_comment">// m - disableCaching() builder method</em>
-<a class="jxr_linenumber" name="L578" href="#L578">578</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L579" href="#L579">579</a> 
-<a class="jxr_linenumber" name="L580" href="#L580">580</a> 	@Test
-<a class="jxr_linenumber" name="L581" href="#L581">581</a> 	<strong class="jxr_keyword">void</strong> m01_disableCaching() {
-<a class="jxr_linenumber" name="L582" href="#L582">582</a> 		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
-<a class="jxr_linenumber" name="L583" href="#L583">583</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L584" href="#L584">584</a> 			.cacheMode(NONE)
-<a class="jxr_linenumber" name="L585" href="#L585">585</a> 			.supplier((k1, k2) -&gt; {
-<a class="jxr_linenumber" name="L586" href="#L586">586</a> 				callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L587" href="#L587">587</a> 				<strong class="jxr_keyword">return</strong> <span class="jxr_string">"value"</span>;
-<a class="jxr_linenumber" name="L588" href="#L588">588</a> 			})
-<a class="jxr_linenumber" name="L589" href="#L589">589</a> 			.build();
-<a class="jxr_linenumber" name="L590" href="#L590">590</a> 
+<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
+<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.collections.CacheMode.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
+<a class="jxr_linenumber" name="L22" href="#L22">22</a>  
+<a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> java.util.concurrent.atomic.*;
+<a class="jxr_linenumber" name="L24" href="#L24">24</a>  
+<a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.*;
+<a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.api.*;
+<a class="jxr_linenumber" name="L27" href="#L27">27</a>  
+<a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong class="jxr_keyword">class</strong> <a name="Cache2_Test" href="../../../../../org/apache/juneau/commons/collections/Cache2_Test.html#Cache2_Test">Cache2_Test</a> <strong class="jxr_keyword">extends</strong> <a name="TestBase" href="../../../../../org/apache/juneau/TestBase.html#TestBase">TestBase</a> {
+<a class="jxr_linenumber" name="L29" href="#L29">29</a>  
+<a class="jxr_linenumber" name="L30" href="#L30">30</a>  	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L31" href="#L31">31</a>  	<em class="jxr_comment">// a - Basic cache operations with default supplier</em>
+<a class="jxr_linenumber" name="L32" href="#L32">32</a>  	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L33" href="#L33">33</a>  
+<a class="jxr_linenumber" name="L34" href="#L34">34</a>  	@Test
+<a class="jxr_linenumber" name="L35" href="#L35">35</a>  	<strong class="jxr_keyword">void</strong> a01_defaultSupplier_cacheMiss() {
+<a class="jxr_linenumber" name="L36" href="#L36">36</a>  		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
+<a class="jxr_linenumber" name="L37" href="#L37">37</a>  		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L38" href="#L38">38</a>  			.supplier((k1, k2) -&gt; {
+<a class="jxr_linenumber" name="L39" href="#L39">39</a>  				callCount.incrementAndGet();
+<a class="jxr_linenumber" name="L40" href="#L40">40</a>  				<strong class="jxr_keyword">return</strong> k1 + <span class="jxr_string">":"</span> + k2;
+<a class="jxr_linenumber" name="L41" href="#L41">41</a>  			})
+<a class="jxr_linenumber" name="L42" href="#L42">42</a>  			.build();
+<a class="jxr_linenumber" name="L43" href="#L43">43</a>  
+<a class="jxr_linenumber" name="L44" href="#L44">44</a>  		<strong class="jxr_keyword">var</strong> result = x.get(<span class="jxr_string">"user"</span>, 123);
+<a class="jxr_linenumber" name="L45" href="#L45">45</a>  
+<a class="jxr_linenumber" name="L46" href="#L46">46</a>  		assertEquals(<span class="jxr_string">"user:123"</span>, result);
+<a class="jxr_linenumber" name="L47" href="#L47">47</a>  		assertEquals(1, callCount.get());
+<a class="jxr_linenumber" name="L48" href="#L48">48</a>  		assertSize(1, x);
+<a class="jxr_linenumber" name="L49" href="#L49">49</a>  		assertEquals(0, x.getCacheHits());
+<a class="jxr_linenumber" name="L50" href="#L50">50</a>  	}
+<a class="jxr_linenumber" name="L51" href="#L51">51</a>  
+<a class="jxr_linenumber" name="L52" href="#L52">52</a>  	@Test
+<a class="jxr_linenumber" name="L53" href="#L53">53</a>  	<strong class="jxr_keyword">void</strong> a02_defaultSupplier_cacheHit() {
+<a class="jxr_linenumber" name="L54" href="#L54">54</a>  		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
+<a class="jxr_linenumber" name="L55" href="#L55">55</a>  		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L56" href="#L56">56</a>  			.supplier((k1, k2) -&gt; {
+<a class="jxr_linenumber" name="L57" href="#L57">57</a>  				callCount.incrementAndGet();
+<a class="jxr_linenumber" name="L58" href="#L58">58</a>  				<strong class="jxr_keyword">return</strong> k1 + <span class="jxr_string">":"</span> + k2;
+<a class="jxr_linenumber" name="L59" href="#L59">59</a>  			})
+<a class="jxr_linenumber" name="L60" href="#L60">60</a>  			.build();
+<a class="jxr_linenumber" name="L61" href="#L61">61</a>  
+<a class="jxr_linenumber" name="L62" href="#L62">62</a>  		<em class="jxr_comment">// First call - cache miss</em>
+<a class="jxr_linenumber" name="L63" href="#L63">63</a>  		<strong class="jxr_keyword">var</strong> result1 = x.get(<span class="jxr_string">"user"</span>, 123);
+<a class="jxr_linenumber" name="L64" href="#L64">64</a>  
+<a class="jxr_linenumber" name="L65" href="#L65">65</a>  		<em class="jxr_comment">// Second call - cache hit</em>
+<a class="jxr_linenumber" name="L66" href="#L66">66</a>  		<strong class="jxr_keyword">var</strong> result2 = x.get(<span class="jxr_string">"user"</span>, 123);
+<a class="jxr_linenumber" name="L67" href="#L67">67</a>  
+<a class="jxr_linenumber" name="L68" href="#L68">68</a>  		assertEquals(<span class="jxr_string">"user:123"</span>, result1);
+<a class="jxr_linenumber" name="L69" href="#L69">69</a>  		assertEquals(<span class="jxr_string">"user:123"</span>, result2);
+<a class="jxr_linenumber" name="L70" href="#L70">70</a>  		assertSame(result1, result2);
+<a class="jxr_linenumber" name="L71" href="#L71">71</a>  		assertEquals(1, callCount.get()); <em class="jxr_comment">// Supplier only called once</em>
+<a class="jxr_linenumber" name="L72" href="#L72">72</a>  		assertSize(1, x);
+<a class="jxr_linenumber" name="L73" href="#L73">73</a>  		assertEquals(1, x.getCacheHits());
+<a class="jxr_linenumber" name="L74" href="#L74">74</a>  	}
+<a class="jxr_linenumber" name="L75" href="#L75">75</a>  
+<a class="jxr_linenumber" name="L76" href="#L76">76</a>  	@Test
+<a class="jxr_linenumber" name="L77" href="#L77">77</a>  	<strong class="jxr_keyword">void</strong> a03_multipleKeys() {
+<a class="jxr_linenumber" name="L78" href="#L78">78</a>  		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
+<a class="jxr_linenumber" name="L79" href="#L79">79</a>  		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L80" href="#L80">80</a>  			.supplier((k1, k2) -&gt; {
+<a class="jxr_linenumber" name="L81" href="#L81">81</a>  				callCount.incrementAndGet();
+<a class="jxr_linenumber" name="L82" href="#L82">82</a>  				<strong class="jxr_keyword">return</strong> k1 + <span class="jxr_string">":"</span> + k2;
+<a class="jxr_linenumber" name="L83" href="#L83">83</a>  			})
+<a class="jxr_linenumber" name="L84" href="#L84">84</a>  			.build();
+<a class="jxr_linenumber" name="L85" href="#L85">85</a>  
+<a class="jxr_linenumber" name="L86" href="#L86">86</a>  		<strong class="jxr_keyword">var</strong> v1 = x.get(<span class="jxr_string">"user"</span>, 123);
+<a class="jxr_linenumber" name="L87" href="#L87">87</a>  		<strong class="jxr_keyword">var</strong> v2 = x.get(<span class="jxr_string">"admin"</span>, 456);
+<a class="jxr_linenumber" name="L88" href="#L88">88</a>  		<strong class="jxr_keyword">var</strong> v3 = x.get(<span class="jxr_string">"guest"</span>, 789);
+<a class="jxr_linenumber" name="L89" href="#L89">89</a>  
+<a class="jxr_linenumber" name="L90" href="#L90">90</a>  		assertEquals(<span class="jxr_string">"user:123"</span>, v1);
+<a class="jxr_linenumber" name="L91" href="#L91">91</a>  		assertEquals(<span class="jxr_string">"admin:456"</span>, v2);
+<a class="jxr_linenumber" name="L92" href="#L92">92</a>  		assertEquals(<span class="jxr_string">"guest:789"</span>, v3);
+<a class="jxr_linenumber" name="L93" href="#L93">93</a>  		assertEquals(3, callCount.get());
+<a class="jxr_linenumber" name="L94" href="#L94">94</a>  		assertSize(3, x);
+<a class="jxr_linenumber" name="L95" href="#L95">95</a>  		assertEquals(0, x.getCacheHits());
+<a class="jxr_linenumber" name="L96" href="#L96">96</a>  	}
+<a class="jxr_linenumber" name="L97" href="#L97">97</a>  
+<a class="jxr_linenumber" name="L98" href="#L98">98</a>  	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L99" href="#L99">99</a>  	<em class="jxr_comment">// b - Override supplier</em>
+<a class="jxr_linenumber" name="L100" href="#L100">100</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L101" href="#L101">101</a> 
+<a class="jxr_linenumber" name="L102" href="#L102">102</a> 	@Test
+<a class="jxr_linenumber" name="L103" href="#L103">103</a> 	<strong class="jxr_keyword">void</strong> b01_overrideSupplier() {
+<a class="jxr_linenumber" name="L104" href="#L104">104</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L105" href="#L105">105</a> 			.supplier((k1, k2) -&gt; k1 + <span class="jxr_string">":"</span> + k2) <em class="jxr_comment">// Default</em>
+<a class="jxr_linenumber" name="L106" href="#L106">106</a> 			.build();
+<a class="jxr_linenumber" name="L107" href="#L107">107</a> 
+<a class="jxr_linenumber" name="L108" href="#L108">108</a> 		<em class="jxr_comment">// Use override supplier</em>
+<a class="jxr_linenumber" name="L109" href="#L109">109</a> 		<strong class="jxr_keyword">var</strong> result = x.get(<span class="jxr_string">"user"</span>, 123, () -&gt; <span class="jxr_string">"OVERRIDE"</span>);
+<a class="jxr_linenumber" name="L110" href="#L110">110</a> 
+<a class="jxr_linenumber" name="L111" href="#L111">111</a> 		assertEquals(<span class="jxr_string">"OVERRIDE"</span>, result);
+<a class="jxr_linenumber" name="L112" href="#L112">112</a> 		assertSize(1, x);
+<a class="jxr_linenumber" name="L113" href="#L113">113</a> 	}
+<a class="jxr_linenumber" name="L114" href="#L114">114</a> 
+<a class="jxr_linenumber" name="L115" href="#L115">115</a> 	@Test
+<a class="jxr_linenumber" name="L116" href="#L116">116</a> 	<strong class="jxr_keyword">void</strong> b02_overrideSupplier_cachesResult() {
+<a class="jxr_linenumber" name="L117" href="#L117">117</a> 		<strong class="jxr_keyword">var</strong> defaultCalls = <strong class="jxr_keyword">new</strong> AtomicInteger();
+<a class="jxr_linenumber" name="L118" href="#L118">118</a> 		<strong class="jxr_keyword">var</strong> overrideCalls = <strong class="jxr_keyword">new</strong> AtomicInteger();
+<a class="jxr_linenumber" name="L119" href="#L119">119</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L120" href="#L120">120</a> 			.supplier((k1, k2) -&gt; {
+<a class="jxr_linenumber" name="L121" href="#L121">121</a> 				defaultCalls.incrementAndGet();
+<a class="jxr_linenumber" name="L122" href="#L122">122</a> 				<strong class="jxr_keyword">return</strong> <span class="jxr_string">"DEFAULT"</span>;
+<a class="jxr_linenumber" name="L123" href="#L123">123</a> 			})
+<a class="jxr_linenumber" name="L124" href="#L124">124</a> 			.build();
+<a class="jxr_linenumber" name="L125" href="#L125">125</a> 
+<a class="jxr_linenumber" name="L126" href="#L126">126</a> 		<em class="jxr_comment">// First call with override</em>
+<a class="jxr_linenumber" name="L127" href="#L127">127</a> 		<strong class="jxr_keyword">var</strong> result1 = x.get(<span class="jxr_string">"user"</span>, 123, () -&gt; {
+<a class="jxr_linenumber" name="L128" href="#L128">128</a> 			overrideCalls.incrementAndGet();
+<a class="jxr_linenumber" name="L129" href="#L129">129</a> 			<strong class="jxr_keyword">return</strong> <span class="jxr_string">"OVERRIDE"</span>;
+<a class="jxr_linenumber" name="L130" href="#L130">130</a> 		});
+<a class="jxr_linenumber" name="L131" href="#L131">131</a> 
+<a class="jxr_linenumber" name="L132" href="#L132">132</a> 		<em class="jxr_comment">// Second call with default supplier - should use cached value</em>
+<a class="jxr_linenumber" name="L133" href="#L133">133</a> 		<strong class="jxr_keyword">var</strong> result2 = x.get(<span class="jxr_string">"user"</span>, 123);
+<a class="jxr_linenumber" name="L134" href="#L134">134</a> 
+<a class="jxr_linenumber" name="L135" href="#L135">135</a> 		assertEquals(<span class="jxr_string">"OVERRIDE"</span>, result1);
+<a class="jxr_linenumber" name="L136" href="#L136">136</a> 		assertEquals(<span class="jxr_string">"OVERRIDE"</span>, result2); <em class="jxr_comment">// Cached value, not default</em>
+<a class="jxr_linenumber" name="L137" href="#L137">137</a> 		assertEquals(0, defaultCalls.get());
+<a class="jxr_linenumber" name="L138" href="#L138">138</a> 		assertEquals(1, overrideCalls.get());
+<a class="jxr_linenumber" name="L139" href="#L139">139</a> 		assertEquals(1, x.getCacheHits());
+<a class="jxr_linenumber" name="L140" href="#L140">140</a> 	}
+<a class="jxr_linenumber" name="L141" href="#L141">141</a> 
+<a class="jxr_linenumber" name="L142" href="#L142">142</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L143" href="#L143">143</a> 	<em class="jxr_comment">// c - Null key validation</em>
+<a class="jxr_linenumber" name="L144" href="#L144">144</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L145" href="#L145">145</a> 
+<a class="jxr_linenumber" name="L146" href="#L146">146</a> 	@Test
+<a class="jxr_linenumber" name="L147" href="#L147">147</a> 	<strong class="jxr_keyword">void</strong> c01_nullKeys_defaultSupplier() {
+<a class="jxr_linenumber" name="L148" href="#L148">148</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L149" href="#L149">149</a> 			.supplier((k1, k2) -&gt; <span class="jxr_string">"value-"</span> + k1 + <span class="jxr_string">"-"</span> + k2)
+<a class="jxr_linenumber" name="L150" href="#L150">150</a> 			.build();
+<a class="jxr_linenumber" name="L151" href="#L151">151</a> 
+<a class="jxr_linenumber" name="L152" href="#L152">152</a> 		<em class="jxr_comment">// Null keys are now allowed</em>
+<a class="jxr_linenumber" name="L153" href="#L153">153</a> 		assertEquals(<span class="jxr_string">"value-null-123"</span>, x.get(<strong class="jxr_keyword">null</strong>, 123));
+<a class="jxr_linenumber" name="L154" href="#L154">154</a> 		assertEquals(<span class="jxr_string">"value-user-null"</span>, x.get(<span class="jxr_string">"user"</span>, <strong class="jxr_keyword">null</strong>));
+<a class="jxr_linenumber" name="L155" href="#L155">155</a> 		assertEquals(<span class="jxr_string">"value-null-null"</span>, x.get(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>));
+<a class="jxr_linenumber" name="L156" href="#L156">156</a> 
+<a class="jxr_linenumber" name="L157" href="#L157">157</a> 		<em class="jxr_comment">// Cached values should be returned on subsequent calls</em>
+<a class="jxr_linenumber" name="L158" href="#L158">158</a> 		assertEquals(<span class="jxr_string">"value-null-123"</span>, x.get(<strong class="jxr_keyword">null</strong>, 123));
+<a class="jxr_linenumber" name="L159" href="#L159">159</a> 		assertEquals(<span class="jxr_string">"value-user-null"</span>, x.get(<span class="jxr_string">"user"</span>, <strong class="jxr_keyword">null</strong>));
+<a class="jxr_linenumber" name="L160" href="#L160">160</a> 	}
+<a class="jxr_linenumber" name="L161" href="#L161">161</a> 
+<a class="jxr_linenumber" name="L162" href="#L162">162</a> 	@Test
+<a class="jxr_linenumber" name="L163" href="#L163">163</a> 	<strong class="jxr_keyword">void</strong> c02_nullKeys_overrideSupplier() {
+<a class="jxr_linenumber" name="L164" href="#L164">164</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L165" href="#L165">165</a> 
+<a class="jxr_linenumber" name="L166" href="#L166">166</a> 		<em class="jxr_comment">// Null keys are now allowed</em>
+<a class="jxr_linenumber" name="L167" href="#L167">167</a> 		assertEquals(<span class="jxr_string">"value"</span>, x.get(<strong class="jxr_keyword">null</strong>, 123, () -&gt; <span class="jxr_string">"value"</span>));
+<a class="jxr_linenumber" name="L168" href="#L168">168</a> 		assertEquals(<span class="jxr_string">"value"</span>, x.get(<span class="jxr_string">"user"</span>, <strong class="jxr_keyword">null</strong>, () -&gt; <span class="jxr_string">"value"</span>));
+<a class="jxr_linenumber" name="L169" href="#L169">169</a> 		assertEquals(<span class="jxr_string">"value"</span>, x.get(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, () -&gt; <span class="jxr_string">"value"</span>));
+<a class="jxr_linenumber" name="L170" href="#L170">170</a> 
+<a class="jxr_linenumber" name="L171" href="#L171">171</a> 		<em class="jxr_comment">// Cached values should be returned on subsequent calls</em>
+<a class="jxr_linenumber" name="L172" href="#L172">172</a> 		assertEquals(<span class="jxr_string">"value"</span>, x.get(<strong class="jxr_keyword">null</strong>, 123, () -&gt; <span class="jxr_string">"should-not-be-called"</span>));
+<a class="jxr_linenumber" name="L173" href="#L173">173</a> 		assertEquals(<span class="jxr_string">"value"</span>, x.get(<span class="jxr_string">"user"</span>, <strong class="jxr_keyword">null</strong>, () -&gt; <span class="jxr_string">"should-not-be-called"</span>));
+<a class="jxr_linenumber" name="L174" href="#L174">174</a> 	}
+<a class="jxr_linenumber" name="L175" href="#L175">175</a> 
+<a class="jxr_linenumber" name="L176" href="#L176">176</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L177" href="#L177">177</a> 	<em class="jxr_comment">// d - Disabled caching</em>
+<a class="jxr_linenumber" name="L178" href="#L178">178</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L179" href="#L179">179</a> 
+<a class="jxr_linenumber" name="L180" href="#L180">180</a> 	@Test
+<a class="jxr_linenumber" name="L181" href="#L181">181</a> 	<strong class="jxr_keyword">void</strong> d01_disableCaching_alwaysCallsSupplier() {
+<a class="jxr_linenumber" name="L182" href="#L182">182</a> 		<strong class="jxr_keyword">var</strong> defaultCallCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
+<a class="jxr_linenumber" name="L183" href="#L183">183</a> 		<strong class="jxr_keyword">var</strong> overrideCallCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
+<a class="jxr_linenumber" name="L184" href="#L184">184</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L185" href="#L185">185</a> 			.cacheMode(NONE)
+<a class="jxr_linenumber" name="L186" href="#L186">186</a> 			.supplier((k1, k2) -&gt; {
+<a class="jxr_linenumber" name="L187" href="#L187">187</a> 				defaultCallCount.incrementAndGet();
+<a class="jxr_linenumber" name="L188" href="#L188">188</a> 				<strong class="jxr_keyword">return</strong> k1 + <span class="jxr_string">":"</span> + k2;
+<a class="jxr_linenumber" name="L189" href="#L189">189</a> 			})
+<a class="jxr_linenumber" name="L190" href="#L190">190</a> 			.build();
+<a class="jxr_linenumber" name="L191" href="#L191">191</a> 
+<a class="jxr_linenumber" name="L192" href="#L192">192</a> 		<em class="jxr_comment">// First call with override supplier</em>
+<a class="jxr_linenumber" name="L193" href="#L193">193</a> 		assertEquals(<span class="jxr_string">"user:123"</span>, x.get(<span class="jxr_string">"user"</span>, 123, () -&gt; {
+<a class="jxr_linenumber" name="L194" href="#L194">194</a> 			overrideCallCount.incrementAndGet();
+<a class="jxr_linenumber" name="L195" href="#L195">195</a> 			<strong class="jxr_keyword">return</strong> <span class="jxr_string">"user:123"</span>;
+<a class="jxr_linenumber" name="L196" href="#L196">196</a> 		}));
+<a class="jxr_linenumber" name="L197" href="#L197">197</a> 		assertEquals(0, defaultCallCount.get());
+<a class="jxr_linenumber" name="L198" href="#L198">198</a> 		assertEquals(1, overrideCallCount.get());
+<a class="jxr_linenumber" name="L199" href="#L199">199</a> 
+<a class="jxr_linenumber" name="L200" href="#L200">200</a> 		<em class="jxr_comment">// Second call with override - supplier called again (no caching)</em>
+<a class="jxr_linenumber" name="L201" href="#L201">201</a> 		assertEquals(<span class="jxr_string">"user:123"</span>, x.get(<span class="jxr_string">"user"</span>, 123, () -&gt; {
+<a class="jxr_linenumber" name="L202" href="#L202">202</a> 			overrideCallCount.incrementAndGet();
+<a class="jxr_linenumber" name="L203" href="#L203">203</a> 			<strong class="jxr_keyword">return</strong> <span class="jxr_string">"user:123"</span>;
+<a class="jxr_linenumber" name="L204" href="#L204">204</a> 		}));
+<a class="jxr_linenumber" name="L205" href="#L205">205</a> 		assertEquals(0, defaultCallCount.get());
+<a class="jxr_linenumber" name="L206" href="#L206">206</a> 		assertEquals(2, overrideCallCount.get());
+<a class="jxr_linenumber" name="L207" href="#L207">207</a> 
+<a class="jxr_linenumber" name="L208" href="#L208">208</a> 		<em class="jxr_comment">// Using default supplier</em>
+<a class="jxr_linenumber" name="L209" href="#L209">209</a> 		assertEquals(<span class="jxr_string">"user:456"</span>, x.get(<span class="jxr_string">"user"</span>, 456));
+<a class="jxr_linenumber" name="L210" href="#L210">210</a> 		assertEquals(1, defaultCallCount.get());
+<a class="jxr_linenumber" name="L211" href="#L211">211</a> 
+<a class="jxr_linenumber" name="L212" href="#L212">212</a> 		assertEquals(<span class="jxr_string">"user:456"</span>, x.get(<span class="jxr_string">"user"</span>, 456));
+<a class="jxr_linenumber" name="L213" href="#L213">213</a> 		assertEquals(2, defaultCallCount.get()); <em class="jxr_comment">// Called again</em>
+<a class="jxr_linenumber" name="L214" href="#L214">214</a> 
+<a class="jxr_linenumber" name="L215" href="#L215">215</a> 		assertEmpty(x); <em class="jxr_comment">// Nothing cached</em>
+<a class="jxr_linenumber" name="L216" href="#L216">216</a> 	}
+<a class="jxr_linenumber" name="L217" href="#L217">217</a> 
+<a class="jxr_linenumber" name="L218" href="#L218">218</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L219" href="#L219">219</a> 	<em class="jxr_comment">// d2 - Weak cache mode</em>
+<a class="jxr_linenumber" name="L220" href="#L220">220</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L221" href="#L221">221</a> 
+<a class="jxr_linenumber" name="L222" href="#L222">222</a> 	@Test
+<a class="jxr_linenumber" name="L223" href="#L223">223</a> 	<strong class="jxr_keyword">void</strong> d02_weakMode_basicCaching() {
+<a class="jxr_linenumber" name="L224" href="#L224">224</a> 		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
+<a class="jxr_linenumber" name="L225" href="#L225">225</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L226" href="#L226">226</a> 			.cacheMode(WEAK)
+<a class="jxr_linenumber" name="L227" href="#L227">227</a> 			.supplier((k1, k2) -&gt; {
+<a class="jxr_linenumber" name="L228" href="#L228">228</a> 				callCount.incrementAndGet();
+<a class="jxr_linenumber" name="L229" href="#L229">229</a> 				<strong class="jxr_keyword">return</strong> k1 + <span class="jxr_string">":"</span> + k2;
+<a class="jxr_linenumber" name="L230" href="#L230">230</a> 			})
+<a class="jxr_linenumber" name="L231" href="#L231">231</a> 			.build();
+<a class="jxr_linenumber" name="L232" href="#L232">232</a> 
+<a class="jxr_linenumber" name="L233" href="#L233">233</a> 		<em class="jxr_comment">// First call - cache miss</em>
+<a class="jxr_linenumber" name="L234" href="#L234">234</a> 		<strong class="jxr_keyword">var</strong> result1 = x.get(<span class="jxr_string">"user"</span>, 123);
+<a class="jxr_linenumber" name="L235" href="#L235">235</a> 
+<a class="jxr_linenumber" name="L236" href="#L236">236</a> 		<em class="jxr_comment">// Second call - cache hit</em>
+<a class="jxr_linenumber" name="L237" href="#L237">237</a> 		<strong class="jxr_keyword">var</strong> result2 = x.get(<span class="jxr_string">"user"</span>, 123);
+<a class="jxr_linenumber" name="L238" href="#L238">238</a> 
+<a class="jxr_linenumber" name="L239" href="#L239">239</a> 		assertEquals(<span class="jxr_string">"user:123"</span>, result1);
+<a class="jxr_linenumber" name="L240" href="#L240">240</a> 		assertEquals(<span class="jxr_string">"user:123"</span>, result2);
+<a class="jxr_linenumber" name="L241" href="#L241">241</a> 		assertSame(result1, result2);
+<a class="jxr_linenumber" name="L242" href="#L242">242</a> 		assertEquals(1, callCount.get()); <em class="jxr_comment">// Supplier only called once</em>
+<a class="jxr_linenumber" name="L243" href="#L243">243</a> 		assertSize(1, x);
+<a class="jxr_linenumber" name="L244" href="#L244">244</a> 		assertEquals(1, x.getCacheHits());
+<a class="jxr_linenumber" name="L245" href="#L245">245</a> 	}
+<a class="jxr_linenumber" name="L246" href="#L246">246</a> 
+<a class="jxr_linenumber" name="L247" href="#L247">247</a> 	@Test
+<a class="jxr_linenumber" name="L248" href="#L248">248</a> 	<strong class="jxr_keyword">void</strong> d03_weakMode_multipleKeys() {
+<a class="jxr_linenumber" name="L249" href="#L249">249</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L250" href="#L250">250</a> 			.cacheMode(WEAK)
+<a class="jxr_linenumber" name="L251" href="#L251">251</a> 			.supplier((k1, k2) -&gt; k1 + <span class="jxr_string">":"</span> + k2)
+<a class="jxr_linenumber" name="L252" href="#L252">252</a> 			.build();
+<a class="jxr_linenumber" name="L253" href="#L253">253</a> 
+<a class="jxr_linenumber" name="L254" href="#L254">254</a> 		x.get(<span class="jxr_string">"user"</span>, 123);
+<a class="jxr_linenumber" name="L255" href="#L255">255</a> 		x.get(<span class="jxr_string">"admin"</span>, 456);
+<a class="jxr_linenumber" name="L256" href="#L256">256</a> 		x.get(<span class="jxr_string">"guest"</span>, 789);
+<a class="jxr_linenumber" name="L257" href="#L257">257</a> 
+<a class="jxr_linenumber" name="L258" href="#L258">258</a> 		assertSize(3, x);
+<a class="jxr_linenumber" name="L259" href="#L259">259</a> 		assertEquals(0, x.getCacheHits());
+<a class="jxr_linenumber" name="L260" href="#L260">260</a> 
+<a class="jxr_linenumber" name="L261" href="#L261">261</a> 		<em class="jxr_comment">// Verify all cached</em>
+<a class="jxr_linenumber" name="L262" href="#L262">262</a> 		assertEquals(<span class="jxr_string">"user:123"</span>, x.get(<span class="jxr_string">"user"</span>, 123));
+<a class="jxr_linenumber" name="L263" href="#L263">263</a> 		assertEquals(<span class="jxr_string">"admin:456"</span>, x.get(<span class="jxr_string">"admin"</span>, 456));
+<a class="jxr_linenumber" name="L264" href="#L264">264</a> 		assertEquals(<span class="jxr_string">"guest:789"</span>, x.get(<span class="jxr_string">"guest"</span>, 789));
+<a class="jxr_linenumber" name="L265" href="#L265">265</a> 		assertEquals(3, x.getCacheHits());
+<a class="jxr_linenumber" name="L266" href="#L266">266</a> 	}
+<a class="jxr_linenumber" name="L267" href="#L267">267</a> 
+<a class="jxr_linenumber" name="L268" href="#L268">268</a> 	@Test
+<a class="jxr_linenumber" name="L269" href="#L269">269</a> 	<strong class="jxr_keyword">void</strong> d04_weakMode_clear() {
+<a class="jxr_linenumber" name="L270" href="#L270">270</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L271" href="#L271">271</a> 			.cacheMode(WEAK)
+<a class="jxr_linenumber" name="L272" href="#L272">272</a> 			.supplier((k1, k2) -&gt; k1 + <span class="jxr_string">":"</span> + k2)
+<a class="jxr_linenumber" name="L273" href="#L273">273</a> 			.build();
+<a class="jxr_linenumber" name="L274" href="#L274">274</a> 
+<a class="jxr_linenumber" name="L275" href="#L275">275</a> 		x.get(<span class="jxr_string">"user"</span>, 123);
+<a class="jxr_linenumber" name="L276" href="#L276">276</a> 		x.get(<span class="jxr_string">"admin"</span>, 456);
+<a class="jxr_linenumber" name="L277" href="#L277">277</a> 		assertSize(2, x);
+<a class="jxr_linenumber" name="L278" href="#L278">278</a> 
+<a class="jxr_linenumber" name="L279" href="#L279">279</a> 		x.clear();
+<a class="jxr_linenumber" name="L280" href="#L280">280</a> 		assertEmpty(x);
+<a class="jxr_linenumber" name="L281" href="#L281">281</a> 	}
+<a class="jxr_linenumber" name="L282" href="#L282">282</a> 
+<a class="jxr_linenumber" name="L283" href="#L283">283</a> 	@Test
+<a class="jxr_linenumber" name="L284" href="#L284">284</a> 	<strong class="jxr_keyword">void</strong> d05_weakMode_maxSize() {
+<a class="jxr_linenumber" name="L285" href="#L285">285</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L286" href="#L286">286</a> 			.cacheMode(WEAK)
+<a class="jxr_linenumber" name="L287" href="#L287">287</a> 			.maxSize(2)
+<a class="jxr_linenumber" name="L288" href="#L288">288</a> 			.supplier((k1, k2) -&gt; k1 + <span class="jxr_string">":"</span> + k2)
+<a class="jxr_linenumber" name="L289" href="#L289">289</a> 			.build();
+<a class="jxr_linenumber" name="L290" href="#L290">290</a> 
+<a class="jxr_linenumber" name="L291" href="#L291">291</a> 		x.get(<span class="jxr_string">"k1"</span>, 1);
+<a class="jxr_linenumber" name="L292" href="#L292">292</a> 		x.get(<span class="jxr_string">"k2"</span>, 2);
+<a class="jxr_linenumber" name="L293" href="#L293">293</a> 		assertSize(2, x);
+<a class="jxr_linenumber" name="L294" href="#L294">294</a> 
+<a class="jxr_linenumber" name="L295" href="#L295">295</a> 		<em class="jxr_comment">// 3rd item doesn't trigger eviction yet</em>
+<a class="jxr_linenumber" name="L296" href="#L296">296</a> 		x.get(<span class="jxr_string">"k3"</span>, 3);
+<a class="jxr_linenumber" name="L297" href="#L297">297</a> 		assertSize(3, x);
+<a class="jxr_linenumber" name="L298" href="#L298">298</a> 
+<a class="jxr_linenumber" name="L299" href="#L299">299</a> 		<em class="jxr_comment">// 4th item triggers eviction</em>
+<a class="jxr_linenumber" name="L300" href="#L300">300</a> 		x.get(<span class="jxr_string">"k4"</span>, 4);
+<a class="jxr_linenumber" name="L301" href="#L301">301</a> 		assertSize(1, x);
+<a class="jxr_linenumber" name="L302" href="#L302">302</a> 	}
+<a class="jxr_linenumber" name="L303" href="#L303">303</a> 
+<a class="jxr_linenumber" name="L304" href="#L304">304</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L305" href="#L305">305</a> 	<em class="jxr_comment">// e - Max size and eviction</em>
+<a class="jxr_linenumber" name="L306" href="#L306">306</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L307" href="#L307">307</a> 
+<a class="jxr_linenumber" name="L308" href="#L308">308</a> 	@Test
+<a class="jxr_linenumber" name="L309" href="#L309">309</a> 	<strong class="jxr_keyword">void</strong> e01_maxSize_clearsWhenExceeded() {
+<a class="jxr_linenumber" name="L310" href="#L310">310</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L311" href="#L311">311</a> 			.maxSize(2)
+<a class="jxr_linenumber" name="L312" href="#L312">312</a> 			.supplier((k1, k2) -&gt; k1 + <span class="jxr_string">":"</span> + k2)
+<a class="jxr_linenumber" name="L313" href="#L313">313</a> 			.build();
+<a class="jxr_linenumber" name="L314" href="#L314">314</a> 
+<a class="jxr_linenumber" name="L315" href="#L315">315</a> 		x.get(<span class="jxr_string">"k1"</span>, 1);
+<a class="jxr_linenumber" name="L316" href="#L316">316</a> 		x.get(<span class="jxr_string">"k2"</span>, 2);
+<a class="jxr_linenumber" name="L317" href="#L317">317</a> 		assertSize(2, x);
+<a class="jxr_linenumber" name="L318" href="#L318">318</a> 
+<a class="jxr_linenumber" name="L319" href="#L319">319</a> 		<em class="jxr_comment">// Adding a third entry doesn't exceed maxSize (2 &gt; 2 is false)</em>
+<a class="jxr_linenumber" name="L320" href="#L320">320</a> 		x.get(<span class="jxr_string">"k3"</span>, 3);
+<a class="jxr_linenumber" name="L321" href="#L321">321</a> 		assertSize(3, x);
+<a class="jxr_linenumber" name="L322" href="#L322">322</a> 
+<a class="jxr_linenumber" name="L323" href="#L323">323</a> 		<em class="jxr_comment">// Fourth entry triggers clear (3 &gt; 2 is true)</em>
+<a class="jxr_linenumber" name="L324" href="#L324">324</a> 		x.get(<span class="jxr_string">"k4"</span>, 4);
+<a class="jxr_linenumber" name="L325" href="#L325">325</a> 		assertSize(1, x); <em class="jxr_comment">// Only the new entry</em>
+<a class="jxr_linenumber" name="L326" href="#L326">326</a> 	}
+<a class="jxr_linenumber" name="L327" href="#L327">327</a> 
+<a class="jxr_linenumber" name="L328" href="#L328">328</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L329" href="#L329">329</a> 	<em class="jxr_comment">// f - Cache hits tracking</em>
+<a class="jxr_linenumber" name="L330" href="#L330">330</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L331" href="#L331">331</a> 
+<a class="jxr_linenumber" name="L332" href="#L332">332</a> 	@Test
+<a class="jxr_linenumber" name="L333" href="#L333">333</a> 	<strong class="jxr_keyword">void</strong> f01_cacheHitsTracking() {
+<a class="jxr_linenumber" name="L334" href="#L334">334</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L335" href="#L335">335</a> 			.supplier((k1, k2) -&gt; k1 + <span class="jxr_string">":"</span> + k2)
+<a class="jxr_linenumber" name="L336" href="#L336">336</a> 			.build();
+<a class="jxr_linenumber" name="L337" href="#L337">337</a> 
+<a class="jxr_linenumber" name="L338" href="#L338">338</a> 		assertEquals(0, x.getCacheHits());
+<a class="jxr_linenumber" name="L339" href="#L339">339</a> 
+<a class="jxr_linenumber" name="L340" href="#L340">340</a> 		x.get(<span class="jxr_string">"user"</span>, 123); <em class="jxr_comment">// Miss</em>
+<a class="jxr_linenumber" name="L341" href="#L341">341</a> 		assertEquals(0, x.getCacheHits());
+<a class="jxr_linenumber" name="L342" href="#L342">342</a> 
+<a class="jxr_linenumber" name="L343" href="#L343">343</a> 		x.get(<span class="jxr_string">"user"</span>, 123); <em class="jxr_comment">// Hit</em>
+<a class="jxr_linenumber" name="L344" href="#L344">344</a> 		assertEquals(1, x.getCacheHits());
+<a class="jxr_linenumber" name="L345" href="#L345">345</a> 
+<a class="jxr_linenumber" name="L346" href="#L346">346</a> 		x.get(<span class="jxr_string">"admin"</span>, 456); <em class="jxr_comment">// Miss</em>
+<a class="jxr_linenumber" name="L347" href="#L347">347</a> 		assertEquals(1, x.getCacheHits());
+<a class="jxr_linenumber" name="L348" href="#L348">348</a> 
+<a class="jxr_linenumber" name="L349" href="#L349">349</a> 		x.get(<span class="jxr_string">"user"</span>, 123); <em class="jxr_comment">// Hit</em>
+<a class="jxr_linenumber" name="L350" href="#L350">350</a> 		x.get(<span class="jxr_string">"admin"</span>, 456); <em class="jxr_comment">// Hit</em>
+<a class="jxr_linenumber" name="L351" href="#L351">351</a> 		assertEquals(3, x.getCacheHits());
+<a class="jxr_linenumber" name="L352" href="#L352">352</a> 	}
+<a class="jxr_linenumber" name="L353" href="#L353">353</a> 
+<a class="jxr_linenumber" name="L354" href="#L354">354</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L355" href="#L355">355</a> 	<em class="jxr_comment">// g - Clear operation</em>
+<a class="jxr_linenumber" name="L356" href="#L356">356</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L357" href="#L357">357</a> 
+<a class="jxr_linenumber" name="L358" href="#L358">358</a> 	@Test
+<a class="jxr_linenumber" name="L359" href="#L359">359</a> 	<strong class="jxr_keyword">void</strong> g01_clear() {
+<a class="jxr_linenumber" name="L360" href="#L360">360</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L361" href="#L361">361</a> 			.supplier((k1, k2) -&gt; k1 + <span class="jxr_string">":"</span> + k2)
+<a class="jxr_linenumber" name="L362" href="#L362">362</a> 			.build();
+<a class="jxr_linenumber" name="L363" href="#L363">363</a> 
+<a class="jxr_linenumber" name="L364" href="#L364">364</a> 		x.get(<span class="jxr_string">"user"</span>, 123);
+<a class="jxr_linenumber" name="L365" href="#L365">365</a> 		x.get(<span class="jxr_string">"admin"</span>, 456);
+<a class="jxr_linenumber" name="L366" href="#L366">366</a> 		assertSize(2, x);
+<a class="jxr_linenumber" name="L367" href="#L367">367</a> 
+<a class="jxr_linenumber" name="L368" href="#L368">368</a> 		x.clear();
+<a class="jxr_linenumber" name="L369" href="#L369">369</a> 
+<a class="jxr_linenumber" name="L370" href="#L370">370</a> 		assertEmpty(x);
+<a class="jxr_linenumber" name="L371" href="#L371">371</a> 	}
+<a class="jxr_linenumber" name="L372" href="#L372">372</a> 
+<a class="jxr_linenumber" name="L373" href="#L373">373</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L374" href="#L374">374</a> 	<em class="jxr_comment">// h - No default supplier</em>
+<a class="jxr_linenumber" name="L375" href="#L375">375</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L376" href="#L376">376</a> 
+<a class="jxr_linenumber" name="L377" href="#L377">377</a> 	@Test
+<a class="jxr_linenumber" name="L378" href="#L378">378</a> 	<strong class="jxr_keyword">void</strong> h01_noDefaultSupplier_requiresOverride() {
+<a class="jxr_linenumber" name="L379" href="#L379">379</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L380" href="#L380">380</a> 
+<a class="jxr_linenumber" name="L381" href="#L381">381</a> 		assertThrows(NullPointerException.<strong class="jxr_keyword">class</strong>, () -&gt; x.get(<span class="jxr_string">"user"</span>, 123));
+<a class="jxr_linenumber" name="L382" href="#L382">382</a> 	}
+<a class="jxr_linenumber" name="L383" href="#L383">383</a> 
+<a class="jxr_linenumber" name="L384" href="#L384">384</a> 	@Test
+<a class="jxr_linenumber" name="L385" href="#L385">385</a> 	<strong class="jxr_keyword">void</strong> h02_noDefaultSupplier_worksWithOverride() {
+<a class="jxr_linenumber" name="L386" href="#L386">386</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L387" href="#L387">387</a> 
+<a class="jxr_linenumber" name="L388" href="#L388">388</a> 		<strong class="jxr_keyword">var</strong> result = x.get(<span class="jxr_string">"user"</span>, 123, () -&gt; <span class="jxr_string">"CUSTOM"</span>);
+<a class="jxr_linenumber" name="L389" href="#L389">389</a> 
+<a class="jxr_linenumber" name="L390" href="#L390">390</a> 		assertEquals(<span class="jxr_string">"CUSTOM"</span>, result);
+<a class="jxr_linenumber" name="L391" href="#L391">391</a> 		assertSize(1, x);
+<a class="jxr_linenumber" name="L392" href="#L392">392</a> 	}
+<a class="jxr_linenumber" name="L393" href="#L393">393</a> 
+<a class="jxr_linenumber" name="L394" href="#L394">394</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L395" href="#L395">395</a> 	<em class="jxr_comment">// i - put() method</em>
+<a class="jxr_linenumber" name="L396" href="#L396">396</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L397" href="#L397">397</a> 
+<a class="jxr_linenumber" name="L398" href="#L398">398</a> 	@Test
+<a class="jxr_linenumber" name="L399" href="#L399">399</a> 	<strong class="jxr_keyword">void</strong> i01_put_directInsertion() {
+<a class="jxr_linenumber" name="L400" href="#L400">400</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L401" href="#L401">401</a> 		<strong class="jxr_keyword">var</strong> previous = x.put(<span class="jxr_string">"user"</span>, 123, <span class="jxr_string">"value1"</span>);
+<a class="jxr_linenumber" name="L402" href="#L402">402</a> 		assertNull(previous);
+<a class="jxr_linenumber" name="L403" href="#L403">403</a> 		assertEquals(<span class="jxr_string">"value1"</span>, x.get(<span class="jxr_string">"user"</span>, 123, () -&gt; <span class="jxr_string">"should not be called"</span>));
+<a class="jxr_linenumber" name="L404" href="#L404">404</a> 		assertSize(1, x);
+<a class="jxr_linenumber" name="L405" href="#L405">405</a> 	}
+<a class="jxr_linenumber" name="L406" href="#L406">406</a> 
+<a class="jxr_linenumber" name="L407" href="#L407">407</a> 	@Test
+<a class="jxr_linenumber" name="L408" href="#L408">408</a> 	<strong class="jxr_keyword">void</strong> i02_put_overwritesExisting() {
+<a class="jxr_linenumber" name="L409" href="#L409">409</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L410" href="#L410">410</a> 		x.put(<span class="jxr_string">"user"</span>, 123, <span class="jxr_string">"value1"</span>);
+<a class="jxr_linenumber" name="L411" href="#L411">411</a> 		<strong class="jxr_keyword">var</strong> previous = x.put(<span class="jxr_string">"user"</span>, 123, <span class="jxr_string">"value2"</span>);
+<a class="jxr_linenumber" name="L412" href="#L412">412</a> 		assertEquals(<span class="jxr_string">"value1"</span>, previous);
+<a class="jxr_linenumber" name="L413" href="#L413">413</a> 		assertEquals(<span class="jxr_string">"value2"</span>, x.get(<span class="jxr_string">"user"</span>, 123, () -&gt; <span class="jxr_string">"should not be called"</span>));
+<a class="jxr_linenumber" name="L414" href="#L414">414</a> 	}
+<a class="jxr_linenumber" name="L415" href="#L415">415</a> 
+<a class="jxr_linenumber" name="L416" href="#L416">416</a> 	@Test
+<a class="jxr_linenumber" name="L417" href="#L417">417</a> 	<strong class="jxr_keyword">void</strong> i03_put_withNullValue() {
+<a class="jxr_linenumber" name="L418" href="#L418">418</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L419" href="#L419">419</a> 		x.put(<span class="jxr_string">"user"</span>, 123, <span class="jxr_string">"value1"</span>);
+<a class="jxr_linenumber" name="L420" href="#L420">420</a> 		<strong class="jxr_keyword">var</strong> previous = x.put(<span class="jxr_string">"user"</span>, 123, <strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="L421" href="#L421">421</a> 		assertEquals(<span class="jxr_string">"value1"</span>, previous);
+<a class="jxr_linenumber" name="L422" href="#L422">422</a> 		assertFalse(x.containsKey(<span class="jxr_string">"user"</span>, 123));
+<a class="jxr_linenumber" name="L423" href="#L423">423</a> 	}
+<a class="jxr_linenumber" name="L424" href="#L424">424</a> 
+<a class="jxr_linenumber" name="L425" href="#L425">425</a> 	@Test
+<a class="jxr_linenumber" name="L426" href="#L426">426</a> 	<strong class="jxr_keyword">void</strong> i04_put_withNullValue_newKey() {
+<a class="jxr_linenumber" name="L427" href="#L427">427</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L428" href="#L428">428</a> 		<strong class="jxr_keyword">var</strong> previous = x.put(<span class="jxr_string">"user"</span>, 123, <strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="L429" href="#L429">429</a> 		assertNull(previous);
+<a class="jxr_linenumber" name="L430" href="#L430">430</a> 		assertFalse(x.containsKey(<span class="jxr_string">"user"</span>, 123));
+<a class="jxr_linenumber" name="L431" href="#L431">431</a> 		assertTrue(x.isEmpty());
+<a class="jxr_linenumber" name="L432" href="#L432">432</a> 	}
+<a class="jxr_linenumber" name="L433" href="#L433">433</a> 
+<a class="jxr_linenumber" name="L434" href="#L434">434</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L435" href="#L435">435</a> 	<em class="jxr_comment">// j - isEmpty() method</em>
+<a class="jxr_linenumber" name="L436" href="#L436">436</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L437" href="#L437">437</a> 
+<a class="jxr_linenumber" name="L438" href="#L438">438</a> 	@Test
+<a class="jxr_linenumber" name="L439" href="#L439">439</a> 	<strong class="jxr_keyword">void</strong> j01_isEmpty_newCache() {
+<a class="jxr_linenumber" name="L440" href="#L440">440</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L441" href="#L441">441</a> 		assertTrue(x.isEmpty());
+<a class="jxr_linenumber" name="L442" href="#L442">442</a> 	}
+<a class="jxr_linenumber" name="L443" href="#L443">443</a> 
+<a class="jxr_linenumber" name="L444" href="#L444">444</a> 	@Test
+<a class="jxr_linenumber" name="L445" href="#L445">445</a> 	<strong class="jxr_keyword">void</strong> j02_isEmpty_afterPut() {
+<a class="jxr_linenumber" name="L446" href="#L446">446</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L447" href="#L447">447</a> 		x.put(<span class="jxr_string">"user"</span>, 123, <span class="jxr_string">"value"</span>);
+<a class="jxr_linenumber" name="L448" href="#L448">448</a> 		assertFalse(x.isEmpty());
+<a class="jxr_linenumber" name="L449" href="#L449">449</a> 	}
+<a class="jxr_linenumber" name="L450" href="#L450">450</a> 
+<a class="jxr_linenumber" name="L451" href="#L451">451</a> 	@Test
+<a class="jxr_linenumber" name="L452" href="#L452">452</a> 	<strong class="jxr_keyword">void</strong> j03_isEmpty_afterClear() {
+<a class="jxr_linenumber" name="L453" href="#L453">453</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L454" href="#L454">454</a> 		x.put(<span class="jxr_string">"user"</span>, 123, <span class="jxr_string">"value"</span>);
+<a class="jxr_linenumber" name="L455" href="#L455">455</a> 		x.clear();
+<a class="jxr_linenumber" name="L456" href="#L456">456</a> 		assertTrue(x.isEmpty());
+<a class="jxr_linenumber" name="L457" href="#L457">457</a> 	}
+<a class="jxr_linenumber" name="L458" href="#L458">458</a> 
+<a class="jxr_linenumber" name="L459" href="#L459">459</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L460" href="#L460">460</a> 	<em class="jxr_comment">// k - containsKey() method</em>
+<a class="jxr_linenumber" name="L461" href="#L461">461</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L462" href="#L462">462</a> 
+<a class="jxr_linenumber" name="L463" href="#L463">463</a> 	@Test
+<a class="jxr_linenumber" name="L464" href="#L464">464</a> 	<strong class="jxr_keyword">void</strong> k01_containsKey_notPresent() {
+<a class="jxr_linenumber" name="L465" href="#L465">465</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L466" href="#L466">466</a> 		assertFalse(x.containsKey(<span class="jxr_string">"user"</span>, 123));
+<a class="jxr_linenumber" name="L467" href="#L467">467</a> 	}
+<a class="jxr_linenumber" name="L468" href="#L468">468</a> 
+<a class="jxr_linenumber" name="L469" href="#L469">469</a> 	@Test
+<a class="jxr_linenumber" name="L470" href="#L470">470</a> 	<strong class="jxr_keyword">void</strong> k02_containsKey_afterPut() {
+<a class="jxr_linenumber" name="L471" href="#L471">471</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L472" href="#L472">472</a> 		x.put(<span class="jxr_string">"user"</span>, 123, <span class="jxr_string">"value"</span>);
+<a class="jxr_linenumber" name="L473" href="#L473">473</a> 		assertTrue(x.containsKey(<span class="jxr_string">"user"</span>, 123));
+<a class="jxr_linenumber" name="L474" href="#L474">474</a> 		assertFalse(x.containsKey(<span class="jxr_string">"user"</span>, 456));
+<a class="jxr_linenumber" name="L475" href="#L475">475</a> 	}
+<a class="jxr_linenumber" name="L476" href="#L476">476</a> 
+<a class="jxr_linenumber" name="L477" href="#L477">477</a> 	@Test
+<a class="jxr_linenumber" name="L478" href="#L478">478</a> 	<strong class="jxr_keyword">void</strong> k03_containsKey_afterGet() {
+<a class="jxr_linenumber" name="L479" href="#L479">479</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L480" href="#L480">480</a> 			.supplier((k1, k2) -&gt; k1 + <span class="jxr_string">":"</span> + k2)
+<a class="jxr_linenumber" name="L481" href="#L481">481</a> 			.build();
+<a class="jxr_linenumber" name="L482" href="#L482">482</a> 		x.get(<span class="jxr_string">"user"</span>, 123);
+<a class="jxr_linenumber" name="L483" href="#L483">483</a> 		assertTrue(x.containsKey(<span class="jxr_string">"user"</span>, 123));
+<a class="jxr_linenumber" name="L484" href="#L484">484</a> 	}
+<a class="jxr_linenumber" name="L485" href="#L485">485</a> 
+<a class="jxr_linenumber" name="L486" href="#L486">486</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L487" href="#L487">487</a> 	<em class="jxr_comment">// l - remove() method</em>
+<a class="jxr_linenumber" name="L488" href="#L488">488</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L489" href="#L489">489</a> 
+<a class="jxr_linenumber" name="L490" href="#L490">490</a> 	@Test
+<a class="jxr_linenumber" name="L491" href="#L491">491</a> 	<strong class="jxr_keyword">void</strong> l02_remove_existingKey() {
+<a class="jxr_linenumber" name="L492" href="#L492">492</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L493" href="#L493">493</a> 		x.put(<span class="jxr_string">"user"</span>, 123, <span class="jxr_string">"value1"</span>);
+<a class="jxr_linenumber" name="L494" href="#L494">494</a> 		<strong class="jxr_keyword">var</strong> removed = x.remove(<span class="jxr_string">"user"</span>, 123);
+<a class="jxr_linenumber" name="L495" href="#L495">495</a> 		assertEquals(<span class="jxr_string">"value1"</span>, removed);
+<a class="jxr_linenumber" name="L496" href="#L496">496</a> 		assertFalse(x.containsKey(<span class="jxr_string">"user"</span>, 123));
+<a class="jxr_linenumber" name="L497" href="#L497">497</a> 	}
+<a class="jxr_linenumber" name="L498" href="#L498">498</a> 
+<a class="jxr_linenumber" name="L499" href="#L499">499</a> 	@Test
+<a class="jxr_linenumber" name="L500" href="#L500">500</a> 	<strong class="jxr_keyword">void</strong> l03_remove_nonExistentKey() {
+<a class="jxr_linenumber" name="L501" href="#L501">501</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L502" href="#L502">502</a> 		<strong class="jxr_keyword">var</strong> removed = x.remove(<span class="jxr_string">"user"</span>, 123);
+<a class="jxr_linenumber" name="L503" href="#L503">503</a> 		assertNull(removed);
+<a class="jxr_linenumber" name="L504" href="#L504">504</a> 	}
+<a class="jxr_linenumber" name="L505" href="#L505">505</a> 
+<a class="jxr_linenumber" name="L506" href="#L506">506</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L507" href="#L507">507</a> 	<em class="jxr_comment">// m - containsValue() method</em>
+<a class="jxr_linenumber" name="L508" href="#L508">508</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L509" href="#L509">509</a> 
+<a class="jxr_linenumber" name="L510" href="#L510">510</a> 	@Test
+<a class="jxr_linenumber" name="L511" href="#L511">511</a> 	<strong class="jxr_keyword">void</strong> m02_containsValue_present() {
+<a class="jxr_linenumber" name="L512" href="#L512">512</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L513" href="#L513">513</a> 		x.put(<span class="jxr_string">"user"</span>, 123, <span class="jxr_string">"value1"</span>);
+<a class="jxr_linenumber" name="L514" href="#L514">514</a> 		x.put(<span class="jxr_string">"admin"</span>, 456, <span class="jxr_string">"value2"</span>);
+<a class="jxr_linenumber" name="L515" href="#L515">515</a> 		assertTrue(x.containsValue(<span class="jxr_string">"value1"</span>));
+<a class="jxr_linenumber" name="L516" href="#L516">516</a> 		assertTrue(x.containsValue(<span class="jxr_string">"value2"</span>));
+<a class="jxr_linenumber" name="L517" href="#L517">517</a> 		assertFalse(x.containsValue(<span class="jxr_string">"value3"</span>));
+<a class="jxr_linenumber" name="L518" href="#L518">518</a> 	}
+<a class="jxr_linenumber" name="L519" href="#L519">519</a> 
+<a class="jxr_linenumber" name="L520" href="#L520">520</a> 	@Test
+<a class="jxr_linenumber" name="L521" href="#L521">521</a> 	<strong class="jxr_keyword">void</strong> m03_containsValue_notPresent() {
+<a class="jxr_linenumber" name="L522" href="#L522">522</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L523" href="#L523">523</a> 		assertFalse(x.containsValue(<span class="jxr_string">"value1"</span>));
+<a class="jxr_linenumber" name="L524" href="#L524">524</a> 	}
+<a class="jxr_linenumber" name="L525" href="#L525">525</a> 
+<a class="jxr_linenumber" name="L526" href="#L526">526</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L527" href="#L527">527</a> 	<em class="jxr_comment">// n - logOnExit() builder methods</em>
+<a class="jxr_linenumber" name="L528" href="#L528">528</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L529" href="#L529">529</a> 
+<a class="jxr_linenumber" name="L530" href="#L530">530</a> 	@Test
+<a class="jxr_linenumber" name="L531" href="#L531">531</a> 	<strong class="jxr_keyword">void</strong> n02_logOnExit_withStringId() {
+<a class="jxr_linenumber" name="L532" href="#L532">532</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L533" href="#L533">533</a> 			.logOnExit(<span class="jxr_string">"TestCache2"</span>)
+<a class="jxr_linenumber" name="L534" href="#L534">534</a> 			.supplier((k1, k2) -&gt; k1 + <span class="jxr_string">":"</span> + k2)
+<a class="jxr_linenumber" name="L535" href="#L535">535</a> 			.build();
+<a class="jxr_linenumber" name="L536" href="#L536">536</a> 		x.get(<span class="jxr_string">"user"</span>, 123);
+<a class="jxr_linenumber" name="L537" href="#L537">537</a> 		assertSize(1, x);
+<a class="jxr_linenumber" name="L538" href="#L538">538</a> 	}
+<a class="jxr_linenumber" name="L539" href="#L539">539</a> 
+<a class="jxr_linenumber" name="L540" href="#L540">540</a> 	@Test
+<a class="jxr_linenumber" name="L541" href="#L541">541</a> 	<strong class="jxr_keyword">void</strong> n03_logOnExit_withBooleanTrue() {
+<a class="jxr_linenumber" name="L542" href="#L542">542</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L543" href="#L543">543</a> 			.logOnExit(<strong class="jxr_keyword">true</strong>, <span class="jxr_string">"MyCache2"</span>)
+<a class="jxr_linenumber" name="L544" href="#L544">544</a> 			.supplier((k1, k2) -&gt; k1 + <span class="jxr_string">":"</span> + k2)
+<a class="jxr_linenumber" name="L545" href="#L545">545</a> 			.build();
+<a class="jxr_linenumber" name="L546" href="#L546">546</a> 		x.get(<span class="jxr_string">"user"</span>, 123);
+<a class="jxr_linenumber" name="L547" href="#L547">547</a> 		assertSize(1, x);
+<a class="jxr_linenumber" name="L548" href="#L548">548</a> 	}
+<a class="jxr_linenumber" name="L549" href="#L549">549</a> 
+<a class="jxr_linenumber" name="L550" href="#L550">550</a> 	@Test
+<a class="jxr_linenumber" name="L551" href="#L551">551</a> 	<strong class="jxr_keyword">void</strong> n04_logOnExit_withBooleanFalse() {
+<a class="jxr_linenumber" name="L552" href="#L552">552</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L553" href="#L553">553</a> 			.logOnExit(false, <span class="jxr_string">"DisabledCache2"</span>)
+<a class="jxr_linenumber" name="L554" href="#L554">554</a> 			.supplier((k1, k2) -&gt; k1 + <span class="jxr_string">":"</span> + k2)
+<a class="jxr_linenumber" name="L555" href="#L555">555</a> 			.build();
+<a class="jxr_linenumber" name="L556" href="#L556">556</a> 		x.get(<span class="jxr_string">"user"</span>, 123);
+<a class="jxr_linenumber" name="L557" href="#L557">557</a> 		assertSize(1, x);
+<a class="jxr_linenumber" name="L558" href="#L558">558</a> 	}
+<a class="jxr_linenumber" name="L559" href="#L559">559</a> 
+<a class="jxr_linenumber" name="L560" href="#L560">560</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L561" href="#L561">561</a> 	<em class="jxr_comment">// l - create() static method</em>
+<a class="jxr_linenumber" name="L562" href="#L562">562</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L563" href="#L563">563</a> 
+<a class="jxr_linenumber" name="L564" href="#L564">564</a> 	@Test
+<a class="jxr_linenumber" name="L565" href="#L565">565</a> 	<strong class="jxr_keyword">void</strong> l01_create_basic() {
+<a class="jxr_linenumber" name="L566" href="#L566">566</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.&lt;String, Integer, String&gt;create()
+<a class="jxr_linenumber" name="L567" href="#L567">567</a> 			.supplier((k1, k2) -&gt; k1 + <span class="jxr_string">":"</span> + k2)
+<a class="jxr_linenumber" name="L568" href="#L568">568</a> 			.build();
+<a class="jxr_linenumber" name="L569" href="#L569">569</a> 
+<a class="jxr_linenumber" name="L570" href="#L570">570</a> 		<strong class="jxr_keyword">var</strong> result = x.get(<span class="jxr_string">"user"</span>, 123);
+<a class="jxr_linenumber" name="L571" href="#L571">571</a> 		assertEquals(<span class="jxr_string">"user:123"</span>, result);
+<a class="jxr_linenumber" name="L572" href="#L572">572</a> 		assertSize(1, x);
+<a class="jxr_linenumber" name="L573" href="#L573">573</a> 	}
+<a class="jxr_linenumber" name="L574" href="#L574">574</a> 
+<a class="jxr_linenumber" name="L575" href="#L575">575</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L576" href="#L576">576</a> 	<em class="jxr_comment">// m - disableCaching() builder method</em>
+<a class="jxr_linenumber" name="L577" href="#L577">577</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L578" href="#L578">578</a> 
+<a class="jxr_linenumber" name="L579" href="#L579">579</a> 	@Test
+<a class="jxr_linenumber" name="L580" href="#L580">580</a> 	<strong class="jxr_keyword">void</strong> m01_disableCaching() {
+<a class="jxr_linenumber" name="L581" href="#L581">581</a> 		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
+<a class="jxr_linenumber" name="L582" href="#L582">582</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L583" href="#L583">583</a> 			.cacheMode(NONE)
+<a class="jxr_linenumber" name="L584" href="#L584">584</a> 			.supplier((k1, k2) -&gt; {
+<a class="jxr_linenumber" name="L585" href="#L585">585</a> 				callCount.incrementAndGet();
+<a class="jxr_linenumber" name="L586" href="#L586">586</a> 				<strong class="jxr_keyword">return</strong> <span class="jxr_string">"value"</span>;
+<a class="jxr_linenumber" name="L587" href="#L587">587</a> 			})
+<a class="jxr_linenumber" name="L588" href="#L588">588</a> 			.build();
+<a class="jxr_linenumber" name="L589" href="#L589">589</a> 
+<a class="jxr_linenumber" name="L590" href="#L590">590</a> 		x.get(<span class="jxr_string">"user"</span>, 123);
 <a class="jxr_linenumber" name="L591" href="#L591">591</a> 		x.get(<span class="jxr_string">"user"</span>, 123);
-<a class="jxr_linenumber" name="L592" href="#L592">592</a> 		x.get(<span class="jxr_string">"user"</span>, 123);
-<a class="jxr_linenumber" name="L593" href="#L593">593</a> 		assertEquals(2, callCount.get());
-<a class="jxr_linenumber" name="L594" href="#L594">594</a> 		assertTrue(x.isEmpty());
-<a class="jxr_linenumber" name="L595" href="#L595">595</a> 	}
-<a class="jxr_linenumber" name="L596" href="#L596">596</a> 
-<a class="jxr_linenumber" name="L597" href="#L597">597</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L598" href="#L598">598</a> 	<em class="jxr_comment">// n - Null value handling</em>
-<a class="jxr_linenumber" name="L599" href="#L599">599</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L600" href="#L600">600</a> 
-<a class="jxr_linenumber" name="L601" href="#L601">601</a> 	@Test
-<a class="jxr_linenumber" name="L602" href="#L602">602</a> 	<strong class="jxr_keyword">void</strong> n01_nullValue_notCached() {
-<a class="jxr_linenumber" name="L603" href="#L603">603</a> 		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
-<a class="jxr_linenumber" name="L604" href="#L604">604</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L605" href="#L605">605</a> 
-<a class="jxr_linenumber" name="L606" href="#L606">606</a> 		<strong class="jxr_keyword">var</strong> result1 = x.get(<span class="jxr_string">"user"</span>, 123, () -&gt; {
-<a class="jxr_linenumber" name="L607" href="#L607">607</a> 			callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L608" href="#L608">608</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L609" href="#L609">609</a> 		});
-<a class="jxr_linenumber" name="L610" href="#L610">610</a> 		assertNull(result1);
-<a class="jxr_linenumber" name="L611" href="#L611">611</a> 
-<a class="jxr_linenumber" name="L612" href="#L612">612</a> 		<strong class="jxr_keyword">var</strong> result2 = x.get(<span class="jxr_string">"user"</span>, 123, () -&gt; {
-<a class="jxr_linenumber" name="L613" href="#L613">613</a> 			callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L614" href="#L614">614</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L615" href="#L615">615</a> 		});
-<a class="jxr_linenumber" name="L616" href="#L616">616</a> 		assertNull(result2);
-<a class="jxr_linenumber" name="L617" href="#L617">617</a> 		assertEquals(2, callCount.get());
-<a class="jxr_linenumber" name="L618" href="#L618">618</a> 		assertTrue(x.isEmpty());
-<a class="jxr_linenumber" name="L619" href="#L619">619</a> 	}
-<a class="jxr_linenumber" name="L620" href="#L620">620</a> }
-<a class="jxr_linenumber" name="L621" href="#L621">621</a> 
+<a class="jxr_linenumber" name="L592" href="#L592">592</a> 		assertEquals(2, callCount.get());
+<a class="jxr_linenumber" name="L593" href="#L593">593</a> 		assertTrue(x.isEmpty());
+<a class="jxr_linenumber" name="L594" href="#L594">594</a> 	}
+<a class="jxr_linenumber" name="L595" href="#L595">595</a> 
+<a class="jxr_linenumber" name="L596" href="#L596">596</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L597" href="#L597">597</a> 	<em class="jxr_comment">// n - Null value handling</em>
+<a class="jxr_linenumber" name="L598" href="#L598">598</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L599" href="#L599">599</a> 
+<a class="jxr_linenumber" name="L600" href="#L600">600</a> 	@Test
+<a class="jxr_linenumber" name="L601" href="#L601">601</a> 	<strong class="jxr_keyword">void</strong> n01_nullValue_notCached() {
+<a class="jxr_linenumber" name="L602" href="#L602">602</a> 		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
+<a class="jxr_linenumber" name="L603" href="#L603">603</a> 		<strong class="jxr_keyword">var</strong> x = Cache2.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L604" href="#L604">604</a> 
+<a class="jxr_linenumber" name="L605" href="#L605">605</a> 		<strong class="jxr_keyword">var</strong> result1 = x.get(<span class="jxr_string">"user"</span>, 123, () -&gt; {
+<a class="jxr_linenumber" name="L606" href="#L606">606</a> 			callCount.incrementAndGet();
+<a class="jxr_linenumber" name="L607" href="#L607">607</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L608" href="#L608">608</a> 		});
+<a class="jxr_linenumber" name="L609" href="#L609">609</a> 		assertNull(result1);
+<a class="jxr_linenumber" name="L610" href="#L610">610</a> 
+<a class="jxr_linenumber" name="L611" href="#L611">611</a> 		<strong class="jxr_keyword">var</strong> result2 = x.get(<span class="jxr_string">"user"</span>, 123, () -&gt; {
+<a class="jxr_linenumber" name="L612" href="#L612">612</a> 			callCount.incrementAndGet();
+<a class="jxr_linenumber" name="L613" href="#L613">613</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L614" href="#L614">614</a> 		});
+<a class="jxr_linenumber" name="L615" href="#L615">615</a> 		assertNull(result2);
+<a class="jxr_linenumber" name="L616" href="#L616">616</a> 		assertEquals(2, callCount.get());
+<a class="jxr_linenumber" name="L617" href="#L617">617</a> 		assertTrue(x.isEmpty());
+<a class="jxr_linenumber" name="L618" href="#L618">618</a> 	}
+<a class="jxr_linenumber" name="L619" href="#L619">619</a> }
+<a class="jxr_linenumber" name="L620" href="#L620">620</a> 
 </pre>
 <hr/>
 <div id="footer">© 2016–2025 <a href="https://www.apache.org/">The Apache Software Foundation</a></div>
diff --git a/site/xref-test/org/apache/juneau/common/collections/Cache3_Test.html b/site/xref-test/org/apache/juneau/commons/collections/Cache3_Test.html
similarity index 59%
rename from site/xref-test/org/apache/juneau/common/collections/Cache3_Test.html
rename to site/xref-test/org/apache/juneau/commons/collections/Cache3_Test.html
index b0a0cb60ec..69ca64576d 100644
--- a/site/xref-test/org/apache/juneau/common/collections/Cache3_Test.html
+++ b/site/xref-test/org/apache/juneau/commons/collections/Cache3_Test.html
@@ -5,7 +5,7 @@
 <link type="text/css" rel="stylesheet" href="../../../../../stylesheet.css" />
 </head>
 <body>
-<div id="overview"><a href="../../../../../../testapidocs/org/apache/juneau/common/collections/Cache3_Test.html">View Javadoc</a></div><pre>
+<div id="overview"><a href="../../../../../../testapidocs/org/apache/juneau/commons/collections/Cache3_Test.html">View Javadoc</a></div><pre>
 <a class="jxr_linenumber" name="L1" href="#L1">1</a>   <em class="jxr_comment">/*</em>
 <a class="jxr_linenumber" name="L2" href="#L2">2</a>   <em class="jxr_comment"> * Licensed to the Apache Software Foundation (ASF) under one or more</em>
 <a class="jxr_linenumber" name="L3" href="#L3">3</a>   <em class="jxr_comment"> * contributor license agreements.  See the NOTICE file distributed with</em>
@@ -22,334 +22,333 @@
 <a class="jxr_linenumber" name="L14" href="#L14">14</a>  <em class="jxr_comment"> * See the License for the specific language governing permissions and</em>
 <a class="jxr_linenumber" name="L15" href="#L15">15</a>  <em class="jxr_comment"> * limitations under the License.</em>
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
-<a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.common.collections;
+<a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.commons.collections;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
-<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.collections.CacheMode.*;
-<a class="jxr_linenumber" name="L20" href="#L20">20</a>  
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
-<a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
-<a class="jxr_linenumber" name="L23" href="#L23">23</a>  
-<a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> java.util.concurrent.atomic.*;
-<a class="jxr_linenumber" name="L25" href="#L25">25</a>  
-<a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.*;
-<a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.api.*;
-<a class="jxr_linenumber" name="L28" href="#L28">28</a>  
-<a class="jxr_linenumber" name="L29" href="#L29">29</a>  <strong class="jxr_keyword">class</strong> <a name="Cache3_Test" href="../../../../../org/apache/juneau/common/collections/Cache3_Test.html#Cache3_Test">Cache3_Test</a> <strong class="jxr_keyword">extends</strong> <a name="TestBase" href="../../../../../org/apache/juneau/TestBase.html#TestBase">TestBase</a> {
-<a class="jxr_linenumber" name="L30" href="#L30">30</a>  
-<a class="jxr_linenumber" name="L31" href="#L31">31</a>  	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L32" href="#L32">32</a>  	<em class="jxr_comment">// a - Basic cache operations</em>
-<a class="jxr_linenumber" name="L33" href="#L33">33</a>  	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L34" href="#L34">34</a>  
-<a class="jxr_linenumber" name="L35" href="#L35">35</a>  	@Test
-<a class="jxr_linenumber" name="L36" href="#L36">36</a>  	<strong class="jxr_keyword">void</strong> a01_defaultSupplier_basic() {
-<a class="jxr_linenumber" name="L37" href="#L37">37</a>  		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
-<a class="jxr_linenumber" name="L38" href="#L38">38</a>  		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L39" href="#L39">39</a>  			.supplier((k1, k2, k3) -&gt; {
-<a class="jxr_linenumber" name="L40" href="#L40">40</a>  				callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L41" href="#L41">41</a>  				<strong class="jxr_keyword">return</strong> k1 + <span class="jxr_string">":"</span> + k2 + <span class="jxr_string">":"</span> + k3;
-<a class="jxr_linenumber" name="L42" href="#L42">42</a>  			})
-<a class="jxr_linenumber" name="L43" href="#L43">43</a>  			.build();
-<a class="jxr_linenumber" name="L44" href="#L44">44</a>  
-<a class="jxr_linenumber" name="L45" href="#L45">45</a>  		<strong class="jxr_keyword">var</strong> result1 = x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1);
-<a class="jxr_linenumber" name="L46" href="#L46">46</a>  		<strong class="jxr_keyword">var</strong> result2 = x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1); <em class="jxr_comment">// Cache hit</em>
-<a class="jxr_linenumber" name="L47" href="#L47">47</a>  
-<a class="jxr_linenumber" name="L48" href="#L48">48</a>  		assertEquals(<span class="jxr_string">"en:US:1"</span>, result1);
-<a class="jxr_linenumber" name="L49" href="#L49">49</a>  		assertEquals(<span class="jxr_string">"en:US:1"</span>, result2);
-<a class="jxr_linenumber" name="L50" href="#L50">50</a>  		assertEquals(1, callCount.get());
-<a class="jxr_linenumber" name="L51" href="#L51">51</a>  		assertEquals(1, x.getCacheHits());
-<a class="jxr_linenumber" name="L52" href="#L52">52</a>  	}
-<a class="jxr_linenumber" name="L53" href="#L53">53</a>  
-<a class="jxr_linenumber" name="L54" href="#L54">54</a>  	@Test
-<a class="jxr_linenumber" name="L55" href="#L55">55</a>  	<strong class="jxr_keyword">void</strong> a02_overrideSupplier() {
-<a class="jxr_linenumber" name="L56" href="#L56">56</a>  		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L57" href="#L57">57</a>  			.supplier((k1, k2, k3) -&gt; <span class="jxr_string">"DEFAULT"</span>)
-<a class="jxr_linenumber" name="L58" href="#L58">58</a>  			.build();
-<a class="jxr_linenumber" name="L59" href="#L59">59</a>  
-<a class="jxr_linenumber" name="L60" href="#L60">60</a>  		<strong class="jxr_keyword">var</strong> result = x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1, () -&gt; <span class="jxr_string">"OVERRIDE"</span>);
-<a class="jxr_linenumber" name="L61" href="#L61">61</a>  
-<a class="jxr_linenumber" name="L62" href="#L62">62</a>  		assertEquals(<span class="jxr_string">"OVERRIDE"</span>, result);
-<a class="jxr_linenumber" name="L63" href="#L63">63</a>  	}
-<a class="jxr_linenumber" name="L64" href="#L64">64</a>  
-<a class="jxr_linenumber" name="L65" href="#L65">65</a>  	@Test
-<a class="jxr_linenumber" name="L66" href="#L66">66</a>  	<strong class="jxr_keyword">void</strong> a03_nullKeys() {
-<a class="jxr_linenumber" name="L67" href="#L67">67</a>  		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L68" href="#L68">68</a>  			.supplier((k1, k2, k3) -&gt; <span class="jxr_string">"value-"</span> + k1 + <span class="jxr_string">"-"</span> + k2 + <span class="jxr_string">"-"</span> + k3)
-<a class="jxr_linenumber" name="L69" href="#L69">69</a>  			.build();
-<a class="jxr_linenumber" name="L70" href="#L70">70</a>  
-<a class="jxr_linenumber" name="L71" href="#L71">71</a>  		<em class="jxr_comment">// Null keys are now allowed</em>
-<a class="jxr_linenumber" name="L72" href="#L72">72</a>  		assertEquals(<span class="jxr_string">"value-null-US-1"</span>, x.get(<strong class="jxr_keyword">null</strong>, <span class="jxr_string">"US"</span>, 1));
-<a class="jxr_linenumber" name="L73" href="#L73">73</a>  		assertEquals(<span class="jxr_string">"value-en-null-1"</span>, x.get(<span class="jxr_string">"en"</span>, <strong class="jxr_keyword">null</strong>, 1));
-<a class="jxr_linenumber" name="L74" href="#L74">74</a>  		assertEquals(<span class="jxr_string">"value-en-US-null"</span>, x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <strong class="jxr_keyword">null</strong>));
-<a class="jxr_linenumber" name="L75" href="#L75">75</a>  		assertEquals(<span class="jxr_string">"value-null-null-null"</span>, x.get(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>));
-<a class="jxr_linenumber" name="L76" href="#L76">76</a>  
-<a class="jxr_linenumber" name="L77" href="#L77">77</a>  		<em class="jxr_comment">// Cached values should be returned on subsequent calls</em>
-<a class="jxr_linenumber" name="L78" href="#L78">78</a>  		assertEquals(<span class="jxr_string">"value-null-US-1"</span>, x.get(<strong class="jxr_keyword">null</strong>, <span class="jxr_string">"US"</span>, 1));
-<a class="jxr_linenumber" name="L79" href="#L79">79</a>  		assertEquals(<span class="jxr_string">"value-en-null-1"</span>, x.get(<span class="jxr_string">"en"</span>, <strong class="jxr_keyword">null</strong>, 1));
-<a class="jxr_linenumber" name="L80" href="#L80">80</a>  	}
-<a class="jxr_linenumber" name="L81" href="#L81">81</a>  
-<a class="jxr_linenumber" name="L82" href="#L82">82</a>  	@Test
-<a class="jxr_linenumber" name="L83" href="#L83">83</a>  	<strong class="jxr_keyword">void</strong> a04_disableCaching() {
-<a class="jxr_linenumber" name="L84" href="#L84">84</a>  		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
-<a class="jxr_linenumber" name="L85" href="#L85">85</a>  		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L86" href="#L86">86</a>  			.cacheMode(NONE)
-<a class="jxr_linenumber" name="L87" href="#L87">87</a>  			.supplier((k1, k2, k3) -&gt; {
-<a class="jxr_linenumber" name="L88" href="#L88">88</a>  				callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L89" href="#L89">89</a>  				<strong class="jxr_keyword">return</strong> <span class="jxr_string">"value"</span>;
-<a class="jxr_linenumber" name="L90" href="#L90">90</a>  			})
-<a class="jxr_linenumber" name="L91" href="#L91">91</a>  			.build();
-<a class="jxr_linenumber" name="L92" href="#L92">92</a>  
+<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
+<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.collections.CacheMode.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
+<a class="jxr_linenumber" name="L22" href="#L22">22</a>  
+<a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> java.util.concurrent.atomic.*;
+<a class="jxr_linenumber" name="L24" href="#L24">24</a>  
+<a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.*;
+<a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.api.*;
+<a class="jxr_linenumber" name="L27" href="#L27">27</a>  
+<a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong class="jxr_keyword">class</strong> <a name="Cache3_Test" href="../../../../../org/apache/juneau/commons/collections/Cache3_Test.html#Cache3_Test">Cache3_Test</a> <strong class="jxr_keyword">extends</strong> <a name="TestBase" href="../../../../../org/apache/juneau/TestBase.html#TestBase">TestBase</a> {
+<a class="jxr_linenumber" name="L29" href="#L29">29</a>  
+<a class="jxr_linenumber" name="L30" href="#L30">30</a>  	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L31" href="#L31">31</a>  	<em class="jxr_comment">// a - Basic cache operations</em>
+<a class="jxr_linenumber" name="L32" href="#L32">32</a>  	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L33" href="#L33">33</a>  
+<a class="jxr_linenumber" name="L34" href="#L34">34</a>  	@Test
+<a class="jxr_linenumber" name="L35" href="#L35">35</a>  	<strong class="jxr_keyword">void</strong> a01_defaultSupplier_basic() {
+<a class="jxr_linenumber" name="L36" href="#L36">36</a>  		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
+<a class="jxr_linenumber" name="L37" href="#L37">37</a>  		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L38" href="#L38">38</a>  			.supplier((k1, k2, k3) -&gt; {
+<a class="jxr_linenumber" name="L39" href="#L39">39</a>  				callCount.incrementAndGet();
+<a class="jxr_linenumber" name="L40" href="#L40">40</a>  				<strong class="jxr_keyword">return</strong> k1 + <span class="jxr_string">":"</span> + k2 + <span class="jxr_string">":"</span> + k3;
+<a class="jxr_linenumber" name="L41" href="#L41">41</a>  			})
+<a class="jxr_linenumber" name="L42" href="#L42">42</a>  			.build();
+<a class="jxr_linenumber" name="L43" href="#L43">43</a>  
+<a class="jxr_linenumber" name="L44" href="#L44">44</a>  		<strong class="jxr_keyword">var</strong> result1 = x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1);
+<a class="jxr_linenumber" name="L45" href="#L45">45</a>  		<strong class="jxr_keyword">var</strong> result2 = x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1); <em class="jxr_comment">// Cache hit</em>
+<a class="jxr_linenumber" name="L46" href="#L46">46</a>  
+<a class="jxr_linenumber" name="L47" href="#L47">47</a>  		assertEquals(<span class="jxr_string">"en:US:1"</span>, result1);
+<a class="jxr_linenumber" name="L48" href="#L48">48</a>  		assertEquals(<span class="jxr_string">"en:US:1"</span>, result2);
+<a class="jxr_linenumber" name="L49" href="#L49">49</a>  		assertEquals(1, callCount.get());
+<a class="jxr_linenumber" name="L50" href="#L50">50</a>  		assertEquals(1, x.getCacheHits());
+<a class="jxr_linenumber" name="L51" href="#L51">51</a>  	}
+<a class="jxr_linenumber" name="L52" href="#L52">52</a>  
+<a class="jxr_linenumber" name="L53" href="#L53">53</a>  	@Test
+<a class="jxr_linenumber" name="L54" href="#L54">54</a>  	<strong class="jxr_keyword">void</strong> a02_overrideSupplier() {
+<a class="jxr_linenumber" name="L55" href="#L55">55</a>  		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L56" href="#L56">56</a>  			.supplier((k1, k2, k3) -&gt; <span class="jxr_string">"DEFAULT"</span>)
+<a class="jxr_linenumber" name="L57" href="#L57">57</a>  			.build();
+<a class="jxr_linenumber" name="L58" href="#L58">58</a>  
+<a class="jxr_linenumber" name="L59" href="#L59">59</a>  		<strong class="jxr_keyword">var</strong> result = x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1, () -&gt; <span class="jxr_string">"OVERRIDE"</span>);
+<a class="jxr_linenumber" name="L60" href="#L60">60</a>  
+<a class="jxr_linenumber" name="L61" href="#L61">61</a>  		assertEquals(<span class="jxr_string">"OVERRIDE"</span>, result);
+<a class="jxr_linenumber" name="L62" href="#L62">62</a>  	}
+<a class="jxr_linenumber" name="L63" href="#L63">63</a>  
+<a class="jxr_linenumber" name="L64" href="#L64">64</a>  	@Test
+<a class="jxr_linenumber" name="L65" href="#L65">65</a>  	<strong class="jxr_keyword">void</strong> a03_nullKeys() {
+<a class="jxr_linenumber" name="L66" href="#L66">66</a>  		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L67" href="#L67">67</a>  			.supplier((k1, k2, k3) -&gt; <span class="jxr_string">"value-"</span> + k1 + <span class="jxr_string">"-"</span> + k2 + <span class="jxr_string">"-"</span> + k3)
+<a class="jxr_linenumber" name="L68" href="#L68">68</a>  			.build();
+<a class="jxr_linenumber" name="L69" href="#L69">69</a>  
+<a class="jxr_linenumber" name="L70" href="#L70">70</a>  		<em class="jxr_comment">// Null keys are now allowed</em>
+<a class="jxr_linenumber" name="L71" href="#L71">71</a>  		assertEquals(<span class="jxr_string">"value-null-US-1"</span>, x.get(<strong class="jxr_keyword">null</strong>, <span class="jxr_string">"US"</span>, 1));
+<a class="jxr_linenumber" name="L72" href="#L72">72</a>  		assertEquals(<span class="jxr_string">"value-en-null-1"</span>, x.get(<span class="jxr_string">"en"</span>, <strong class="jxr_keyword">null</strong>, 1));
+<a class="jxr_linenumber" name="L73" href="#L73">73</a>  		assertEquals(<span class="jxr_string">"value-en-US-null"</span>, x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <strong class="jxr_keyword">null</strong>));
+<a class="jxr_linenumber" name="L74" href="#L74">74</a>  		assertEquals(<span class="jxr_string">"value-null-null-null"</span>, x.get(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>));
+<a class="jxr_linenumber" name="L75" href="#L75">75</a>  
+<a class="jxr_linenumber" name="L76" href="#L76">76</a>  		<em class="jxr_comment">// Cached values should be returned on subsequent calls</em>
+<a class="jxr_linenumber" name="L77" href="#L77">77</a>  		assertEquals(<span class="jxr_string">"value-null-US-1"</span>, x.get(<strong class="jxr_keyword">null</strong>, <span class="jxr_string">"US"</span>, 1));
+<a class="jxr_linenumber" name="L78" href="#L78">78</a>  		assertEquals(<span class="jxr_string">"value-en-null-1"</span>, x.get(<span class="jxr_string">"en"</span>, <strong class="jxr_keyword">null</strong>, 1));
+<a class="jxr_linenumber" name="L79" href="#L79">79</a>  	}
+<a class="jxr_linenumber" name="L80" href="#L80">80</a>  
+<a class="jxr_linenumber" name="L81" href="#L81">81</a>  	@Test
+<a class="jxr_linenumber" name="L82" href="#L82">82</a>  	<strong class="jxr_keyword">void</strong> a04_disableCaching() {
+<a class="jxr_linenumber" name="L83" href="#L83">83</a>  		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
+<a class="jxr_linenumber" name="L84" href="#L84">84</a>  		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L85" href="#L85">85</a>  			.cacheMode(NONE)
+<a class="jxr_linenumber" name="L86" href="#L86">86</a>  			.supplier((k1, k2, k3) -&gt; {
+<a class="jxr_linenumber" name="L87" href="#L87">87</a>  				callCount.incrementAndGet();
+<a class="jxr_linenumber" name="L88" href="#L88">88</a>  				<strong class="jxr_keyword">return</strong> <span class="jxr_string">"value"</span>;
+<a class="jxr_linenumber" name="L89" href="#L89">89</a>  			})
+<a class="jxr_linenumber" name="L90" href="#L90">90</a>  			.build();
+<a class="jxr_linenumber" name="L91" href="#L91">91</a>  
+<a class="jxr_linenumber" name="L92" href="#L92">92</a>  		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1);
 <a class="jxr_linenumber" name="L93" href="#L93">93</a>  		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1);
-<a class="jxr_linenumber" name="L94" href="#L94">94</a>  		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1);
-<a class="jxr_linenumber" name="L95" href="#L95">95</a>  
-<a class="jxr_linenumber" name="L96" href="#L96">96</a>  		assertEquals(2, callCount.get()); <em class="jxr_comment">// Called twice</em>
-<a class="jxr_linenumber" name="L97" href="#L97">97</a>  		assertEmpty(x);
-<a class="jxr_linenumber" name="L98" href="#L98">98</a>  	}
-<a class="jxr_linenumber" name="L99" href="#L99">99</a>  
-<a class="jxr_linenumber" name="L100" href="#L100">100</a> 	@Test
-<a class="jxr_linenumber" name="L101" href="#L101">101</a> 	<strong class="jxr_keyword">void</strong> a04b_weakMode_basicCaching() {
-<a class="jxr_linenumber" name="L102" href="#L102">102</a> 		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
-<a class="jxr_linenumber" name="L103" href="#L103">103</a> 		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L104" href="#L104">104</a> 			.cacheMode(WEAK)
-<a class="jxr_linenumber" name="L105" href="#L105">105</a> 			.supplier((k1, k2, k3) -&gt; {
-<a class="jxr_linenumber" name="L106" href="#L106">106</a> 				callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L107" href="#L107">107</a> 				<strong class="jxr_keyword">return</strong> k1 + <span class="jxr_string">":"</span> + k2 + <span class="jxr_string">":"</span> + k3;
-<a class="jxr_linenumber" name="L108" href="#L108">108</a> 			})
-<a class="jxr_linenumber" name="L109" href="#L109">109</a> 			.build();
-<a class="jxr_linenumber" name="L110" href="#L110">110</a> 
-<a class="jxr_linenumber" name="L111" href="#L111">111</a> 		<em class="jxr_comment">// First call - cache miss</em>
-<a class="jxr_linenumber" name="L112" href="#L112">112</a> 		<strong class="jxr_keyword">var</strong> result1 = x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1);
-<a class="jxr_linenumber" name="L113" href="#L113">113</a> 
-<a class="jxr_linenumber" name="L114" href="#L114">114</a> 		<em class="jxr_comment">// Second call - cache hit</em>
-<a class="jxr_linenumber" name="L115" href="#L115">115</a> 		<strong class="jxr_keyword">var</strong> result2 = x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1);
-<a class="jxr_linenumber" name="L116" href="#L116">116</a> 
-<a class="jxr_linenumber" name="L117" href="#L117">117</a> 		assertEquals(<span class="jxr_string">"en:US:1"</span>, result1);
-<a class="jxr_linenumber" name="L118" href="#L118">118</a> 		assertEquals(<span class="jxr_string">"en:US:1"</span>, result2);
-<a class="jxr_linenumber" name="L119" href="#L119">119</a> 		assertSame(result1, result2);
-<a class="jxr_linenumber" name="L120" href="#L120">120</a> 		assertEquals(1, callCount.get()); <em class="jxr_comment">// Supplier only called once</em>
-<a class="jxr_linenumber" name="L121" href="#L121">121</a> 		assertSize(1, x);
-<a class="jxr_linenumber" name="L122" href="#L122">122</a> 		assertEquals(1, x.getCacheHits());
-<a class="jxr_linenumber" name="L123" href="#L123">123</a> 	}
-<a class="jxr_linenumber" name="L124" href="#L124">124</a> 
-<a class="jxr_linenumber" name="L125" href="#L125">125</a> 	@Test
-<a class="jxr_linenumber" name="L126" href="#L126">126</a> 	<strong class="jxr_keyword">void</strong> a04c_weakMode_multipleKeys() {
-<a class="jxr_linenumber" name="L127" href="#L127">127</a> 		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L128" href="#L128">128</a> 			.cacheMode(WEAK)
-<a class="jxr_linenumber" name="L129" href="#L129">129</a> 			.supplier((k1, k2, k3) -&gt; k1 + <span class="jxr_string">":"</span> + k2 + <span class="jxr_string">":"</span> + k3)
-<a class="jxr_linenumber" name="L130" href="#L130">130</a> 			.build();
-<a class="jxr_linenumber" name="L131" href="#L131">131</a> 
-<a class="jxr_linenumber" name="L132" href="#L132">132</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1);
-<a class="jxr_linenumber" name="L133" href="#L133">133</a> 		x.get(<span class="jxr_string">"fr"</span>, <span class="jxr_string">"FR"</span>, 2);
-<a class="jxr_linenumber" name="L134" href="#L134">134</a> 		x.get(<span class="jxr_string">"de"</span>, <span class="jxr_string">"DE"</span>, 3);
-<a class="jxr_linenumber" name="L135" href="#L135">135</a> 
-<a class="jxr_linenumber" name="L136" href="#L136">136</a> 		assertSize(3, x);
-<a class="jxr_linenumber" name="L137" href="#L137">137</a> 		assertEquals(0, x.getCacheHits());
-<a class="jxr_linenumber" name="L138" href="#L138">138</a> 
-<a class="jxr_linenumber" name="L139" href="#L139">139</a> 		<em class="jxr_comment">// Verify all cached</em>
-<a class="jxr_linenumber" name="L140" href="#L140">140</a> 		assertEquals(<span class="jxr_string">"en:US:1"</span>, x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1));
-<a class="jxr_linenumber" name="L141" href="#L141">141</a> 		assertEquals(<span class="jxr_string">"fr:FR:2"</span>, x.get(<span class="jxr_string">"fr"</span>, <span class="jxr_string">"FR"</span>, 2));
-<a class="jxr_linenumber" name="L142" href="#L142">142</a> 		assertEquals(<span class="jxr_string">"de:DE:3"</span>, x.get(<span class="jxr_string">"de"</span>, <span class="jxr_string">"DE"</span>, 3));
-<a class="jxr_linenumber" name="L143" href="#L143">143</a> 		assertEquals(3, x.getCacheHits());
-<a class="jxr_linenumber" name="L144" href="#L144">144</a> 	}
-<a class="jxr_linenumber" name="L145" href="#L145">145</a> 
-<a class="jxr_linenumber" name="L146" href="#L146">146</a> 	@Test
-<a class="jxr_linenumber" name="L147" href="#L147">147</a> 	<strong class="jxr_keyword">void</strong> a04d_weakMode_clear() {
-<a class="jxr_linenumber" name="L148" href="#L148">148</a> 		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L149" href="#L149">149</a> 			.cacheMode(WEAK)
-<a class="jxr_linenumber" name="L150" href="#L150">150</a> 			.supplier((k1, k2, k3) -&gt; <span class="jxr_string">"value"</span>)
-<a class="jxr_linenumber" name="L151" href="#L151">151</a> 			.build();
-<a class="jxr_linenumber" name="L152" href="#L152">152</a> 
-<a class="jxr_linenumber" name="L153" href="#L153">153</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1);
-<a class="jxr_linenumber" name="L154" href="#L154">154</a> 		x.get(<span class="jxr_string">"fr"</span>, <span class="jxr_string">"FR"</span>, 2);
-<a class="jxr_linenumber" name="L155" href="#L155">155</a> 		assertSize(2, x);
-<a class="jxr_linenumber" name="L156" href="#L156">156</a> 
-<a class="jxr_linenumber" name="L157" href="#L157">157</a> 		x.clear();
-<a class="jxr_linenumber" name="L158" href="#L158">158</a> 		assertEmpty(x);
-<a class="jxr_linenumber" name="L159" href="#L159">159</a> 	}
-<a class="jxr_linenumber" name="L160" href="#L160">160</a> 
-<a class="jxr_linenumber" name="L161" href="#L161">161</a> 	@Test
-<a class="jxr_linenumber" name="L162" href="#L162">162</a> 	<strong class="jxr_keyword">void</strong> a04e_weakMode_maxSize() {
-<a class="jxr_linenumber" name="L163" href="#L163">163</a> 		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L164" href="#L164">164</a> 			.cacheMode(WEAK)
-<a class="jxr_linenumber" name="L165" href="#L165">165</a> 			.maxSize(2)
-<a class="jxr_linenumber" name="L166" href="#L166">166</a> 			.supplier((k1, k2, k3) -&gt; <span class="jxr_string">"value"</span>)
-<a class="jxr_linenumber" name="L167" href="#L167">167</a> 			.build();
-<a class="jxr_linenumber" name="L168" href="#L168">168</a> 
-<a class="jxr_linenumber" name="L169" href="#L169">169</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1);
-<a class="jxr_linenumber" name="L170" href="#L170">170</a> 		x.get(<span class="jxr_string">"fr"</span>, <span class="jxr_string">"FR"</span>, 2);
-<a class="jxr_linenumber" name="L171" href="#L171">171</a> 		assertSize(2, x);
-<a class="jxr_linenumber" name="L172" href="#L172">172</a> 
-<a class="jxr_linenumber" name="L173" href="#L173">173</a> 		<em class="jxr_comment">// 3rd item doesn't trigger eviction yet</em>
-<a class="jxr_linenumber" name="L174" href="#L174">174</a> 		x.get(<span class="jxr_string">"de"</span>, <span class="jxr_string">"DE"</span>, 3);
-<a class="jxr_linenumber" name="L175" href="#L175">175</a> 		assertSize(3, x);
-<a class="jxr_linenumber" name="L176" href="#L176">176</a> 
-<a class="jxr_linenumber" name="L177" href="#L177">177</a> 		<em class="jxr_comment">// 4th item triggers eviction</em>
-<a class="jxr_linenumber" name="L178" href="#L178">178</a> 		x.get(<span class="jxr_string">"es"</span>, <span class="jxr_string">"ES"</span>, 4);
-<a class="jxr_linenumber" name="L179" href="#L179">179</a> 		assertSize(1, x);
-<a class="jxr_linenumber" name="L180" href="#L180">180</a> 	}
-<a class="jxr_linenumber" name="L181" href="#L181">181</a> 
-<a class="jxr_linenumber" name="L182" href="#L182">182</a> 	@Test
-<a class="jxr_linenumber" name="L183" href="#L183">183</a> 	<strong class="jxr_keyword">void</strong> a05_maxSize() {
-<a class="jxr_linenumber" name="L184" href="#L184">184</a> 		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L185" href="#L185">185</a> 			.maxSize(2)
-<a class="jxr_linenumber" name="L186" href="#L186">186</a> 			.supplier((k1, k2, k3) -&gt; <span class="jxr_string">"value"</span>)
-<a class="jxr_linenumber" name="L187" href="#L187">187</a> 			.build();
-<a class="jxr_linenumber" name="L188" href="#L188">188</a> 
-<a class="jxr_linenumber" name="L189" href="#L189">189</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1);
-<a class="jxr_linenumber" name="L190" href="#L190">190</a> 		x.get(<span class="jxr_string">"fr"</span>, <span class="jxr_string">"FR"</span>, 2);
-<a class="jxr_linenumber" name="L191" href="#L191">191</a> 		assertSize(2, x);
-<a class="jxr_linenumber" name="L192" href="#L192">192</a> 
-<a class="jxr_linenumber" name="L193" href="#L193">193</a> 		x.get(<span class="jxr_string">"de"</span>, <span class="jxr_string">"DE"</span>, 3);
-<a class="jxr_linenumber" name="L194" href="#L194">194</a> 		assertSize(3, x);
-<a class="jxr_linenumber" name="L195" href="#L195">195</a> 
-<a class="jxr_linenumber" name="L196" href="#L196">196</a> 		x.get(<span class="jxr_string">"es"</span>, <span class="jxr_string">"ES"</span>, 4); <em class="jxr_comment">// This exceeds max (3 &gt; 2)</em>
-<a class="jxr_linenumber" name="L197" href="#L197">197</a> 		assertSize(1, x); <em class="jxr_comment">// Cleared</em>
-<a class="jxr_linenumber" name="L198" href="#L198">198</a> 	}
-<a class="jxr_linenumber" name="L199" href="#L199">199</a> 
-<a class="jxr_linenumber" name="L200" href="#L200">200</a> 	@Test
-<a class="jxr_linenumber" name="L201" href="#L201">201</a> 	<strong class="jxr_keyword">void</strong> a06_cacheHitsTracking() {
-<a class="jxr_linenumber" name="L202" href="#L202">202</a> 		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L203" href="#L203">203</a> 			.supplier((k1, k2, k3) -&gt; <span class="jxr_string">"value"</span>)
-<a class="jxr_linenumber" name="L204" href="#L204">204</a> 			.build();
-<a class="jxr_linenumber" name="L205" href="#L205">205</a> 
-<a class="jxr_linenumber" name="L206" href="#L206">206</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1); <em class="jxr_comment">// Miss</em>
-<a class="jxr_linenumber" name="L207" href="#L207">207</a> 		assertEquals(0, x.getCacheHits());
-<a class="jxr_linenumber" name="L208" href="#L208">208</a> 
+<a class="jxr_linenumber" name="L94" href="#L94">94</a>  
+<a class="jxr_linenumber" name="L95" href="#L95">95</a>  		assertEquals(2, callCount.get()); <em class="jxr_comment">// Called twice</em>
+<a class="jxr_linenumber" name="L96" href="#L96">96</a>  		assertEmpty(x);
+<a class="jxr_linenumber" name="L97" href="#L97">97</a>  	}
+<a class="jxr_linenumber" name="L98" href="#L98">98</a>  
+<a class="jxr_linenumber" name="L99" href="#L99">99</a>  	@Test
+<a class="jxr_linenumber" name="L100" href="#L100">100</a> 	<strong class="jxr_keyword">void</strong> a04b_weakMode_basicCaching() {
+<a class="jxr_linenumber" name="L101" href="#L101">101</a> 		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
+<a class="jxr_linenumber" name="L102" href="#L102">102</a> 		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L103" href="#L103">103</a> 			.cacheMode(WEAK)
+<a class="jxr_linenumber" name="L104" href="#L104">104</a> 			.supplier((k1, k2, k3) -&gt; {
+<a class="jxr_linenumber" name="L105" href="#L105">105</a> 				callCount.incrementAndGet();
+<a class="jxr_linenumber" name="L106" href="#L106">106</a> 				<strong class="jxr_keyword">return</strong> k1 + <span class="jxr_string">":"</span> + k2 + <span class="jxr_string">":"</span> + k3;
+<a class="jxr_linenumber" name="L107" href="#L107">107</a> 			})
+<a class="jxr_linenumber" name="L108" href="#L108">108</a> 			.build();
+<a class="jxr_linenumber" name="L109" href="#L109">109</a> 
+<a class="jxr_linenumber" name="L110" href="#L110">110</a> 		<em class="jxr_comment">// First call - cache miss</em>
+<a class="jxr_linenumber" name="L111" href="#L111">111</a> 		<strong class="jxr_keyword">var</strong> result1 = x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1);
+<a class="jxr_linenumber" name="L112" href="#L112">112</a> 
+<a class="jxr_linenumber" name="L113" href="#L113">113</a> 		<em class="jxr_comment">// Second call - cache hit</em>
+<a class="jxr_linenumber" name="L114" href="#L114">114</a> 		<strong class="jxr_keyword">var</strong> result2 = x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1);
+<a class="jxr_linenumber" name="L115" href="#L115">115</a> 
+<a class="jxr_linenumber" name="L116" href="#L116">116</a> 		assertEquals(<span class="jxr_string">"en:US:1"</span>, result1);
+<a class="jxr_linenumber" name="L117" href="#L117">117</a> 		assertEquals(<span class="jxr_string">"en:US:1"</span>, result2);
+<a class="jxr_linenumber" name="L118" href="#L118">118</a> 		assertSame(result1, result2);
+<a class="jxr_linenumber" name="L119" href="#L119">119</a> 		assertEquals(1, callCount.get()); <em class="jxr_comment">// Supplier only called once</em>
+<a class="jxr_linenumber" name="L120" href="#L120">120</a> 		assertSize(1, x);
+<a class="jxr_linenumber" name="L121" href="#L121">121</a> 		assertEquals(1, x.getCacheHits());
+<a class="jxr_linenumber" name="L122" href="#L122">122</a> 	}
+<a class="jxr_linenumber" name="L123" href="#L123">123</a> 
+<a class="jxr_linenumber" name="L124" href="#L124">124</a> 	@Test
+<a class="jxr_linenumber" name="L125" href="#L125">125</a> 	<strong class="jxr_keyword">void</strong> a04c_weakMode_multipleKeys() {
+<a class="jxr_linenumber" name="L126" href="#L126">126</a> 		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L127" href="#L127">127</a> 			.cacheMode(WEAK)
+<a class="jxr_linenumber" name="L128" href="#L128">128</a> 			.supplier((k1, k2, k3) -&gt; k1 + <span class="jxr_string">":"</span> + k2 + <span class="jxr_string">":"</span> + k3)
+<a class="jxr_linenumber" name="L129" href="#L129">129</a> 			.build();
+<a class="jxr_linenumber" name="L130" href="#L130">130</a> 
+<a class="jxr_linenumber" name="L131" href="#L131">131</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1);
+<a class="jxr_linenumber" name="L132" href="#L132">132</a> 		x.get(<span class="jxr_string">"fr"</span>, <span class="jxr_string">"FR"</span>, 2);
+<a class="jxr_linenumber" name="L133" href="#L133">133</a> 		x.get(<span class="jxr_string">"de"</span>, <span class="jxr_string">"DE"</span>, 3);
+<a class="jxr_linenumber" name="L134" href="#L134">134</a> 
+<a class="jxr_linenumber" name="L135" href="#L135">135</a> 		assertSize(3, x);
+<a class="jxr_linenumber" name="L136" href="#L136">136</a> 		assertEquals(0, x.getCacheHits());
+<a class="jxr_linenumber" name="L137" href="#L137">137</a> 
+<a class="jxr_linenumber" name="L138" href="#L138">138</a> 		<em class="jxr_comment">// Verify all cached</em>
+<a class="jxr_linenumber" name="L139" href="#L139">139</a> 		assertEquals(<span class="jxr_string">"en:US:1"</span>, x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1));
+<a class="jxr_linenumber" name="L140" href="#L140">140</a> 		assertEquals(<span class="jxr_string">"fr:FR:2"</span>, x.get(<span class="jxr_string">"fr"</span>, <span class="jxr_string">"FR"</span>, 2));
+<a class="jxr_linenumber" name="L141" href="#L141">141</a> 		assertEquals(<span class="jxr_string">"de:DE:3"</span>, x.get(<span class="jxr_string">"de"</span>, <span class="jxr_string">"DE"</span>, 3));
+<a class="jxr_linenumber" name="L142" href="#L142">142</a> 		assertEquals(3, x.getCacheHits());
+<a class="jxr_linenumber" name="L143" href="#L143">143</a> 	}
+<a class="jxr_linenumber" name="L144" href="#L144">144</a> 
+<a class="jxr_linenumber" name="L145" href="#L145">145</a> 	@Test
+<a class="jxr_linenumber" name="L146" href="#L146">146</a> 	<strong class="jxr_keyword">void</strong> a04d_weakMode_clear() {
+<a class="jxr_linenumber" name="L147" href="#L147">147</a> 		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L148" href="#L148">148</a> 			.cacheMode(WEAK)
+<a class="jxr_linenumber" name="L149" href="#L149">149</a> 			.supplier((k1, k2, k3) -&gt; <span class="jxr_string">"value"</span>)
+<a class="jxr_linenumber" name="L150" href="#L150">150</a> 			.build();
+<a class="jxr_linenumber" name="L151" href="#L151">151</a> 
+<a class="jxr_linenumber" name="L152" href="#L152">152</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1);
+<a class="jxr_linenumber" name="L153" href="#L153">153</a> 		x.get(<span class="jxr_string">"fr"</span>, <span class="jxr_string">"FR"</span>, 2);
+<a class="jxr_linenumber" name="L154" href="#L154">154</a> 		assertSize(2, x);
+<a class="jxr_linenumber" name="L155" href="#L155">155</a> 
+<a class="jxr_linenumber" name="L156" href="#L156">156</a> 		x.clear();
+<a class="jxr_linenumber" name="L157" href="#L157">157</a> 		assertEmpty(x);
+<a class="jxr_linenumber" name="L158" href="#L158">158</a> 	}
+<a class="jxr_linenumber" name="L159" href="#L159">159</a> 
+<a class="jxr_linenumber" name="L160" href="#L160">160</a> 	@Test
+<a class="jxr_linenumber" name="L161" href="#L161">161</a> 	<strong class="jxr_keyword">void</strong> a04e_weakMode_maxSize() {
+<a class="jxr_linenumber" name="L162" href="#L162">162</a> 		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L163" href="#L163">163</a> 			.cacheMode(WEAK)
+<a class="jxr_linenumber" name="L164" href="#L164">164</a> 			.maxSize(2)
+<a class="jxr_linenumber" name="L165" href="#L165">165</a> 			.supplier((k1, k2, k3) -&gt; <span class="jxr_string">"value"</span>)
+<a class="jxr_linenumber" name="L166" href="#L166">166</a> 			.build();
+<a class="jxr_linenumber" name="L167" href="#L167">167</a> 
+<a class="jxr_linenumber" name="L168" href="#L168">168</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1);
+<a class="jxr_linenumber" name="L169" href="#L169">169</a> 		x.get(<span class="jxr_string">"fr"</span>, <span class="jxr_string">"FR"</span>, 2);
+<a class="jxr_linenumber" name="L170" href="#L170">170</a> 		assertSize(2, x);
+<a class="jxr_linenumber" name="L171" href="#L171">171</a> 
+<a class="jxr_linenumber" name="L172" href="#L172">172</a> 		<em class="jxr_comment">// 3rd item doesn't trigger eviction yet</em>
+<a class="jxr_linenumber" name="L173" href="#L173">173</a> 		x.get(<span class="jxr_string">"de"</span>, <span class="jxr_string">"DE"</span>, 3);
+<a class="jxr_linenumber" name="L174" href="#L174">174</a> 		assertSize(3, x);
+<a class="jxr_linenumber" name="L175" href="#L175">175</a> 
+<a class="jxr_linenumber" name="L176" href="#L176">176</a> 		<em class="jxr_comment">// 4th item triggers eviction</em>
+<a class="jxr_linenumber" name="L177" href="#L177">177</a> 		x.get(<span class="jxr_string">"es"</span>, <span class="jxr_string">"ES"</span>, 4);
+<a class="jxr_linenumber" name="L178" href="#L178">178</a> 		assertSize(1, x);
+<a class="jxr_linenumber" name="L179" href="#L179">179</a> 	}
+<a class="jxr_linenumber" name="L180" href="#L180">180</a> 
+<a class="jxr_linenumber" name="L181" href="#L181">181</a> 	@Test
+<a class="jxr_linenumber" name="L182" href="#L182">182</a> 	<strong class="jxr_keyword">void</strong> a05_maxSize() {
+<a class="jxr_linenumber" name="L183" href="#L183">183</a> 		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L184" href="#L184">184</a> 			.maxSize(2)
+<a class="jxr_linenumber" name="L185" href="#L185">185</a> 			.supplier((k1, k2, k3) -&gt; <span class="jxr_string">"value"</span>)
+<a class="jxr_linenumber" name="L186" href="#L186">186</a> 			.build();
+<a class="jxr_linenumber" name="L187" href="#L187">187</a> 
+<a class="jxr_linenumber" name="L188" href="#L188">188</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1);
+<a class="jxr_linenumber" name="L189" href="#L189">189</a> 		x.get(<span class="jxr_string">"fr"</span>, <span class="jxr_string">"FR"</span>, 2);
+<a class="jxr_linenumber" name="L190" href="#L190">190</a> 		assertSize(2, x);
+<a class="jxr_linenumber" name="L191" href="#L191">191</a> 
+<a class="jxr_linenumber" name="L192" href="#L192">192</a> 		x.get(<span class="jxr_string">"de"</span>, <span class="jxr_string">"DE"</span>, 3);
+<a class="jxr_linenumber" name="L193" href="#L193">193</a> 		assertSize(3, x);
+<a class="jxr_linenumber" name="L194" href="#L194">194</a> 
+<a class="jxr_linenumber" name="L195" href="#L195">195</a> 		x.get(<span class="jxr_string">"es"</span>, <span class="jxr_string">"ES"</span>, 4); <em class="jxr_comment">// This exceeds max (3 &gt; 2)</em>
+<a class="jxr_linenumber" name="L196" href="#L196">196</a> 		assertSize(1, x); <em class="jxr_comment">// Cleared</em>
+<a class="jxr_linenumber" name="L197" href="#L197">197</a> 	}
+<a class="jxr_linenumber" name="L198" href="#L198">198</a> 
+<a class="jxr_linenumber" name="L199" href="#L199">199</a> 	@Test
+<a class="jxr_linenumber" name="L200" href="#L200">200</a> 	<strong class="jxr_keyword">void</strong> a06_cacheHitsTracking() {
+<a class="jxr_linenumber" name="L201" href="#L201">201</a> 		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L202" href="#L202">202</a> 			.supplier((k1, k2, k3) -&gt; <span class="jxr_string">"value"</span>)
+<a class="jxr_linenumber" name="L203" href="#L203">203</a> 			.build();
+<a class="jxr_linenumber" name="L204" href="#L204">204</a> 
+<a class="jxr_linenumber" name="L205" href="#L205">205</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1); <em class="jxr_comment">// Miss</em>
+<a class="jxr_linenumber" name="L206" href="#L206">206</a> 		assertEquals(0, x.getCacheHits());
+<a class="jxr_linenumber" name="L207" href="#L207">207</a> 
+<a class="jxr_linenumber" name="L208" href="#L208">208</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1); <em class="jxr_comment">// Hit</em>
 <a class="jxr_linenumber" name="L209" href="#L209">209</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1); <em class="jxr_comment">// Hit</em>
-<a class="jxr_linenumber" name="L210" href="#L210">210</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1); <em class="jxr_comment">// Hit</em>
-<a class="jxr_linenumber" name="L211" href="#L211">211</a> 		assertEquals(2, x.getCacheHits());
-<a class="jxr_linenumber" name="L212" href="#L212">212</a> 	}
-<a class="jxr_linenumber" name="L213" href="#L213">213</a> 
-<a class="jxr_linenumber" name="L214" href="#L214">214</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L215" href="#L215">215</a> 	<em class="jxr_comment">// b - put(), isEmpty(), containsKey()</em>
-<a class="jxr_linenumber" name="L216" href="#L216">216</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L217" href="#L217">217</a> 
-<a class="jxr_linenumber" name="L218" href="#L218">218</a> 	@Test
-<a class="jxr_linenumber" name="L219" href="#L219">219</a> 	<strong class="jxr_keyword">void</strong> b01_put() {
-<a class="jxr_linenumber" name="L220" href="#L220">220</a> 		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L221" href="#L221">221</a> 		<strong class="jxr_keyword">var</strong> previous = x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1, <span class="jxr_string">"value"</span>);
-<a class="jxr_linenumber" name="L222" href="#L222">222</a> 		assertNull(previous);
-<a class="jxr_linenumber" name="L223" href="#L223">223</a> 		assertEquals(<span class="jxr_string">"value"</span>, x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1, () -&gt; <span class="jxr_string">"should not be called"</span>));
-<a class="jxr_linenumber" name="L224" href="#L224">224</a> 	}
-<a class="jxr_linenumber" name="L225" href="#L225">225</a> 
-<a class="jxr_linenumber" name="L226" href="#L226">226</a> 	@Test
-<a class="jxr_linenumber" name="L227" href="#L227">227</a> 	<strong class="jxr_keyword">void</strong> b01b_put_withNullValue() {
-<a class="jxr_linenumber" name="L228" href="#L228">228</a> 		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L229" href="#L229">229</a> 		x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L230" href="#L230">230</a> 		<strong class="jxr_keyword">var</strong> previous = x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1, <strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="L231" href="#L231">231</a> 		assertEquals(<span class="jxr_string">"value1"</span>, previous);
-<a class="jxr_linenumber" name="L232" href="#L232">232</a> 		assertFalse(x.containsKey(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1));
-<a class="jxr_linenumber" name="L233" href="#L233">233</a> 	}
-<a class="jxr_linenumber" name="L234" href="#L234">234</a> 
-<a class="jxr_linenumber" name="L235" href="#L235">235</a> 	@Test
-<a class="jxr_linenumber" name="L236" href="#L236">236</a> 	<strong class="jxr_keyword">void</strong> b02_isEmpty() {
-<a class="jxr_linenumber" name="L237" href="#L237">237</a> 		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L238" href="#L238">238</a> 		assertTrue(x.isEmpty());
-<a class="jxr_linenumber" name="L239" href="#L239">239</a> 		x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1, <span class="jxr_string">"value"</span>);
-<a class="jxr_linenumber" name="L240" href="#L240">240</a> 		assertFalse(x.isEmpty());
-<a class="jxr_linenumber" name="L241" href="#L241">241</a> 		x.clear();
-<a class="jxr_linenumber" name="L242" href="#L242">242</a> 		assertTrue(x.isEmpty());
-<a class="jxr_linenumber" name="L243" href="#L243">243</a> 	}
-<a class="jxr_linenumber" name="L244" href="#L244">244</a> 
-<a class="jxr_linenumber" name="L245" href="#L245">245</a> 	@Test
-<a class="jxr_linenumber" name="L246" href="#L246">246</a> 	<strong class="jxr_keyword">void</strong> b03_containsKey() {
-<a class="jxr_linenumber" name="L247" href="#L247">247</a> 		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L248" href="#L248">248</a> 		assertFalse(x.containsKey(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1));
-<a class="jxr_linenumber" name="L249" href="#L249">249</a> 		x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1, <span class="jxr_string">"value"</span>);
-<a class="jxr_linenumber" name="L250" href="#L250">250</a> 		assertTrue(x.containsKey(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1));
-<a class="jxr_linenumber" name="L251" href="#L251">251</a> 		assertFalse(x.containsKey(<span class="jxr_string">"fr"</span>, <span class="jxr_string">"FR"</span>, 2));
-<a class="jxr_linenumber" name="L252" href="#L252">252</a> 	}
-<a class="jxr_linenumber" name="L253" href="#L253">253</a> 
-<a class="jxr_linenumber" name="L254" href="#L254">254</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L255" href="#L255">255</a> 	<em class="jxr_comment">// c - create(), disableCaching(), null values</em>
-<a class="jxr_linenumber" name="L256" href="#L256">256</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L257" href="#L257">257</a> 
-<a class="jxr_linenumber" name="L258" href="#L258">258</a> 	@Test
-<a class="jxr_linenumber" name="L259" href="#L259">259</a> 	<strong class="jxr_keyword">void</strong> c01_create() {
-<a class="jxr_linenumber" name="L260" href="#L260">260</a> 		<strong class="jxr_keyword">var</strong> x = Cache3.&lt;String, String, Integer, String&gt;create()
-<a class="jxr_linenumber" name="L261" href="#L261">261</a> 			.supplier((k1, k2, k3) -&gt; k1 + <span class="jxr_string">":"</span> + k2 + <span class="jxr_string">":"</span> + k3)
-<a class="jxr_linenumber" name="L262" href="#L262">262</a> 			.build();
-<a class="jxr_linenumber" name="L263" href="#L263">263</a> 		<strong class="jxr_keyword">var</strong> result = x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1);
-<a class="jxr_linenumber" name="L264" href="#L264">264</a> 		assertEquals(<span class="jxr_string">"en:US:1"</span>, result);
-<a class="jxr_linenumber" name="L265" href="#L265">265</a> 	}
-<a class="jxr_linenumber" name="L266" href="#L266">266</a> 
-<a class="jxr_linenumber" name="L267" href="#L267">267</a> 	@Test
-<a class="jxr_linenumber" name="L268" href="#L268">268</a> 	<strong class="jxr_keyword">void</strong> c02_disableCaching() {
-<a class="jxr_linenumber" name="L269" href="#L269">269</a> 		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
-<a class="jxr_linenumber" name="L270" href="#L270">270</a> 		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L271" href="#L271">271</a> 			.cacheMode(NONE)
-<a class="jxr_linenumber" name="L272" href="#L272">272</a> 			.supplier((k1, k2, k3) -&gt; {
-<a class="jxr_linenumber" name="L273" href="#L273">273</a> 				callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L274" href="#L274">274</a> 				<strong class="jxr_keyword">return</strong> <span class="jxr_string">"value"</span>;
-<a class="jxr_linenumber" name="L275" href="#L275">275</a> 			})
-<a class="jxr_linenumber" name="L276" href="#L276">276</a> 			.build();
+<a class="jxr_linenumber" name="L210" href="#L210">210</a> 		assertEquals(2, x.getCacheHits());
+<a class="jxr_linenumber" name="L211" href="#L211">211</a> 	}
+<a class="jxr_linenumber" name="L212" href="#L212">212</a> 
+<a class="jxr_linenumber" name="L213" href="#L213">213</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L214" href="#L214">214</a> 	<em class="jxr_comment">// b - put(), isEmpty(), containsKey()</em>
+<a class="jxr_linenumber" name="L215" href="#L215">215</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L216" href="#L216">216</a> 
+<a class="jxr_linenumber" name="L217" href="#L217">217</a> 	@Test
+<a class="jxr_linenumber" name="L218" href="#L218">218</a> 	<strong class="jxr_keyword">void</strong> b01_put() {
+<a class="jxr_linenumber" name="L219" href="#L219">219</a> 		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L220" href="#L220">220</a> 		<strong class="jxr_keyword">var</strong> previous = x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1, <span class="jxr_string">"value"</span>);
+<a class="jxr_linenumber" name="L221" href="#L221">221</a> 		assertNull(previous);
+<a class="jxr_linenumber" name="L222" href="#L222">222</a> 		assertEquals(<span class="jxr_string">"value"</span>, x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1, () -&gt; <span class="jxr_string">"should not be called"</span>));
+<a class="jxr_linenumber" name="L223" href="#L223">223</a> 	}
+<a class="jxr_linenumber" name="L224" href="#L224">224</a> 
+<a class="jxr_linenumber" name="L225" href="#L225">225</a> 	@Test
+<a class="jxr_linenumber" name="L226" href="#L226">226</a> 	<strong class="jxr_keyword">void</strong> b01b_put_withNullValue() {
+<a class="jxr_linenumber" name="L227" href="#L227">227</a> 		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L228" href="#L228">228</a> 		x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1, <span class="jxr_string">"value1"</span>);
+<a class="jxr_linenumber" name="L229" href="#L229">229</a> 		<strong class="jxr_keyword">var</strong> previous = x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1, <strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="L230" href="#L230">230</a> 		assertEquals(<span class="jxr_string">"value1"</span>, previous);
+<a class="jxr_linenumber" name="L231" href="#L231">231</a> 		assertFalse(x.containsKey(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1));
+<a class="jxr_linenumber" name="L232" href="#L232">232</a> 	}
+<a class="jxr_linenumber" name="L233" href="#L233">233</a> 
+<a class="jxr_linenumber" name="L234" href="#L234">234</a> 	@Test
+<a class="jxr_linenumber" name="L235" href="#L235">235</a> 	<strong class="jxr_keyword">void</strong> b02_isEmpty() {
+<a class="jxr_linenumber" name="L236" href="#L236">236</a> 		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L237" href="#L237">237</a> 		assertTrue(x.isEmpty());
+<a class="jxr_linenumber" name="L238" href="#L238">238</a> 		x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1, <span class="jxr_string">"value"</span>);
+<a class="jxr_linenumber" name="L239" href="#L239">239</a> 		assertFalse(x.isEmpty());
+<a class="jxr_linenumber" name="L240" href="#L240">240</a> 		x.clear();
+<a class="jxr_linenumber" name="L241" href="#L241">241</a> 		assertTrue(x.isEmpty());
+<a class="jxr_linenumber" name="L242" href="#L242">242</a> 	}
+<a class="jxr_linenumber" name="L243" href="#L243">243</a> 
+<a class="jxr_linenumber" name="L244" href="#L244">244</a> 	@Test
+<a class="jxr_linenumber" name="L245" href="#L245">245</a> 	<strong class="jxr_keyword">void</strong> b03_containsKey() {
+<a class="jxr_linenumber" name="L246" href="#L246">246</a> 		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L247" href="#L247">247</a> 		assertFalse(x.containsKey(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1));
+<a class="jxr_linenumber" name="L248" href="#L248">248</a> 		x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1, <span class="jxr_string">"value"</span>);
+<a class="jxr_linenumber" name="L249" href="#L249">249</a> 		assertTrue(x.containsKey(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1));
+<a class="jxr_linenumber" name="L250" href="#L250">250</a> 		assertFalse(x.containsKey(<span class="jxr_string">"fr"</span>, <span class="jxr_string">"FR"</span>, 2));
+<a class="jxr_linenumber" name="L251" href="#L251">251</a> 	}
+<a class="jxr_linenumber" name="L252" href="#L252">252</a> 
+<a class="jxr_linenumber" name="L253" href="#L253">253</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L254" href="#L254">254</a> 	<em class="jxr_comment">// c - create(), disableCaching(), null values</em>
+<a class="jxr_linenumber" name="L255" href="#L255">255</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L256" href="#L256">256</a> 
+<a class="jxr_linenumber" name="L257" href="#L257">257</a> 	@Test
+<a class="jxr_linenumber" name="L258" href="#L258">258</a> 	<strong class="jxr_keyword">void</strong> c01_create() {
+<a class="jxr_linenumber" name="L259" href="#L259">259</a> 		<strong class="jxr_keyword">var</strong> x = Cache3.&lt;String, String, Integer, String&gt;create()
+<a class="jxr_linenumber" name="L260" href="#L260">260</a> 			.supplier((k1, k2, k3) -&gt; k1 + <span class="jxr_string">":"</span> + k2 + <span class="jxr_string">":"</span> + k3)
+<a class="jxr_linenumber" name="L261" href="#L261">261</a> 			.build();
+<a class="jxr_linenumber" name="L262" href="#L262">262</a> 		<strong class="jxr_keyword">var</strong> result = x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1);
+<a class="jxr_linenumber" name="L263" href="#L263">263</a> 		assertEquals(<span class="jxr_string">"en:US:1"</span>, result);
+<a class="jxr_linenumber" name="L264" href="#L264">264</a> 	}
+<a class="jxr_linenumber" name="L265" href="#L265">265</a> 
+<a class="jxr_linenumber" name="L266" href="#L266">266</a> 	@Test
+<a class="jxr_linenumber" name="L267" href="#L267">267</a> 	<strong class="jxr_keyword">void</strong> c02_disableCaching() {
+<a class="jxr_linenumber" name="L268" href="#L268">268</a> 		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
+<a class="jxr_linenumber" name="L269" href="#L269">269</a> 		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L270" href="#L270">270</a> 			.cacheMode(NONE)
+<a class="jxr_linenumber" name="L271" href="#L271">271</a> 			.supplier((k1, k2, k3) -&gt; {
+<a class="jxr_linenumber" name="L272" href="#L272">272</a> 				callCount.incrementAndGet();
+<a class="jxr_linenumber" name="L273" href="#L273">273</a> 				<strong class="jxr_keyword">return</strong> <span class="jxr_string">"value"</span>;
+<a class="jxr_linenumber" name="L274" href="#L274">274</a> 			})
+<a class="jxr_linenumber" name="L275" href="#L275">275</a> 			.build();
+<a class="jxr_linenumber" name="L276" href="#L276">276</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1);
 <a class="jxr_linenumber" name="L277" href="#L277">277</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1);
-<a class="jxr_linenumber" name="L278" href="#L278">278</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1);
-<a class="jxr_linenumber" name="L279" href="#L279">279</a> 		assertEquals(2, callCount.get());
-<a class="jxr_linenumber" name="L280" href="#L280">280</a> 		assertTrue(x.isEmpty());
-<a class="jxr_linenumber" name="L281" href="#L281">281</a> 	}
-<a class="jxr_linenumber" name="L282" href="#L282">282</a> 
-<a class="jxr_linenumber" name="L283" href="#L283">283</a> 	@Test
-<a class="jxr_linenumber" name="L284" href="#L284">284</a> 	<strong class="jxr_keyword">void</strong> c03_nullValue_notCached() {
-<a class="jxr_linenumber" name="L285" href="#L285">285</a> 		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
-<a class="jxr_linenumber" name="L286" href="#L286">286</a> 		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L287" href="#L287">287</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1, () -&gt; {
-<a class="jxr_linenumber" name="L288" href="#L288">288</a> 			callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L289" href="#L289">289</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L290" href="#L290">290</a> 		});
-<a class="jxr_linenumber" name="L291" href="#L291">291</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1, () -&gt; {
-<a class="jxr_linenumber" name="L292" href="#L292">292</a> 			callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L293" href="#L293">293</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L294" href="#L294">294</a> 		});
-<a class="jxr_linenumber" name="L295" href="#L295">295</a> 		assertEquals(2, callCount.get());
-<a class="jxr_linenumber" name="L296" href="#L296">296</a> 		assertTrue(x.isEmpty());
-<a class="jxr_linenumber" name="L297" href="#L297">297</a> 	}
-<a class="jxr_linenumber" name="L298" href="#L298">298</a> 
-<a class="jxr_linenumber" name="L299" href="#L299">299</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L300" href="#L300">300</a> 	<em class="jxr_comment">// d - remove() and containsValue()</em>
-<a class="jxr_linenumber" name="L301" href="#L301">301</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L302" href="#L302">302</a> 
-<a class="jxr_linenumber" name="L303" href="#L303">303</a> 	@Test
-<a class="jxr_linenumber" name="L304" href="#L304">304</a> 	<strong class="jxr_keyword">void</strong> d01_remove() {
-<a class="jxr_linenumber" name="L305" href="#L305">305</a> 		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L306" href="#L306">306</a> 		x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L307" href="#L307">307</a> 		<strong class="jxr_keyword">var</strong> removed = x.remove(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1);
-<a class="jxr_linenumber" name="L308" href="#L308">308</a> 		assertEquals(<span class="jxr_string">"value1"</span>, removed);
-<a class="jxr_linenumber" name="L309" href="#L309">309</a> 		assertFalse(x.containsKey(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1));
-<a class="jxr_linenumber" name="L310" href="#L310">310</a> 	}
-<a class="jxr_linenumber" name="L311" href="#L311">311</a> 
-<a class="jxr_linenumber" name="L312" href="#L312">312</a> 	@Test
-<a class="jxr_linenumber" name="L313" href="#L313">313</a> 	<strong class="jxr_keyword">void</strong> d02_containsValue() {
-<a class="jxr_linenumber" name="L314" href="#L314">314</a> 		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L315" href="#L315">315</a> 		x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L316" href="#L316">316</a> 		assertTrue(x.containsValue(<span class="jxr_string">"value1"</span>));
-<a class="jxr_linenumber" name="L317" href="#L317">317</a> 		assertFalse(x.containsValue(<span class="jxr_string">"value2"</span>));
-<a class="jxr_linenumber" name="L318" href="#L318">318</a> 	}
-<a class="jxr_linenumber" name="L319" href="#L319">319</a> 
-<a class="jxr_linenumber" name="L320" href="#L320">320</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L321" href="#L321">321</a> 	<em class="jxr_comment">// e - logOnExit() builder methods</em>
-<a class="jxr_linenumber" name="L322" href="#L322">322</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L323" href="#L323">323</a> 
-<a class="jxr_linenumber" name="L324" href="#L324">324</a> 	@Test
-<a class="jxr_linenumber" name="L325" href="#L325">325</a> 	<strong class="jxr_keyword">void</strong> e01_logOnExit_withStringId() {
-<a class="jxr_linenumber" name="L326" href="#L326">326</a> 		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L327" href="#L327">327</a> 			.logOnExit(<span class="jxr_string">"TestCache3"</span>)
-<a class="jxr_linenumber" name="L328" href="#L328">328</a> 			.supplier((k1, k2, k3) -&gt; k1 + <span class="jxr_string">":"</span> + k2 + <span class="jxr_string">":"</span> + k3)
-<a class="jxr_linenumber" name="L329" href="#L329">329</a> 			.build();
-<a class="jxr_linenumber" name="L330" href="#L330">330</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1);
-<a class="jxr_linenumber" name="L331" href="#L331">331</a> 		assertSize(1, x);
-<a class="jxr_linenumber" name="L332" href="#L332">332</a> 	}
-<a class="jxr_linenumber" name="L333" href="#L333">333</a> 
-<a class="jxr_linenumber" name="L334" href="#L334">334</a> 	@Test
-<a class="jxr_linenumber" name="L335" href="#L335">335</a> 	<strong class="jxr_keyword">void</strong> e02_logOnExit_withBoolean() {
-<a class="jxr_linenumber" name="L336" href="#L336">336</a> 		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L337" href="#L337">337</a> 			.logOnExit(<strong class="jxr_keyword">true</strong>, <span class="jxr_string">"MyCache3"</span>)
-<a class="jxr_linenumber" name="L338" href="#L338">338</a> 			.supplier((k1, k2, k3) -&gt; k1 + <span class="jxr_string">":"</span> + k2 + <span class="jxr_string">":"</span> + k3)
-<a class="jxr_linenumber" name="L339" href="#L339">339</a> 			.build();
-<a class="jxr_linenumber" name="L340" href="#L340">340</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1);
-<a class="jxr_linenumber" name="L341" href="#L341">341</a> 		assertSize(1, x);
-<a class="jxr_linenumber" name="L342" href="#L342">342</a> 	}
-<a class="jxr_linenumber" name="L343" href="#L343">343</a> }
-<a class="jxr_linenumber" name="L344" href="#L344">344</a> 
+<a class="jxr_linenumber" name="L278" href="#L278">278</a> 		assertEquals(2, callCount.get());
+<a class="jxr_linenumber" name="L279" href="#L279">279</a> 		assertTrue(x.isEmpty());
+<a class="jxr_linenumber" name="L280" href="#L280">280</a> 	}
+<a class="jxr_linenumber" name="L281" href="#L281">281</a> 
+<a class="jxr_linenumber" name="L282" href="#L282">282</a> 	@Test
+<a class="jxr_linenumber" name="L283" href="#L283">283</a> 	<strong class="jxr_keyword">void</strong> c03_nullValue_notCached() {
+<a class="jxr_linenumber" name="L284" href="#L284">284</a> 		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
+<a class="jxr_linenumber" name="L285" href="#L285">285</a> 		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L286" href="#L286">286</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1, () -&gt; {
+<a class="jxr_linenumber" name="L287" href="#L287">287</a> 			callCount.incrementAndGet();
+<a class="jxr_linenumber" name="L288" href="#L288">288</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L289" href="#L289">289</a> 		});
+<a class="jxr_linenumber" name="L290" href="#L290">290</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1, () -&gt; {
+<a class="jxr_linenumber" name="L291" href="#L291">291</a> 			callCount.incrementAndGet();
+<a class="jxr_linenumber" name="L292" href="#L292">292</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L293" href="#L293">293</a> 		});
+<a class="jxr_linenumber" name="L294" href="#L294">294</a> 		assertEquals(2, callCount.get());
+<a class="jxr_linenumber" name="L295" href="#L295">295</a> 		assertTrue(x.isEmpty());
+<a class="jxr_linenumber" name="L296" href="#L296">296</a> 	}
+<a class="jxr_linenumber" name="L297" href="#L297">297</a> 
+<a class="jxr_linenumber" name="L298" href="#L298">298</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L299" href="#L299">299</a> 	<em class="jxr_comment">// d - remove() and containsValue()</em>
+<a class="jxr_linenumber" name="L300" href="#L300">300</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L301" href="#L301">301</a> 
+<a class="jxr_linenumber" name="L302" href="#L302">302</a> 	@Test
+<a class="jxr_linenumber" name="L303" href="#L303">303</a> 	<strong class="jxr_keyword">void</strong> d01_remove() {
+<a class="jxr_linenumber" name="L304" href="#L304">304</a> 		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L305" href="#L305">305</a> 		x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1, <span class="jxr_string">"value1"</span>);
+<a class="jxr_linenumber" name="L306" href="#L306">306</a> 		<strong class="jxr_keyword">var</strong> removed = x.remove(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1);
+<a class="jxr_linenumber" name="L307" href="#L307">307</a> 		assertEquals(<span class="jxr_string">"value1"</span>, removed);
+<a class="jxr_linenumber" name="L308" href="#L308">308</a> 		assertFalse(x.containsKey(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1));
+<a class="jxr_linenumber" name="L309" href="#L309">309</a> 	}
+<a class="jxr_linenumber" name="L310" href="#L310">310</a> 
+<a class="jxr_linenumber" name="L311" href="#L311">311</a> 	@Test
+<a class="jxr_linenumber" name="L312" href="#L312">312</a> 	<strong class="jxr_keyword">void</strong> d02_containsValue() {
+<a class="jxr_linenumber" name="L313" href="#L313">313</a> 		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L314" href="#L314">314</a> 		x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1, <span class="jxr_string">"value1"</span>);
+<a class="jxr_linenumber" name="L315" href="#L315">315</a> 		assertTrue(x.containsValue(<span class="jxr_string">"value1"</span>));
+<a class="jxr_linenumber" name="L316" href="#L316">316</a> 		assertFalse(x.containsValue(<span class="jxr_string">"value2"</span>));
+<a class="jxr_linenumber" name="L317" href="#L317">317</a> 	}
+<a class="jxr_linenumber" name="L318" href="#L318">318</a> 
+<a class="jxr_linenumber" name="L319" href="#L319">319</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L320" href="#L320">320</a> 	<em class="jxr_comment">// e - logOnExit() builder methods</em>
+<a class="jxr_linenumber" name="L321" href="#L321">321</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L322" href="#L322">322</a> 
+<a class="jxr_linenumber" name="L323" href="#L323">323</a> 	@Test
+<a class="jxr_linenumber" name="L324" href="#L324">324</a> 	<strong class="jxr_keyword">void</strong> e01_logOnExit_withStringId() {
+<a class="jxr_linenumber" name="L325" href="#L325">325</a> 		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L326" href="#L326">326</a> 			.logOnExit(<span class="jxr_string">"TestCache3"</span>)
+<a class="jxr_linenumber" name="L327" href="#L327">327</a> 			.supplier((k1, k2, k3) -&gt; k1 + <span class="jxr_string">":"</span> + k2 + <span class="jxr_string">":"</span> + k3)
+<a class="jxr_linenumber" name="L328" href="#L328">328</a> 			.build();
+<a class="jxr_linenumber" name="L329" href="#L329">329</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1);
+<a class="jxr_linenumber" name="L330" href="#L330">330</a> 		assertSize(1, x);
+<a class="jxr_linenumber" name="L331" href="#L331">331</a> 	}
+<a class="jxr_linenumber" name="L332" href="#L332">332</a> 
+<a class="jxr_linenumber" name="L333" href="#L333">333</a> 	@Test
+<a class="jxr_linenumber" name="L334" href="#L334">334</a> 	<strong class="jxr_keyword">void</strong> e02_logOnExit_withBoolean() {
+<a class="jxr_linenumber" name="L335" href="#L335">335</a> 		<strong class="jxr_keyword">var</strong> x = Cache3.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L336" href="#L336">336</a> 			.logOnExit(<strong class="jxr_keyword">true</strong>, <span class="jxr_string">"MyCache3"</span>)
+<a class="jxr_linenumber" name="L337" href="#L337">337</a> 			.supplier((k1, k2, k3) -&gt; k1 + <span class="jxr_string">":"</span> + k2 + <span class="jxr_string">":"</span> + k3)
+<a class="jxr_linenumber" name="L338" href="#L338">338</a> 			.build();
+<a class="jxr_linenumber" name="L339" href="#L339">339</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, 1);
+<a class="jxr_linenumber" name="L340" href="#L340">340</a> 		assertSize(1, x);
+<a class="jxr_linenumber" name="L341" href="#L341">341</a> 	}
+<a class="jxr_linenumber" name="L342" href="#L342">342</a> }
+<a class="jxr_linenumber" name="L343" href="#L343">343</a> 
 </pre>
 <hr/>
 <div id="footer">© 2016–2025 <a href="https://www.apache.org/">The Apache Software Foundation</a></div>
diff --git a/site/xref-test/org/apache/juneau/common/collections/Cache4_Test.html b/site/xref-test/org/apache/juneau/commons/collections/Cache4_Test.html
similarity index 62%
rename from site/xref-test/org/apache/juneau/common/collections/Cache4_Test.html
rename to site/xref-test/org/apache/juneau/commons/collections/Cache4_Test.html
index c649ee5707..530eac005a 100644
--- a/site/xref-test/org/apache/juneau/common/collections/Cache4_Test.html
+++ b/site/xref-test/org/apache/juneau/commons/collections/Cache4_Test.html
@@ -5,7 +5,7 @@
 <link type="text/css" rel="stylesheet" href="../../../../../stylesheet.css" />
 </head>
 <body>
-<div id="overview"><a href="../../../../../../testapidocs/org/apache/juneau/common/collections/Cache4_Test.html">View Javadoc</a></div><pre>
+<div id="overview"><a href="../../../../../../testapidocs/org/apache/juneau/commons/collections/Cache4_Test.html">View Javadoc</a></div><pre>
 <a class="jxr_linenumber" name="L1" href="#L1">1</a>   <em class="jxr_comment">/*</em>
 <a class="jxr_linenumber" name="L2" href="#L2">2</a>   <em class="jxr_comment"> * Licensed to the Apache Software Foundation (ASF) under one or more</em>
 <a class="jxr_linenumber" name="L3" href="#L3">3</a>   <em class="jxr_comment"> * contributor license agreements.  See the NOTICE file distributed with</em>
@@ -22,334 +22,333 @@
 <a class="jxr_linenumber" name="L14" href="#L14">14</a>  <em class="jxr_comment"> * See the License for the specific language governing permissions and</em>
 <a class="jxr_linenumber" name="L15" href="#L15">15</a>  <em class="jxr_comment"> * limitations under the License.</em>
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
-<a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.common.collections;
+<a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.commons.collections;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
-<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.collections.CacheMode.*;
-<a class="jxr_linenumber" name="L20" href="#L20">20</a>  
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
-<a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
-<a class="jxr_linenumber" name="L23" href="#L23">23</a>  
-<a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> java.util.concurrent.atomic.*;
-<a class="jxr_linenumber" name="L25" href="#L25">25</a>  
-<a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.*;
-<a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.api.*;
-<a class="jxr_linenumber" name="L28" href="#L28">28</a>  
-<a class="jxr_linenumber" name="L29" href="#L29">29</a>  <strong class="jxr_keyword">class</strong> <a name="Cache4_Test" href="../../../../../org/apache/juneau/common/collections/Cache4_Test.html#Cache4_Test">Cache4_Test</a> <strong class="jxr_keyword">extends</strong> <a name="TestBase" href="../../../../../org/apache/juneau/TestBase.html#TestBase">TestBase</a> {
-<a class="jxr_linenumber" name="L30" href="#L30">30</a>  
-<a class="jxr_linenumber" name="L31" href="#L31">31</a>  	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L32" href="#L32">32</a>  	<em class="jxr_comment">// a - Basic cache operations</em>
-<a class="jxr_linenumber" name="L33" href="#L33">33</a>  	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L34" href="#L34">34</a>  
-<a class="jxr_linenumber" name="L35" href="#L35">35</a>  	@Test
-<a class="jxr_linenumber" name="L36" href="#L36">36</a>  	<strong class="jxr_keyword">void</strong> a01_defaultSupplier_basic() {
-<a class="jxr_linenumber" name="L37" href="#L37">37</a>  		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
-<a class="jxr_linenumber" name="L38" href="#L38">38</a>  		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L39" href="#L39">39</a>  			.supplier((k1, k2, k3, k4) -&gt; {
-<a class="jxr_linenumber" name="L40" href="#L40">40</a>  				callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L41" href="#L41">41</a>  				<strong class="jxr_keyword">return</strong> k1 + <span class="jxr_string">":"</span> + k2 + <span class="jxr_string">":"</span> + k3 + <span class="jxr_string">":"</span> + k4;
-<a class="jxr_linenumber" name="L42" href="#L42">42</a>  			})
-<a class="jxr_linenumber" name="L43" href="#L43">43</a>  			.build();
-<a class="jxr_linenumber" name="L44" href="#L44">44</a>  
-<a class="jxr_linenumber" name="L45" href="#L45">45</a>  		<strong class="jxr_keyword">var</strong> result1 = x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1);
-<a class="jxr_linenumber" name="L46" href="#L46">46</a>  		<strong class="jxr_keyword">var</strong> result2 = x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1); <em class="jxr_comment">// Cache hit</em>
-<a class="jxr_linenumber" name="L47" href="#L47">47</a>  
-<a class="jxr_linenumber" name="L48" href="#L48">48</a>  		assertEquals(<span class="jxr_string">"en:US:formal:1"</span>, result1);
-<a class="jxr_linenumber" name="L49" href="#L49">49</a>  		assertEquals(<span class="jxr_string">"en:US:formal:1"</span>, result2);
-<a class="jxr_linenumber" name="L50" href="#L50">50</a>  		assertEquals(1, callCount.get());
-<a class="jxr_linenumber" name="L51" href="#L51">51</a>  		assertEquals(1, x.getCacheHits());
-<a class="jxr_linenumber" name="L52" href="#L52">52</a>  	}
-<a class="jxr_linenumber" name="L53" href="#L53">53</a>  
-<a class="jxr_linenumber" name="L54" href="#L54">54</a>  	@Test
-<a class="jxr_linenumber" name="L55" href="#L55">55</a>  	<strong class="jxr_keyword">void</strong> a02_overrideSupplier() {
-<a class="jxr_linenumber" name="L56" href="#L56">56</a>  		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L57" href="#L57">57</a>  			.supplier((k1, k2, k3, k4) -&gt; <span class="jxr_string">"DEFAULT"</span>)
-<a class="jxr_linenumber" name="L58" href="#L58">58</a>  			.build();
-<a class="jxr_linenumber" name="L59" href="#L59">59</a>  
-<a class="jxr_linenumber" name="L60" href="#L60">60</a>  		<strong class="jxr_keyword">var</strong> result = x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1, () -&gt; <span class="jxr_string">"OVERRIDE"</span>);
-<a class="jxr_linenumber" name="L61" href="#L61">61</a>  
-<a class="jxr_linenumber" name="L62" href="#L62">62</a>  		assertEquals(<span class="jxr_string">"OVERRIDE"</span>, result);
-<a class="jxr_linenumber" name="L63" href="#L63">63</a>  	}
-<a class="jxr_linenumber" name="L64" href="#L64">64</a>  
-<a class="jxr_linenumber" name="L65" href="#L65">65</a>  	@Test
-<a class="jxr_linenumber" name="L66" href="#L66">66</a>  	<strong class="jxr_keyword">void</strong> a03_nullKeys() {
-<a class="jxr_linenumber" name="L67" href="#L67">67</a>  		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L68" href="#L68">68</a>  			.supplier((k1, k2, k3, k4) -&gt; <span class="jxr_string">"value-"</span> + k1 + <span class="jxr_string">"-"</span> + k2 + <span class="jxr_string">"-"</span> + k3 + <span class="jxr_string">"-"</span> + k4)
-<a class="jxr_linenumber" name="L69" href="#L69">69</a>  			.build();
-<a class="jxr_linenumber" name="L70" href="#L70">70</a>  
-<a class="jxr_linenumber" name="L71" href="#L71">71</a>  		<em class="jxr_comment">// Null keys are now allowed</em>
-<a class="jxr_linenumber" name="L72" href="#L72">72</a>  		assertEquals(<span class="jxr_string">"value-null-US-formal-1"</span>, x.get(<strong class="jxr_keyword">null</strong>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1));
-<a class="jxr_linenumber" name="L73" href="#L73">73</a>  		assertEquals(<span class="jxr_string">"value-en-null-formal-1"</span>, x.get(<span class="jxr_string">"en"</span>, <strong class="jxr_keyword">null</strong>, <span class="jxr_string">"formal"</span>, 1));
-<a class="jxr_linenumber" name="L74" href="#L74">74</a>  		assertEquals(<span class="jxr_string">"value-en-US-null-1"</span>, x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <strong class="jxr_keyword">null</strong>, 1));
-<a class="jxr_linenumber" name="L75" href="#L75">75</a>  		assertEquals(<span class="jxr_string">"value-en-US-formal-null"</span>, x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, <strong class="jxr_keyword">null</strong>));
-<a class="jxr_linenumber" name="L76" href="#L76">76</a>  		assertEquals(<span class="jxr_string">"value-null-null-null-null"</span>, x.get(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>));
-<a class="jxr_linenumber" name="L77" href="#L77">77</a>  
-<a class="jxr_linenumber" name="L78" href="#L78">78</a>  		<em class="jxr_comment">// Cached values should be returned on subsequent calls</em>
-<a class="jxr_linenumber" name="L79" href="#L79">79</a>  		assertEquals(<span class="jxr_string">"value-null-US-formal-1"</span>, x.get(<strong class="jxr_keyword">null</strong>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1));
-<a class="jxr_linenumber" name="L80" href="#L80">80</a>  		assertEquals(<span class="jxr_string">"value-en-null-formal-1"</span>, x.get(<span class="jxr_string">"en"</span>, <strong class="jxr_keyword">null</strong>, <span class="jxr_string">"formal"</span>, 1));
-<a class="jxr_linenumber" name="L81" href="#L81">81</a>  	}
-<a class="jxr_linenumber" name="L82" href="#L82">82</a>  
-<a class="jxr_linenumber" name="L83" href="#L83">83</a>  	@Test
-<a class="jxr_linenumber" name="L84" href="#L84">84</a>  	<strong class="jxr_keyword">void</strong> a04_disableCaching() {
-<a class="jxr_linenumber" name="L85" href="#L85">85</a>  		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
-<a class="jxr_linenumber" name="L86" href="#L86">86</a>  		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L87" href="#L87">87</a>  			.cacheMode(NONE)
-<a class="jxr_linenumber" name="L88" href="#L88">88</a>  			.supplier((k1, k2, k3, k4) -&gt; {
-<a class="jxr_linenumber" name="L89" href="#L89">89</a>  				callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L90" href="#L90">90</a>  				<strong class="jxr_keyword">return</strong> <span class="jxr_string">"value"</span>;
-<a class="jxr_linenumber" name="L91" href="#L91">91</a>  			})
-<a class="jxr_linenumber" name="L92" href="#L92">92</a>  			.build();
-<a class="jxr_linenumber" name="L93" href="#L93">93</a>  
+<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
+<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.collections.CacheMode.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
+<a class="jxr_linenumber" name="L22" href="#L22">22</a>  
+<a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> java.util.concurrent.atomic.*;
+<a class="jxr_linenumber" name="L24" href="#L24">24</a>  
+<a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.*;
+<a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.api.*;
+<a class="jxr_linenumber" name="L27" href="#L27">27</a>  
+<a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong class="jxr_keyword">class</strong> <a name="Cache4_Test" href="../../../../../org/apache/juneau/commons/collections/Cache4_Test.html#Cache4_Test">Cache4_Test</a> <strong class="jxr_keyword">extends</strong> <a name="TestBase" href="../../../../../org/apache/juneau/TestBase.html#TestBase">TestBase</a> {
+<a class="jxr_linenumber" name="L29" href="#L29">29</a>  
+<a class="jxr_linenumber" name="L30" href="#L30">30</a>  	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L31" href="#L31">31</a>  	<em class="jxr_comment">// a - Basic cache operations</em>
+<a class="jxr_linenumber" name="L32" href="#L32">32</a>  	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L33" href="#L33">33</a>  
+<a class="jxr_linenumber" name="L34" href="#L34">34</a>  	@Test
+<a class="jxr_linenumber" name="L35" href="#L35">35</a>  	<strong class="jxr_keyword">void</strong> a01_defaultSupplier_basic() {
+<a class="jxr_linenumber" name="L36" href="#L36">36</a>  		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
+<a class="jxr_linenumber" name="L37" href="#L37">37</a>  		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L38" href="#L38">38</a>  			.supplier((k1, k2, k3, k4) -&gt; {
+<a class="jxr_linenumber" name="L39" href="#L39">39</a>  				callCount.incrementAndGet();
+<a class="jxr_linenumber" name="L40" href="#L40">40</a>  				<strong class="jxr_keyword">return</strong> k1 + <span class="jxr_string">":"</span> + k2 + <span class="jxr_string">":"</span> + k3 + <span class="jxr_string">":"</span> + k4;
+<a class="jxr_linenumber" name="L41" href="#L41">41</a>  			})
+<a class="jxr_linenumber" name="L42" href="#L42">42</a>  			.build();
+<a class="jxr_linenumber" name="L43" href="#L43">43</a>  
+<a class="jxr_linenumber" name="L44" href="#L44">44</a>  		<strong class="jxr_keyword">var</strong> result1 = x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1);
+<a class="jxr_linenumber" name="L45" href="#L45">45</a>  		<strong class="jxr_keyword">var</strong> result2 = x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1); <em class="jxr_comment">// Cache hit</em>
+<a class="jxr_linenumber" name="L46" href="#L46">46</a>  
+<a class="jxr_linenumber" name="L47" href="#L47">47</a>  		assertEquals(<span class="jxr_string">"en:US:formal:1"</span>, result1);
+<a class="jxr_linenumber" name="L48" href="#L48">48</a>  		assertEquals(<span class="jxr_string">"en:US:formal:1"</span>, result2);
+<a class="jxr_linenumber" name="L49" href="#L49">49</a>  		assertEquals(1, callCount.get());
+<a class="jxr_linenumber" name="L50" href="#L50">50</a>  		assertEquals(1, x.getCacheHits());
+<a class="jxr_linenumber" name="L51" href="#L51">51</a>  	}
+<a class="jxr_linenumber" name="L52" href="#L52">52</a>  
+<a class="jxr_linenumber" name="L53" href="#L53">53</a>  	@Test
+<a class="jxr_linenumber" name="L54" href="#L54">54</a>  	<strong class="jxr_keyword">void</strong> a02_overrideSupplier() {
+<a class="jxr_linenumber" name="L55" href="#L55">55</a>  		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L56" href="#L56">56</a>  			.supplier((k1, k2, k3, k4) -&gt; <span class="jxr_string">"DEFAULT"</span>)
+<a class="jxr_linenumber" name="L57" href="#L57">57</a>  			.build();
+<a class="jxr_linenumber" name="L58" href="#L58">58</a>  
+<a class="jxr_linenumber" name="L59" href="#L59">59</a>  		<strong class="jxr_keyword">var</strong> result = x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1, () -&gt; <span class="jxr_string">"OVERRIDE"</span>);
+<a class="jxr_linenumber" name="L60" href="#L60">60</a>  
+<a class="jxr_linenumber" name="L61" href="#L61">61</a>  		assertEquals(<span class="jxr_string">"OVERRIDE"</span>, result);
+<a class="jxr_linenumber" name="L62" href="#L62">62</a>  	}
+<a class="jxr_linenumber" name="L63" href="#L63">63</a>  
+<a class="jxr_linenumber" name="L64" href="#L64">64</a>  	@Test
+<a class="jxr_linenumber" name="L65" href="#L65">65</a>  	<strong class="jxr_keyword">void</strong> a03_nullKeys() {
+<a class="jxr_linenumber" name="L66" href="#L66">66</a>  		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L67" href="#L67">67</a>  			.supplier((k1, k2, k3, k4) -&gt; <span class="jxr_string">"value-"</span> + k1 + <span class="jxr_string">"-"</span> + k2 + <span class="jxr_string">"-"</span> + k3 + <span class="jxr_string">"-"</span> + k4)
+<a class="jxr_linenumber" name="L68" href="#L68">68</a>  			.build();
+<a class="jxr_linenumber" name="L69" href="#L69">69</a>  
+<a class="jxr_linenumber" name="L70" href="#L70">70</a>  		<em class="jxr_comment">// Null keys are now allowed</em>
+<a class="jxr_linenumber" name="L71" href="#L71">71</a>  		assertEquals(<span class="jxr_string">"value-null-US-formal-1"</span>, x.get(<strong class="jxr_keyword">null</strong>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1));
+<a class="jxr_linenumber" name="L72" href="#L72">72</a>  		assertEquals(<span class="jxr_string">"value-en-null-formal-1"</span>, x.get(<span class="jxr_string">"en"</span>, <strong class="jxr_keyword">null</strong>, <span class="jxr_string">"formal"</span>, 1));
+<a class="jxr_linenumber" name="L73" href="#L73">73</a>  		assertEquals(<span class="jxr_string">"value-en-US-null-1"</span>, x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <strong class="jxr_keyword">null</strong>, 1));
+<a class="jxr_linenumber" name="L74" href="#L74">74</a>  		assertEquals(<span class="jxr_string">"value-en-US-formal-null"</span>, x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, <strong class="jxr_keyword">null</strong>));
+<a class="jxr_linenumber" name="L75" href="#L75">75</a>  		assertEquals(<span class="jxr_string">"value-null-null-null-null"</span>, x.get(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>));
+<a class="jxr_linenumber" name="L76" href="#L76">76</a>  
+<a class="jxr_linenumber" name="L77" href="#L77">77</a>  		<em class="jxr_comment">// Cached values should be returned on subsequent calls</em>
+<a class="jxr_linenumber" name="L78" href="#L78">78</a>  		assertEquals(<span class="jxr_string">"value-null-US-formal-1"</span>, x.get(<strong class="jxr_keyword">null</strong>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1));
+<a class="jxr_linenumber" name="L79" href="#L79">79</a>  		assertEquals(<span class="jxr_string">"value-en-null-formal-1"</span>, x.get(<span class="jxr_string">"en"</span>, <strong class="jxr_keyword">null</strong>, <span class="jxr_string">"formal"</span>, 1));
+<a class="jxr_linenumber" name="L80" href="#L80">80</a>  	}
+<a class="jxr_linenumber" name="L81" href="#L81">81</a>  
+<a class="jxr_linenumber" name="L82" href="#L82">82</a>  	@Test
+<a class="jxr_linenumber" name="L83" href="#L83">83</a>  	<strong class="jxr_keyword">void</strong> a04_disableCaching() {
+<a class="jxr_linenumber" name="L84" href="#L84">84</a>  		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
+<a class="jxr_linenumber" name="L85" href="#L85">85</a>  		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L86" href="#L86">86</a>  			.cacheMode(NONE)
+<a class="jxr_linenumber" name="L87" href="#L87">87</a>  			.supplier((k1, k2, k3, k4) -&gt; {
+<a class="jxr_linenumber" name="L88" href="#L88">88</a>  				callCount.incrementAndGet();
+<a class="jxr_linenumber" name="L89" href="#L89">89</a>  				<strong class="jxr_keyword">return</strong> <span class="jxr_string">"value"</span>;
+<a class="jxr_linenumber" name="L90" href="#L90">90</a>  			})
+<a class="jxr_linenumber" name="L91" href="#L91">91</a>  			.build();
+<a class="jxr_linenumber" name="L92" href="#L92">92</a>  
+<a class="jxr_linenumber" name="L93" href="#L93">93</a>  		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1);
 <a class="jxr_linenumber" name="L94" href="#L94">94</a>  		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1);
-<a class="jxr_linenumber" name="L95" href="#L95">95</a>  		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1);
-<a class="jxr_linenumber" name="L96" href="#L96">96</a>  
-<a class="jxr_linenumber" name="L97" href="#L97">97</a>  		assertEquals(2, callCount.get()); <em class="jxr_comment">// Called twice</em>
-<a class="jxr_linenumber" name="L98" href="#L98">98</a>  		assertEmpty(x);
-<a class="jxr_linenumber" name="L99" href="#L99">99</a>  	}
-<a class="jxr_linenumber" name="L100" href="#L100">100</a> 
-<a class="jxr_linenumber" name="L101" href="#L101">101</a> 	@Test
-<a class="jxr_linenumber" name="L102" href="#L102">102</a> 	<strong class="jxr_keyword">void</strong> a04b_weakMode_basicCaching() {
-<a class="jxr_linenumber" name="L103" href="#L103">103</a> 		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
-<a class="jxr_linenumber" name="L104" href="#L104">104</a> 		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L105" href="#L105">105</a> 			.cacheMode(WEAK)
-<a class="jxr_linenumber" name="L106" href="#L106">106</a> 			.supplier((k1, k2, k3, k4) -&gt; {
-<a class="jxr_linenumber" name="L107" href="#L107">107</a> 				callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L108" href="#L108">108</a> 				<strong class="jxr_keyword">return</strong> k1 + <span class="jxr_string">":"</span> + k2 + <span class="jxr_string">":"</span> + k3 + <span class="jxr_string">":"</span> + k4;
-<a class="jxr_linenumber" name="L109" href="#L109">109</a> 			})
-<a class="jxr_linenumber" name="L110" href="#L110">110</a> 			.build();
-<a class="jxr_linenumber" name="L111" href="#L111">111</a> 
-<a class="jxr_linenumber" name="L112" href="#L112">112</a> 		<em class="jxr_comment">// First call - cache miss</em>
-<a class="jxr_linenumber" name="L113" href="#L113">113</a> 		<strong class="jxr_keyword">var</strong> result1 = x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1);
-<a class="jxr_linenumber" name="L114" href="#L114">114</a> 
-<a class="jxr_linenumber" name="L115" href="#L115">115</a> 		<em class="jxr_comment">// Second call - cache hit</em>
-<a class="jxr_linenumber" name="L116" href="#L116">116</a> 		<strong class="jxr_keyword">var</strong> result2 = x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1);
-<a class="jxr_linenumber" name="L117" href="#L117">117</a> 
-<a class="jxr_linenumber" name="L118" href="#L118">118</a> 		assertEquals(<span class="jxr_string">"en:US:formal:1"</span>, result1);
-<a class="jxr_linenumber" name="L119" href="#L119">119</a> 		assertEquals(<span class="jxr_string">"en:US:formal:1"</span>, result2);
-<a class="jxr_linenumber" name="L120" href="#L120">120</a> 		assertSame(result1, result2);
-<a class="jxr_linenumber" name="L121" href="#L121">121</a> 		assertEquals(1, callCount.get()); <em class="jxr_comment">// Supplier only called once</em>
-<a class="jxr_linenumber" name="L122" href="#L122">122</a> 		assertSize(1, x);
-<a class="jxr_linenumber" name="L123" href="#L123">123</a> 		assertEquals(1, x.getCacheHits());
-<a class="jxr_linenumber" name="L124" href="#L124">124</a> 	}
-<a class="jxr_linenumber" name="L125" href="#L125">125</a> 
-<a class="jxr_linenumber" name="L126" href="#L126">126</a> 	@Test
-<a class="jxr_linenumber" name="L127" href="#L127">127</a> 	<strong class="jxr_keyword">void</strong> a04c_weakMode_multipleKeys() {
-<a class="jxr_linenumber" name="L128" href="#L128">128</a> 		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L129" href="#L129">129</a> 			.cacheMode(WEAK)
-<a class="jxr_linenumber" name="L130" href="#L130">130</a> 			.supplier((k1, k2, k3, k4) -&gt; k1 + <span class="jxr_string">":"</span> + k2 + <span class="jxr_string">":"</span> + k3 + <span class="jxr_string">":"</span> + k4)
-<a class="jxr_linenumber" name="L131" href="#L131">131</a> 			.build();
-<a class="jxr_linenumber" name="L132" href="#L132">132</a> 
-<a class="jxr_linenumber" name="L133" href="#L133">133</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1);
-<a class="jxr_linenumber" name="L134" href="#L134">134</a> 		x.get(<span class="jxr_string">"fr"</span>, <span class="jxr_string">"FR"</span>, <span class="jxr_string">"formal"</span>, 2);
-<a class="jxr_linenumber" name="L135" href="#L135">135</a> 		x.get(<span class="jxr_string">"de"</span>, <span class="jxr_string">"DE"</span>, <span class="jxr_string">"formal"</span>, 3);
-<a class="jxr_linenumber" name="L136" href="#L136">136</a> 
-<a class="jxr_linenumber" name="L137" href="#L137">137</a> 		assertSize(3, x);
-<a class="jxr_linenumber" name="L138" href="#L138">138</a> 		assertEquals(0, x.getCacheHits());
-<a class="jxr_linenumber" name="L139" href="#L139">139</a> 
-<a class="jxr_linenumber" name="L140" href="#L140">140</a> 		<em class="jxr_comment">// Verify all cached</em>
-<a class="jxr_linenumber" name="L141" href="#L141">141</a> 		assertEquals(<span class="jxr_string">"en:US:formal:1"</span>, x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1));
-<a class="jxr_linenumber" name="L142" href="#L142">142</a> 		assertEquals(<span class="jxr_string">"fr:FR:formal:2"</span>, x.get(<span class="jxr_string">"fr"</span>, <span class="jxr_string">"FR"</span>, <span class="jxr_string">"formal"</span>, 2));
-<a class="jxr_linenumber" name="L143" href="#L143">143</a> 		assertEquals(<span class="jxr_string">"de:DE:formal:3"</span>, x.get(<span class="jxr_string">"de"</span>, <span class="jxr_string">"DE"</span>, <span class="jxr_string">"formal"</span>, 3));
-<a class="jxr_linenumber" name="L144" href="#L144">144</a> 		assertEquals(3, x.getCacheHits());
-<a class="jxr_linenumber" name="L145" href="#L145">145</a> 	}
-<a class="jxr_linenumber" name="L146" href="#L146">146</a> 
-<a class="jxr_linenumber" name="L147" href="#L147">147</a> 	@Test
-<a class="jxr_linenumber" name="L148" href="#L148">148</a> 	<strong class="jxr_keyword">void</strong> a04d_weakMode_clear() {
-<a class="jxr_linenumber" name="L149" href="#L149">149</a> 		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L150" href="#L150">150</a> 			.cacheMode(WEAK)
-<a class="jxr_linenumber" name="L151" href="#L151">151</a> 			.supplier((k1, k2, k3, k4) -&gt; <span class="jxr_string">"value"</span>)
-<a class="jxr_linenumber" name="L152" href="#L152">152</a> 			.build();
-<a class="jxr_linenumber" name="L153" href="#L153">153</a> 
-<a class="jxr_linenumber" name="L154" href="#L154">154</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1);
-<a class="jxr_linenumber" name="L155" href="#L155">155</a> 		x.get(<span class="jxr_string">"fr"</span>, <span class="jxr_string">"FR"</span>, <span class="jxr_string">"formal"</span>, 2);
-<a class="jxr_linenumber" name="L156" href="#L156">156</a> 		assertSize(2, x);
-<a class="jxr_linenumber" name="L157" href="#L157">157</a> 
-<a class="jxr_linenumber" name="L158" href="#L158">158</a> 		x.clear();
-<a class="jxr_linenumber" name="L159" href="#L159">159</a> 		assertEmpty(x);
-<a class="jxr_linenumber" name="L160" href="#L160">160</a> 	}
-<a class="jxr_linenumber" name="L161" href="#L161">161</a> 
-<a class="jxr_linenumber" name="L162" href="#L162">162</a> 	@Test
-<a class="jxr_linenumber" name="L163" href="#L163">163</a> 	<strong class="jxr_keyword">void</strong> a04e_weakMode_maxSize() {
-<a class="jxr_linenumber" name="L164" href="#L164">164</a> 		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L165" href="#L165">165</a> 			.cacheMode(WEAK)
-<a class="jxr_linenumber" name="L166" href="#L166">166</a> 			.maxSize(2)
-<a class="jxr_linenumber" name="L167" href="#L167">167</a> 			.supplier((k1, k2, k3, k4) -&gt; <span class="jxr_string">"value"</span>)
-<a class="jxr_linenumber" name="L168" href="#L168">168</a> 			.build();
-<a class="jxr_linenumber" name="L169" href="#L169">169</a> 
-<a class="jxr_linenumber" name="L170" href="#L170">170</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1);
-<a class="jxr_linenumber" name="L171" href="#L171">171</a> 		x.get(<span class="jxr_string">"fr"</span>, <span class="jxr_string">"FR"</span>, <span class="jxr_string">"formal"</span>, 2);
-<a class="jxr_linenumber" name="L172" href="#L172">172</a> 		assertSize(2, x);
-<a class="jxr_linenumber" name="L173" href="#L173">173</a> 
-<a class="jxr_linenumber" name="L174" href="#L174">174</a> 		<em class="jxr_comment">// 3rd item doesn't trigger eviction yet</em>
-<a class="jxr_linenumber" name="L175" href="#L175">175</a> 		x.get(<span class="jxr_string">"de"</span>, <span class="jxr_string">"DE"</span>, <span class="jxr_string">"formal"</span>, 3);
-<a class="jxr_linenumber" name="L176" href="#L176">176</a> 		assertSize(3, x);
-<a class="jxr_linenumber" name="L177" href="#L177">177</a> 
-<a class="jxr_linenumber" name="L178" href="#L178">178</a> 		<em class="jxr_comment">// 4th item triggers eviction</em>
-<a class="jxr_linenumber" name="L179" href="#L179">179</a> 		x.get(<span class="jxr_string">"es"</span>, <span class="jxr_string">"ES"</span>, <span class="jxr_string">"formal"</span>, 4);
-<a class="jxr_linenumber" name="L180" href="#L180">180</a> 		assertSize(1, x);
-<a class="jxr_linenumber" name="L181" href="#L181">181</a> 	}
-<a class="jxr_linenumber" name="L182" href="#L182">182</a> 
-<a class="jxr_linenumber" name="L183" href="#L183">183</a> 	@Test
-<a class="jxr_linenumber" name="L184" href="#L184">184</a> 	<strong class="jxr_keyword">void</strong> a05_maxSize() {
-<a class="jxr_linenumber" name="L185" href="#L185">185</a> 		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L186" href="#L186">186</a> 			.maxSize(2)
-<a class="jxr_linenumber" name="L187" href="#L187">187</a> 			.supplier((k1, k2, k3, k4) -&gt; <span class="jxr_string">"value"</span>)
-<a class="jxr_linenumber" name="L188" href="#L188">188</a> 			.build();
-<a class="jxr_linenumber" name="L189" href="#L189">189</a> 
-<a class="jxr_linenumber" name="L190" href="#L190">190</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1);
-<a class="jxr_linenumber" name="L191" href="#L191">191</a> 		x.get(<span class="jxr_string">"fr"</span>, <span class="jxr_string">"FR"</span>, <span class="jxr_string">"formal"</span>, 2);
-<a class="jxr_linenumber" name="L192" href="#L192">192</a> 		assertSize(2, x);
-<a class="jxr_linenumber" name="L193" href="#L193">193</a> 
-<a class="jxr_linenumber" name="L194" href="#L194">194</a> 		x.get(<span class="jxr_string">"de"</span>, <span class="jxr_string">"DE"</span>, <span class="jxr_string">"formal"</span>, 3); <em class="jxr_comment">// Doesn't exceed yet</em>
-<a class="jxr_linenumber" name="L195" href="#L195">195</a> 		assertSize(3, x);
-<a class="jxr_linenumber" name="L196" href="#L196">196</a> 
-<a class="jxr_linenumber" name="L197" href="#L197">197</a> 		x.get(<span class="jxr_string">"es"</span>, <span class="jxr_string">"ES"</span>, <span class="jxr_string">"formal"</span>, 4); <em class="jxr_comment">// Exceeds max (3 &gt; 2), triggers clear</em>
-<a class="jxr_linenumber" name="L198" href="#L198">198</a> 		assertSize(1, x); <em class="jxr_comment">// Cleared</em>
-<a class="jxr_linenumber" name="L199" href="#L199">199</a> 	}
-<a class="jxr_linenumber" name="L200" href="#L200">200</a> 
-<a class="jxr_linenumber" name="L201" href="#L201">201</a> 	@Test
-<a class="jxr_linenumber" name="L202" href="#L202">202</a> 	<strong class="jxr_keyword">void</strong> a06_cacheHitsTracking() {
-<a class="jxr_linenumber" name="L203" href="#L203">203</a> 		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L204" href="#L204">204</a> 			.supplier((k1, k2, k3, k4) -&gt; <span class="jxr_string">"value"</span>)
-<a class="jxr_linenumber" name="L205" href="#L205">205</a> 			.build();
-<a class="jxr_linenumber" name="L206" href="#L206">206</a> 
-<a class="jxr_linenumber" name="L207" href="#L207">207</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1); <em class="jxr_comment">// Miss</em>
-<a class="jxr_linenumber" name="L208" href="#L208">208</a> 		assertEquals(0, x.getCacheHits());
-<a class="jxr_linenumber" name="L209" href="#L209">209</a> 
+<a class="jxr_linenumber" name="L95" href="#L95">95</a>  
+<a class="jxr_linenumber" name="L96" href="#L96">96</a>  		assertEquals(2, callCount.get()); <em class="jxr_comment">// Called twice</em>
+<a class="jxr_linenumber" name="L97" href="#L97">97</a>  		assertEmpty(x);
+<a class="jxr_linenumber" name="L98" href="#L98">98</a>  	}
+<a class="jxr_linenumber" name="L99" href="#L99">99</a>  
+<a class="jxr_linenumber" name="L100" href="#L100">100</a> 	@Test
+<a class="jxr_linenumber" name="L101" href="#L101">101</a> 	<strong class="jxr_keyword">void</strong> a04b_weakMode_basicCaching() {
+<a class="jxr_linenumber" name="L102" href="#L102">102</a> 		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
+<a class="jxr_linenumber" name="L103" href="#L103">103</a> 		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L104" href="#L104">104</a> 			.cacheMode(WEAK)
+<a class="jxr_linenumber" name="L105" href="#L105">105</a> 			.supplier((k1, k2, k3, k4) -&gt; {
+<a class="jxr_linenumber" name="L106" href="#L106">106</a> 				callCount.incrementAndGet();
+<a class="jxr_linenumber" name="L107" href="#L107">107</a> 				<strong class="jxr_keyword">return</strong> k1 + <span class="jxr_string">":"</span> + k2 + <span class="jxr_string">":"</span> + k3 + <span class="jxr_string">":"</span> + k4;
+<a class="jxr_linenumber" name="L108" href="#L108">108</a> 			})
+<a class="jxr_linenumber" name="L109" href="#L109">109</a> 			.build();
+<a class="jxr_linenumber" name="L110" href="#L110">110</a> 
+<a class="jxr_linenumber" name="L111" href="#L111">111</a> 		<em class="jxr_comment">// First call - cache miss</em>
+<a class="jxr_linenumber" name="L112" href="#L112">112</a> 		<strong class="jxr_keyword">var</strong> result1 = x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1);
+<a class="jxr_linenumber" name="L113" href="#L113">113</a> 
+<a class="jxr_linenumber" name="L114" href="#L114">114</a> 		<em class="jxr_comment">// Second call - cache hit</em>
+<a class="jxr_linenumber" name="L115" href="#L115">115</a> 		<strong class="jxr_keyword">var</strong> result2 = x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1);
+<a class="jxr_linenumber" name="L116" href="#L116">116</a> 
+<a class="jxr_linenumber" name="L117" href="#L117">117</a> 		assertEquals(<span class="jxr_string">"en:US:formal:1"</span>, result1);
+<a class="jxr_linenumber" name="L118" href="#L118">118</a> 		assertEquals(<span class="jxr_string">"en:US:formal:1"</span>, result2);
+<a class="jxr_linenumber" name="L119" href="#L119">119</a> 		assertSame(result1, result2);
+<a class="jxr_linenumber" name="L120" href="#L120">120</a> 		assertEquals(1, callCount.get()); <em class="jxr_comment">// Supplier only called once</em>
+<a class="jxr_linenumber" name="L121" href="#L121">121</a> 		assertSize(1, x);
+<a class="jxr_linenumber" name="L122" href="#L122">122</a> 		assertEquals(1, x.getCacheHits());
+<a class="jxr_linenumber" name="L123" href="#L123">123</a> 	}
+<a class="jxr_linenumber" name="L124" href="#L124">124</a> 
+<a class="jxr_linenumber" name="L125" href="#L125">125</a> 	@Test
+<a class="jxr_linenumber" name="L126" href="#L126">126</a> 	<strong class="jxr_keyword">void</strong> a04c_weakMode_multipleKeys() {
+<a class="jxr_linenumber" name="L127" href="#L127">127</a> 		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L128" href="#L128">128</a> 			.cacheMode(WEAK)
+<a class="jxr_linenumber" name="L129" href="#L129">129</a> 			.supplier((k1, k2, k3, k4) -&gt; k1 + <span class="jxr_string">":"</span> + k2 + <span class="jxr_string">":"</span> + k3 + <span class="jxr_string">":"</span> + k4)
+<a class="jxr_linenumber" name="L130" href="#L130">130</a> 			.build();
+<a class="jxr_linenumber" name="L131" href="#L131">131</a> 
+<a class="jxr_linenumber" name="L132" href="#L132">132</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1);
+<a class="jxr_linenumber" name="L133" href="#L133">133</a> 		x.get(<span class="jxr_string">"fr"</span>, <span class="jxr_string">"FR"</span>, <span class="jxr_string">"formal"</span>, 2);
+<a class="jxr_linenumber" name="L134" href="#L134">134</a> 		x.get(<span class="jxr_string">"de"</span>, <span class="jxr_string">"DE"</span>, <span class="jxr_string">"formal"</span>, 3);
+<a class="jxr_linenumber" name="L135" href="#L135">135</a> 
+<a class="jxr_linenumber" name="L136" href="#L136">136</a> 		assertSize(3, x);
+<a class="jxr_linenumber" name="L137" href="#L137">137</a> 		assertEquals(0, x.getCacheHits());
+<a class="jxr_linenumber" name="L138" href="#L138">138</a> 
+<a class="jxr_linenumber" name="L139" href="#L139">139</a> 		<em class="jxr_comment">// Verify all cached</em>
+<a class="jxr_linenumber" name="L140" href="#L140">140</a> 		assertEquals(<span class="jxr_string">"en:US:formal:1"</span>, x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1));
+<a class="jxr_linenumber" name="L141" href="#L141">141</a> 		assertEquals(<span class="jxr_string">"fr:FR:formal:2"</span>, x.get(<span class="jxr_string">"fr"</span>, <span class="jxr_string">"FR"</span>, <span class="jxr_string">"formal"</span>, 2));
+<a class="jxr_linenumber" name="L142" href="#L142">142</a> 		assertEquals(<span class="jxr_string">"de:DE:formal:3"</span>, x.get(<span class="jxr_string">"de"</span>, <span class="jxr_string">"DE"</span>, <span class="jxr_string">"formal"</span>, 3));
+<a class="jxr_linenumber" name="L143" href="#L143">143</a> 		assertEquals(3, x.getCacheHits());
+<a class="jxr_linenumber" name="L144" href="#L144">144</a> 	}
+<a class="jxr_linenumber" name="L145" href="#L145">145</a> 
+<a class="jxr_linenumber" name="L146" href="#L146">146</a> 	@Test
+<a class="jxr_linenumber" name="L147" href="#L147">147</a> 	<strong class="jxr_keyword">void</strong> a04d_weakMode_clear() {
+<a class="jxr_linenumber" name="L148" href="#L148">148</a> 		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L149" href="#L149">149</a> 			.cacheMode(WEAK)
+<a class="jxr_linenumber" name="L150" href="#L150">150</a> 			.supplier((k1, k2, k3, k4) -&gt; <span class="jxr_string">"value"</span>)
+<a class="jxr_linenumber" name="L151" href="#L151">151</a> 			.build();
+<a class="jxr_linenumber" name="L152" href="#L152">152</a> 
+<a class="jxr_linenumber" name="L153" href="#L153">153</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1);
+<a class="jxr_linenumber" name="L154" href="#L154">154</a> 		x.get(<span class="jxr_string">"fr"</span>, <span class="jxr_string">"FR"</span>, <span class="jxr_string">"formal"</span>, 2);
+<a class="jxr_linenumber" name="L155" href="#L155">155</a> 		assertSize(2, x);
+<a class="jxr_linenumber" name="L156" href="#L156">156</a> 
+<a class="jxr_linenumber" name="L157" href="#L157">157</a> 		x.clear();
+<a class="jxr_linenumber" name="L158" href="#L158">158</a> 		assertEmpty(x);
+<a class="jxr_linenumber" name="L159" href="#L159">159</a> 	}
+<a class="jxr_linenumber" name="L160" href="#L160">160</a> 
+<a class="jxr_linenumber" name="L161" href="#L161">161</a> 	@Test
+<a class="jxr_linenumber" name="L162" href="#L162">162</a> 	<strong class="jxr_keyword">void</strong> a04e_weakMode_maxSize() {
+<a class="jxr_linenumber" name="L163" href="#L163">163</a> 		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L164" href="#L164">164</a> 			.cacheMode(WEAK)
+<a class="jxr_linenumber" name="L165" href="#L165">165</a> 			.maxSize(2)
+<a class="jxr_linenumber" name="L166" href="#L166">166</a> 			.supplier((k1, k2, k3, k4) -&gt; <span class="jxr_string">"value"</span>)
+<a class="jxr_linenumber" name="L167" href="#L167">167</a> 			.build();
+<a class="jxr_linenumber" name="L168" href="#L168">168</a> 
+<a class="jxr_linenumber" name="L169" href="#L169">169</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1);
+<a class="jxr_linenumber" name="L170" href="#L170">170</a> 		x.get(<span class="jxr_string">"fr"</span>, <span class="jxr_string">"FR"</span>, <span class="jxr_string">"formal"</span>, 2);
+<a class="jxr_linenumber" name="L171" href="#L171">171</a> 		assertSize(2, x);
+<a class="jxr_linenumber" name="L172" href="#L172">172</a> 
+<a class="jxr_linenumber" name="L173" href="#L173">173</a> 		<em class="jxr_comment">// 3rd item doesn't trigger eviction yet</em>
+<a class="jxr_linenumber" name="L174" href="#L174">174</a> 		x.get(<span class="jxr_string">"de"</span>, <span class="jxr_string">"DE"</span>, <span class="jxr_string">"formal"</span>, 3);
+<a class="jxr_linenumber" name="L175" href="#L175">175</a> 		assertSize(3, x);
+<a class="jxr_linenumber" name="L176" href="#L176">176</a> 
+<a class="jxr_linenumber" name="L177" href="#L177">177</a> 		<em class="jxr_comment">// 4th item triggers eviction</em>
+<a class="jxr_linenumber" name="L178" href="#L178">178</a> 		x.get(<span class="jxr_string">"es"</span>, <span class="jxr_string">"ES"</span>, <span class="jxr_string">"formal"</span>, 4);
+<a class="jxr_linenumber" name="L179" href="#L179">179</a> 		assertSize(1, x);
+<a class="jxr_linenumber" name="L180" href="#L180">180</a> 	}
+<a class="jxr_linenumber" name="L181" href="#L181">181</a> 
+<a class="jxr_linenumber" name="L182" href="#L182">182</a> 	@Test
+<a class="jxr_linenumber" name="L183" href="#L183">183</a> 	<strong class="jxr_keyword">void</strong> a05_maxSize() {
+<a class="jxr_linenumber" name="L184" href="#L184">184</a> 		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L185" href="#L185">185</a> 			.maxSize(2)
+<a class="jxr_linenumber" name="L186" href="#L186">186</a> 			.supplier((k1, k2, k3, k4) -&gt; <span class="jxr_string">"value"</span>)
+<a class="jxr_linenumber" name="L187" href="#L187">187</a> 			.build();
+<a class="jxr_linenumber" name="L188" href="#L188">188</a> 
+<a class="jxr_linenumber" name="L189" href="#L189">189</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1);
+<a class="jxr_linenumber" name="L190" href="#L190">190</a> 		x.get(<span class="jxr_string">"fr"</span>, <span class="jxr_string">"FR"</span>, <span class="jxr_string">"formal"</span>, 2);
+<a class="jxr_linenumber" name="L191" href="#L191">191</a> 		assertSize(2, x);
+<a class="jxr_linenumber" name="L192" href="#L192">192</a> 
+<a class="jxr_linenumber" name="L193" href="#L193">193</a> 		x.get(<span class="jxr_string">"de"</span>, <span class="jxr_string">"DE"</span>, <span class="jxr_string">"formal"</span>, 3); <em class="jxr_comment">// Doesn't exceed yet</em>
+<a class="jxr_linenumber" name="L194" href="#L194">194</a> 		assertSize(3, x);
+<a class="jxr_linenumber" name="L195" href="#L195">195</a> 
+<a class="jxr_linenumber" name="L196" href="#L196">196</a> 		x.get(<span class="jxr_string">"es"</span>, <span class="jxr_string">"ES"</span>, <span class="jxr_string">"formal"</span>, 4); <em class="jxr_comment">// Exceeds max (3 &gt; 2), triggers clear</em>
+<a class="jxr_linenumber" name="L197" href="#L197">197</a> 		assertSize(1, x); <em class="jxr_comment">// Cleared</em>
+<a class="jxr_linenumber" name="L198" href="#L198">198</a> 	}
+<a class="jxr_linenumber" name="L199" href="#L199">199</a> 
+<a class="jxr_linenumber" name="L200" href="#L200">200</a> 	@Test
+<a class="jxr_linenumber" name="L201" href="#L201">201</a> 	<strong class="jxr_keyword">void</strong> a06_cacheHitsTracking() {
+<a class="jxr_linenumber" name="L202" href="#L202">202</a> 		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L203" href="#L203">203</a> 			.supplier((k1, k2, k3, k4) -&gt; <span class="jxr_string">"value"</span>)
+<a class="jxr_linenumber" name="L204" href="#L204">204</a> 			.build();
+<a class="jxr_linenumber" name="L205" href="#L205">205</a> 
+<a class="jxr_linenumber" name="L206" href="#L206">206</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1); <em class="jxr_comment">// Miss</em>
+<a class="jxr_linenumber" name="L207" href="#L207">207</a> 		assertEquals(0, x.getCacheHits());
+<a class="jxr_linenumber" name="L208" href="#L208">208</a> 
+<a class="jxr_linenumber" name="L209" href="#L209">209</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1); <em class="jxr_comment">// Hit</em>
 <a class="jxr_linenumber" name="L210" href="#L210">210</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1); <em class="jxr_comment">// Hit</em>
-<a class="jxr_linenumber" name="L211" href="#L211">211</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1); <em class="jxr_comment">// Hit</em>
-<a class="jxr_linenumber" name="L212" href="#L212">212</a> 		assertEquals(2, x.getCacheHits());
-<a class="jxr_linenumber" name="L213" href="#L213">213</a> 	}
-<a class="jxr_linenumber" name="L214" href="#L214">214</a> 
-<a class="jxr_linenumber" name="L215" href="#L215">215</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L216" href="#L216">216</a> 	<em class="jxr_comment">// b - put(), isEmpty(), containsKey()</em>
-<a class="jxr_linenumber" name="L217" href="#L217">217</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L218" href="#L218">218</a> 
-<a class="jxr_linenumber" name="L219" href="#L219">219</a> 	@Test
-<a class="jxr_linenumber" name="L220" href="#L220">220</a> 	<strong class="jxr_keyword">void</strong> b01_put() {
-<a class="jxr_linenumber" name="L221" href="#L221">221</a> 		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L222" href="#L222">222</a> 		<strong class="jxr_keyword">var</strong> previous = x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1, <span class="jxr_string">"value"</span>);
-<a class="jxr_linenumber" name="L223" href="#L223">223</a> 		assertNull(previous);
-<a class="jxr_linenumber" name="L224" href="#L224">224</a> 		assertEquals(<span class="jxr_string">"value"</span>, x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1, () -&gt; <span class="jxr_string">"should not be called"</span>));
-<a class="jxr_linenumber" name="L225" href="#L225">225</a> 	}
-<a class="jxr_linenumber" name="L226" href="#L226">226</a> 
-<a class="jxr_linenumber" name="L227" href="#L227">227</a> 	@Test
-<a class="jxr_linenumber" name="L228" href="#L228">228</a> 	<strong class="jxr_keyword">void</strong> b01b_put_withNullValue() {
-<a class="jxr_linenumber" name="L229" href="#L229">229</a> 		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L230" href="#L230">230</a> 		x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L231" href="#L231">231</a> 		<strong class="jxr_keyword">var</strong> previous = x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1, <strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="L232" href="#L232">232</a> 		assertEquals(<span class="jxr_string">"value1"</span>, previous);
-<a class="jxr_linenumber" name="L233" href="#L233">233</a> 		assertFalse(x.containsKey(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1));
-<a class="jxr_linenumber" name="L234" href="#L234">234</a> 	}
-<a class="jxr_linenumber" name="L235" href="#L235">235</a> 
-<a class="jxr_linenumber" name="L236" href="#L236">236</a> 	@Test
-<a class="jxr_linenumber" name="L237" href="#L237">237</a> 	<strong class="jxr_keyword">void</strong> b02_isEmpty() {
-<a class="jxr_linenumber" name="L238" href="#L238">238</a> 		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L239" href="#L239">239</a> 		assertTrue(x.isEmpty());
-<a class="jxr_linenumber" name="L240" href="#L240">240</a> 		x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1, <span class="jxr_string">"value"</span>);
-<a class="jxr_linenumber" name="L241" href="#L241">241</a> 		assertFalse(x.isEmpty());
-<a class="jxr_linenumber" name="L242" href="#L242">242</a> 		x.clear();
-<a class="jxr_linenumber" name="L243" href="#L243">243</a> 		assertTrue(x.isEmpty());
-<a class="jxr_linenumber" name="L244" href="#L244">244</a> 	}
-<a class="jxr_linenumber" name="L245" href="#L245">245</a> 
-<a class="jxr_linenumber" name="L246" href="#L246">246</a> 	@Test
-<a class="jxr_linenumber" name="L247" href="#L247">247</a> 	<strong class="jxr_keyword">void</strong> b03_containsKey() {
-<a class="jxr_linenumber" name="L248" href="#L248">248</a> 		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L249" href="#L249">249</a> 		assertFalse(x.containsKey(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1));
-<a class="jxr_linenumber" name="L250" href="#L250">250</a> 		x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1, <span class="jxr_string">"value"</span>);
-<a class="jxr_linenumber" name="L251" href="#L251">251</a> 		assertTrue(x.containsKey(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1));
-<a class="jxr_linenumber" name="L252" href="#L252">252</a> 	}
-<a class="jxr_linenumber" name="L253" href="#L253">253</a> 
-<a class="jxr_linenumber" name="L254" href="#L254">254</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L255" href="#L255">255</a> 	<em class="jxr_comment">// c - create(), disableCaching(), null values</em>
-<a class="jxr_linenumber" name="L256" href="#L256">256</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L257" href="#L257">257</a> 
-<a class="jxr_linenumber" name="L258" href="#L258">258</a> 	@Test
-<a class="jxr_linenumber" name="L259" href="#L259">259</a> 	<strong class="jxr_keyword">void</strong> c01_create() {
-<a class="jxr_linenumber" name="L260" href="#L260">260</a> 		<strong class="jxr_keyword">var</strong> x = Cache4.&lt;String, String, String, Integer, String&gt;create()
-<a class="jxr_linenumber" name="L261" href="#L261">261</a> 			.supplier((k1, k2, k3, k4) -&gt; k1 + <span class="jxr_string">":"</span> + k2 + <span class="jxr_string">":"</span> + k3 + <span class="jxr_string">":"</span> + k4)
-<a class="jxr_linenumber" name="L262" href="#L262">262</a> 			.build();
-<a class="jxr_linenumber" name="L263" href="#L263">263</a> 		<strong class="jxr_keyword">var</strong> result = x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1);
-<a class="jxr_linenumber" name="L264" href="#L264">264</a> 		assertEquals(<span class="jxr_string">"en:US:formal:1"</span>, result);
-<a class="jxr_linenumber" name="L265" href="#L265">265</a> 	}
-<a class="jxr_linenumber" name="L266" href="#L266">266</a> 
-<a class="jxr_linenumber" name="L267" href="#L267">267</a> 	@Test
-<a class="jxr_linenumber" name="L268" href="#L268">268</a> 	<strong class="jxr_keyword">void</strong> c02_disableCaching() {
-<a class="jxr_linenumber" name="L269" href="#L269">269</a> 		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
-<a class="jxr_linenumber" name="L270" href="#L270">270</a> 		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L271" href="#L271">271</a> 			.cacheMode(NONE)
-<a class="jxr_linenumber" name="L272" href="#L272">272</a> 			.supplier((k1, k2, k3, k4) -&gt; {
-<a class="jxr_linenumber" name="L273" href="#L273">273</a> 				callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L274" href="#L274">274</a> 				<strong class="jxr_keyword">return</strong> <span class="jxr_string">"value"</span>;
-<a class="jxr_linenumber" name="L275" href="#L275">275</a> 			})
-<a class="jxr_linenumber" name="L276" href="#L276">276</a> 			.build();
+<a class="jxr_linenumber" name="L211" href="#L211">211</a> 		assertEquals(2, x.getCacheHits());
+<a class="jxr_linenumber" name="L212" href="#L212">212</a> 	}
+<a class="jxr_linenumber" name="L213" href="#L213">213</a> 
+<a class="jxr_linenumber" name="L214" href="#L214">214</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L215" href="#L215">215</a> 	<em class="jxr_comment">// b - put(), isEmpty(), containsKey()</em>
+<a class="jxr_linenumber" name="L216" href="#L216">216</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L217" href="#L217">217</a> 
+<a class="jxr_linenumber" name="L218" href="#L218">218</a> 	@Test
+<a class="jxr_linenumber" name="L219" href="#L219">219</a> 	<strong class="jxr_keyword">void</strong> b01_put() {
+<a class="jxr_linenumber" name="L220" href="#L220">220</a> 		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L221" href="#L221">221</a> 		<strong class="jxr_keyword">var</strong> previous = x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1, <span class="jxr_string">"value"</span>);
+<a class="jxr_linenumber" name="L222" href="#L222">222</a> 		assertNull(previous);
+<a class="jxr_linenumber" name="L223" href="#L223">223</a> 		assertEquals(<span class="jxr_string">"value"</span>, x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1, () -&gt; <span class="jxr_string">"should not be called"</span>));
+<a class="jxr_linenumber" name="L224" href="#L224">224</a> 	}
+<a class="jxr_linenumber" name="L225" href="#L225">225</a> 
+<a class="jxr_linenumber" name="L226" href="#L226">226</a> 	@Test
+<a class="jxr_linenumber" name="L227" href="#L227">227</a> 	<strong class="jxr_keyword">void</strong> b01b_put_withNullValue() {
+<a class="jxr_linenumber" name="L228" href="#L228">228</a> 		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L229" href="#L229">229</a> 		x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1, <span class="jxr_string">"value1"</span>);
+<a class="jxr_linenumber" name="L230" href="#L230">230</a> 		<strong class="jxr_keyword">var</strong> previous = x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1, <strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="L231" href="#L231">231</a> 		assertEquals(<span class="jxr_string">"value1"</span>, previous);
+<a class="jxr_linenumber" name="L232" href="#L232">232</a> 		assertFalse(x.containsKey(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1));
+<a class="jxr_linenumber" name="L233" href="#L233">233</a> 	}
+<a class="jxr_linenumber" name="L234" href="#L234">234</a> 
+<a class="jxr_linenumber" name="L235" href="#L235">235</a> 	@Test
+<a class="jxr_linenumber" name="L236" href="#L236">236</a> 	<strong class="jxr_keyword">void</strong> b02_isEmpty() {
+<a class="jxr_linenumber" name="L237" href="#L237">237</a> 		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L238" href="#L238">238</a> 		assertTrue(x.isEmpty());
+<a class="jxr_linenumber" name="L239" href="#L239">239</a> 		x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1, <span class="jxr_string">"value"</span>);
+<a class="jxr_linenumber" name="L240" href="#L240">240</a> 		assertFalse(x.isEmpty());
+<a class="jxr_linenumber" name="L241" href="#L241">241</a> 		x.clear();
+<a class="jxr_linenumber" name="L242" href="#L242">242</a> 		assertTrue(x.isEmpty());
+<a class="jxr_linenumber" name="L243" href="#L243">243</a> 	}
+<a class="jxr_linenumber" name="L244" href="#L244">244</a> 
+<a class="jxr_linenumber" name="L245" href="#L245">245</a> 	@Test
+<a class="jxr_linenumber" name="L246" href="#L246">246</a> 	<strong class="jxr_keyword">void</strong> b03_containsKey() {
+<a class="jxr_linenumber" name="L247" href="#L247">247</a> 		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L248" href="#L248">248</a> 		assertFalse(x.containsKey(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1));
+<a class="jxr_linenumber" name="L249" href="#L249">249</a> 		x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1, <span class="jxr_string">"value"</span>);
+<a class="jxr_linenumber" name="L250" href="#L250">250</a> 		assertTrue(x.containsKey(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1));
+<a class="jxr_linenumber" name="L251" href="#L251">251</a> 	}
+<a class="jxr_linenumber" name="L252" href="#L252">252</a> 
+<a class="jxr_linenumber" name="L253" href="#L253">253</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L254" href="#L254">254</a> 	<em class="jxr_comment">// c - create(), disableCaching(), null values</em>
+<a class="jxr_linenumber" name="L255" href="#L255">255</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L256" href="#L256">256</a> 
+<a class="jxr_linenumber" name="L257" href="#L257">257</a> 	@Test
+<a class="jxr_linenumber" name="L258" href="#L258">258</a> 	<strong class="jxr_keyword">void</strong> c01_create() {
+<a class="jxr_linenumber" name="L259" href="#L259">259</a> 		<strong class="jxr_keyword">var</strong> x = Cache4.&lt;String, String, String, Integer, String&gt;create()
+<a class="jxr_linenumber" name="L260" href="#L260">260</a> 			.supplier((k1, k2, k3, k4) -&gt; k1 + <span class="jxr_string">":"</span> + k2 + <span class="jxr_string">":"</span> + k3 + <span class="jxr_string">":"</span> + k4)
+<a class="jxr_linenumber" name="L261" href="#L261">261</a> 			.build();
+<a class="jxr_linenumber" name="L262" href="#L262">262</a> 		<strong class="jxr_keyword">var</strong> result = x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1);
+<a class="jxr_linenumber" name="L263" href="#L263">263</a> 		assertEquals(<span class="jxr_string">"en:US:formal:1"</span>, result);
+<a class="jxr_linenumber" name="L264" href="#L264">264</a> 	}
+<a class="jxr_linenumber" name="L265" href="#L265">265</a> 
+<a class="jxr_linenumber" name="L266" href="#L266">266</a> 	@Test
+<a class="jxr_linenumber" name="L267" href="#L267">267</a> 	<strong class="jxr_keyword">void</strong> c02_disableCaching() {
+<a class="jxr_linenumber" name="L268" href="#L268">268</a> 		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
+<a class="jxr_linenumber" name="L269" href="#L269">269</a> 		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L270" href="#L270">270</a> 			.cacheMode(NONE)
+<a class="jxr_linenumber" name="L271" href="#L271">271</a> 			.supplier((k1, k2, k3, k4) -&gt; {
+<a class="jxr_linenumber" name="L272" href="#L272">272</a> 				callCount.incrementAndGet();
+<a class="jxr_linenumber" name="L273" href="#L273">273</a> 				<strong class="jxr_keyword">return</strong> <span class="jxr_string">"value"</span>;
+<a class="jxr_linenumber" name="L274" href="#L274">274</a> 			})
+<a class="jxr_linenumber" name="L275" href="#L275">275</a> 			.build();
+<a class="jxr_linenumber" name="L276" href="#L276">276</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1);
 <a class="jxr_linenumber" name="L277" href="#L277">277</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1);
-<a class="jxr_linenumber" name="L278" href="#L278">278</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1);
-<a class="jxr_linenumber" name="L279" href="#L279">279</a> 		assertEquals(2, callCount.get());
-<a class="jxr_linenumber" name="L280" href="#L280">280</a> 		assertTrue(x.isEmpty());
-<a class="jxr_linenumber" name="L281" href="#L281">281</a> 	}
-<a class="jxr_linenumber" name="L282" href="#L282">282</a> 
-<a class="jxr_linenumber" name="L283" href="#L283">283</a> 	@Test
-<a class="jxr_linenumber" name="L284" href="#L284">284</a> 	<strong class="jxr_keyword">void</strong> c03_nullValue_notCached() {
-<a class="jxr_linenumber" name="L285" href="#L285">285</a> 		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
-<a class="jxr_linenumber" name="L286" href="#L286">286</a> 		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L287" href="#L287">287</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1, () -&gt; {
-<a class="jxr_linenumber" name="L288" href="#L288">288</a> 			callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L289" href="#L289">289</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L290" href="#L290">290</a> 		});
-<a class="jxr_linenumber" name="L291" href="#L291">291</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1, () -&gt; {
-<a class="jxr_linenumber" name="L292" href="#L292">292</a> 			callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L293" href="#L293">293</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L294" href="#L294">294</a> 		});
-<a class="jxr_linenumber" name="L295" href="#L295">295</a> 		assertEquals(2, callCount.get());
-<a class="jxr_linenumber" name="L296" href="#L296">296</a> 		assertTrue(x.isEmpty());
-<a class="jxr_linenumber" name="L297" href="#L297">297</a> 	}
-<a class="jxr_linenumber" name="L298" href="#L298">298</a> 
-<a class="jxr_linenumber" name="L299" href="#L299">299</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L300" href="#L300">300</a> 	<em class="jxr_comment">// d - remove() and containsValue()</em>
-<a class="jxr_linenumber" name="L301" href="#L301">301</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L302" href="#L302">302</a> 
-<a class="jxr_linenumber" name="L303" href="#L303">303</a> 	@Test
-<a class="jxr_linenumber" name="L304" href="#L304">304</a> 	<strong class="jxr_keyword">void</strong> d01_remove() {
-<a class="jxr_linenumber" name="L305" href="#L305">305</a> 		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L306" href="#L306">306</a> 		x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L307" href="#L307">307</a> 		<strong class="jxr_keyword">var</strong> removed = x.remove(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1);
-<a class="jxr_linenumber" name="L308" href="#L308">308</a> 		assertEquals(<span class="jxr_string">"value1"</span>, removed);
-<a class="jxr_linenumber" name="L309" href="#L309">309</a> 		assertFalse(x.containsKey(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1));
-<a class="jxr_linenumber" name="L310" href="#L310">310</a> 	}
-<a class="jxr_linenumber" name="L311" href="#L311">311</a> 
-<a class="jxr_linenumber" name="L312" href="#L312">312</a> 	@Test
-<a class="jxr_linenumber" name="L313" href="#L313">313</a> 	<strong class="jxr_keyword">void</strong> d02_containsValue() {
-<a class="jxr_linenumber" name="L314" href="#L314">314</a> 		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L315" href="#L315">315</a> 		x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L316" href="#L316">316</a> 		assertTrue(x.containsValue(<span class="jxr_string">"value1"</span>));
-<a class="jxr_linenumber" name="L317" href="#L317">317</a> 		assertFalse(x.containsValue(<span class="jxr_string">"value2"</span>));
-<a class="jxr_linenumber" name="L318" href="#L318">318</a> 	}
-<a class="jxr_linenumber" name="L319" href="#L319">319</a> 
-<a class="jxr_linenumber" name="L320" href="#L320">320</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L321" href="#L321">321</a> 	<em class="jxr_comment">// e - logOnExit() builder methods</em>
-<a class="jxr_linenumber" name="L322" href="#L322">322</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L323" href="#L323">323</a> 
-<a class="jxr_linenumber" name="L324" href="#L324">324</a> 	@Test
-<a class="jxr_linenumber" name="L325" href="#L325">325</a> 	<strong class="jxr_keyword">void</strong> e01_logOnExit_withStringId() {
-<a class="jxr_linenumber" name="L326" href="#L326">326</a> 		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L327" href="#L327">327</a> 			.logOnExit(<span class="jxr_string">"TestCache4"</span>)
-<a class="jxr_linenumber" name="L328" href="#L328">328</a> 			.supplier((k1, k2, k3, k4) -&gt; k1 + <span class="jxr_string">":"</span> + k2 + <span class="jxr_string">":"</span> + k3 + <span class="jxr_string">":"</span> + k4)
-<a class="jxr_linenumber" name="L329" href="#L329">329</a> 			.build();
-<a class="jxr_linenumber" name="L330" href="#L330">330</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1);
-<a class="jxr_linenumber" name="L331" href="#L331">331</a> 		assertSize(1, x);
-<a class="jxr_linenumber" name="L332" href="#L332">332</a> 	}
-<a class="jxr_linenumber" name="L333" href="#L333">333</a> 
-<a class="jxr_linenumber" name="L334" href="#L334">334</a> 	@Test
-<a class="jxr_linenumber" name="L335" href="#L335">335</a> 	<strong class="jxr_keyword">void</strong> e02_logOnExit_withBoolean() {
-<a class="jxr_linenumber" name="L336" href="#L336">336</a> 		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L337" href="#L337">337</a> 			.logOnExit(<strong class="jxr_keyword">true</strong>, <span class="jxr_string">"MyCache4"</span>)
-<a class="jxr_linenumber" name="L338" href="#L338">338</a> 			.supplier((k1, k2, k3, k4) -&gt; k1 + <span class="jxr_string">":"</span> + k2 + <span class="jxr_string">":"</span> + k3 + <span class="jxr_string">":"</span> + k4)
-<a class="jxr_linenumber" name="L339" href="#L339">339</a> 			.build();
-<a class="jxr_linenumber" name="L340" href="#L340">340</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1);
-<a class="jxr_linenumber" name="L341" href="#L341">341</a> 		assertSize(1, x);
-<a class="jxr_linenumber" name="L342" href="#L342">342</a> 	}
-<a class="jxr_linenumber" name="L343" href="#L343">343</a> }
-<a class="jxr_linenumber" name="L344" href="#L344">344</a> 
+<a class="jxr_linenumber" name="L278" href="#L278">278</a> 		assertEquals(2, callCount.get());
+<a class="jxr_linenumber" name="L279" href="#L279">279</a> 		assertTrue(x.isEmpty());
+<a class="jxr_linenumber" name="L280" href="#L280">280</a> 	}
+<a class="jxr_linenumber" name="L281" href="#L281">281</a> 
+<a class="jxr_linenumber" name="L282" href="#L282">282</a> 	@Test
+<a class="jxr_linenumber" name="L283" href="#L283">283</a> 	<strong class="jxr_keyword">void</strong> c03_nullValue_notCached() {
+<a class="jxr_linenumber" name="L284" href="#L284">284</a> 		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
+<a class="jxr_linenumber" name="L285" href="#L285">285</a> 		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L286" href="#L286">286</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1, () -&gt; {
+<a class="jxr_linenumber" name="L287" href="#L287">287</a> 			callCount.incrementAndGet();
+<a class="jxr_linenumber" name="L288" href="#L288">288</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L289" href="#L289">289</a> 		});
+<a class="jxr_linenumber" name="L290" href="#L290">290</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1, () -&gt; {
+<a class="jxr_linenumber" name="L291" href="#L291">291</a> 			callCount.incrementAndGet();
+<a class="jxr_linenumber" name="L292" href="#L292">292</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L293" href="#L293">293</a> 		});
+<a class="jxr_linenumber" name="L294" href="#L294">294</a> 		assertEquals(2, callCount.get());
+<a class="jxr_linenumber" name="L295" href="#L295">295</a> 		assertTrue(x.isEmpty());
+<a class="jxr_linenumber" name="L296" href="#L296">296</a> 	}
+<a class="jxr_linenumber" name="L297" href="#L297">297</a> 
+<a class="jxr_linenumber" name="L298" href="#L298">298</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L299" href="#L299">299</a> 	<em class="jxr_comment">// d - remove() and containsValue()</em>
+<a class="jxr_linenumber" name="L300" href="#L300">300</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L301" href="#L301">301</a> 
+<a class="jxr_linenumber" name="L302" href="#L302">302</a> 	@Test
+<a class="jxr_linenumber" name="L303" href="#L303">303</a> 	<strong class="jxr_keyword">void</strong> d01_remove() {
+<a class="jxr_linenumber" name="L304" href="#L304">304</a> 		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L305" href="#L305">305</a> 		x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1, <span class="jxr_string">"value1"</span>);
+<a class="jxr_linenumber" name="L306" href="#L306">306</a> 		<strong class="jxr_keyword">var</strong> removed = x.remove(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1);
+<a class="jxr_linenumber" name="L307" href="#L307">307</a> 		assertEquals(<span class="jxr_string">"value1"</span>, removed);
+<a class="jxr_linenumber" name="L308" href="#L308">308</a> 		assertFalse(x.containsKey(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1));
+<a class="jxr_linenumber" name="L309" href="#L309">309</a> 	}
+<a class="jxr_linenumber" name="L310" href="#L310">310</a> 
+<a class="jxr_linenumber" name="L311" href="#L311">311</a> 	@Test
+<a class="jxr_linenumber" name="L312" href="#L312">312</a> 	<strong class="jxr_keyword">void</strong> d02_containsValue() {
+<a class="jxr_linenumber" name="L313" href="#L313">313</a> 		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L314" href="#L314">314</a> 		x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1, <span class="jxr_string">"value1"</span>);
+<a class="jxr_linenumber" name="L315" href="#L315">315</a> 		assertTrue(x.containsValue(<span class="jxr_string">"value1"</span>));
+<a class="jxr_linenumber" name="L316" href="#L316">316</a> 		assertFalse(x.containsValue(<span class="jxr_string">"value2"</span>));
+<a class="jxr_linenumber" name="L317" href="#L317">317</a> 	}
+<a class="jxr_linenumber" name="L318" href="#L318">318</a> 
+<a class="jxr_linenumber" name="L319" href="#L319">319</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L320" href="#L320">320</a> 	<em class="jxr_comment">// e - logOnExit() builder methods</em>
+<a class="jxr_linenumber" name="L321" href="#L321">321</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L322" href="#L322">322</a> 
+<a class="jxr_linenumber" name="L323" href="#L323">323</a> 	@Test
+<a class="jxr_linenumber" name="L324" href="#L324">324</a> 	<strong class="jxr_keyword">void</strong> e01_logOnExit_withStringId() {
+<a class="jxr_linenumber" name="L325" href="#L325">325</a> 		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L326" href="#L326">326</a> 			.logOnExit(<span class="jxr_string">"TestCache4"</span>)
+<a class="jxr_linenumber" name="L327" href="#L327">327</a> 			.supplier((k1, k2, k3, k4) -&gt; k1 + <span class="jxr_string">":"</span> + k2 + <span class="jxr_string">":"</span> + k3 + <span class="jxr_string">":"</span> + k4)
+<a class="jxr_linenumber" name="L328" href="#L328">328</a> 			.build();
+<a class="jxr_linenumber" name="L329" href="#L329">329</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1);
+<a class="jxr_linenumber" name="L330" href="#L330">330</a> 		assertSize(1, x);
+<a class="jxr_linenumber" name="L331" href="#L331">331</a> 	}
+<a class="jxr_linenumber" name="L332" href="#L332">332</a> 
+<a class="jxr_linenumber" name="L333" href="#L333">333</a> 	@Test
+<a class="jxr_linenumber" name="L334" href="#L334">334</a> 	<strong class="jxr_keyword">void</strong> e02_logOnExit_withBoolean() {
+<a class="jxr_linenumber" name="L335" href="#L335">335</a> 		<strong class="jxr_keyword">var</strong> x = Cache4.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L336" href="#L336">336</a> 			.logOnExit(<strong class="jxr_keyword">true</strong>, <span class="jxr_string">"MyCache4"</span>)
+<a class="jxr_linenumber" name="L337" href="#L337">337</a> 			.supplier((k1, k2, k3, k4) -&gt; k1 + <span class="jxr_string">":"</span> + k2 + <span class="jxr_string">":"</span> + k3 + <span class="jxr_string">":"</span> + k4)
+<a class="jxr_linenumber" name="L338" href="#L338">338</a> 			.build();
+<a class="jxr_linenumber" name="L339" href="#L339">339</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"formal"</span>, 1);
+<a class="jxr_linenumber" name="L340" href="#L340">340</a> 		assertSize(1, x);
+<a class="jxr_linenumber" name="L341" href="#L341">341</a> 	}
+<a class="jxr_linenumber" name="L342" href="#L342">342</a> }
+<a class="jxr_linenumber" name="L343" href="#L343">343</a> 
 </pre>
 <hr/>
 <div id="footer">© 2016–2025 <a href="https://www.apache.org/">The Apache Software Foundation</a></div>
diff --git a/site/xref-test/org/apache/juneau/common/collections/Cache5_Test.html b/site/xref-test/org/apache/juneau/commons/collections/Cache5_Test.html
similarity index 65%
rename from site/xref-test/org/apache/juneau/common/collections/Cache5_Test.html
rename to site/xref-test/org/apache/juneau/commons/collections/Cache5_Test.html
index e8510a612e..b9baa3aa66 100644
--- a/site/xref-test/org/apache/juneau/common/collections/Cache5_Test.html
+++ b/site/xref-test/org/apache/juneau/commons/collections/Cache5_Test.html
@@ -5,7 +5,7 @@
 <link type="text/css" rel="stylesheet" href="../../../../../stylesheet.css" />
 </head>
 <body>
-<div id="overview"><a href="../../../../../../testapidocs/org/apache/juneau/common/collections/Cache5_Test.html">View Javadoc</a></div><pre>
+<div id="overview"><a href="../../../../../../testapidocs/org/apache/juneau/commons/collections/Cache5_Test.html">View Javadoc</a></div><pre>
 <a class="jxr_linenumber" name="L1" href="#L1">1</a>   <em class="jxr_comment">/*</em>
 <a class="jxr_linenumber" name="L2" href="#L2">2</a>   <em class="jxr_comment"> * Licensed to the Apache Software Foundation (ASF) under one or more</em>
 <a class="jxr_linenumber" name="L3" href="#L3">3</a>   <em class="jxr_comment"> * contributor license agreements.  See the NOTICE file distributed with</em>
@@ -22,335 +22,334 @@
 <a class="jxr_linenumber" name="L14" href="#L14">14</a>  <em class="jxr_comment"> * See the License for the specific language governing permissions and</em>
 <a class="jxr_linenumber" name="L15" href="#L15">15</a>  <em class="jxr_comment"> * limitations under the License.</em>
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
-<a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.common.collections;
+<a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.commons.collections;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
-<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.collections.CacheMode.*;
-<a class="jxr_linenumber" name="L20" href="#L20">20</a>  
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
-<a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
-<a class="jxr_linenumber" name="L23" href="#L23">23</a>  
-<a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> java.util.concurrent.atomic.*;
-<a class="jxr_linenumber" name="L25" href="#L25">25</a>  
-<a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.*;
-<a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.api.*;
-<a class="jxr_linenumber" name="L28" href="#L28">28</a>  
-<a class="jxr_linenumber" name="L29" href="#L29">29</a>  <strong class="jxr_keyword">class</strong> <a name="Cache5_Test" href="../../../../../org/apache/juneau/common/collections/Cache5_Test.html#Cache5_Test">Cache5_Test</a> <strong class="jxr_keyword">extends</strong> <a name="TestBase" href="../../../../../org/apache/juneau/TestBase.html#TestBase">TestBase</a> {
-<a class="jxr_linenumber" name="L30" href="#L30">30</a>  
-<a class="jxr_linenumber" name="L31" href="#L31">31</a>  	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L32" href="#L32">32</a>  	<em class="jxr_comment">// a - Basic cache operations</em>
-<a class="jxr_linenumber" name="L33" href="#L33">33</a>  	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L34" href="#L34">34</a>  
-<a class="jxr_linenumber" name="L35" href="#L35">35</a>  	@Test
-<a class="jxr_linenumber" name="L36" href="#L36">36</a>  	<strong class="jxr_keyword">void</strong> a01_defaultSupplier_basic() {
-<a class="jxr_linenumber" name="L37" href="#L37">37</a>  		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
-<a class="jxr_linenumber" name="L38" href="#L38">38</a>  		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L39" href="#L39">39</a>  			.supplier((k1, k2, k3, k4, k5) -&gt; {
-<a class="jxr_linenumber" name="L40" href="#L40">40</a>  				callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L41" href="#L41">41</a>  				<strong class="jxr_keyword">return</strong> k1 + <span class="jxr_string">":"</span> + k2 + <span class="jxr_string">":"</span> + k3 + <span class="jxr_string">":"</span> + k4 + <span class="jxr_string">":"</span> + k5;
-<a class="jxr_linenumber" name="L42" href="#L42">42</a>  			})
-<a class="jxr_linenumber" name="L43" href="#L43">43</a>  			.build();
-<a class="jxr_linenumber" name="L44" href="#L44">44</a>  
-<a class="jxr_linenumber" name="L45" href="#L45">45</a>  		<strong class="jxr_keyword">var</strong> result1 = x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1);
-<a class="jxr_linenumber" name="L46" href="#L46">46</a>  		<strong class="jxr_keyword">var</strong> result2 = x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1); <em class="jxr_comment">// Cache hit</em>
-<a class="jxr_linenumber" name="L47" href="#L47">47</a>  
-<a class="jxr_linenumber" name="L48" href="#L48">48</a>  		assertEquals(<span class="jxr_string">"en:US:west:formal:1"</span>, result1);
-<a class="jxr_linenumber" name="L49" href="#L49">49</a>  		assertEquals(<span class="jxr_string">"en:US:west:formal:1"</span>, result2);
-<a class="jxr_linenumber" name="L50" href="#L50">50</a>  		assertEquals(1, callCount.get());
-<a class="jxr_linenumber" name="L51" href="#L51">51</a>  		assertEquals(1, x.getCacheHits());
-<a class="jxr_linenumber" name="L52" href="#L52">52</a>  	}
-<a class="jxr_linenumber" name="L53" href="#L53">53</a>  
-<a class="jxr_linenumber" name="L54" href="#L54">54</a>  	@Test
-<a class="jxr_linenumber" name="L55" href="#L55">55</a>  	<strong class="jxr_keyword">void</strong> a02_overrideSupplier() {
-<a class="jxr_linenumber" name="L56" href="#L56">56</a>  		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L57" href="#L57">57</a>  			.supplier((k1, k2, k3, k4, k5) -&gt; <span class="jxr_string">"DEFAULT"</span>)
-<a class="jxr_linenumber" name="L58" href="#L58">58</a>  			.build();
-<a class="jxr_linenumber" name="L59" href="#L59">59</a>  
-<a class="jxr_linenumber" name="L60" href="#L60">60</a>  		<strong class="jxr_keyword">var</strong> result = x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1, () -&gt; <span class="jxr_string">"OVERRIDE"</span>);
-<a class="jxr_linenumber" name="L61" href="#L61">61</a>  
-<a class="jxr_linenumber" name="L62" href="#L62">62</a>  		assertEquals(<span class="jxr_string">"OVERRIDE"</span>, result);
-<a class="jxr_linenumber" name="L63" href="#L63">63</a>  	}
-<a class="jxr_linenumber" name="L64" href="#L64">64</a>  
-<a class="jxr_linenumber" name="L65" href="#L65">65</a>  	@Test
-<a class="jxr_linenumber" name="L66" href="#L66">66</a>  	<strong class="jxr_keyword">void</strong> a03_nullKeys() {
-<a class="jxr_linenumber" name="L67" href="#L67">67</a>  		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L68" href="#L68">68</a>  			.supplier((k1, k2, k3, k4, k5) -&gt; <span class="jxr_string">"value-"</span> + k1 + <span class="jxr_string">"-"</span> + k2 + <span class="jxr_string">"-"</span> + k3 + <span class="jxr_string">"-"</span> + k4 + <span class="jxr_string">"-"</span> + k5)
-<a class="jxr_linenumber" name="L69" href="#L69">69</a>  			.build();
-<a class="jxr_linenumber" name="L70" href="#L70">70</a>  
-<a class="jxr_linenumber" name="L71" href="#L71">71</a>  		<em class="jxr_comment">// Null keys are now allowed</em>
-<a class="jxr_linenumber" name="L72" href="#L72">72</a>  		assertEquals(<span class="jxr_string">"value-null-US-west-formal-1"</span>, x.get(<strong class="jxr_keyword">null</strong>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1));
-<a class="jxr_linenumber" name="L73" href="#L73">73</a>  		assertEquals(<span class="jxr_string">"value-en-null-west-formal-1"</span>, x.get(<span class="jxr_string">"en"</span>, <strong class="jxr_keyword">null</strong>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1));
-<a class="jxr_linenumber" name="L74" href="#L74">74</a>  		assertEquals(<span class="jxr_string">"value-en-US-null-formal-1"</span>, x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <strong class="jxr_keyword">null</strong>, <span class="jxr_string">"formal"</span>, 1));
-<a class="jxr_linenumber" name="L75" href="#L75">75</a>  		assertEquals(<span class="jxr_string">"value-en-US-west-null-1"</span>, x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <strong class="jxr_keyword">null</strong>, 1));
-<a class="jxr_linenumber" name="L76" href="#L76">76</a>  		assertEquals(<span class="jxr_string">"value-en-US-west-formal-null"</span>, x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, <strong class="jxr_keyword">null</strong>));
-<a class="jxr_linenumber" name="L77" href="#L77">77</a>  		assertEquals(<span class="jxr_string">"value-null-null-null-null-null"</span>, x.get(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>));
-<a class="jxr_linenumber" name="L78" href="#L78">78</a>  
-<a class="jxr_linenumber" name="L79" href="#L79">79</a>  		<em class="jxr_comment">// Cached values should be returned on subsequent calls</em>
-<a class="jxr_linenumber" name="L80" href="#L80">80</a>  		assertEquals(<span class="jxr_string">"value-null-US-west-formal-1"</span>, x.get(<strong class="jxr_keyword">null</strong>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1));
-<a class="jxr_linenumber" name="L81" href="#L81">81</a>  		assertEquals(<span class="jxr_string">"value-en-null-west-formal-1"</span>, x.get(<span class="jxr_string">"en"</span>, <strong class="jxr_keyword">null</strong>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1));
-<a class="jxr_linenumber" name="L82" href="#L82">82</a>  	}
-<a class="jxr_linenumber" name="L83" href="#L83">83</a>  
-<a class="jxr_linenumber" name="L84" href="#L84">84</a>  	@Test
-<a class="jxr_linenumber" name="L85" href="#L85">85</a>  	<strong class="jxr_keyword">void</strong> a04_disableCaching() {
-<a class="jxr_linenumber" name="L86" href="#L86">86</a>  		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
-<a class="jxr_linenumber" name="L87" href="#L87">87</a>  		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L88" href="#L88">88</a>  			.cacheMode(NONE)
-<a class="jxr_linenumber" name="L89" href="#L89">89</a>  			.supplier((k1, k2, k3, k4, k5) -&gt; {
-<a class="jxr_linenumber" name="L90" href="#L90">90</a>  				callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L91" href="#L91">91</a>  				<strong class="jxr_keyword">return</strong> <span class="jxr_string">"value"</span>;
-<a class="jxr_linenumber" name="L92" href="#L92">92</a>  			})
-<a class="jxr_linenumber" name="L93" href="#L93">93</a>  			.build();
-<a class="jxr_linenumber" name="L94" href="#L94">94</a>  
+<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
+<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.collections.CacheMode.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
+<a class="jxr_linenumber" name="L22" href="#L22">22</a>  
+<a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> java.util.concurrent.atomic.*;
+<a class="jxr_linenumber" name="L24" href="#L24">24</a>  
+<a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.*;
+<a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.api.*;
+<a class="jxr_linenumber" name="L27" href="#L27">27</a>  
+<a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong class="jxr_keyword">class</strong> <a name="Cache5_Test" href="../../../../../org/apache/juneau/commons/collections/Cache5_Test.html#Cache5_Test">Cache5_Test</a> <strong class="jxr_keyword">extends</strong> <a name="TestBase" href="../../../../../org/apache/juneau/TestBase.html#TestBase">TestBase</a> {
+<a class="jxr_linenumber" name="L29" href="#L29">29</a>  
+<a class="jxr_linenumber" name="L30" href="#L30">30</a>  	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L31" href="#L31">31</a>  	<em class="jxr_comment">// a - Basic cache operations</em>
+<a class="jxr_linenumber" name="L32" href="#L32">32</a>  	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L33" href="#L33">33</a>  
+<a class="jxr_linenumber" name="L34" href="#L34">34</a>  	@Test
+<a class="jxr_linenumber" name="L35" href="#L35">35</a>  	<strong class="jxr_keyword">void</strong> a01_defaultSupplier_basic() {
+<a class="jxr_linenumber" name="L36" href="#L36">36</a>  		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
+<a class="jxr_linenumber" name="L37" href="#L37">37</a>  		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L38" href="#L38">38</a>  			.supplier((k1, k2, k3, k4, k5) -&gt; {
+<a class="jxr_linenumber" name="L39" href="#L39">39</a>  				callCount.incrementAndGet();
+<a class="jxr_linenumber" name="L40" href="#L40">40</a>  				<strong class="jxr_keyword">return</strong> k1 + <span class="jxr_string">":"</span> + k2 + <span class="jxr_string">":"</span> + k3 + <span class="jxr_string">":"</span> + k4 + <span class="jxr_string">":"</span> + k5;
+<a class="jxr_linenumber" name="L41" href="#L41">41</a>  			})
+<a class="jxr_linenumber" name="L42" href="#L42">42</a>  			.build();
+<a class="jxr_linenumber" name="L43" href="#L43">43</a>  
+<a class="jxr_linenumber" name="L44" href="#L44">44</a>  		<strong class="jxr_keyword">var</strong> result1 = x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1);
+<a class="jxr_linenumber" name="L45" href="#L45">45</a>  		<strong class="jxr_keyword">var</strong> result2 = x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1); <em class="jxr_comment">// Cache hit</em>
+<a class="jxr_linenumber" name="L46" href="#L46">46</a>  
+<a class="jxr_linenumber" name="L47" href="#L47">47</a>  		assertEquals(<span class="jxr_string">"en:US:west:formal:1"</span>, result1);
+<a class="jxr_linenumber" name="L48" href="#L48">48</a>  		assertEquals(<span class="jxr_string">"en:US:west:formal:1"</span>, result2);
+<a class="jxr_linenumber" name="L49" href="#L49">49</a>  		assertEquals(1, callCount.get());
+<a class="jxr_linenumber" name="L50" href="#L50">50</a>  		assertEquals(1, x.getCacheHits());
+<a class="jxr_linenumber" name="L51" href="#L51">51</a>  	}
+<a class="jxr_linenumber" name="L52" href="#L52">52</a>  
+<a class="jxr_linenumber" name="L53" href="#L53">53</a>  	@Test
+<a class="jxr_linenumber" name="L54" href="#L54">54</a>  	<strong class="jxr_keyword">void</strong> a02_overrideSupplier() {
+<a class="jxr_linenumber" name="L55" href="#L55">55</a>  		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L56" href="#L56">56</a>  			.supplier((k1, k2, k3, k4, k5) -&gt; <span class="jxr_string">"DEFAULT"</span>)
+<a class="jxr_linenumber" name="L57" href="#L57">57</a>  			.build();
+<a class="jxr_linenumber" name="L58" href="#L58">58</a>  
+<a class="jxr_linenumber" name="L59" href="#L59">59</a>  		<strong class="jxr_keyword">var</strong> result = x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1, () -&gt; <span class="jxr_string">"OVERRIDE"</span>);
+<a class="jxr_linenumber" name="L60" href="#L60">60</a>  
+<a class="jxr_linenumber" name="L61" href="#L61">61</a>  		assertEquals(<span class="jxr_string">"OVERRIDE"</span>, result);
+<a class="jxr_linenumber" name="L62" href="#L62">62</a>  	}
+<a class="jxr_linenumber" name="L63" href="#L63">63</a>  
+<a class="jxr_linenumber" name="L64" href="#L64">64</a>  	@Test
+<a class="jxr_linenumber" name="L65" href="#L65">65</a>  	<strong class="jxr_keyword">void</strong> a03_nullKeys() {
+<a class="jxr_linenumber" name="L66" href="#L66">66</a>  		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L67" href="#L67">67</a>  			.supplier((k1, k2, k3, k4, k5) -&gt; <span class="jxr_string">"value-"</span> + k1 + <span class="jxr_string">"-"</span> + k2 + <span class="jxr_string">"-"</span> + k3 + <span class="jxr_string">"-"</span> + k4 + <span class="jxr_string">"-"</span> + k5)
+<a class="jxr_linenumber" name="L68" href="#L68">68</a>  			.build();
+<a class="jxr_linenumber" name="L69" href="#L69">69</a>  
+<a class="jxr_linenumber" name="L70" href="#L70">70</a>  		<em class="jxr_comment">// Null keys are now allowed</em>
+<a class="jxr_linenumber" name="L71" href="#L71">71</a>  		assertEquals(<span class="jxr_string">"value-null-US-west-formal-1"</span>, x.get(<strong class="jxr_keyword">null</strong>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1));
+<a class="jxr_linenumber" name="L72" href="#L72">72</a>  		assertEquals(<span class="jxr_string">"value-en-null-west-formal-1"</span>, x.get(<span class="jxr_string">"en"</span>, <strong class="jxr_keyword">null</strong>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1));
+<a class="jxr_linenumber" name="L73" href="#L73">73</a>  		assertEquals(<span class="jxr_string">"value-en-US-null-formal-1"</span>, x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <strong class="jxr_keyword">null</strong>, <span class="jxr_string">"formal"</span>, 1));
+<a class="jxr_linenumber" name="L74" href="#L74">74</a>  		assertEquals(<span class="jxr_string">"value-en-US-west-null-1"</span>, x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <strong class="jxr_keyword">null</strong>, 1));
+<a class="jxr_linenumber" name="L75" href="#L75">75</a>  		assertEquals(<span class="jxr_string">"value-en-US-west-formal-null"</span>, x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, <strong class="jxr_keyword">null</strong>));
+<a class="jxr_linenumber" name="L76" href="#L76">76</a>  		assertEquals(<span class="jxr_string">"value-null-null-null-null-null"</span>, x.get(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>));
+<a class="jxr_linenumber" name="L77" href="#L77">77</a>  
+<a class="jxr_linenumber" name="L78" href="#L78">78</a>  		<em class="jxr_comment">// Cached values should be returned on subsequent calls</em>
+<a class="jxr_linenumber" name="L79" href="#L79">79</a>  		assertEquals(<span class="jxr_string">"value-null-US-west-formal-1"</span>, x.get(<strong class="jxr_keyword">null</strong>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1));
+<a class="jxr_linenumber" name="L80" href="#L80">80</a>  		assertEquals(<span class="jxr_string">"value-en-null-west-formal-1"</span>, x.get(<span class="jxr_string">"en"</span>, <strong class="jxr_keyword">null</strong>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1));
+<a class="jxr_linenumber" name="L81" href="#L81">81</a>  	}
+<a class="jxr_linenumber" name="L82" href="#L82">82</a>  
+<a class="jxr_linenumber" name="L83" href="#L83">83</a>  	@Test
+<a class="jxr_linenumber" name="L84" href="#L84">84</a>  	<strong class="jxr_keyword">void</strong> a04_disableCaching() {
+<a class="jxr_linenumber" name="L85" href="#L85">85</a>  		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
+<a class="jxr_linenumber" name="L86" href="#L86">86</a>  		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L87" href="#L87">87</a>  			.cacheMode(NONE)
+<a class="jxr_linenumber" name="L88" href="#L88">88</a>  			.supplier((k1, k2, k3, k4, k5) -&gt; {
+<a class="jxr_linenumber" name="L89" href="#L89">89</a>  				callCount.incrementAndGet();
+<a class="jxr_linenumber" name="L90" href="#L90">90</a>  				<strong class="jxr_keyword">return</strong> <span class="jxr_string">"value"</span>;
+<a class="jxr_linenumber" name="L91" href="#L91">91</a>  			})
+<a class="jxr_linenumber" name="L92" href="#L92">92</a>  			.build();
+<a class="jxr_linenumber" name="L93" href="#L93">93</a>  
+<a class="jxr_linenumber" name="L94" href="#L94">94</a>  		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1);
 <a class="jxr_linenumber" name="L95" href="#L95">95</a>  		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1);
-<a class="jxr_linenumber" name="L96" href="#L96">96</a>  		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1);
-<a class="jxr_linenumber" name="L97" href="#L97">97</a>  
-<a class="jxr_linenumber" name="L98" href="#L98">98</a>  		assertEquals(2, callCount.get()); <em class="jxr_comment">// Called twice</em>
-<a class="jxr_linenumber" name="L99" href="#L99">99</a>  		assertEmpty(x);
-<a class="jxr_linenumber" name="L100" href="#L100">100</a> 	}
-<a class="jxr_linenumber" name="L101" href="#L101">101</a> 
-<a class="jxr_linenumber" name="L102" href="#L102">102</a> 	@Test
-<a class="jxr_linenumber" name="L103" href="#L103">103</a> 	<strong class="jxr_keyword">void</strong> a04b_weakMode_basicCaching() {
-<a class="jxr_linenumber" name="L104" href="#L104">104</a> 		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
-<a class="jxr_linenumber" name="L105" href="#L105">105</a> 		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L106" href="#L106">106</a> 			.cacheMode(WEAK)
-<a class="jxr_linenumber" name="L107" href="#L107">107</a> 			.supplier((k1, k2, k3, k4, k5) -&gt; {
-<a class="jxr_linenumber" name="L108" href="#L108">108</a> 				callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L109" href="#L109">109</a> 				<strong class="jxr_keyword">return</strong> k1 + <span class="jxr_string">":"</span> + k2 + <span class="jxr_string">":"</span> + k3 + <span class="jxr_string">":"</span> + k4 + <span class="jxr_string">":"</span> + k5;
-<a class="jxr_linenumber" name="L110" href="#L110">110</a> 			})
-<a class="jxr_linenumber" name="L111" href="#L111">111</a> 			.build();
-<a class="jxr_linenumber" name="L112" href="#L112">112</a> 
-<a class="jxr_linenumber" name="L113" href="#L113">113</a> 		<em class="jxr_comment">// First call - cache miss</em>
-<a class="jxr_linenumber" name="L114" href="#L114">114</a> 		<strong class="jxr_keyword">var</strong> result1 = x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1);
-<a class="jxr_linenumber" name="L115" href="#L115">115</a> 
-<a class="jxr_linenumber" name="L116" href="#L116">116</a> 		<em class="jxr_comment">// Second call - cache hit</em>
-<a class="jxr_linenumber" name="L117" href="#L117">117</a> 		<strong class="jxr_keyword">var</strong> result2 = x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1);
-<a class="jxr_linenumber" name="L118" href="#L118">118</a> 
-<a class="jxr_linenumber" name="L119" href="#L119">119</a> 		assertEquals(<span class="jxr_string">"en:US:west:formal:1"</span>, result1);
-<a class="jxr_linenumber" name="L120" href="#L120">120</a> 		assertEquals(<span class="jxr_string">"en:US:west:formal:1"</span>, result2);
-<a class="jxr_linenumber" name="L121" href="#L121">121</a> 		assertSame(result1, result2);
-<a class="jxr_linenumber" name="L122" href="#L122">122</a> 		assertEquals(1, callCount.get()); <em class="jxr_comment">// Supplier only called once</em>
-<a class="jxr_linenumber" name="L123" href="#L123">123</a> 		assertSize(1, x);
-<a class="jxr_linenumber" name="L124" href="#L124">124</a> 		assertEquals(1, x.getCacheHits());
-<a class="jxr_linenumber" name="L125" href="#L125">125</a> 	}
-<a class="jxr_linenumber" name="L126" href="#L126">126</a> 
-<a class="jxr_linenumber" name="L127" href="#L127">127</a> 	@Test
-<a class="jxr_linenumber" name="L128" href="#L128">128</a> 	<strong class="jxr_keyword">void</strong> a04c_weakMode_multipleKeys() {
-<a class="jxr_linenumber" name="L129" href="#L129">129</a> 		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L130" href="#L130">130</a> 			.cacheMode(WEAK)
-<a class="jxr_linenumber" name="L131" href="#L131">131</a> 			.supplier((k1, k2, k3, k4, k5) -&gt; k1 + <span class="jxr_string">":"</span> + k2 + <span class="jxr_string">":"</span> + k3 + <span class="jxr_string">":"</span> + k4 + <span class="jxr_string">":"</span> + k5)
-<a class="jxr_linenumber" name="L132" href="#L132">132</a> 			.build();
-<a class="jxr_linenumber" name="L133" href="#L133">133</a> 
-<a class="jxr_linenumber" name="L134" href="#L134">134</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1);
-<a class="jxr_linenumber" name="L135" href="#L135">135</a> 		x.get(<span class="jxr_string">"fr"</span>, <span class="jxr_string">"FR"</span>, <span class="jxr_string">"north"</span>, <span class="jxr_string">"formal"</span>, 2);
-<a class="jxr_linenumber" name="L136" href="#L136">136</a> 		x.get(<span class="jxr_string">"de"</span>, <span class="jxr_string">"DE"</span>, <span class="jxr_string">"south"</span>, <span class="jxr_string">"formal"</span>, 3);
-<a class="jxr_linenumber" name="L137" href="#L137">137</a> 
-<a class="jxr_linenumber" name="L138" href="#L138">138</a> 		assertSize(3, x);
-<a class="jxr_linenumber" name="L139" href="#L139">139</a> 		assertEquals(0, x.getCacheHits());
-<a class="jxr_linenumber" name="L140" href="#L140">140</a> 
-<a class="jxr_linenumber" name="L141" href="#L141">141</a> 		<em class="jxr_comment">// Verify all cached</em>
-<a class="jxr_linenumber" name="L142" href="#L142">142</a> 		assertEquals(<span class="jxr_string">"en:US:west:formal:1"</span>, x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1));
-<a class="jxr_linenumber" name="L143" href="#L143">143</a> 		assertEquals(<span class="jxr_string">"fr:FR:north:formal:2"</span>, x.get(<span class="jxr_string">"fr"</span>, <span class="jxr_string">"FR"</span>, <span class="jxr_string">"north"</span>, <span class="jxr_string">"formal"</span>, 2));
-<a class="jxr_linenumber" name="L144" href="#L144">144</a> 		assertEquals(<span class="jxr_string">"de:DE:south:formal:3"</span>, x.get(<span class="jxr_string">"de"</span>, <span class="jxr_string">"DE"</span>, <span class="jxr_string">"south"</span>, <span class="jxr_string">"formal"</span>, 3));
-<a class="jxr_linenumber" name="L145" href="#L145">145</a> 		assertEquals(3, x.getCacheHits());
-<a class="jxr_linenumber" name="L146" href="#L146">146</a> 	}
-<a class="jxr_linenumber" name="L147" href="#L147">147</a> 
-<a class="jxr_linenumber" name="L148" href="#L148">148</a> 	@Test
-<a class="jxr_linenumber" name="L149" href="#L149">149</a> 	<strong class="jxr_keyword">void</strong> a04d_weakMode_clear() {
-<a class="jxr_linenumber" name="L150" href="#L150">150</a> 		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L151" href="#L151">151</a> 			.cacheMode(WEAK)
-<a class="jxr_linenumber" name="L152" href="#L152">152</a> 			.supplier((k1, k2, k3, k4, k5) -&gt; <span class="jxr_string">"value"</span>)
-<a class="jxr_linenumber" name="L153" href="#L153">153</a> 			.build();
-<a class="jxr_linenumber" name="L154" href="#L154">154</a> 
-<a class="jxr_linenumber" name="L155" href="#L155">155</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1);
-<a class="jxr_linenumber" name="L156" href="#L156">156</a> 		x.get(<span class="jxr_string">"fr"</span>, <span class="jxr_string">"FR"</span>, <span class="jxr_string">"north"</span>, <span class="jxr_string">"formal"</span>, 2);
-<a class="jxr_linenumber" name="L157" href="#L157">157</a> 		assertSize(2, x);
-<a class="jxr_linenumber" name="L158" href="#L158">158</a> 
-<a class="jxr_linenumber" name="L159" href="#L159">159</a> 		x.clear();
-<a class="jxr_linenumber" name="L160" href="#L160">160</a> 		assertEmpty(x);
-<a class="jxr_linenumber" name="L161" href="#L161">161</a> 	}
-<a class="jxr_linenumber" name="L162" href="#L162">162</a> 
-<a class="jxr_linenumber" name="L163" href="#L163">163</a> 	@Test
-<a class="jxr_linenumber" name="L164" href="#L164">164</a> 	<strong class="jxr_keyword">void</strong> a04e_weakMode_maxSize() {
-<a class="jxr_linenumber" name="L165" href="#L165">165</a> 		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L166" href="#L166">166</a> 			.cacheMode(WEAK)
-<a class="jxr_linenumber" name="L167" href="#L167">167</a> 			.maxSize(2)
-<a class="jxr_linenumber" name="L168" href="#L168">168</a> 			.supplier((k1, k2, k3, k4, k5) -&gt; <span class="jxr_string">"value"</span>)
-<a class="jxr_linenumber" name="L169" href="#L169">169</a> 			.build();
-<a class="jxr_linenumber" name="L170" href="#L170">170</a> 
-<a class="jxr_linenumber" name="L171" href="#L171">171</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1);
-<a class="jxr_linenumber" name="L172" href="#L172">172</a> 		x.get(<span class="jxr_string">"fr"</span>, <span class="jxr_string">"FR"</span>, <span class="jxr_string">"north"</span>, <span class="jxr_string">"formal"</span>, 2);
-<a class="jxr_linenumber" name="L173" href="#L173">173</a> 		assertSize(2, x);
-<a class="jxr_linenumber" name="L174" href="#L174">174</a> 
-<a class="jxr_linenumber" name="L175" href="#L175">175</a> 		<em class="jxr_comment">// 3rd item doesn't trigger eviction yet</em>
-<a class="jxr_linenumber" name="L176" href="#L176">176</a> 		x.get(<span class="jxr_string">"de"</span>, <span class="jxr_string">"DE"</span>, <span class="jxr_string">"south"</span>, <span class="jxr_string">"formal"</span>, 3);
-<a class="jxr_linenumber" name="L177" href="#L177">177</a> 		assertSize(3, x);
-<a class="jxr_linenumber" name="L178" href="#L178">178</a> 
-<a class="jxr_linenumber" name="L179" href="#L179">179</a> 		<em class="jxr_comment">// 4th item triggers eviction</em>
-<a class="jxr_linenumber" name="L180" href="#L180">180</a> 		x.get(<span class="jxr_string">"es"</span>, <span class="jxr_string">"ES"</span>, <span class="jxr_string">"east"</span>, <span class="jxr_string">"formal"</span>, 4);
-<a class="jxr_linenumber" name="L181" href="#L181">181</a> 		assertSize(1, x);
-<a class="jxr_linenumber" name="L182" href="#L182">182</a> 	}
-<a class="jxr_linenumber" name="L183" href="#L183">183</a> 
-<a class="jxr_linenumber" name="L184" href="#L184">184</a> 	@Test
-<a class="jxr_linenumber" name="L185" href="#L185">185</a> 	<strong class="jxr_keyword">void</strong> a05_maxSize() {
-<a class="jxr_linenumber" name="L186" href="#L186">186</a> 		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L187" href="#L187">187</a> 			.maxSize(2)
-<a class="jxr_linenumber" name="L188" href="#L188">188</a> 			.supplier((k1, k2, k3, k4, k5) -&gt; <span class="jxr_string">"value"</span>)
-<a class="jxr_linenumber" name="L189" href="#L189">189</a> 			.build();
-<a class="jxr_linenumber" name="L190" href="#L190">190</a> 
-<a class="jxr_linenumber" name="L191" href="#L191">191</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1);
-<a class="jxr_linenumber" name="L192" href="#L192">192</a> 		x.get(<span class="jxr_string">"fr"</span>, <span class="jxr_string">"FR"</span>, <span class="jxr_string">"north"</span>, <span class="jxr_string">"formal"</span>, 2);
-<a class="jxr_linenumber" name="L193" href="#L193">193</a> 		assertSize(2, x);
-<a class="jxr_linenumber" name="L194" href="#L194">194</a> 
-<a class="jxr_linenumber" name="L195" href="#L195">195</a> 		x.get(<span class="jxr_string">"de"</span>, <span class="jxr_string">"DE"</span>, <span class="jxr_string">"south"</span>, <span class="jxr_string">"formal"</span>, 3); <em class="jxr_comment">// Doesn't exceed yet</em>
-<a class="jxr_linenumber" name="L196" href="#L196">196</a> 		assertSize(3, x);
-<a class="jxr_linenumber" name="L197" href="#L197">197</a> 
-<a class="jxr_linenumber" name="L198" href="#L198">198</a> 		x.get(<span class="jxr_string">"es"</span>, <span class="jxr_string">"ES"</span>, <span class="jxr_string">"east"</span>, <span class="jxr_string">"formal"</span>, 4); <em class="jxr_comment">// Exceeds max (3 &gt; 2), triggers clear</em>
-<a class="jxr_linenumber" name="L199" href="#L199">199</a> 		assertSize(1, x); <em class="jxr_comment">// Cleared</em>
-<a class="jxr_linenumber" name="L200" href="#L200">200</a> 	}
-<a class="jxr_linenumber" name="L201" href="#L201">201</a> 
-<a class="jxr_linenumber" name="L202" href="#L202">202</a> 	@Test
-<a class="jxr_linenumber" name="L203" href="#L203">203</a> 	<strong class="jxr_keyword">void</strong> a06_cacheHitsTracking() {
-<a class="jxr_linenumber" name="L204" href="#L204">204</a> 		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L205" href="#L205">205</a> 			.supplier((k1, k2, k3, k4, k5) -&gt; <span class="jxr_string">"value"</span>)
-<a class="jxr_linenumber" name="L206" href="#L206">206</a> 			.build();
-<a class="jxr_linenumber" name="L207" href="#L207">207</a> 
-<a class="jxr_linenumber" name="L208" href="#L208">208</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1); <em class="jxr_comment">// Miss</em>
-<a class="jxr_linenumber" name="L209" href="#L209">209</a> 		assertEquals(0, x.getCacheHits());
-<a class="jxr_linenumber" name="L210" href="#L210">210</a> 
+<a class="jxr_linenumber" name="L96" href="#L96">96</a>  
+<a class="jxr_linenumber" name="L97" href="#L97">97</a>  		assertEquals(2, callCount.get()); <em class="jxr_comment">// Called twice</em>
+<a class="jxr_linenumber" name="L98" href="#L98">98</a>  		assertEmpty(x);
+<a class="jxr_linenumber" name="L99" href="#L99">99</a>  	}
+<a class="jxr_linenumber" name="L100" href="#L100">100</a> 
+<a class="jxr_linenumber" name="L101" href="#L101">101</a> 	@Test
+<a class="jxr_linenumber" name="L102" href="#L102">102</a> 	<strong class="jxr_keyword">void</strong> a04b_weakMode_basicCaching() {
+<a class="jxr_linenumber" name="L103" href="#L103">103</a> 		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
+<a class="jxr_linenumber" name="L104" href="#L104">104</a> 		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L105" href="#L105">105</a> 			.cacheMode(WEAK)
+<a class="jxr_linenumber" name="L106" href="#L106">106</a> 			.supplier((k1, k2, k3, k4, k5) -&gt; {
+<a class="jxr_linenumber" name="L107" href="#L107">107</a> 				callCount.incrementAndGet();
+<a class="jxr_linenumber" name="L108" href="#L108">108</a> 				<strong class="jxr_keyword">return</strong> k1 + <span class="jxr_string">":"</span> + k2 + <span class="jxr_string">":"</span> + k3 + <span class="jxr_string">":"</span> + k4 + <span class="jxr_string">":"</span> + k5;
+<a class="jxr_linenumber" name="L109" href="#L109">109</a> 			})
+<a class="jxr_linenumber" name="L110" href="#L110">110</a> 			.build();
+<a class="jxr_linenumber" name="L111" href="#L111">111</a> 
+<a class="jxr_linenumber" name="L112" href="#L112">112</a> 		<em class="jxr_comment">// First call - cache miss</em>
+<a class="jxr_linenumber" name="L113" href="#L113">113</a> 		<strong class="jxr_keyword">var</strong> result1 = x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1);
+<a class="jxr_linenumber" name="L114" href="#L114">114</a> 
+<a class="jxr_linenumber" name="L115" href="#L115">115</a> 		<em class="jxr_comment">// Second call - cache hit</em>
+<a class="jxr_linenumber" name="L116" href="#L116">116</a> 		<strong class="jxr_keyword">var</strong> result2 = x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1);
+<a class="jxr_linenumber" name="L117" href="#L117">117</a> 
+<a class="jxr_linenumber" name="L118" href="#L118">118</a> 		assertEquals(<span class="jxr_string">"en:US:west:formal:1"</span>, result1);
+<a class="jxr_linenumber" name="L119" href="#L119">119</a> 		assertEquals(<span class="jxr_string">"en:US:west:formal:1"</span>, result2);
+<a class="jxr_linenumber" name="L120" href="#L120">120</a> 		assertSame(result1, result2);
+<a class="jxr_linenumber" name="L121" href="#L121">121</a> 		assertEquals(1, callCount.get()); <em class="jxr_comment">// Supplier only called once</em>
+<a class="jxr_linenumber" name="L122" href="#L122">122</a> 		assertSize(1, x);
+<a class="jxr_linenumber" name="L123" href="#L123">123</a> 		assertEquals(1, x.getCacheHits());
+<a class="jxr_linenumber" name="L124" href="#L124">124</a> 	}
+<a class="jxr_linenumber" name="L125" href="#L125">125</a> 
+<a class="jxr_linenumber" name="L126" href="#L126">126</a> 	@Test
+<a class="jxr_linenumber" name="L127" href="#L127">127</a> 	<strong class="jxr_keyword">void</strong> a04c_weakMode_multipleKeys() {
+<a class="jxr_linenumber" name="L128" href="#L128">128</a> 		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L129" href="#L129">129</a> 			.cacheMode(WEAK)
+<a class="jxr_linenumber" name="L130" href="#L130">130</a> 			.supplier((k1, k2, k3, k4, k5) -&gt; k1 + <span class="jxr_string">":"</span> + k2 + <span class="jxr_string">":"</span> + k3 + <span class="jxr_string">":"</span> + k4 + <span class="jxr_string">":"</span> + k5)
+<a class="jxr_linenumber" name="L131" href="#L131">131</a> 			.build();
+<a class="jxr_linenumber" name="L132" href="#L132">132</a> 
+<a class="jxr_linenumber" name="L133" href="#L133">133</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1);
+<a class="jxr_linenumber" name="L134" href="#L134">134</a> 		x.get(<span class="jxr_string">"fr"</span>, <span class="jxr_string">"FR"</span>, <span class="jxr_string">"north"</span>, <span class="jxr_string">"formal"</span>, 2);
+<a class="jxr_linenumber" name="L135" href="#L135">135</a> 		x.get(<span class="jxr_string">"de"</span>, <span class="jxr_string">"DE"</span>, <span class="jxr_string">"south"</span>, <span class="jxr_string">"formal"</span>, 3);
+<a class="jxr_linenumber" name="L136" href="#L136">136</a> 
+<a class="jxr_linenumber" name="L137" href="#L137">137</a> 		assertSize(3, x);
+<a class="jxr_linenumber" name="L138" href="#L138">138</a> 		assertEquals(0, x.getCacheHits());
+<a class="jxr_linenumber" name="L139" href="#L139">139</a> 
+<a class="jxr_linenumber" name="L140" href="#L140">140</a> 		<em class="jxr_comment">// Verify all cached</em>
+<a class="jxr_linenumber" name="L141" href="#L141">141</a> 		assertEquals(<span class="jxr_string">"en:US:west:formal:1"</span>, x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1));
+<a class="jxr_linenumber" name="L142" href="#L142">142</a> 		assertEquals(<span class="jxr_string">"fr:FR:north:formal:2"</span>, x.get(<span class="jxr_string">"fr"</span>, <span class="jxr_string">"FR"</span>, <span class="jxr_string">"north"</span>, <span class="jxr_string">"formal"</span>, 2));
+<a class="jxr_linenumber" name="L143" href="#L143">143</a> 		assertEquals(<span class="jxr_string">"de:DE:south:formal:3"</span>, x.get(<span class="jxr_string">"de"</span>, <span class="jxr_string">"DE"</span>, <span class="jxr_string">"south"</span>, <span class="jxr_string">"formal"</span>, 3));
+<a class="jxr_linenumber" name="L144" href="#L144">144</a> 		assertEquals(3, x.getCacheHits());
+<a class="jxr_linenumber" name="L145" href="#L145">145</a> 	}
+<a class="jxr_linenumber" name="L146" href="#L146">146</a> 
+<a class="jxr_linenumber" name="L147" href="#L147">147</a> 	@Test
+<a class="jxr_linenumber" name="L148" href="#L148">148</a> 	<strong class="jxr_keyword">void</strong> a04d_weakMode_clear() {
+<a class="jxr_linenumber" name="L149" href="#L149">149</a> 		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L150" href="#L150">150</a> 			.cacheMode(WEAK)
+<a class="jxr_linenumber" name="L151" href="#L151">151</a> 			.supplier((k1, k2, k3, k4, k5) -&gt; <span class="jxr_string">"value"</span>)
+<a class="jxr_linenumber" name="L152" href="#L152">152</a> 			.build();
+<a class="jxr_linenumber" name="L153" href="#L153">153</a> 
+<a class="jxr_linenumber" name="L154" href="#L154">154</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1);
+<a class="jxr_linenumber" name="L155" href="#L155">155</a> 		x.get(<span class="jxr_string">"fr"</span>, <span class="jxr_string">"FR"</span>, <span class="jxr_string">"north"</span>, <span class="jxr_string">"formal"</span>, 2);
+<a class="jxr_linenumber" name="L156" href="#L156">156</a> 		assertSize(2, x);
+<a class="jxr_linenumber" name="L157" href="#L157">157</a> 
+<a class="jxr_linenumber" name="L158" href="#L158">158</a> 		x.clear();
+<a class="jxr_linenumber" name="L159" href="#L159">159</a> 		assertEmpty(x);
+<a class="jxr_linenumber" name="L160" href="#L160">160</a> 	}
+<a class="jxr_linenumber" name="L161" href="#L161">161</a> 
+<a class="jxr_linenumber" name="L162" href="#L162">162</a> 	@Test
+<a class="jxr_linenumber" name="L163" href="#L163">163</a> 	<strong class="jxr_keyword">void</strong> a04e_weakMode_maxSize() {
+<a class="jxr_linenumber" name="L164" href="#L164">164</a> 		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L165" href="#L165">165</a> 			.cacheMode(WEAK)
+<a class="jxr_linenumber" name="L166" href="#L166">166</a> 			.maxSize(2)
+<a class="jxr_linenumber" name="L167" href="#L167">167</a> 			.supplier((k1, k2, k3, k4, k5) -&gt; <span class="jxr_string">"value"</span>)
+<a class="jxr_linenumber" name="L168" href="#L168">168</a> 			.build();
+<a class="jxr_linenumber" name="L169" href="#L169">169</a> 
+<a class="jxr_linenumber" name="L170" href="#L170">170</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1);
+<a class="jxr_linenumber" name="L171" href="#L171">171</a> 		x.get(<span class="jxr_string">"fr"</span>, <span class="jxr_string">"FR"</span>, <span class="jxr_string">"north"</span>, <span class="jxr_string">"formal"</span>, 2);
+<a class="jxr_linenumber" name="L172" href="#L172">172</a> 		assertSize(2, x);
+<a class="jxr_linenumber" name="L173" href="#L173">173</a> 
+<a class="jxr_linenumber" name="L174" href="#L174">174</a> 		<em class="jxr_comment">// 3rd item doesn't trigger eviction yet</em>
+<a class="jxr_linenumber" name="L175" href="#L175">175</a> 		x.get(<span class="jxr_string">"de"</span>, <span class="jxr_string">"DE"</span>, <span class="jxr_string">"south"</span>, <span class="jxr_string">"formal"</span>, 3);
+<a class="jxr_linenumber" name="L176" href="#L176">176</a> 		assertSize(3, x);
+<a class="jxr_linenumber" name="L177" href="#L177">177</a> 
+<a class="jxr_linenumber" name="L178" href="#L178">178</a> 		<em class="jxr_comment">// 4th item triggers eviction</em>
+<a class="jxr_linenumber" name="L179" href="#L179">179</a> 		x.get(<span class="jxr_string">"es"</span>, <span class="jxr_string">"ES"</span>, <span class="jxr_string">"east"</span>, <span class="jxr_string">"formal"</span>, 4);
+<a class="jxr_linenumber" name="L180" href="#L180">180</a> 		assertSize(1, x);
+<a class="jxr_linenumber" name="L181" href="#L181">181</a> 	}
+<a class="jxr_linenumber" name="L182" href="#L182">182</a> 
+<a class="jxr_linenumber" name="L183" href="#L183">183</a> 	@Test
+<a class="jxr_linenumber" name="L184" href="#L184">184</a> 	<strong class="jxr_keyword">void</strong> a05_maxSize() {
+<a class="jxr_linenumber" name="L185" href="#L185">185</a> 		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L186" href="#L186">186</a> 			.maxSize(2)
+<a class="jxr_linenumber" name="L187" href="#L187">187</a> 			.supplier((k1, k2, k3, k4, k5) -&gt; <span class="jxr_string">"value"</span>)
+<a class="jxr_linenumber" name="L188" href="#L188">188</a> 			.build();
+<a class="jxr_linenumber" name="L189" href="#L189">189</a> 
+<a class="jxr_linenumber" name="L190" href="#L190">190</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1);
+<a class="jxr_linenumber" name="L191" href="#L191">191</a> 		x.get(<span class="jxr_string">"fr"</span>, <span class="jxr_string">"FR"</span>, <span class="jxr_string">"north"</span>, <span class="jxr_string">"formal"</span>, 2);
+<a class="jxr_linenumber" name="L192" href="#L192">192</a> 		assertSize(2, x);
+<a class="jxr_linenumber" name="L193" href="#L193">193</a> 
+<a class="jxr_linenumber" name="L194" href="#L194">194</a> 		x.get(<span class="jxr_string">"de"</span>, <span class="jxr_string">"DE"</span>, <span class="jxr_string">"south"</span>, <span class="jxr_string">"formal"</span>, 3); <em class="jxr_comment">// Doesn't exceed yet</em>
+<a class="jxr_linenumber" name="L195" href="#L195">195</a> 		assertSize(3, x);
+<a class="jxr_linenumber" name="L196" href="#L196">196</a> 
+<a class="jxr_linenumber" name="L197" href="#L197">197</a> 		x.get(<span class="jxr_string">"es"</span>, <span class="jxr_string">"ES"</span>, <span class="jxr_string">"east"</span>, <span class="jxr_string">"formal"</span>, 4); <em class="jxr_comment">// Exceeds max (3 &gt; 2), triggers clear</em>
+<a class="jxr_linenumber" name="L198" href="#L198">198</a> 		assertSize(1, x); <em class="jxr_comment">// Cleared</em>
+<a class="jxr_linenumber" name="L199" href="#L199">199</a> 	}
+<a class="jxr_linenumber" name="L200" href="#L200">200</a> 
+<a class="jxr_linenumber" name="L201" href="#L201">201</a> 	@Test
+<a class="jxr_linenumber" name="L202" href="#L202">202</a> 	<strong class="jxr_keyword">void</strong> a06_cacheHitsTracking() {
+<a class="jxr_linenumber" name="L203" href="#L203">203</a> 		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L204" href="#L204">204</a> 			.supplier((k1, k2, k3, k4, k5) -&gt; <span class="jxr_string">"value"</span>)
+<a class="jxr_linenumber" name="L205" href="#L205">205</a> 			.build();
+<a class="jxr_linenumber" name="L206" href="#L206">206</a> 
+<a class="jxr_linenumber" name="L207" href="#L207">207</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1); <em class="jxr_comment">// Miss</em>
+<a class="jxr_linenumber" name="L208" href="#L208">208</a> 		assertEquals(0, x.getCacheHits());
+<a class="jxr_linenumber" name="L209" href="#L209">209</a> 
+<a class="jxr_linenumber" name="L210" href="#L210">210</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1); <em class="jxr_comment">// Hit</em>
 <a class="jxr_linenumber" name="L211" href="#L211">211</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1); <em class="jxr_comment">// Hit</em>
-<a class="jxr_linenumber" name="L212" href="#L212">212</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1); <em class="jxr_comment">// Hit</em>
-<a class="jxr_linenumber" name="L213" href="#L213">213</a> 		assertEquals(2, x.getCacheHits());
-<a class="jxr_linenumber" name="L214" href="#L214">214</a> 	}
-<a class="jxr_linenumber" name="L215" href="#L215">215</a> 
-<a class="jxr_linenumber" name="L216" href="#L216">216</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L217" href="#L217">217</a> 	<em class="jxr_comment">// b - put(), isEmpty(), containsKey()</em>
-<a class="jxr_linenumber" name="L218" href="#L218">218</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L219" href="#L219">219</a> 
-<a class="jxr_linenumber" name="L220" href="#L220">220</a> 	@Test
-<a class="jxr_linenumber" name="L221" href="#L221">221</a> 	<strong class="jxr_keyword">void</strong> b01_put() {
-<a class="jxr_linenumber" name="L222" href="#L222">222</a> 		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L223" href="#L223">223</a> 		<strong class="jxr_keyword">var</strong> previous = x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1, <span class="jxr_string">"value"</span>);
-<a class="jxr_linenumber" name="L224" href="#L224">224</a> 		assertNull(previous);
-<a class="jxr_linenumber" name="L225" href="#L225">225</a> 		assertEquals(<span class="jxr_string">"value"</span>, x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1, () -&gt; <span class="jxr_string">"should not be called"</span>));
-<a class="jxr_linenumber" name="L226" href="#L226">226</a> 	}
-<a class="jxr_linenumber" name="L227" href="#L227">227</a> 
-<a class="jxr_linenumber" name="L228" href="#L228">228</a> 	@Test
-<a class="jxr_linenumber" name="L229" href="#L229">229</a> 	<strong class="jxr_keyword">void</strong> b01b_put_withNullValue() {
-<a class="jxr_linenumber" name="L230" href="#L230">230</a> 		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L231" href="#L231">231</a> 		x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L232" href="#L232">232</a> 		<strong class="jxr_keyword">var</strong> previous = x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1, <strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="L233" href="#L233">233</a> 		assertEquals(<span class="jxr_string">"value1"</span>, previous);
-<a class="jxr_linenumber" name="L234" href="#L234">234</a> 		assertFalse(x.containsKey(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1));
-<a class="jxr_linenumber" name="L235" href="#L235">235</a> 	}
-<a class="jxr_linenumber" name="L236" href="#L236">236</a> 
-<a class="jxr_linenumber" name="L237" href="#L237">237</a> 	@Test
-<a class="jxr_linenumber" name="L238" href="#L238">238</a> 	<strong class="jxr_keyword">void</strong> b02_isEmpty() {
-<a class="jxr_linenumber" name="L239" href="#L239">239</a> 		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L240" href="#L240">240</a> 		assertTrue(x.isEmpty());
-<a class="jxr_linenumber" name="L241" href="#L241">241</a> 		x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1, <span class="jxr_string">"value"</span>);
-<a class="jxr_linenumber" name="L242" href="#L242">242</a> 		assertFalse(x.isEmpty());
-<a class="jxr_linenumber" name="L243" href="#L243">243</a> 		x.clear();
-<a class="jxr_linenumber" name="L244" href="#L244">244</a> 		assertTrue(x.isEmpty());
-<a class="jxr_linenumber" name="L245" href="#L245">245</a> 	}
-<a class="jxr_linenumber" name="L246" href="#L246">246</a> 
-<a class="jxr_linenumber" name="L247" href="#L247">247</a> 	@Test
-<a class="jxr_linenumber" name="L248" href="#L248">248</a> 	<strong class="jxr_keyword">void</strong> b03_containsKey() {
-<a class="jxr_linenumber" name="L249" href="#L249">249</a> 		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L250" href="#L250">250</a> 		assertFalse(x.containsKey(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1));
-<a class="jxr_linenumber" name="L251" href="#L251">251</a> 		x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1, <span class="jxr_string">"value"</span>);
-<a class="jxr_linenumber" name="L252" href="#L252">252</a> 		assertTrue(x.containsKey(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1));
-<a class="jxr_linenumber" name="L253" href="#L253">253</a> 	}
-<a class="jxr_linenumber" name="L254" href="#L254">254</a> 
-<a class="jxr_linenumber" name="L255" href="#L255">255</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L256" href="#L256">256</a> 	<em class="jxr_comment">// c - create(), disableCaching(), null values</em>
-<a class="jxr_linenumber" name="L257" href="#L257">257</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L258" href="#L258">258</a> 
-<a class="jxr_linenumber" name="L259" href="#L259">259</a> 	@Test
-<a class="jxr_linenumber" name="L260" href="#L260">260</a> 	<strong class="jxr_keyword">void</strong> c01_create() {
-<a class="jxr_linenumber" name="L261" href="#L261">261</a> 		<strong class="jxr_keyword">var</strong> x = Cache5.&lt;String, String, String, String, Integer, String&gt;create()
-<a class="jxr_linenumber" name="L262" href="#L262">262</a> 			.supplier((k1, k2, k3, k4, k5) -&gt; k1 + <span class="jxr_string">":"</span> + k2 + <span class="jxr_string">":"</span> + k3 + <span class="jxr_string">":"</span> + k4 + <span class="jxr_string">":"</span> + k5)
-<a class="jxr_linenumber" name="L263" href="#L263">263</a> 			.build();
-<a class="jxr_linenumber" name="L264" href="#L264">264</a> 		<strong class="jxr_keyword">var</strong> result = x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1);
-<a class="jxr_linenumber" name="L265" href="#L265">265</a> 		assertEquals(<span class="jxr_string">"en:US:west:formal:1"</span>, result);
-<a class="jxr_linenumber" name="L266" href="#L266">266</a> 	}
-<a class="jxr_linenumber" name="L267" href="#L267">267</a> 
-<a class="jxr_linenumber" name="L268" href="#L268">268</a> 	@Test
-<a class="jxr_linenumber" name="L269" href="#L269">269</a> 	<strong class="jxr_keyword">void</strong> c02_disableCaching() {
-<a class="jxr_linenumber" name="L270" href="#L270">270</a> 		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
-<a class="jxr_linenumber" name="L271" href="#L271">271</a> 		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L272" href="#L272">272</a> 			.cacheMode(NONE)
-<a class="jxr_linenumber" name="L273" href="#L273">273</a> 			.supplier((k1, k2, k3, k4, k5) -&gt; {
-<a class="jxr_linenumber" name="L274" href="#L274">274</a> 				callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L275" href="#L275">275</a> 				<strong class="jxr_keyword">return</strong> <span class="jxr_string">"value"</span>;
-<a class="jxr_linenumber" name="L276" href="#L276">276</a> 			})
-<a class="jxr_linenumber" name="L277" href="#L277">277</a> 			.build();
+<a class="jxr_linenumber" name="L212" href="#L212">212</a> 		assertEquals(2, x.getCacheHits());
+<a class="jxr_linenumber" name="L213" href="#L213">213</a> 	}
+<a class="jxr_linenumber" name="L214" href="#L214">214</a> 
+<a class="jxr_linenumber" name="L215" href="#L215">215</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L216" href="#L216">216</a> 	<em class="jxr_comment">// b - put(), isEmpty(), containsKey()</em>
+<a class="jxr_linenumber" name="L217" href="#L217">217</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L218" href="#L218">218</a> 
+<a class="jxr_linenumber" name="L219" href="#L219">219</a> 	@Test
+<a class="jxr_linenumber" name="L220" href="#L220">220</a> 	<strong class="jxr_keyword">void</strong> b01_put() {
+<a class="jxr_linenumber" name="L221" href="#L221">221</a> 		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L222" href="#L222">222</a> 		<strong class="jxr_keyword">var</strong> previous = x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1, <span class="jxr_string">"value"</span>);
+<a class="jxr_linenumber" name="L223" href="#L223">223</a> 		assertNull(previous);
+<a class="jxr_linenumber" name="L224" href="#L224">224</a> 		assertEquals(<span class="jxr_string">"value"</span>, x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1, () -&gt; <span class="jxr_string">"should not be called"</span>));
+<a class="jxr_linenumber" name="L225" href="#L225">225</a> 	}
+<a class="jxr_linenumber" name="L226" href="#L226">226</a> 
+<a class="jxr_linenumber" name="L227" href="#L227">227</a> 	@Test
+<a class="jxr_linenumber" name="L228" href="#L228">228</a> 	<strong class="jxr_keyword">void</strong> b01b_put_withNullValue() {
+<a class="jxr_linenumber" name="L229" href="#L229">229</a> 		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L230" href="#L230">230</a> 		x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1, <span class="jxr_string">"value1"</span>);
+<a class="jxr_linenumber" name="L231" href="#L231">231</a> 		<strong class="jxr_keyword">var</strong> previous = x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1, <strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="L232" href="#L232">232</a> 		assertEquals(<span class="jxr_string">"value1"</span>, previous);
+<a class="jxr_linenumber" name="L233" href="#L233">233</a> 		assertFalse(x.containsKey(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1));
+<a class="jxr_linenumber" name="L234" href="#L234">234</a> 	}
+<a class="jxr_linenumber" name="L235" href="#L235">235</a> 
+<a class="jxr_linenumber" name="L236" href="#L236">236</a> 	@Test
+<a class="jxr_linenumber" name="L237" href="#L237">237</a> 	<strong class="jxr_keyword">void</strong> b02_isEmpty() {
+<a class="jxr_linenumber" name="L238" href="#L238">238</a> 		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L239" href="#L239">239</a> 		assertTrue(x.isEmpty());
+<a class="jxr_linenumber" name="L240" href="#L240">240</a> 		x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1, <span class="jxr_string">"value"</span>);
+<a class="jxr_linenumber" name="L241" href="#L241">241</a> 		assertFalse(x.isEmpty());
+<a class="jxr_linenumber" name="L242" href="#L242">242</a> 		x.clear();
+<a class="jxr_linenumber" name="L243" href="#L243">243</a> 		assertTrue(x.isEmpty());
+<a class="jxr_linenumber" name="L244" href="#L244">244</a> 	}
+<a class="jxr_linenumber" name="L245" href="#L245">245</a> 
+<a class="jxr_linenumber" name="L246" href="#L246">246</a> 	@Test
+<a class="jxr_linenumber" name="L247" href="#L247">247</a> 	<strong class="jxr_keyword">void</strong> b03_containsKey() {
+<a class="jxr_linenumber" name="L248" href="#L248">248</a> 		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L249" href="#L249">249</a> 		assertFalse(x.containsKey(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1));
+<a class="jxr_linenumber" name="L250" href="#L250">250</a> 		x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1, <span class="jxr_string">"value"</span>);
+<a class="jxr_linenumber" name="L251" href="#L251">251</a> 		assertTrue(x.containsKey(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1));
+<a class="jxr_linenumber" name="L252" href="#L252">252</a> 	}
+<a class="jxr_linenumber" name="L253" href="#L253">253</a> 
+<a class="jxr_linenumber" name="L254" href="#L254">254</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L255" href="#L255">255</a> 	<em class="jxr_comment">// c - create(), disableCaching(), null values</em>
+<a class="jxr_linenumber" name="L256" href="#L256">256</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L257" href="#L257">257</a> 
+<a class="jxr_linenumber" name="L258" href="#L258">258</a> 	@Test
+<a class="jxr_linenumber" name="L259" href="#L259">259</a> 	<strong class="jxr_keyword">void</strong> c01_create() {
+<a class="jxr_linenumber" name="L260" href="#L260">260</a> 		<strong class="jxr_keyword">var</strong> x = Cache5.&lt;String, String, String, String, Integer, String&gt;create()
+<a class="jxr_linenumber" name="L261" href="#L261">261</a> 			.supplier((k1, k2, k3, k4, k5) -&gt; k1 + <span class="jxr_string">":"</span> + k2 + <span class="jxr_string">":"</span> + k3 + <span class="jxr_string">":"</span> + k4 + <span class="jxr_string">":"</span> + k5)
+<a class="jxr_linenumber" name="L262" href="#L262">262</a> 			.build();
+<a class="jxr_linenumber" name="L263" href="#L263">263</a> 		<strong class="jxr_keyword">var</strong> result = x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1);
+<a class="jxr_linenumber" name="L264" href="#L264">264</a> 		assertEquals(<span class="jxr_string">"en:US:west:formal:1"</span>, result);
+<a class="jxr_linenumber" name="L265" href="#L265">265</a> 	}
+<a class="jxr_linenumber" name="L266" href="#L266">266</a> 
+<a class="jxr_linenumber" name="L267" href="#L267">267</a> 	@Test
+<a class="jxr_linenumber" name="L268" href="#L268">268</a> 	<strong class="jxr_keyword">void</strong> c02_disableCaching() {
+<a class="jxr_linenumber" name="L269" href="#L269">269</a> 		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
+<a class="jxr_linenumber" name="L270" href="#L270">270</a> 		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L271" href="#L271">271</a> 			.cacheMode(NONE)
+<a class="jxr_linenumber" name="L272" href="#L272">272</a> 			.supplier((k1, k2, k3, k4, k5) -&gt; {
+<a class="jxr_linenumber" name="L273" href="#L273">273</a> 				callCount.incrementAndGet();
+<a class="jxr_linenumber" name="L274" href="#L274">274</a> 				<strong class="jxr_keyword">return</strong> <span class="jxr_string">"value"</span>;
+<a class="jxr_linenumber" name="L275" href="#L275">275</a> 			})
+<a class="jxr_linenumber" name="L276" href="#L276">276</a> 			.build();
+<a class="jxr_linenumber" name="L277" href="#L277">277</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1);
 <a class="jxr_linenumber" name="L278" href="#L278">278</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1);
-<a class="jxr_linenumber" name="L279" href="#L279">279</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1);
-<a class="jxr_linenumber" name="L280" href="#L280">280</a> 		assertEquals(2, callCount.get());
-<a class="jxr_linenumber" name="L281" href="#L281">281</a> 		assertTrue(x.isEmpty());
-<a class="jxr_linenumber" name="L282" href="#L282">282</a> 	}
-<a class="jxr_linenumber" name="L283" href="#L283">283</a> 
-<a class="jxr_linenumber" name="L284" href="#L284">284</a> 	@Test
-<a class="jxr_linenumber" name="L285" href="#L285">285</a> 	<strong class="jxr_keyword">void</strong> c03_nullValue_notCached() {
-<a class="jxr_linenumber" name="L286" href="#L286">286</a> 		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
-<a class="jxr_linenumber" name="L287" href="#L287">287</a> 		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L288" href="#L288">288</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1, () -&gt; {
-<a class="jxr_linenumber" name="L289" href="#L289">289</a> 			callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L290" href="#L290">290</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L291" href="#L291">291</a> 		});
-<a class="jxr_linenumber" name="L292" href="#L292">292</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1, () -&gt; {
-<a class="jxr_linenumber" name="L293" href="#L293">293</a> 			callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L294" href="#L294">294</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L295" href="#L295">295</a> 		});
-<a class="jxr_linenumber" name="L296" href="#L296">296</a> 		assertEquals(2, callCount.get());
-<a class="jxr_linenumber" name="L297" href="#L297">297</a> 		assertTrue(x.isEmpty());
-<a class="jxr_linenumber" name="L298" href="#L298">298</a> 	}
-<a class="jxr_linenumber" name="L299" href="#L299">299</a> 
-<a class="jxr_linenumber" name="L300" href="#L300">300</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L301" href="#L301">301</a> 	<em class="jxr_comment">// d - remove() and containsValue()</em>
-<a class="jxr_linenumber" name="L302" href="#L302">302</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L303" href="#L303">303</a> 
-<a class="jxr_linenumber" name="L304" href="#L304">304</a> 	@Test
-<a class="jxr_linenumber" name="L305" href="#L305">305</a> 	<strong class="jxr_keyword">void</strong> d01_remove() {
-<a class="jxr_linenumber" name="L306" href="#L306">306</a> 		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L307" href="#L307">307</a> 		x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L308" href="#L308">308</a> 		<strong class="jxr_keyword">var</strong> removed = x.remove(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1);
-<a class="jxr_linenumber" name="L309" href="#L309">309</a> 		assertEquals(<span class="jxr_string">"value1"</span>, removed);
-<a class="jxr_linenumber" name="L310" href="#L310">310</a> 		assertFalse(x.containsKey(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1));
-<a class="jxr_linenumber" name="L311" href="#L311">311</a> 	}
-<a class="jxr_linenumber" name="L312" href="#L312">312</a> 
-<a class="jxr_linenumber" name="L313" href="#L313">313</a> 	@Test
-<a class="jxr_linenumber" name="L314" href="#L314">314</a> 	<strong class="jxr_keyword">void</strong> d02_containsValue() {
-<a class="jxr_linenumber" name="L315" href="#L315">315</a> 		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L316" href="#L316">316</a> 		x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L317" href="#L317">317</a> 		assertTrue(x.containsValue(<span class="jxr_string">"value1"</span>));
-<a class="jxr_linenumber" name="L318" href="#L318">318</a> 		assertFalse(x.containsValue(<span class="jxr_string">"value2"</span>));
-<a class="jxr_linenumber" name="L319" href="#L319">319</a> 	}
-<a class="jxr_linenumber" name="L320" href="#L320">320</a> 
-<a class="jxr_linenumber" name="L321" href="#L321">321</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L322" href="#L322">322</a> 	<em class="jxr_comment">// e - logOnExit() builder methods</em>
-<a class="jxr_linenumber" name="L323" href="#L323">323</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L324" href="#L324">324</a> 
-<a class="jxr_linenumber" name="L325" href="#L325">325</a> 	@Test
-<a class="jxr_linenumber" name="L326" href="#L326">326</a> 	<strong class="jxr_keyword">void</strong> e01_logOnExit_withStringId() {
-<a class="jxr_linenumber" name="L327" href="#L327">327</a> 		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L328" href="#L328">328</a> 			.logOnExit(<span class="jxr_string">"TestCache5"</span>)
-<a class="jxr_linenumber" name="L329" href="#L329">329</a> 			.supplier((k1, k2, k3, k4, k5) -&gt; k1 + <span class="jxr_string">":"</span> + k2 + <span class="jxr_string">":"</span> + k3 + <span class="jxr_string">":"</span> + k4 + <span class="jxr_string">":"</span> + k5)
-<a class="jxr_linenumber" name="L330" href="#L330">330</a> 			.build();
-<a class="jxr_linenumber" name="L331" href="#L331">331</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1);
-<a class="jxr_linenumber" name="L332" href="#L332">332</a> 		assertSize(1, x);
-<a class="jxr_linenumber" name="L333" href="#L333">333</a> 	}
-<a class="jxr_linenumber" name="L334" href="#L334">334</a> 
-<a class="jxr_linenumber" name="L335" href="#L335">335</a> 	@Test
-<a class="jxr_linenumber" name="L336" href="#L336">336</a> 	<strong class="jxr_keyword">void</strong> e02_logOnExit_withBoolean() {
-<a class="jxr_linenumber" name="L337" href="#L337">337</a> 		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L338" href="#L338">338</a> 			.logOnExit(<strong class="jxr_keyword">true</strong>, <span class="jxr_string">"MyCache5"</span>)
-<a class="jxr_linenumber" name="L339" href="#L339">339</a> 			.supplier((k1, k2, k3, k4, k5) -&gt; k1 + <span class="jxr_string">":"</span> + k2 + <span class="jxr_string">":"</span> + k3 + <span class="jxr_string">":"</span> + k4 + <span class="jxr_string">":"</span> + k5)
-<a class="jxr_linenumber" name="L340" href="#L340">340</a> 			.build();
-<a class="jxr_linenumber" name="L341" href="#L341">341</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1);
-<a class="jxr_linenumber" name="L342" href="#L342">342</a> 		assertSize(1, x);
-<a class="jxr_linenumber" name="L343" href="#L343">343</a> 	}
-<a class="jxr_linenumber" name="L344" href="#L344">344</a> }
-<a class="jxr_linenumber" name="L345" href="#L345">345</a> 
+<a class="jxr_linenumber" name="L279" href="#L279">279</a> 		assertEquals(2, callCount.get());
+<a class="jxr_linenumber" name="L280" href="#L280">280</a> 		assertTrue(x.isEmpty());
+<a class="jxr_linenumber" name="L281" href="#L281">281</a> 	}
+<a class="jxr_linenumber" name="L282" href="#L282">282</a> 
+<a class="jxr_linenumber" name="L283" href="#L283">283</a> 	@Test
+<a class="jxr_linenumber" name="L284" href="#L284">284</a> 	<strong class="jxr_keyword">void</strong> c03_nullValue_notCached() {
+<a class="jxr_linenumber" name="L285" href="#L285">285</a> 		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
+<a class="jxr_linenumber" name="L286" href="#L286">286</a> 		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L287" href="#L287">287</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1, () -&gt; {
+<a class="jxr_linenumber" name="L288" href="#L288">288</a> 			callCount.incrementAndGet();
+<a class="jxr_linenumber" name="L289" href="#L289">289</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L290" href="#L290">290</a> 		});
+<a class="jxr_linenumber" name="L291" href="#L291">291</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1, () -&gt; {
+<a class="jxr_linenumber" name="L292" href="#L292">292</a> 			callCount.incrementAndGet();
+<a class="jxr_linenumber" name="L293" href="#L293">293</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L294" href="#L294">294</a> 		});
+<a class="jxr_linenumber" name="L295" href="#L295">295</a> 		assertEquals(2, callCount.get());
+<a class="jxr_linenumber" name="L296" href="#L296">296</a> 		assertTrue(x.isEmpty());
+<a class="jxr_linenumber" name="L297" href="#L297">297</a> 	}
+<a class="jxr_linenumber" name="L298" href="#L298">298</a> 
+<a class="jxr_linenumber" name="L299" href="#L299">299</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L300" href="#L300">300</a> 	<em class="jxr_comment">// d - remove() and containsValue()</em>
+<a class="jxr_linenumber" name="L301" href="#L301">301</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L302" href="#L302">302</a> 
+<a class="jxr_linenumber" name="L303" href="#L303">303</a> 	@Test
+<a class="jxr_linenumber" name="L304" href="#L304">304</a> 	<strong class="jxr_keyword">void</strong> d01_remove() {
+<a class="jxr_linenumber" name="L305" href="#L305">305</a> 		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L306" href="#L306">306</a> 		x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1, <span class="jxr_string">"value1"</span>);
+<a class="jxr_linenumber" name="L307" href="#L307">307</a> 		<strong class="jxr_keyword">var</strong> removed = x.remove(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1);
+<a class="jxr_linenumber" name="L308" href="#L308">308</a> 		assertEquals(<span class="jxr_string">"value1"</span>, removed);
+<a class="jxr_linenumber" name="L309" href="#L309">309</a> 		assertFalse(x.containsKey(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1));
+<a class="jxr_linenumber" name="L310" href="#L310">310</a> 	}
+<a class="jxr_linenumber" name="L311" href="#L311">311</a> 
+<a class="jxr_linenumber" name="L312" href="#L312">312</a> 	@Test
+<a class="jxr_linenumber" name="L313" href="#L313">313</a> 	<strong class="jxr_keyword">void</strong> d02_containsValue() {
+<a class="jxr_linenumber" name="L314" href="#L314">314</a> 		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L315" href="#L315">315</a> 		x.put(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1, <span class="jxr_string">"value1"</span>);
+<a class="jxr_linenumber" name="L316" href="#L316">316</a> 		assertTrue(x.containsValue(<span class="jxr_string">"value1"</span>));
+<a class="jxr_linenumber" name="L317" href="#L317">317</a> 		assertFalse(x.containsValue(<span class="jxr_string">"value2"</span>));
+<a class="jxr_linenumber" name="L318" href="#L318">318</a> 	}
+<a class="jxr_linenumber" name="L319" href="#L319">319</a> 
+<a class="jxr_linenumber" name="L320" href="#L320">320</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L321" href="#L321">321</a> 	<em class="jxr_comment">// e - logOnExit() builder methods</em>
+<a class="jxr_linenumber" name="L322" href="#L322">322</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L323" href="#L323">323</a> 
+<a class="jxr_linenumber" name="L324" href="#L324">324</a> 	@Test
+<a class="jxr_linenumber" name="L325" href="#L325">325</a> 	<strong class="jxr_keyword">void</strong> e01_logOnExit_withStringId() {
+<a class="jxr_linenumber" name="L326" href="#L326">326</a> 		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L327" href="#L327">327</a> 			.logOnExit(<span class="jxr_string">"TestCache5"</span>)
+<a class="jxr_linenumber" name="L328" href="#L328">328</a> 			.supplier((k1, k2, k3, k4, k5) -&gt; k1 + <span class="jxr_string">":"</span> + k2 + <span class="jxr_string">":"</span> + k3 + <span class="jxr_string">":"</span> + k4 + <span class="jxr_string">":"</span> + k5)
+<a class="jxr_linenumber" name="L329" href="#L329">329</a> 			.build();
+<a class="jxr_linenumber" name="L330" href="#L330">330</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1);
+<a class="jxr_linenumber" name="L331" href="#L331">331</a> 		assertSize(1, x);
+<a class="jxr_linenumber" name="L332" href="#L332">332</a> 	}
+<a class="jxr_linenumber" name="L333" href="#L333">333</a> 
+<a class="jxr_linenumber" name="L334" href="#L334">334</a> 	@Test
+<a class="jxr_linenumber" name="L335" href="#L335">335</a> 	<strong class="jxr_keyword">void</strong> e02_logOnExit_withBoolean() {
+<a class="jxr_linenumber" name="L336" href="#L336">336</a> 		<strong class="jxr_keyword">var</strong> x = Cache5.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L337" href="#L337">337</a> 			.logOnExit(<strong class="jxr_keyword">true</strong>, <span class="jxr_string">"MyCache5"</span>)
+<a class="jxr_linenumber" name="L338" href="#L338">338</a> 			.supplier((k1, k2, k3, k4, k5) -&gt; k1 + <span class="jxr_string">":"</span> + k2 + <span class="jxr_string">":"</span> + k3 + <span class="jxr_string">":"</span> + k4 + <span class="jxr_string">":"</span> + k5)
+<a class="jxr_linenumber" name="L339" href="#L339">339</a> 			.build();
+<a class="jxr_linenumber" name="L340" href="#L340">340</a> 		x.get(<span class="jxr_string">"en"</span>, <span class="jxr_string">"US"</span>, <span class="jxr_string">"west"</span>, <span class="jxr_string">"formal"</span>, 1);
+<a class="jxr_linenumber" name="L341" href="#L341">341</a> 		assertSize(1, x);
+<a class="jxr_linenumber" name="L342" href="#L342">342</a> 	}
+<a class="jxr_linenumber" name="L343" href="#L343">343</a> }
+<a class="jxr_linenumber" name="L344" href="#L344">344</a> 
 </pre>
 <hr/>
 <div id="footer">© 2016–2025 <a href="https://www.apache.org/">The Apache Software Foundation</a></div>
diff --git a/site/xref-test/org/apache/juneau/common/collections/CacheMode_Test.html b/site/xref-test/org/apache/juneau/commons/collections/CacheMode_Test.html
similarity index 95%
rename from site/xref-test/org/apache/juneau/common/collections/CacheMode_Test.html
rename to site/xref-test/org/apache/juneau/commons/collections/CacheMode_Test.html
index 518c9031f8..f7f2dda358 100644
--- a/site/xref-test/org/apache/juneau/common/collections/CacheMode_Test.html
+++ b/site/xref-test/org/apache/juneau/commons/collections/CacheMode_Test.html
@@ -5,7 +5,7 @@
 <link type="text/css" rel="stylesheet" href="../../../../../stylesheet.css" />
 </head>
 <body>
-<div id="overview"><a href="../../../../../../testapidocs/org/apache/juneau/common/collections/CacheMode_Test.html">View Javadoc</a></div><pre>
+<div id="overview"><a href="../../../../../../testapidocs/org/apache/juneau/commons/collections/CacheMode_Test.html">View Javadoc</a></div><pre>
 <a class="jxr_linenumber" name="L1" href="#L1">1</a>   <em class="jxr_comment">/*</em>
 <a class="jxr_linenumber" name="L2" href="#L2">2</a>   <em class="jxr_comment"> * Licensed to the Apache Software Foundation (ASF) under one or more</em>
 <a class="jxr_linenumber" name="L3" href="#L3">3</a>   <em class="jxr_comment"> * contributor license agreements.  See the NOTICE file distributed with</em>
@@ -22,14 +22,14 @@
 <a class="jxr_linenumber" name="L14" href="#L14">14</a>  <em class="jxr_comment"> * See the License for the specific language governing permissions and</em>
 <a class="jxr_linenumber" name="L15" href="#L15">15</a>  <em class="jxr_comment"> * limitations under the License.</em>
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
-<a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.common.collections;
+<a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.commons.collections;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.*;
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.api.*;
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  
-<a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">class</strong> <a name="CacheMode_Test" href="../../../../../org/apache/juneau/common/collections/CacheMode_Test.html#CacheMode_Test">CacheMode_Test</a> <strong class="jxr_keyword">extends</strong> <a name="TestBase" href="../../../../../org/apache/juneau/TestBase.html#TestBase">TestBase</a> {
+<a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">class</strong> <a name="CacheMode_Test" href="../../../../../org/apache/juneau/commons/collections/CacheMode_Test.html#CacheMode_Test">CacheMode_Test</a> <strong class="jxr_keyword">extends</strong> <a name="TestBase" href="../../../../../org/apache/juneau/TestBase.html#TestBase">TestBase</a> {
 <a class="jxr_linenumber" name="L25" href="#L25">25</a>  
 <a class="jxr_linenumber" name="L26" href="#L26">26</a>  	<em class="jxr_comment">//====================================================================================================</em>
 <a class="jxr_linenumber" name="L27" href="#L27">27</a>  	<em class="jxr_comment">// parse(String)</em>
diff --git a/site/xref-test/org/apache/juneau/common/collections/Cache_Test.html b/site/xref-test/org/apache/juneau/commons/collections/Cache_Test.html
similarity index 57%
rename from site/xref-test/org/apache/juneau/common/collections/Cache_Test.html
rename to site/xref-test/org/apache/juneau/commons/collections/Cache_Test.html
index 199b0708f8..7faac279fa 100644
--- a/site/xref-test/org/apache/juneau/common/collections/Cache_Test.html
+++ b/site/xref-test/org/apache/juneau/commons/collections/Cache_Test.html
@@ -5,7 +5,7 @@
 <link type="text/css" rel="stylesheet" href="../../../../../stylesheet.css" />
 </head>
 <body>
-<div id="overview"><a href="../../../../../../testapidocs/org/apache/juneau/common/collections/Cache_Test.html">View Javadoc</a></div><pre>
+<div id="overview"><a href="../../../../../../testapidocs/org/apache/juneau/commons/collections/Cache_Test.html">View Javadoc</a></div><pre>
 <a class="jxr_linenumber" name="L1" href="#L1">1</a>   <em class="jxr_comment">/*</em>
 <a class="jxr_linenumber" name="L2" href="#L2">2</a>   <em class="jxr_comment"> * Licensed to the Apache Software Foundation (ASF) under one or more</em>
 <a class="jxr_linenumber" name="L3" href="#L3">3</a>   <em class="jxr_comment"> * contributor license agreements.  See the NOTICE file distributed with</em>
@@ -22,920 +22,919 @@
 <a class="jxr_linenumber" name="L14" href="#L14">14</a>  <em class="jxr_comment"> * See the License for the specific language governing permissions and</em>
 <a class="jxr_linenumber" name="L15" href="#L15">15</a>  <em class="jxr_comment"> * limitations under the License.</em>
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
-<a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.common.collections;
+<a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.juneau.commons.collections;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
-<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.common.collections.CacheMode.*;
-<a class="jxr_linenumber" name="L20" href="#L20">20</a>  
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
-<a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
-<a class="jxr_linenumber" name="L23" href="#L23">23</a>  
-<a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> java.util.concurrent.*;
-<a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> java.util.concurrent.atomic.*;
-<a class="jxr_linenumber" name="L26" href="#L26">26</a>  
-<a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.*;
-<a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.api.*;
-<a class="jxr_linenumber" name="L29" href="#L29">29</a>  
-<a class="jxr_linenumber" name="L30" href="#L30">30</a>  <strong class="jxr_keyword">class</strong> <a name="Cache_Test" href="../../../../../org/apache/juneau/common/collections/Cache_Test.html#Cache_Test">Cache_Test</a> <strong class="jxr_keyword">extends</strong> <a name="TestBase" href="../../../../../org/apache/juneau/TestBase.html#TestBase">TestBase</a> {
-<a class="jxr_linenumber" name="L31" href="#L31">31</a>  
-<a class="jxr_linenumber" name="L32" href="#L32">32</a>  	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L33" href="#L33">33</a>  	<em class="jxr_comment">// Basic cache operations - get, hit, miss</em>
-<a class="jxr_linenumber" name="L34" href="#L34">34</a>  	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L35" href="#L35">35</a>  
-<a class="jxr_linenumber" name="L36" href="#L36">36</a>  	@Test <strong class="jxr_keyword">void</strong> a01_basicGet_cacheMiss() {
-<a class="jxr_linenumber" name="L37" href="#L37">37</a>  		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L38" href="#L38">38</a>  		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
-<a class="jxr_linenumber" name="L39" href="#L39">39</a>  
-<a class="jxr_linenumber" name="L40" href="#L40">40</a>  		<strong class="jxr_keyword">var</strong> result = cache.get(<span class="jxr_string">"key1"</span>, () -&gt; {
-<a class="jxr_linenumber" name="L41" href="#L41">41</a>  			callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L42" href="#L42">42</a>  			<strong class="jxr_keyword">return</strong> <span class="jxr_string">"value1"</span>;
-<a class="jxr_linenumber" name="L43" href="#L43">43</a>  		});
-<a class="jxr_linenumber" name="L44" href="#L44">44</a>  
-<a class="jxr_linenumber" name="L45" href="#L45">45</a>  		assertEquals(<span class="jxr_string">"value1"</span>, result);
-<a class="jxr_linenumber" name="L46" href="#L46">46</a>  		assertEquals(1, callCount.get());
-<a class="jxr_linenumber" name="L47" href="#L47">47</a>  		assertSize(1, cache);
-<a class="jxr_linenumber" name="L48" href="#L48">48</a>  		assertEquals(0, cache.getCacheHits());
-<a class="jxr_linenumber" name="L49" href="#L49">49</a>  	}
-<a class="jxr_linenumber" name="L50" href="#L50">50</a>  
-<a class="jxr_linenumber" name="L51" href="#L51">51</a>  	@Test <strong class="jxr_keyword">void</strong> a02_basicGet_cacheHit() {
-<a class="jxr_linenumber" name="L52" href="#L52">52</a>  		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L53" href="#L53">53</a>  		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
-<a class="jxr_linenumber" name="L54" href="#L54">54</a>  
-<a class="jxr_linenumber" name="L55" href="#L55">55</a>  		<em class="jxr_comment">// First call - cache miss</em>
-<a class="jxr_linenumber" name="L56" href="#L56">56</a>  		<strong class="jxr_keyword">var</strong> result1 = cache.get(<span class="jxr_string">"key1"</span>, () -&gt; {
-<a class="jxr_linenumber" name="L57" href="#L57">57</a>  			callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L58" href="#L58">58</a>  			<strong class="jxr_keyword">return</strong> <span class="jxr_string">"value1"</span>;
-<a class="jxr_linenumber" name="L59" href="#L59">59</a>  		});
-<a class="jxr_linenumber" name="L60" href="#L60">60</a>  
-<a class="jxr_linenumber" name="L61" href="#L61">61</a>  		<em class="jxr_comment">// Second call - cache hit</em>
-<a class="jxr_linenumber" name="L62" href="#L62">62</a>  		<strong class="jxr_keyword">var</strong> result2 = cache.get(<span class="jxr_string">"key1"</span>, () -&gt; {
-<a class="jxr_linenumber" name="L63" href="#L63">63</a>  			callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L64" href="#L64">64</a>  			<strong class="jxr_keyword">return</strong> <span class="jxr_string">"should not be called"</span>;
-<a class="jxr_linenumber" name="L65" href="#L65">65</a>  		});
-<a class="jxr_linenumber" name="L66" href="#L66">66</a>  
-<a class="jxr_linenumber" name="L67" href="#L67">67</a>  		assertEquals(<span class="jxr_string">"value1"</span>, result1);
-<a class="jxr_linenumber" name="L68" href="#L68">68</a>  		assertEquals(<span class="jxr_string">"value1"</span>, result2);
-<a class="jxr_linenumber" name="L69" href="#L69">69</a>  		assertSame(result1, result2); <em class="jxr_comment">// Same instance</em>
-<a class="jxr_linenumber" name="L70" href="#L70">70</a>  		assertEquals(1, callCount.get()); <em class="jxr_comment">// Supplier only called once</em>
-<a class="jxr_linenumber" name="L71" href="#L71">71</a>  		assertSize(1, cache);
-<a class="jxr_linenumber" name="L72" href="#L72">72</a>  		assertEquals(1, cache.getCacheHits());
-<a class="jxr_linenumber" name="L73" href="#L73">73</a>  	}
-<a class="jxr_linenumber" name="L74" href="#L74">74</a>  
-<a class="jxr_linenumber" name="L75" href="#L75">75</a>  	@Test <strong class="jxr_keyword">void</strong> a03_multipleKeys() {
-<a class="jxr_linenumber" name="L76" href="#L76">76</a>  		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L77" href="#L77">77</a>  
-<a class="jxr_linenumber" name="L78" href="#L78">78</a>  		<strong class="jxr_keyword">var</strong> v1 = cache.get(<span class="jxr_string">"one"</span>, () -&gt; 1);
-<a class="jxr_linenumber" name="L79" href="#L79">79</a>  		<strong class="jxr_keyword">var</strong> v2 = cache.get(<span class="jxr_string">"two"</span>, () -&gt; 2);
-<a class="jxr_linenumber" name="L80" href="#L80">80</a>  		<strong class="jxr_keyword">var</strong> v3 = cache.get(<span class="jxr_string">"three"</span>, () -&gt; 3);
-<a class="jxr_linenumber" name="L81" href="#L81">81</a>  
-<a class="jxr_linenumber" name="L82" href="#L82">82</a>  		assertEquals(1, v1);
-<a class="jxr_linenumber" name="L83" href="#L83">83</a>  		assertEquals(2, v2);
-<a class="jxr_linenumber" name="L84" href="#L84">84</a>  		assertEquals(3, v3);
-<a class="jxr_linenumber" name="L85" href="#L85">85</a>  		assertSize(3, cache);
-<a class="jxr_linenumber" name="L86" href="#L86">86</a>  		assertEquals(0, cache.getCacheHits());
-<a class="jxr_linenumber" name="L87" href="#L87">87</a>  
-<a class="jxr_linenumber" name="L88" href="#L88">88</a>  		<em class="jxr_comment">// Verify all cached</em>
-<a class="jxr_linenumber" name="L89" href="#L89">89</a>  		<strong class="jxr_keyword">var</strong> v1Again = cache.get(<span class="jxr_string">"one"</span>, () -&gt; 999);
-<a class="jxr_linenumber" name="L90" href="#L90">90</a>  		<strong class="jxr_keyword">var</strong> v2Again = cache.get(<span class="jxr_string">"two"</span>, () -&gt; 999);
-<a class="jxr_linenumber" name="L91" href="#L91">91</a>  		<strong class="jxr_keyword">var</strong> v3Again = cache.get(<span class="jxr_string">"three"</span>, () -&gt; 999);
-<a class="jxr_linenumber" name="L92" href="#L92">92</a>  
-<a class="jxr_linenumber" name="L93" href="#L93">93</a>  		assertEquals(1, v1Again);
-<a class="jxr_linenumber" name="L94" href="#L94">94</a>  		assertEquals(2, v2Again);
-<a class="jxr_linenumber" name="L95" href="#L95">95</a>  		assertEquals(3, v3Again);
-<a class="jxr_linenumber" name="L96" href="#L96">96</a>  		assertEquals(3, cache.getCacheHits());
-<a class="jxr_linenumber" name="L97" href="#L97">97</a>  	}
-<a class="jxr_linenumber" name="L98" href="#L98">98</a>  
-<a class="jxr_linenumber" name="L99" href="#L99">99</a>  	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L100" href="#L100">100</a> 	<em class="jxr_comment">// Null key handling</em>
-<a class="jxr_linenumber" name="L101" href="#L101">101</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L102" href="#L102">102</a> 
-<a class="jxr_linenumber" name="L103" href="#L103">103</a> 	@Test <strong class="jxr_keyword">void</strong> a04_nullKey_allowed() {
-<a class="jxr_linenumber" name="L104" href="#L104">104</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L105" href="#L105">105</a> 			.supplier(k -&gt; <span class="jxr_string">"value-"</span> + k)
-<a class="jxr_linenumber" name="L106" href="#L106">106</a> 			.build();
-<a class="jxr_linenumber" name="L107" href="#L107">107</a> 
-<a class="jxr_linenumber" name="L108" href="#L108">108</a> 		<em class="jxr_comment">// Null keys are now allowed</em>
-<a class="jxr_linenumber" name="L109" href="#L109">109</a> 		assertEquals(<span class="jxr_string">"value-null"</span>, cache.get(<strong class="jxr_keyword">null</strong>, () -&gt; <span class="jxr_string">"value-null"</span>));
-<a class="jxr_linenumber" name="L110" href="#L110">110</a> 		
-<a class="jxr_linenumber" name="L111" href="#L111">111</a> 		<em class="jxr_comment">// Verify caching works with null keys</em>
-<a class="jxr_linenumber" name="L112" href="#L112">112</a> 		assertEquals(<span class="jxr_string">"value-null"</span>, cache.get(<strong class="jxr_keyword">null</strong>)); <em class="jxr_comment">// Cached (hit #1)</em>
-<a class="jxr_linenumber" name="L113" href="#L113">113</a> 		assertEquals(1, cache.getCacheHits());
-<a class="jxr_linenumber" name="L114" href="#L114">114</a> 		
-<a class="jxr_linenumber" name="L115" href="#L115">115</a> 		assertEquals(<span class="jxr_string">"value-null"</span>, cache.get(<strong class="jxr_keyword">null</strong>)); <em class="jxr_comment">// Cached (hit #2)</em>
-<a class="jxr_linenumber" name="L116" href="#L116">116</a> 		assertEquals(2, cache.getCacheHits());
-<a class="jxr_linenumber" name="L117" href="#L117">117</a> 	}
-<a class="jxr_linenumber" name="L118" href="#L118">118</a> 
-<a class="jxr_linenumber" name="L119" href="#L119">119</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L120" href="#L120">120</a> 	<em class="jxr_comment">// Size and clear operations</em>
-<a class="jxr_linenumber" name="L121" href="#L121">121</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L122" href="#L122">122</a> 
-<a class="jxr_linenumber" name="L123" href="#L123">123</a> 	@Test <strong class="jxr_keyword">void</strong> a06_size() {
-<a class="jxr_linenumber" name="L124" href="#L124">124</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L125" href="#L125">125</a> 
-<a class="jxr_linenumber" name="L126" href="#L126">126</a> 		assertEmpty(cache);
-<a class="jxr_linenumber" name="L127" href="#L127">127</a> 
-<a class="jxr_linenumber" name="L128" href="#L128">128</a> 		cache.get(<span class="jxr_string">"one"</span>, () -&gt; 1);
-<a class="jxr_linenumber" name="L129" href="#L129">129</a> 		assertSize(1, cache);
-<a class="jxr_linenumber" name="L130" href="#L130">130</a> 
-<a class="jxr_linenumber" name="L131" href="#L131">131</a> 		cache.get(<span class="jxr_string">"two"</span>, () -&gt; 2);
-<a class="jxr_linenumber" name="L132" href="#L132">132</a> 		assertSize(2, cache);
-<a class="jxr_linenumber" name="L133" href="#L133">133</a> 
-<a class="jxr_linenumber" name="L134" href="#L134">134</a> 		cache.get(<span class="jxr_string">"three"</span>, () -&gt; 3);
-<a class="jxr_linenumber" name="L135" href="#L135">135</a> 		assertSize(3, cache);
-<a class="jxr_linenumber" name="L136" href="#L136">136</a> 
-<a class="jxr_linenumber" name="L137" href="#L137">137</a> 		<em class="jxr_comment">// Accessing existing key doesn't change size</em>
-<a class="jxr_linenumber" name="L138" href="#L138">138</a> 		cache.get(<span class="jxr_string">"one"</span>, () -&gt; 999);
-<a class="jxr_linenumber" name="L139" href="#L139">139</a> 		assertSize(3, cache);
-<a class="jxr_linenumber" name="L140" href="#L140">140</a> 	}
-<a class="jxr_linenumber" name="L141" href="#L141">141</a> 
-<a class="jxr_linenumber" name="L142" href="#L142">142</a> 	@Test <strong class="jxr_keyword">void</strong> a07_clear() {
-<a class="jxr_linenumber" name="L143" href="#L143">143</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L144" href="#L144">144</a> 
-<a class="jxr_linenumber" name="L145" href="#L145">145</a> 		cache.get(<span class="jxr_string">"one"</span>, () -&gt; 1);
-<a class="jxr_linenumber" name="L146" href="#L146">146</a> 		cache.get(<span class="jxr_string">"two"</span>, () -&gt; 2);
-<a class="jxr_linenumber" name="L147" href="#L147">147</a> 		cache.get(<span class="jxr_string">"one"</span>, () -&gt; 999); <em class="jxr_comment">// Cache hit</em>
-<a class="jxr_linenumber" name="L148" href="#L148">148</a> 
-<a class="jxr_linenumber" name="L149" href="#L149">149</a> 		assertSize(2, cache);
-<a class="jxr_linenumber" name="L150" href="#L150">150</a> 		assertEquals(1, cache.getCacheHits());
-<a class="jxr_linenumber" name="L151" href="#L151">151</a> 
-<a class="jxr_linenumber" name="L152" href="#L152">152</a> 		cache.clear();
-<a class="jxr_linenumber" name="L153" href="#L153">153</a> 
-<a class="jxr_linenumber" name="L154" href="#L154">154</a> 		assertEmpty(cache);
-<a class="jxr_linenumber" name="L155" href="#L155">155</a> 		assertEquals(1, cache.getCacheHits()); <em class="jxr_comment">// Hits not cleared</em>
-<a class="jxr_linenumber" name="L156" href="#L156">156</a> 
-<a class="jxr_linenumber" name="L157" href="#L157">157</a> 		<em class="jxr_comment">// Values must be recomputed after clear</em>
-<a class="jxr_linenumber" name="L158" href="#L158">158</a> 		<strong class="jxr_keyword">var</strong> v1 = cache.get(<span class="jxr_string">"one"</span>, () -&gt; 10);
-<a class="jxr_linenumber" name="L159" href="#L159">159</a> 		assertEquals(10, v1);
-<a class="jxr_linenumber" name="L160" href="#L160">160</a> 		assertSize(1, cache);
-<a class="jxr_linenumber" name="L161" href="#L161">161</a> 	}
-<a class="jxr_linenumber" name="L162" href="#L162">162</a> 
-<a class="jxr_linenumber" name="L163" href="#L163">163</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L164" href="#L164">164</a> 	<em class="jxr_comment">// Max size and eviction</em>
-<a class="jxr_linenumber" name="L165" href="#L165">165</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L166" href="#L166">166</a> 
-<a class="jxr_linenumber" name="L167" href="#L167">167</a> 	@Test <strong class="jxr_keyword">void</strong> a08_maxSize_eviction() {
-<a class="jxr_linenumber" name="L168" href="#L168">168</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L169" href="#L169">169</a> 			.maxSize(3)
-<a class="jxr_linenumber" name="L170" href="#L170">170</a> 			.build();
-<a class="jxr_linenumber" name="L171" href="#L171">171</a> 
-<a class="jxr_linenumber" name="L172" href="#L172">172</a> 		cache.get(<span class="jxr_string">"one"</span>, () -&gt; 1);
-<a class="jxr_linenumber" name="L173" href="#L173">173</a> 		cache.get(<span class="jxr_string">"two"</span>, () -&gt; 2);
-<a class="jxr_linenumber" name="L174" href="#L174">174</a> 		cache.get(<span class="jxr_string">"three"</span>, () -&gt; 3);
-<a class="jxr_linenumber" name="L175" href="#L175">175</a> 		assertSize(3, cache);
-<a class="jxr_linenumber" name="L176" href="#L176">176</a> 
-<a class="jxr_linenumber" name="L177" href="#L177">177</a> 		<em class="jxr_comment">// 4th item doesn't trigger eviction (size &gt; maxSize means 4 &gt; 3)</em>
-<a class="jxr_linenumber" name="L178" href="#L178">178</a> 		cache.get(<span class="jxr_string">"four"</span>, () -&gt; 4);
-<a class="jxr_linenumber" name="L179" href="#L179">179</a> 		assertSize(4, cache);
-<a class="jxr_linenumber" name="L180" href="#L180">180</a> 
-<a class="jxr_linenumber" name="L181" href="#L181">181</a> 		<em class="jxr_comment">// 5th item triggers eviction (size=4, 4 &gt; 3, so clear then add)</em>
-<a class="jxr_linenumber" name="L182" href="#L182">182</a> 		cache.get(<span class="jxr_string">"five"</span>, () -&gt; 5);
-<a class="jxr_linenumber" name="L183" href="#L183">183</a> 		assertSize(1, cache); <em class="jxr_comment">// Only the new item</em>
-<a class="jxr_linenumber" name="L184" href="#L184">184</a> 	}
-<a class="jxr_linenumber" name="L185" href="#L185">185</a> 
-<a class="jxr_linenumber" name="L186" href="#L186">186</a> 	@Test <strong class="jxr_keyword">void</strong> a09_maxSize_custom() {
-<a class="jxr_linenumber" name="L187" href="#L187">187</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L188" href="#L188">188</a> 			.maxSize(5)
-<a class="jxr_linenumber" name="L189" href="#L189">189</a> 			.build();
-<a class="jxr_linenumber" name="L190" href="#L190">190</a> 
-<a class="jxr_linenumber" name="L191" href="#L191">191</a> 		<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> i = 1; i &lt;= 5; i++) {
-<a class="jxr_linenumber" name="L192" href="#L192">192</a> 			<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> index = i;
-<a class="jxr_linenumber" name="L193" href="#L193">193</a> 			cache.get(<span class="jxr_string">"key"</span> + index, () -&gt; <span class="jxr_string">"value"</span> + index);
-<a class="jxr_linenumber" name="L194" href="#L194">194</a> 		}
-<a class="jxr_linenumber" name="L195" href="#L195">195</a> 		assertSize(5, cache);
-<a class="jxr_linenumber" name="L196" href="#L196">196</a> 
-<a class="jxr_linenumber" name="L197" href="#L197">197</a> 		<em class="jxr_comment">// 6th item doesn't trigger clear yet (5 &gt; 5 is false)</em>
-<a class="jxr_linenumber" name="L198" href="#L198">198</a> 		cache.get(<span class="jxr_string">"key6"</span>, () -&gt; <span class="jxr_string">"value6"</span>);
-<a class="jxr_linenumber" name="L199" href="#L199">199</a> 		assertSize(6, cache);
-<a class="jxr_linenumber" name="L200" href="#L200">200</a> 
-<a class="jxr_linenumber" name="L201" href="#L201">201</a> 		<em class="jxr_comment">// 7th item triggers clear (6 &gt; 5 is true)</em>
-<a class="jxr_linenumber" name="L202" href="#L202">202</a> 		cache.get(<span class="jxr_string">"key7"</span>, () -&gt; <span class="jxr_string">"value7"</span>);
-<a class="jxr_linenumber" name="L203" href="#L203">203</a> 		assertSize(1, cache);
-<a class="jxr_linenumber" name="L204" href="#L204">204</a> 	}
-<a class="jxr_linenumber" name="L205" href="#L205">205</a> 
-<a class="jxr_linenumber" name="L206" href="#L206">206</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L207" href="#L207">207</a> 	<em class="jxr_comment">// Disabled cache</em>
-<a class="jxr_linenumber" name="L208" href="#L208">208</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L209" href="#L209">209</a> 
-<a class="jxr_linenumber" name="L210" href="#L210">210</a> 	@Test <strong class="jxr_keyword">void</strong> a10_disabled_neverCaches() {
-<a class="jxr_linenumber" name="L211" href="#L211">211</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L212" href="#L212">212</a> 			.cacheMode(NONE)
-<a class="jxr_linenumber" name="L213" href="#L213">213</a> 			.build();
-<a class="jxr_linenumber" name="L214" href="#L214">214</a> 		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
-<a class="jxr_linenumber" name="L215" href="#L215">215</a> 
-<a class="jxr_linenumber" name="L216" href="#L216">216</a> 		<strong class="jxr_keyword">var</strong> result1 = cache.get(<span class="jxr_string">"key1"</span>, () -&gt; {
-<a class="jxr_linenumber" name="L217" href="#L217">217</a> 			callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L218" href="#L218">218</a> 			<strong class="jxr_keyword">return</strong> <span class="jxr_string">"value"</span> + callCount.get();
-<a class="jxr_linenumber" name="L219" href="#L219">219</a> 		});
-<a class="jxr_linenumber" name="L220" href="#L220">220</a> 
-<a class="jxr_linenumber" name="L221" href="#L221">221</a> 		<strong class="jxr_keyword">var</strong> result2 = cache.get(<span class="jxr_string">"key1"</span>, () -&gt; {
-<a class="jxr_linenumber" name="L222" href="#L222">222</a> 			callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L223" href="#L223">223</a> 			<strong class="jxr_keyword">return</strong> <span class="jxr_string">"value"</span> + callCount.get();
-<a class="jxr_linenumber" name="L224" href="#L224">224</a> 		});
-<a class="jxr_linenumber" name="L225" href="#L225">225</a> 
-<a class="jxr_linenumber" name="L226" href="#L226">226</a> 		assertEquals(<span class="jxr_string">"value1"</span>, result1);
-<a class="jxr_linenumber" name="L227" href="#L227">227</a> 		assertEquals(<span class="jxr_string">"value2"</span>, result2);
-<a class="jxr_linenumber" name="L228" href="#L228">228</a> 		assertEquals(2, callCount.get()); <em class="jxr_comment">// Always calls supplier</em>
-<a class="jxr_linenumber" name="L229" href="#L229">229</a> 		assertEmpty(cache);
-<a class="jxr_linenumber" name="L230" href="#L230">230</a> 		assertEquals(0, cache.getCacheHits());
-<a class="jxr_linenumber" name="L231" href="#L231">231</a> 	}
-<a class="jxr_linenumber" name="L232" href="#L232">232</a> 
-<a class="jxr_linenumber" name="L233" href="#L233">233</a> 	@Test <strong class="jxr_keyword">void</strong> a11_disabled_sizeAlwaysZero() {
-<a class="jxr_linenumber" name="L234" href="#L234">234</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L235" href="#L235">235</a> 			.cacheMode(NONE)
-<a class="jxr_linenumber" name="L236" href="#L236">236</a> 			.build();
-<a class="jxr_linenumber" name="L237" href="#L237">237</a> 
-<a class="jxr_linenumber" name="L238" href="#L238">238</a> 		cache.get(<span class="jxr_string">"one"</span>, () -&gt; 1);
-<a class="jxr_linenumber" name="L239" href="#L239">239</a> 		cache.get(<span class="jxr_string">"two"</span>, () -&gt; 2);
-<a class="jxr_linenumber" name="L240" href="#L240">240</a> 		cache.get(<span class="jxr_string">"three"</span>, () -&gt; 3);
-<a class="jxr_linenumber" name="L241" href="#L241">241</a> 
-<a class="jxr_linenumber" name="L242" href="#L242">242</a> 		assertEmpty(cache);
-<a class="jxr_linenumber" name="L243" href="#L243">243</a> 	}
-<a class="jxr_linenumber" name="L244" href="#L244">244</a> 
-<a class="jxr_linenumber" name="L245" href="#L245">245</a> 	@Test <strong class="jxr_keyword">void</strong> a12_disabled_clearHasNoEffect() {
-<a class="jxr_linenumber" name="L246" href="#L246">246</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L247" href="#L247">247</a> 			.cacheMode(NONE)
-<a class="jxr_linenumber" name="L248" href="#L248">248</a> 			.build();
-<a class="jxr_linenumber" name="L249" href="#L249">249</a> 
-<a class="jxr_linenumber" name="L250" href="#L250">250</a> 		cache.clear(); <em class="jxr_comment">// Should not throw</em>
-<a class="jxr_linenumber" name="L251" href="#L251">251</a> 		assertEmpty(cache);
-<a class="jxr_linenumber" name="L252" href="#L252">252</a> 	}
-<a class="jxr_linenumber" name="L253" href="#L253">253</a> 
-<a class="jxr_linenumber" name="L254" href="#L254">254</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L255" href="#L255">255</a> 	<em class="jxr_comment">// Weak cache mode</em>
-<a class="jxr_linenumber" name="L256" href="#L256">256</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L257" href="#L257">257</a> 
-<a class="jxr_linenumber" name="L258" href="#L258">258</a> 	@Test <strong class="jxr_keyword">void</strong> a13_weakMode_basicCaching() {
-<a class="jxr_linenumber" name="L259" href="#L259">259</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L260" href="#L260">260</a> 			.cacheMode(WEAK)
-<a class="jxr_linenumber" name="L261" href="#L261">261</a> 			.build();
-<a class="jxr_linenumber" name="L262" href="#L262">262</a> 		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
-<a class="jxr_linenumber" name="L263" href="#L263">263</a> 
-<a class="jxr_linenumber" name="L264" href="#L264">264</a> 		<em class="jxr_comment">// First call - cache miss</em>
-<a class="jxr_linenumber" name="L265" href="#L265">265</a> 		<strong class="jxr_keyword">var</strong> result1 = cache.get(<span class="jxr_string">"key1"</span>, () -&gt; {
-<a class="jxr_linenumber" name="L266" href="#L266">266</a> 			callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L267" href="#L267">267</a> 			<strong class="jxr_keyword">return</strong> <span class="jxr_string">"value1"</span>;
-<a class="jxr_linenumber" name="L268" href="#L268">268</a> 		});
-<a class="jxr_linenumber" name="L269" href="#L269">269</a> 
-<a class="jxr_linenumber" name="L270" href="#L270">270</a> 		<em class="jxr_comment">// Second call - cache hit</em>
-<a class="jxr_linenumber" name="L271" href="#L271">271</a> 		<strong class="jxr_keyword">var</strong> result2 = cache.get(<span class="jxr_string">"key1"</span>, () -&gt; {
-<a class="jxr_linenumber" name="L272" href="#L272">272</a> 			callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L273" href="#L273">273</a> 			<strong class="jxr_keyword">return</strong> <span class="jxr_string">"should not be called"</span>;
-<a class="jxr_linenumber" name="L274" href="#L274">274</a> 		});
-<a class="jxr_linenumber" name="L275" href="#L275">275</a> 
-<a class="jxr_linenumber" name="L276" href="#L276">276</a> 		assertEquals(<span class="jxr_string">"value1"</span>, result1);
-<a class="jxr_linenumber" name="L277" href="#L277">277</a> 		assertEquals(<span class="jxr_string">"value1"</span>, result2);
-<a class="jxr_linenumber" name="L278" href="#L278">278</a> 		assertSame(result1, result2);
-<a class="jxr_linenumber" name="L279" href="#L279">279</a> 		assertEquals(1, callCount.get()); <em class="jxr_comment">// Supplier only called once</em>
-<a class="jxr_linenumber" name="L280" href="#L280">280</a> 		assertSize(1, cache);
-<a class="jxr_linenumber" name="L281" href="#L281">281</a> 		assertEquals(1, cache.getCacheHits());
-<a class="jxr_linenumber" name="L282" href="#L282">282</a> 	}
-<a class="jxr_linenumber" name="L283" href="#L283">283</a> 
-<a class="jxr_linenumber" name="L284" href="#L284">284</a> 	@Test <strong class="jxr_keyword">void</strong> a14_weakMode_multipleKeys() {
-<a class="jxr_linenumber" name="L285" href="#L285">285</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L286" href="#L286">286</a> 			.cacheMode(WEAK)
-<a class="jxr_linenumber" name="L287" href="#L287">287</a> 			.build();
-<a class="jxr_linenumber" name="L288" href="#L288">288</a> 
-<a class="jxr_linenumber" name="L289" href="#L289">289</a> 		cache.get(<span class="jxr_string">"one"</span>, () -&gt; 1);
-<a class="jxr_linenumber" name="L290" href="#L290">290</a> 		cache.get(<span class="jxr_string">"two"</span>, () -&gt; 2);
-<a class="jxr_linenumber" name="L291" href="#L291">291</a> 		cache.get(<span class="jxr_string">"three"</span>, () -&gt; 3);
-<a class="jxr_linenumber" name="L292" href="#L292">292</a> 
-<a class="jxr_linenumber" name="L293" href="#L293">293</a> 		assertSize(3, cache);
-<a class="jxr_linenumber" name="L294" href="#L294">294</a> 		assertEquals(0, cache.getCacheHits());
-<a class="jxr_linenumber" name="L295" href="#L295">295</a> 
-<a class="jxr_linenumber" name="L296" href="#L296">296</a> 		<em class="jxr_comment">// Verify all cached</em>
-<a class="jxr_linenumber" name="L297" href="#L297">297</a> 		assertEquals(1, cache.get(<span class="jxr_string">"one"</span>, () -&gt; 999));
-<a class="jxr_linenumber" name="L298" href="#L298">298</a> 		assertEquals(2, cache.get(<span class="jxr_string">"two"</span>, () -&gt; 999));
-<a class="jxr_linenumber" name="L299" href="#L299">299</a> 		assertEquals(3, cache.get(<span class="jxr_string">"three"</span>, () -&gt; 999));
-<a class="jxr_linenumber" name="L300" href="#L300">300</a> 		assertEquals(3, cache.getCacheHits());
-<a class="jxr_linenumber" name="L301" href="#L301">301</a> 	}
-<a class="jxr_linenumber" name="L302" href="#L302">302</a> 
-<a class="jxr_linenumber" name="L303" href="#L303">303</a> 	@Test <strong class="jxr_keyword">void</strong> a15_weakMode_clear() {
-<a class="jxr_linenumber" name="L304" href="#L304">304</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L305" href="#L305">305</a> 			.cacheMode(WEAK)
-<a class="jxr_linenumber" name="L306" href="#L306">306</a> 			.build();
-<a class="jxr_linenumber" name="L307" href="#L307">307</a> 
-<a class="jxr_linenumber" name="L308" href="#L308">308</a> 		cache.get(<span class="jxr_string">"one"</span>, () -&gt; 1);
-<a class="jxr_linenumber" name="L309" href="#L309">309</a> 		cache.get(<span class="jxr_string">"two"</span>, () -&gt; 2);
-<a class="jxr_linenumber" name="L310" href="#L310">310</a> 		assertSize(2, cache);
-<a class="jxr_linenumber" name="L311" href="#L311">311</a> 
-<a class="jxr_linenumber" name="L312" href="#L312">312</a> 		cache.clear();
-<a class="jxr_linenumber" name="L313" href="#L313">313</a> 		assertEmpty(cache);
-<a class="jxr_linenumber" name="L314" href="#L314">314</a> 	}
-<a class="jxr_linenumber" name="L315" href="#L315">315</a> 
-<a class="jxr_linenumber" name="L316" href="#L316">316</a> 	@Test <strong class="jxr_keyword">void</strong> a16_weakMode_maxSize() {
-<a class="jxr_linenumber" name="L317" href="#L317">317</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L318" href="#L318">318</a> 			.cacheMode(WEAK)
-<a class="jxr_linenumber" name="L319" href="#L319">319</a> 			.maxSize(3)
-<a class="jxr_linenumber" name="L320" href="#L320">320</a> 			.build();
-<a class="jxr_linenumber" name="L321" href="#L321">321</a> 
-<a class="jxr_linenumber" name="L322" href="#L322">322</a> 		cache.get(<span class="jxr_string">"one"</span>, () -&gt; 1);
-<a class="jxr_linenumber" name="L323" href="#L323">323</a> 		cache.get(<span class="jxr_string">"two"</span>, () -&gt; 2);
-<a class="jxr_linenumber" name="L324" href="#L324">324</a> 		cache.get(<span class="jxr_string">"three"</span>, () -&gt; 3);
-<a class="jxr_linenumber" name="L325" href="#L325">325</a> 		assertSize(3, cache);
-<a class="jxr_linenumber" name="L326" href="#L326">326</a> 
-<a class="jxr_linenumber" name="L327" href="#L327">327</a> 		<em class="jxr_comment">// 4th item doesn't trigger eviction yet</em>
-<a class="jxr_linenumber" name="L328" href="#L328">328</a> 		cache.get(<span class="jxr_string">"four"</span>, () -&gt; 4);
-<a class="jxr_linenumber" name="L329" href="#L329">329</a> 		assertSize(4, cache);
-<a class="jxr_linenumber" name="L330" href="#L330">330</a> 
-<a class="jxr_linenumber" name="L331" href="#L331">331</a> 		<em class="jxr_comment">// 5th item triggers eviction</em>
-<a class="jxr_linenumber" name="L332" href="#L332">332</a> 		cache.get(<span class="jxr_string">"five"</span>, () -&gt; 5);
-<a class="jxr_linenumber" name="L333" href="#L333">333</a> 		assertSize(1, cache);
-<a class="jxr_linenumber" name="L334" href="#L334">334</a> 	}
-<a class="jxr_linenumber" name="L335" href="#L335">335</a> 
-<a class="jxr_linenumber" name="L336" href="#L336">336</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L337" href="#L337">337</a> 	<em class="jxr_comment">// Builder configuration</em>
-<a class="jxr_linenumber" name="L338" href="#L338">338</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L339" href="#L339">339</a> 
-<a class="jxr_linenumber" name="L340" href="#L340">340</a> 	@Test <strong class="jxr_keyword">void</strong> a17_builder_defaults() {
-<a class="jxr_linenumber" name="L341" href="#L341">341</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L342" href="#L342">342</a> 
-<a class="jxr_linenumber" name="L343" href="#L343">343</a> 		<em class="jxr_comment">// Should work with defaults</em>
-<a class="jxr_linenumber" name="L344" href="#L344">344</a> 		cache.get(<span class="jxr_string">"key1"</span>, () -&gt; <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L345" href="#L345">345</a> 		assertSize(1, cache);
-<a class="jxr_linenumber" name="L346" href="#L346">346</a> 	}
-<a class="jxr_linenumber" name="L347" href="#L347">347</a> 
-<a class="jxr_linenumber" name="L348" href="#L348">348</a> 	@Test <strong class="jxr_keyword">void</strong> a18_builder_chaining() {
-<a class="jxr_linenumber" name="L349" href="#L349">349</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L350" href="#L350">350</a> 			.maxSize(100)
-<a class="jxr_linenumber" name="L351" href="#L351">351</a> 			.cacheMode(NONE)
-<a class="jxr_linenumber" name="L352" href="#L352">352</a> 			.build();
-<a class="jxr_linenumber" name="L353" href="#L353">353</a> 
-<a class="jxr_linenumber" name="L354" href="#L354">354</a> 		<em class="jxr_comment">// Disabled takes precedence</em>
-<a class="jxr_linenumber" name="L355" href="#L355">355</a> 		cache.get(<span class="jxr_string">"key1"</span>, () -&gt; <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L356" href="#L356">356</a> 		assertEmpty(cache);
-<a class="jxr_linenumber" name="L357" href="#L357">357</a> 	}
-<a class="jxr_linenumber" name="L358" href="#L358">358</a> 
-<a class="jxr_linenumber" name="L359" href="#L359">359</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L360" href="#L360">360</a> 	<em class="jxr_comment">// Cache hits statistics</em>
-<a class="jxr_linenumber" name="L361" href="#L361">361</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L362" href="#L362">362</a> 
-<a class="jxr_linenumber" name="L363" href="#L363">363</a> 	@Test <strong class="jxr_keyword">void</strong> a19_cacheHits_countsCorrectly() {
-<a class="jxr_linenumber" name="L364" href="#L364">364</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L365" href="#L365">365</a> 
-<a class="jxr_linenumber" name="L366" href="#L366">366</a> 		assertEquals(0, cache.getCacheHits());
-<a class="jxr_linenumber" name="L367" href="#L367">367</a> 
-<a class="jxr_linenumber" name="L368" href="#L368">368</a> 		cache.get(<span class="jxr_string">"one"</span>, () -&gt; 1); <em class="jxr_comment">// Miss</em>
-<a class="jxr_linenumber" name="L369" href="#L369">369</a> 		assertEquals(0, cache.getCacheHits());
-<a class="jxr_linenumber" name="L370" href="#L370">370</a> 
-<a class="jxr_linenumber" name="L371" href="#L371">371</a> 		cache.get(<span class="jxr_string">"one"</span>, () -&gt; 999); <em class="jxr_comment">// Hit</em>
-<a class="jxr_linenumber" name="L372" href="#L372">372</a> 		assertEquals(1, cache.getCacheHits());
-<a class="jxr_linenumber" name="L373" href="#L373">373</a> 
-<a class="jxr_linenumber" name="L374" href="#L374">374</a> 		cache.get(<span class="jxr_string">"two"</span>, () -&gt; 2); <em class="jxr_comment">// Miss</em>
-<a class="jxr_linenumber" name="L375" href="#L375">375</a> 		assertEquals(1, cache.getCacheHits());
-<a class="jxr_linenumber" name="L376" href="#L376">376</a> 
-<a class="jxr_linenumber" name="L377" href="#L377">377</a> 		cache.get(<span class="jxr_string">"one"</span>, () -&gt; 999); <em class="jxr_comment">// Hit</em>
-<a class="jxr_linenumber" name="L378" href="#L378">378</a> 		cache.get(<span class="jxr_string">"two"</span>, () -&gt; 999); <em class="jxr_comment">// Hit</em>
-<a class="jxr_linenumber" name="L379" href="#L379">379</a> 		assertEquals(3, cache.getCacheHits());
-<a class="jxr_linenumber" name="L380" href="#L380">380</a> 	}
-<a class="jxr_linenumber" name="L381" href="#L381">381</a> 
-<a class="jxr_linenumber" name="L382" href="#L382">382</a> 	@Test <strong class="jxr_keyword">void</strong> a20_cacheHits_persistsAfterClear() {
-<a class="jxr_linenumber" name="L383" href="#L383">383</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L384" href="#L384">384</a> 
-<a class="jxr_linenumber" name="L385" href="#L385">385</a> 		cache.get(<span class="jxr_string">"one"</span>, () -&gt; 1);
-<a class="jxr_linenumber" name="L386" href="#L386">386</a> 		cache.get(<span class="jxr_string">"one"</span>, () -&gt; 999); <em class="jxr_comment">// Hit</em>
-<a class="jxr_linenumber" name="L387" href="#L387">387</a> 		assertEquals(1, cache.getCacheHits());
-<a class="jxr_linenumber" name="L388" href="#L388">388</a> 
-<a class="jxr_linenumber" name="L389" href="#L389">389</a> 		cache.clear();
-<a class="jxr_linenumber" name="L390" href="#L390">390</a> 		assertEquals(1, cache.getCacheHits()); <em class="jxr_comment">// Still 1</em>
-<a class="jxr_linenumber" name="L391" href="#L391">391</a> 
-<a class="jxr_linenumber" name="L392" href="#L392">392</a> 		cache.get(<span class="jxr_string">"one"</span>, () -&gt; 1); <em class="jxr_comment">// Miss (recomputed)</em>
-<a class="jxr_linenumber" name="L393" href="#L393">393</a> 		cache.get(<span class="jxr_string">"one"</span>, () -&gt; 999); <em class="jxr_comment">// Hit</em>
-<a class="jxr_linenumber" name="L394" href="#L394">394</a> 		assertEquals(2, cache.getCacheHits()); <em class="jxr_comment">// Incremented</em>
-<a class="jxr_linenumber" name="L395" href="#L395">395</a> 	}
-<a class="jxr_linenumber" name="L396" href="#L396">396</a> 
-<a class="jxr_linenumber" name="L397" href="#L397">397</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L398" href="#L398">398</a> 	<em class="jxr_comment">// Thread safety and concurrency</em>
-<a class="jxr_linenumber" name="L399" href="#L399">399</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L400" href="#L400">400</a> 
-<a class="jxr_linenumber" name="L401" href="#L401">401</a> 	@Test <strong class="jxr_keyword">void</strong> a21_concurrentAccess() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="L402" href="#L402">402</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L403" href="#L403">403</a> 		<strong class="jxr_keyword">var</strong> executor = Executors.newFixedThreadPool(10);
-<a class="jxr_linenumber" name="L404" href="#L404">404</a> 		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
-<a class="jxr_linenumber" name="L405" href="#L405">405</a> 
-<a class="jxr_linenumber" name="L406" href="#L406">406</a> 		<em class="jxr_comment">// Submit 100 tasks that all try to cache the same key</em>
-<a class="jxr_linenumber" name="L407" href="#L407">407</a> 		<strong class="jxr_keyword">var</strong> futures = <strong class="jxr_keyword">new</strong> CompletableFuture[100];
-<a class="jxr_linenumber" name="L408" href="#L408">408</a> 		<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> i = 0; i &lt; 100; i++) {
-<a class="jxr_linenumber" name="L409" href="#L409">409</a> 			futures[i] = CompletableFuture.runAsync(() -&gt; {
-<a class="jxr_linenumber" name="L410" href="#L410">410</a> 				cache.get(1, () -&gt; {
-<a class="jxr_linenumber" name="L411" href="#L411">411</a> 					callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L412" href="#L412">412</a> 					<strong class="jxr_keyword">return</strong> <span class="jxr_string">"value"</span>;
-<a class="jxr_linenumber" name="L413" href="#L413">413</a> 				});
-<a class="jxr_linenumber" name="L414" href="#L414">414</a> 			}, executor);
-<a class="jxr_linenumber" name="L415" href="#L415">415</a> 		}
-<a class="jxr_linenumber" name="L416" href="#L416">416</a> 
-<a class="jxr_linenumber" name="L417" href="#L417">417</a> 		<em class="jxr_comment">// Wait for all tasks to complete</em>
-<a class="jxr_linenumber" name="L418" href="#L418">418</a> 		CompletableFuture.allOf(futures).get(5, TimeUnit.SECONDS);
-<a class="jxr_linenumber" name="L419" href="#L419">419</a> 
-<a class="jxr_linenumber" name="L420" href="#L420">420</a> 		<em class="jxr_comment">// Supplier might be called multiple times due to putIfAbsent semantics,</em>
-<a class="jxr_linenumber" name="L421" href="#L421">421</a> 		<em class="jxr_comment">// but should be much less than 100</em>
-<a class="jxr_linenumber" name="L422" href="#L422">422</a> 		assertTrue(callCount.get() &lt; 10, <span class="jxr_string">"Supplier called "</span> + callCount.get() + <span class="jxr_string">" times"</span>);
-<a class="jxr_linenumber" name="L423" href="#L423">423</a> 		assertSize(1, cache);
-<a class="jxr_linenumber" name="L424" href="#L424">424</a> 
-<a class="jxr_linenumber" name="L425" href="#L425">425</a> 		executor.shutdown();
-<a class="jxr_linenumber" name="L426" href="#L426">426</a> 	}
-<a class="jxr_linenumber" name="L427" href="#L427">427</a> 
-<a class="jxr_linenumber" name="L428" href="#L428">428</a> 	@Test <strong class="jxr_keyword">void</strong> a22_concurrentDifferentKeys() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="L429" href="#L429">429</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L430" href="#L430">430</a> 		<strong class="jxr_keyword">var</strong> executor = Executors.newFixedThreadPool(10);
-<a class="jxr_linenumber" name="L431" href="#L431">431</a> 
-<a class="jxr_linenumber" name="L432" href="#L432">432</a> 		<em class="jxr_comment">// Submit tasks for different keys</em>
-<a class="jxr_linenumber" name="L433" href="#L433">433</a> 		<strong class="jxr_keyword">var</strong> futures = <strong class="jxr_keyword">new</strong> CompletableFuture[10];
-<a class="jxr_linenumber" name="L434" href="#L434">434</a> 		<strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">var</strong> i = 0; i &lt; 10; i++) {
-<a class="jxr_linenumber" name="L435" href="#L435">435</a> 			<strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> key = i;
-<a class="jxr_linenumber" name="L436" href="#L436">436</a> 			futures[i] = CompletableFuture.runAsync(() -&gt; {
-<a class="jxr_linenumber" name="L437" href="#L437">437</a> 				cache.get(key, () -&gt; <span class="jxr_string">"value"</span> + key);
-<a class="jxr_linenumber" name="L438" href="#L438">438</a> 			}, executor);
-<a class="jxr_linenumber" name="L439" href="#L439">439</a> 		}
-<a class="jxr_linenumber" name="L440" href="#L440">440</a> 
-<a class="jxr_linenumber" name="L441" href="#L441">441</a> 		<em class="jxr_comment">// Wait for all tasks to complete</em>
-<a class="jxr_linenumber" name="L442" href="#L442">442</a> 		CompletableFuture.allOf(futures).get(5, TimeUnit.SECONDS);
-<a class="jxr_linenumber" name="L443" href="#L443">443</a> 
-<a class="jxr_linenumber" name="L444" href="#L444">444</a> 		assertSize(10, cache);
-<a class="jxr_linenumber" name="L445" href="#L445">445</a> 
-<a class="jxr_linenumber" name="L446" href="#L446">446</a> 		executor.shutdown();
-<a class="jxr_linenumber" name="L447" href="#L447">447</a> 	}
-<a class="jxr_linenumber" name="L448" href="#L448">448</a> 
-<a class="jxr_linenumber" name="L449" href="#L449">449</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L450" href="#L450">450</a> 	<em class="jxr_comment">// Different key/value types</em>
-<a class="jxr_linenumber" name="L451" href="#L451">451</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L452" href="#L452">452</a> 
-<a class="jxr_linenumber" name="L453" href="#L453">453</a> 	@Test <strong class="jxr_keyword">void</strong> a23_integerKeys() {
-<a class="jxr_linenumber" name="L454" href="#L454">454</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L455" href="#L455">455</a> 
-<a class="jxr_linenumber" name="L456" href="#L456">456</a> 		cache.get(1, () -&gt; <span class="jxr_string">"one"</span>);
-<a class="jxr_linenumber" name="L457" href="#L457">457</a> 		cache.get(2, () -&gt; <span class="jxr_string">"two"</span>);
-<a class="jxr_linenumber" name="L458" href="#L458">458</a> 
-<a class="jxr_linenumber" name="L459" href="#L459">459</a> 		assertEquals(<span class="jxr_string">"one"</span>, cache.get(1, () -&gt; <span class="jxr_string">"should not call"</span>));
-<a class="jxr_linenumber" name="L460" href="#L460">460</a> 		assertSize(2, cache);
-<a class="jxr_linenumber" name="L461" href="#L461">461</a> 		assertEquals(1, cache.getCacheHits());
-<a class="jxr_linenumber" name="L462" href="#L462">462</a> 	}
-<a class="jxr_linenumber" name="L463" href="#L463">463</a> 
-<a class="jxr_linenumber" name="L464" href="#L464">464</a> 	@Test <strong class="jxr_keyword">void</strong> a24_classKeys() {
-<a class="jxr_linenumber" name="L465" href="#L465">465</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(Class.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L466" href="#L466">466</a> 
-<a class="jxr_linenumber" name="L467" href="#L467">467</a> 		cache.get(String.<strong class="jxr_keyword">class</strong>, () -&gt; <span class="jxr_string">"String"</span>);
-<a class="jxr_linenumber" name="L468" href="#L468">468</a> 		cache.get(Integer.<strong class="jxr_keyword">class</strong>, () -&gt; <span class="jxr_string">"Integer"</span>);
-<a class="jxr_linenumber" name="L469" href="#L469">469</a> 
-<a class="jxr_linenumber" name="L470" href="#L470">470</a> 		assertEquals(<span class="jxr_string">"String"</span>, cache.get(String.<strong class="jxr_keyword">class</strong>, () -&gt; <span class="jxr_string">"should not call"</span>));
-<a class="jxr_linenumber" name="L471" href="#L471">471</a> 		assertSize(2, cache);
-<a class="jxr_linenumber" name="L472" href="#L472">472</a> 	}
-<a class="jxr_linenumber" name="L473" href="#L473">473</a> 
-<a class="jxr_linenumber" name="L474" href="#L474">474</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L475" href="#L475">475</a> 	<em class="jxr_comment">// Edge cases</em>
-<a class="jxr_linenumber" name="L476" href="#L476">476</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L477" href="#L477">477</a> 
-<a class="jxr_linenumber" name="L478" href="#L478">478</a> 	@Test <strong class="jxr_keyword">void</strong> a25_sameKeyDifferentValues_returnsFirstCached() {
-<a class="jxr_linenumber" name="L479" href="#L479">479</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L480" href="#L480">480</a> 
-<a class="jxr_linenumber" name="L481" href="#L481">481</a> 		<strong class="jxr_keyword">var</strong> result1 = cache.get(<span class="jxr_string">"key"</span>, () -&gt; <span class="jxr_string">"first"</span>);
-<a class="jxr_linenumber" name="L482" href="#L482">482</a> 		<strong class="jxr_keyword">var</strong> result2 = cache.get(<span class="jxr_string">"key"</span>, () -&gt; <span class="jxr_string">"second"</span>);
-<a class="jxr_linenumber" name="L483" href="#L483">483</a> 
-<a class="jxr_linenumber" name="L484" href="#L484">484</a> 		assertEquals(<span class="jxr_string">"first"</span>, result1);
-<a class="jxr_linenumber" name="L485" href="#L485">485</a> 		assertEquals(<span class="jxr_string">"first"</span>, result2); <em class="jxr_comment">// Returns cached, not "second"</em>
-<a class="jxr_linenumber" name="L486" href="#L486">486</a> 		assertSize(1, cache);
-<a class="jxr_linenumber" name="L487" href="#L487">487</a> 	}
-<a class="jxr_linenumber" name="L488" href="#L488">488</a> 
-<a class="jxr_linenumber" name="L489" href="#L489">489</a> 	@Test <strong class="jxr_keyword">void</strong> a26_emptyCache_operations() {
-<a class="jxr_linenumber" name="L490" href="#L490">490</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L491" href="#L491">491</a> 
-<a class="jxr_linenumber" name="L492" href="#L492">492</a> 		assertEmpty(cache);
-<a class="jxr_linenumber" name="L493" href="#L493">493</a> 		assertEquals(0, cache.getCacheHits());
-<a class="jxr_linenumber" name="L494" href="#L494">494</a> 		cache.clear(); <em class="jxr_comment">// Should not throw on empty cache</em>
-<a class="jxr_linenumber" name="L495" href="#L495">495</a> 		assertEmpty(cache);
-<a class="jxr_linenumber" name="L496" href="#L496">496</a> 	}
-<a class="jxr_linenumber" name="L497" href="#L497">497</a> 
-<a class="jxr_linenumber" name="L498" href="#L498">498</a> 	@Test <strong class="jxr_keyword">void</strong> a27_maxSize_exactBoundary() {
-<a class="jxr_linenumber" name="L499" href="#L499">499</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(Integer.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L500" href="#L500">500</a> 			.maxSize(3)
-<a class="jxr_linenumber" name="L501" href="#L501">501</a> 			.build();
-<a class="jxr_linenumber" name="L502" href="#L502">502</a> 
-<a class="jxr_linenumber" name="L503" href="#L503">503</a> 		cache.get(1, () -&gt; <span class="jxr_string">"one"</span>);
-<a class="jxr_linenumber" name="L504" href="#L504">504</a> 		cache.get(2, () -&gt; <span class="jxr_string">"two"</span>);
-<a class="jxr_linenumber" name="L505" href="#L505">505</a> 		cache.get(3, () -&gt; <span class="jxr_string">"three"</span>);
-<a class="jxr_linenumber" name="L506" href="#L506">506</a> 
-<a class="jxr_linenumber" name="L507" href="#L507">507</a> 		assertSize(3, cache);
-<a class="jxr_linenumber" name="L508" href="#L508">508</a> 
-<a class="jxr_linenumber" name="L509" href="#L509">509</a> 		<em class="jxr_comment">// Accessing existing keys shouldn't trigger eviction</em>
-<a class="jxr_linenumber" name="L510" href="#L510">510</a> 		cache.get(1, () -&gt; <span class="jxr_string">"should not call"</span>);
-<a class="jxr_linenumber" name="L511" href="#L511">511</a> 		cache.get(2, () -&gt; <span class="jxr_string">"should not call"</span>);
-<a class="jxr_linenumber" name="L512" href="#L512">512</a> 		assertSize(3, cache);
-<a class="jxr_linenumber" name="L513" href="#L513">513</a> 		assertEquals(2, cache.getCacheHits());
-<a class="jxr_linenumber" name="L514" href="#L514">514</a> 	}
-<a class="jxr_linenumber" name="L515" href="#L515">515</a> 
-<a class="jxr_linenumber" name="L516" href="#L516">516</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L517" href="#L517">517</a> 	<em class="jxr_comment">// logOnExit configuration</em>
-<a class="jxr_linenumber" name="L518" href="#L518">518</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L519" href="#L519">519</a> 
-<a class="jxr_linenumber" name="L520" href="#L520">520</a> 	@Test <strong class="jxr_keyword">void</strong> a28_logOnExit_withStringId() {
-<a class="jxr_linenumber" name="L521" href="#L521">521</a> 		<em class="jxr_comment">// Test that logOnExit(String) enables logging and sets the id</em>
-<a class="jxr_linenumber" name="L522" href="#L522">522</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L523" href="#L523">523</a> 			.logOnExit(<span class="jxr_string">"TestCache"</span>)
-<a class="jxr_linenumber" name="L524" href="#L524">524</a> 			.build();
-<a class="jxr_linenumber" name="L525" href="#L525">525</a> 
-<a class="jxr_linenumber" name="L526" href="#L526">526</a> 		<em class="jxr_comment">// Use the cache to generate some statistics</em>
-<a class="jxr_linenumber" name="L527" href="#L527">527</a> 		cache.get(<span class="jxr_string">"key1"</span>, () -&gt; <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L528" href="#L528">528</a> 		cache.get(<span class="jxr_string">"key1"</span>, () -&gt; <span class="jxr_string">"should not be called"</span>); <em class="jxr_comment">// Cache hit</em>
-<a class="jxr_linenumber" name="L529" href="#L529">529</a> 		cache.get(<span class="jxr_string">"key2"</span>, () -&gt; <span class="jxr_string">"value2"</span>);
-<a class="jxr_linenumber" name="L530" href="#L530">530</a> 
-<a class="jxr_linenumber" name="L531" href="#L531">531</a> 		<em class="jxr_comment">// Verify cache works normally</em>
-<a class="jxr_linenumber" name="L532" href="#L532">532</a> 		assertSize(2, cache);
-<a class="jxr_linenumber" name="L533" href="#L533">533</a> 		assertEquals(1, cache.getCacheHits());
-<a class="jxr_linenumber" name="L534" href="#L534">534</a> 
-<a class="jxr_linenumber" name="L535" href="#L535">535</a> 		<em class="jxr_comment">// Note: We can't easily test that the shutdown hook was actually registered</em>
-<a class="jxr_linenumber" name="L536" href="#L536">536</a> 		<em class="jxr_comment">// without triggering JVM shutdown, but we can verify the cache was created</em>
-<a class="jxr_linenumber" name="L537" href="#L537">537</a> 		<em class="jxr_comment">// and works correctly with logOnExit enabled</em>
-<a class="jxr_linenumber" name="L538" href="#L538">538</a> 	}
-<a class="jxr_linenumber" name="L539" href="#L539">539</a> 
-<a class="jxr_linenumber" name="L540" href="#L540">540</a> 	@Test <strong class="jxr_keyword">void</strong> a29_logOnExit_withBooleanTrue() {
-<a class="jxr_linenumber" name="L541" href="#L541">541</a> 		<em class="jxr_comment">// Test that logOnExit(boolean, String) with true enables logging</em>
-<a class="jxr_linenumber" name="L542" href="#L542">542</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L543" href="#L543">543</a> 			.logOnExit(<strong class="jxr_keyword">true</strong>, <span class="jxr_string">"MyCache"</span>)
-<a class="jxr_linenumber" name="L544" href="#L544">544</a> 			.build();
-<a class="jxr_linenumber" name="L545" href="#L545">545</a> 
-<a class="jxr_linenumber" name="L546" href="#L546">546</a> 		cache.get(<span class="jxr_string">"one"</span>, () -&gt; 1);
-<a class="jxr_linenumber" name="L547" href="#L547">547</a> 		cache.get(<span class="jxr_string">"one"</span>, () -&gt; 999); <em class="jxr_comment">// Cache hit</em>
-<a class="jxr_linenumber" name="L548" href="#L548">548</a> 
-<a class="jxr_linenumber" name="L549" href="#L549">549</a> 		assertSize(1, cache);
-<a class="jxr_linenumber" name="L550" href="#L550">550</a> 		assertEquals(1, cache.getCacheHits());
-<a class="jxr_linenumber" name="L551" href="#L551">551</a> 	}
-<a class="jxr_linenumber" name="L552" href="#L552">552</a> 
-<a class="jxr_linenumber" name="L553" href="#L553">553</a> 	@Test <strong class="jxr_keyword">void</strong> a30_logOnExit_withBooleanFalse() {
-<a class="jxr_linenumber" name="L554" href="#L554">554</a> 		<em class="jxr_comment">// Test that logOnExit(boolean, String) with false disables logging</em>
-<a class="jxr_linenumber" name="L555" href="#L555">555</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L556" href="#L556">556</a> 			.logOnExit(false, <span class="jxr_string">"DisabledCache"</span>)
-<a class="jxr_linenumber" name="L557" href="#L557">557</a> 			.build();
-<a class="jxr_linenumber" name="L558" href="#L558">558</a> 
-<a class="jxr_linenumber" name="L559" href="#L559">559</a> 		cache.get(<span class="jxr_string">"one"</span>, () -&gt; 1);
-<a class="jxr_linenumber" name="L560" href="#L560">560</a> 		cache.get(<span class="jxr_string">"two"</span>, () -&gt; 2);
-<a class="jxr_linenumber" name="L561" href="#L561">561</a> 
-<a class="jxr_linenumber" name="L562" href="#L562">562</a> 		assertSize(2, cache);
-<a class="jxr_linenumber" name="L563" href="#L563">563</a> 		assertEquals(0, cache.getCacheHits());
-<a class="jxr_linenumber" name="L564" href="#L564">564</a> 	}
-<a class="jxr_linenumber" name="L565" href="#L565">565</a> 
-<a class="jxr_linenumber" name="L566" href="#L566">566</a> 	@Test <strong class="jxr_keyword">void</strong> a31_logOnExit_chaining() {
-<a class="jxr_linenumber" name="L567" href="#L567">567</a> 		<em class="jxr_comment">// Test that logOnExit can be chained with other builder methods</em>
-<a class="jxr_linenumber" name="L568" href="#L568">568</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L569" href="#L569">569</a> 			.maxSize(100)
-<a class="jxr_linenumber" name="L570" href="#L570">570</a> 			.logOnExit(<span class="jxr_string">"ChainedCache"</span>)
-<a class="jxr_linenumber" name="L571" href="#L571">571</a> 			.supplier(k -&gt; <span class="jxr_string">"value-"</span> + k)
-<a class="jxr_linenumber" name="L572" href="#L572">572</a> 			.build();
-<a class="jxr_linenumber" name="L573" href="#L573">573</a> 
-<a class="jxr_linenumber" name="L574" href="#L574">574</a> 		<strong class="jxr_keyword">var</strong> result = cache.get(<span class="jxr_string">"test"</span>);
-<a class="jxr_linenumber" name="L575" href="#L575">575</a> 		assertEquals(<span class="jxr_string">"value-test"</span>, result);
-<a class="jxr_linenumber" name="L576" href="#L576">576</a> 		assertSize(1, cache);
-<a class="jxr_linenumber" name="L577" href="#L577">577</a> 	}
-<a class="jxr_linenumber" name="L578" href="#L578">578</a> 
-<a class="jxr_linenumber" name="L579" href="#L579">579</a> 	@Test <strong class="jxr_keyword">void</strong> a32_logOnExit_multipleCalls_lastWins() {
-<a class="jxr_linenumber" name="L580" href="#L580">580</a> 		<em class="jxr_comment">// Test that calling logOnExit multiple times updates the id</em>
-<a class="jxr_linenumber" name="L581" href="#L581">581</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L582" href="#L582">582</a> 			.logOnExit(<span class="jxr_string">"FirstId"</span>)
-<a class="jxr_linenumber" name="L583" href="#L583">583</a> 			.logOnExit(<span class="jxr_string">"SecondId"</span>)
-<a class="jxr_linenumber" name="L584" href="#L584">584</a> 			.logOnExit(<strong class="jxr_keyword">true</strong>, <span class="jxr_string">"FinalId"</span>)
-<a class="jxr_linenumber" name="L585" href="#L585">585</a> 			.build();
-<a class="jxr_linenumber" name="L586" href="#L586">586</a> 
-<a class="jxr_linenumber" name="L587" href="#L587">587</a> 		cache.get(<span class="jxr_string">"key"</span>, () -&gt; <span class="jxr_string">"value"</span>);
-<a class="jxr_linenumber" name="L588" href="#L588">588</a> 		assertSize(1, cache);
-<a class="jxr_linenumber" name="L589" href="#L589">589</a> 		<em class="jxr_comment">// The final id should be "FinalId" (though we can't easily verify this without</em>
-<a class="jxr_linenumber" name="L590" href="#L590">590</a> 		<em class="jxr_comment">// checking the shutdown hook, the cache should still work correctly)</em>
-<a class="jxr_linenumber" name="L591" href="#L591">591</a> 	}
-<a class="jxr_linenumber" name="L592" href="#L592">592</a> 
-<a class="jxr_linenumber" name="L593" href="#L593">593</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L594" href="#L594">594</a> 	<em class="jxr_comment">// put() method</em>
-<a class="jxr_linenumber" name="L595" href="#L595">595</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L596" href="#L596">596</a> 
-<a class="jxr_linenumber" name="L597" href="#L597">597</a> 	@Test <strong class="jxr_keyword">void</strong> a33_put_directInsertion() {
-<a class="jxr_linenumber" name="L598" href="#L598">598</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L599" href="#L599">599</a> 
-<a class="jxr_linenumber" name="L600" href="#L600">600</a> 		<em class="jxr_comment">// Put a value directly</em>
-<a class="jxr_linenumber" name="L601" href="#L601">601</a> 		<strong class="jxr_keyword">var</strong> previous = cache.put(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L602" href="#L602">602</a> 		assertNull(previous, <span class="jxr_string">"Should return null for new key"</span>);
-<a class="jxr_linenumber" name="L603" href="#L603">603</a> 		assertEquals(<span class="jxr_string">"value1"</span>, cache.get(<span class="jxr_string">"key1"</span>, () -&gt; <span class="jxr_string">"should not be called"</span>));
-<a class="jxr_linenumber" name="L604" href="#L604">604</a> 		assertSize(1, cache);
-<a class="jxr_linenumber" name="L605" href="#L605">605</a> 	}
-<a class="jxr_linenumber" name="L606" href="#L606">606</a> 
-<a class="jxr_linenumber" name="L607" href="#L607">607</a> 	@Test <strong class="jxr_keyword">void</strong> a34_put_overwritesExisting() {
-<a class="jxr_linenumber" name="L608" href="#L608">608</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L609" href="#L609">609</a> 
-<a class="jxr_linenumber" name="L610" href="#L610">610</a> 		cache.put(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L611" href="#L611">611</a> 		<strong class="jxr_keyword">var</strong> previous = cache.put(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value2"</span>);
-<a class="jxr_linenumber" name="L612" href="#L612">612</a> 		assertEquals(<span class="jxr_string">"value1"</span>, previous, <span class="jxr_string">"Should return previous value"</span>);
-<a class="jxr_linenumber" name="L613" href="#L613">613</a> 		assertEquals(<span class="jxr_string">"value2"</span>, cache.get(<span class="jxr_string">"key1"</span>, () -&gt; <span class="jxr_string">"should not be called"</span>));
-<a class="jxr_linenumber" name="L614" href="#L614">614</a> 		assertSize(1, cache);
-<a class="jxr_linenumber" name="L615" href="#L615">615</a> 	}
-<a class="jxr_linenumber" name="L616" href="#L616">616</a> 
-<a class="jxr_linenumber" name="L617" href="#L617">617</a> 	@Test <strong class="jxr_keyword">void</strong> a35_put_withNullValue() {
-<a class="jxr_linenumber" name="L618" href="#L618">618</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L619" href="#L619">619</a> 
-<a class="jxr_linenumber" name="L620" href="#L620">620</a> 		cache.put(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L621" href="#L621">621</a> 		<strong class="jxr_keyword">var</strong> previous = cache.put(<span class="jxr_string">"key1"</span>, <strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="L622" href="#L622">622</a> 		assertEquals(<span class="jxr_string">"value1"</span>, previous);
-<a class="jxr_linenumber" name="L623" href="#L623">623</a> 		<em class="jxr_comment">// Null values are not cached, so key should be removed</em>
-<a class="jxr_linenumber" name="L624" href="#L624">624</a> 		assertFalse(cache.containsKey(<span class="jxr_string">"key1"</span>), <span class="jxr_string">"Key should be removed when null value is put"</span>);
-<a class="jxr_linenumber" name="L625" href="#L625">625</a> 		<em class="jxr_comment">// Null values are not cached, so get() will call supplier</em>
-<a class="jxr_linenumber" name="L626" href="#L626">626</a> 		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
-<a class="jxr_linenumber" name="L627" href="#L627">627</a> 		<strong class="jxr_keyword">var</strong> result = cache.get(<span class="jxr_string">"key1"</span>, () -&gt; {
-<a class="jxr_linenumber" name="L628" href="#L628">628</a> 			callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L629" href="#L629">629</a> 			<strong class="jxr_keyword">return</strong> <span class="jxr_string">"supplied"</span>;
-<a class="jxr_linenumber" name="L630" href="#L630">630</a> 		});
-<a class="jxr_linenumber" name="L631" href="#L631">631</a> 		assertEquals(<span class="jxr_string">"supplied"</span>, result);
-<a class="jxr_linenumber" name="L632" href="#L632">632</a> 		assertEquals(1, callCount.get());
-<a class="jxr_linenumber" name="L633" href="#L633">633</a> 		<em class="jxr_comment">// After get() with non-null supplier, key is now in cache again</em>
-<a class="jxr_linenumber" name="L634" href="#L634">634</a> 		assertTrue(cache.containsKey(<span class="jxr_string">"key1"</span>), <span class="jxr_string">"Key should be in cache after get() with non-null supplier"</span>);
-<a class="jxr_linenumber" name="L635" href="#L635">635</a> 	}
-<a class="jxr_linenumber" name="L636" href="#L636">636</a> 
-<a class="jxr_linenumber" name="L637" href="#L637">637</a> 	@Test <strong class="jxr_keyword">void</strong> a35b_put_withNullValue_newKey() {
-<a class="jxr_linenumber" name="L638" href="#L638">638</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L639" href="#L639">639</a> 		<em class="jxr_comment">// Putting null for a new key should return null and not add anything</em>
-<a class="jxr_linenumber" name="L640" href="#L640">640</a> 		<strong class="jxr_keyword">var</strong> previous = cache.put(<span class="jxr_string">"key1"</span>, <strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="L641" href="#L641">641</a> 		assertNull(previous);
-<a class="jxr_linenumber" name="L642" href="#L642">642</a> 		assertFalse(cache.containsKey(<span class="jxr_string">"key1"</span>));
-<a class="jxr_linenumber" name="L643" href="#L643">643</a> 		assertTrue(cache.isEmpty());
-<a class="jxr_linenumber" name="L644" href="#L644">644</a> 	}
-<a class="jxr_linenumber" name="L645" href="#L645">645</a> 
-<a class="jxr_linenumber" name="L646" href="#L646">646</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L647" href="#L647">647</a> 	<em class="jxr_comment">// isEmpty() method</em>
-<a class="jxr_linenumber" name="L648" href="#L648">648</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L649" href="#L649">649</a> 
-<a class="jxr_linenumber" name="L650" href="#L650">650</a> 	@Test <strong class="jxr_keyword">void</strong> a36_isEmpty_newCache() {
-<a class="jxr_linenumber" name="L651" href="#L651">651</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L652" href="#L652">652</a> 		assertTrue(cache.isEmpty());
-<a class="jxr_linenumber" name="L653" href="#L653">653</a> 	}
-<a class="jxr_linenumber" name="L654" href="#L654">654</a> 
-<a class="jxr_linenumber" name="L655" href="#L655">655</a> 	@Test <strong class="jxr_keyword">void</strong> a37_isEmpty_afterPut() {
-<a class="jxr_linenumber" name="L656" href="#L656">656</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L657" href="#L657">657</a> 		cache.put(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L658" href="#L658">658</a> 		assertFalse(cache.isEmpty());
-<a class="jxr_linenumber" name="L659" href="#L659">659</a> 	}
-<a class="jxr_linenumber" name="L660" href="#L660">660</a> 
-<a class="jxr_linenumber" name="L661" href="#L661">661</a> 	@Test <strong class="jxr_keyword">void</strong> a38_isEmpty_afterGet() {
-<a class="jxr_linenumber" name="L662" href="#L662">662</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L663" href="#L663">663</a> 		cache.get(<span class="jxr_string">"key1"</span>, () -&gt; <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L664" href="#L664">664</a> 		assertFalse(cache.isEmpty());
-<a class="jxr_linenumber" name="L665" href="#L665">665</a> 	}
-<a class="jxr_linenumber" name="L666" href="#L666">666</a> 
-<a class="jxr_linenumber" name="L667" href="#L667">667</a> 	@Test <strong class="jxr_keyword">void</strong> a39_isEmpty_afterClear() {
-<a class="jxr_linenumber" name="L668" href="#L668">668</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L669" href="#L669">669</a> 		cache.put(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L670" href="#L670">670</a> 		cache.put(<span class="jxr_string">"key2"</span>, <span class="jxr_string">"value2"</span>);
-<a class="jxr_linenumber" name="L671" href="#L671">671</a> 		assertFalse(cache.isEmpty());
-<a class="jxr_linenumber" name="L672" href="#L672">672</a> 		cache.clear();
-<a class="jxr_linenumber" name="L673" href="#L673">673</a> 		assertTrue(cache.isEmpty());
-<a class="jxr_linenumber" name="L674" href="#L674">674</a> 	}
-<a class="jxr_linenumber" name="L675" href="#L675">675</a> 
-<a class="jxr_linenumber" name="L676" href="#L676">676</a> 	@Test <strong class="jxr_keyword">void</strong> a40_isEmpty_disabledCache() {
-<a class="jxr_linenumber" name="L677" href="#L677">677</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L678" href="#L678">678</a> 			.cacheMode(NONE)
-<a class="jxr_linenumber" name="L679" href="#L679">679</a> 			.build();
-<a class="jxr_linenumber" name="L680" href="#L680">680</a> 		cache.get(<span class="jxr_string">"key1"</span>, () -&gt; <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L681" href="#L681">681</a> 		assertTrue(cache.isEmpty(), <span class="jxr_string">"Disabled cache should always be empty"</span>);
-<a class="jxr_linenumber" name="L682" href="#L682">682</a> 	}
-<a class="jxr_linenumber" name="L683" href="#L683">683</a> 
-<a class="jxr_linenumber" name="L684" href="#L684">684</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L685" href="#L685">685</a> 	<em class="jxr_comment">// containsKey() method</em>
-<a class="jxr_linenumber" name="L686" href="#L686">686</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L687" href="#L687">687</a> 
-<a class="jxr_linenumber" name="L688" href="#L688">688</a> 	@Test <strong class="jxr_keyword">void</strong> a41_containsKey_notPresent() {
-<a class="jxr_linenumber" name="L689" href="#L689">689</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L690" href="#L690">690</a> 		assertFalse(cache.containsKey(<span class="jxr_string">"key1"</span>));
-<a class="jxr_linenumber" name="L691" href="#L691">691</a> 	}
-<a class="jxr_linenumber" name="L692" href="#L692">692</a> 
-<a class="jxr_linenumber" name="L693" href="#L693">693</a> 	@Test <strong class="jxr_keyword">void</strong> a42_containsKey_afterPut() {
-<a class="jxr_linenumber" name="L694" href="#L694">694</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L695" href="#L695">695</a> 		cache.put(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L696" href="#L696">696</a> 		assertTrue(cache.containsKey(<span class="jxr_string">"key1"</span>));
-<a class="jxr_linenumber" name="L697" href="#L697">697</a> 		assertFalse(cache.containsKey(<span class="jxr_string">"key2"</span>));
-<a class="jxr_linenumber" name="L698" href="#L698">698</a> 	}
-<a class="jxr_linenumber" name="L699" href="#L699">699</a> 
-<a class="jxr_linenumber" name="L700" href="#L700">700</a> 	@Test <strong class="jxr_keyword">void</strong> a43_containsKey_afterGet() {
-<a class="jxr_linenumber" name="L701" href="#L701">701</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L702" href="#L702">702</a> 		cache.get(<span class="jxr_string">"key1"</span>, () -&gt; <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L703" href="#L703">703</a> 		assertTrue(cache.containsKey(<span class="jxr_string">"key1"</span>));
-<a class="jxr_linenumber" name="L704" href="#L704">704</a> 	}
-<a class="jxr_linenumber" name="L705" href="#L705">705</a> 
-<a class="jxr_linenumber" name="L706" href="#L706">706</a> 	@Test <strong class="jxr_keyword">void</strong> a44_containsKey_afterClear() {
-<a class="jxr_linenumber" name="L707" href="#L707">707</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L708" href="#L708">708</a> 		cache.put(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L709" href="#L709">709</a> 		assertTrue(cache.containsKey(<span class="jxr_string">"key1"</span>));
-<a class="jxr_linenumber" name="L710" href="#L710">710</a> 		cache.clear();
-<a class="jxr_linenumber" name="L711" href="#L711">711</a> 		assertFalse(cache.containsKey(<span class="jxr_string">"key1"</span>));
-<a class="jxr_linenumber" name="L712" href="#L712">712</a> 	}
-<a class="jxr_linenumber" name="L713" href="#L713">713</a> 
-<a class="jxr_linenumber" name="L714" href="#L714">714</a> 	@Test <strong class="jxr_keyword">void</strong> a45_containsKey_nullKey() {
-<a class="jxr_linenumber" name="L715" href="#L715">715</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L716" href="#L716">716</a> 		<em class="jxr_comment">// Null keys are now cached, so containsKey should return true after get()</em>
-<a class="jxr_linenumber" name="L717" href="#L717">717</a> 		cache.get(<strong class="jxr_keyword">null</strong>, () -&gt; <span class="jxr_string">"value"</span>);
-<a class="jxr_linenumber" name="L718" href="#L718">718</a> 		assertTrue(cache.containsKey(<strong class="jxr_keyword">null</strong>));
-<a class="jxr_linenumber" name="L719" href="#L719">719</a> 	}
-<a class="jxr_linenumber" name="L720" href="#L720">720</a> 
-<a class="jxr_linenumber" name="L721" href="#L721">721</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L722" href="#L722">722</a> 	<em class="jxr_comment">// remove() method</em>
-<a class="jxr_linenumber" name="L723" href="#L723">723</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L724" href="#L724">724</a> 
-<a class="jxr_linenumber" name="L725" href="#L725">725</a> 	@Test <strong class="jxr_keyword">void</strong> a46_remove_existingKey() {
-<a class="jxr_linenumber" name="L726" href="#L726">726</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L727" href="#L727">727</a> 		cache.put(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L728" href="#L728">728</a> 		<strong class="jxr_keyword">var</strong> removed = cache.remove(<span class="jxr_string">"key1"</span>);
-<a class="jxr_linenumber" name="L729" href="#L729">729</a> 		assertEquals(<span class="jxr_string">"value1"</span>, removed);
-<a class="jxr_linenumber" name="L730" href="#L730">730</a> 		assertFalse(cache.containsKey(<span class="jxr_string">"key1"</span>));
-<a class="jxr_linenumber" name="L731" href="#L731">731</a> 		assertTrue(cache.isEmpty());
-<a class="jxr_linenumber" name="L732" href="#L732">732</a> 	}
-<a class="jxr_linenumber" name="L733" href="#L733">733</a> 
-<a class="jxr_linenumber" name="L734" href="#L734">734</a> 	@Test <strong class="jxr_keyword">void</strong> a47_remove_nonExistentKey() {
-<a class="jxr_linenumber" name="L735" href="#L735">735</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L736" href="#L736">736</a> 		<strong class="jxr_keyword">var</strong> removed = cache.remove(<span class="jxr_string">"key1"</span>);
-<a class="jxr_linenumber" name="L737" href="#L737">737</a> 		assertNull(removed);
-<a class="jxr_linenumber" name="L738" href="#L738">738</a> 	}
-<a class="jxr_linenumber" name="L739" href="#L739">739</a> 
-<a class="jxr_linenumber" name="L740" href="#L740">740</a> 	@Test <strong class="jxr_keyword">void</strong> a48_remove_afterGet() {
-<a class="jxr_linenumber" name="L741" href="#L741">741</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L742" href="#L742">742</a> 		cache.get(<span class="jxr_string">"key1"</span>, () -&gt; <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L743" href="#L743">743</a> 		<strong class="jxr_keyword">var</strong> removed = cache.remove(<span class="jxr_string">"key1"</span>);
-<a class="jxr_linenumber" name="L744" href="#L744">744</a> 		assertEquals(<span class="jxr_string">"value1"</span>, removed);
-<a class="jxr_linenumber" name="L745" href="#L745">745</a> 		assertFalse(cache.containsKey(<span class="jxr_string">"key1"</span>));
-<a class="jxr_linenumber" name="L746" href="#L746">746</a> 	}
-<a class="jxr_linenumber" name="L747" href="#L747">747</a> 
-<a class="jxr_linenumber" name="L748" href="#L748">748</a> 	@Test <strong class="jxr_keyword">void</strong> a49_remove_nullKey() {
-<a class="jxr_linenumber" name="L749" href="#L749">749</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L750" href="#L750">750</a> 		cache.put(<strong class="jxr_keyword">null</strong>, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L751" href="#L751">751</a> 		<strong class="jxr_keyword">var</strong> removed = cache.remove(<strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="L752" href="#L752">752</a> 		assertEquals(<span class="jxr_string">"value1"</span>, removed);
-<a class="jxr_linenumber" name="L753" href="#L753">753</a> 		assertFalse(cache.containsKey(<strong class="jxr_keyword">null</strong>));
-<a class="jxr_linenumber" name="L754" href="#L754">754</a> 	}
-<a class="jxr_linenumber" name="L755" href="#L755">755</a> 
-<a class="jxr_linenumber" name="L756" href="#L756">756</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L757" href="#L757">757</a> 	<em class="jxr_comment">// containsValue() method</em>
-<a class="jxr_linenumber" name="L758" href="#L758">758</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L759" href="#L759">759</a> 
-<a class="jxr_linenumber" name="L760" href="#L760">760</a> 	@Test <strong class="jxr_keyword">void</strong> a50_containsValue_present() {
-<a class="jxr_linenumber" name="L761" href="#L761">761</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L762" href="#L762">762</a> 		cache.put(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L763" href="#L763">763</a> 		cache.put(<span class="jxr_string">"key2"</span>, <span class="jxr_string">"value2"</span>);
-<a class="jxr_linenumber" name="L764" href="#L764">764</a> 		assertTrue(cache.containsValue(<span class="jxr_string">"value1"</span>));
-<a class="jxr_linenumber" name="L765" href="#L765">765</a> 		assertTrue(cache.containsValue(<span class="jxr_string">"value2"</span>));
-<a class="jxr_linenumber" name="L766" href="#L766">766</a> 		assertFalse(cache.containsValue(<span class="jxr_string">"value3"</span>));
-<a class="jxr_linenumber" name="L767" href="#L767">767</a> 	}
-<a class="jxr_linenumber" name="L768" href="#L768">768</a> 
-<a class="jxr_linenumber" name="L769" href="#L769">769</a> 	@Test <strong class="jxr_keyword">void</strong> a51_containsValue_notPresent() {
-<a class="jxr_linenumber" name="L770" href="#L770">770</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L771" href="#L771">771</a> 		assertFalse(cache.containsValue(<span class="jxr_string">"value1"</span>));
-<a class="jxr_linenumber" name="L772" href="#L772">772</a> 	}
-<a class="jxr_linenumber" name="L773" href="#L773">773</a> 
-<a class="jxr_linenumber" name="L774" href="#L774">774</a> 	@Test <strong class="jxr_keyword">void</strong> a52_containsValue_afterRemove() {
-<a class="jxr_linenumber" name="L775" href="#L775">775</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L776" href="#L776">776</a> 		cache.put(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L777" href="#L777">777</a> 		assertTrue(cache.containsValue(<span class="jxr_string">"value1"</span>));
-<a class="jxr_linenumber" name="L778" href="#L778">778</a> 		cache.remove(<span class="jxr_string">"key1"</span>);
-<a class="jxr_linenumber" name="L779" href="#L779">779</a> 		assertFalse(cache.containsValue(<span class="jxr_string">"value1"</span>));
-<a class="jxr_linenumber" name="L780" href="#L780">780</a> 	}
-<a class="jxr_linenumber" name="L781" href="#L781">781</a> 
-<a class="jxr_linenumber" name="L782" href="#L782">782</a> 	@Test <strong class="jxr_keyword">void</strong> a53_containsValue_afterClear() {
-<a class="jxr_linenumber" name="L783" href="#L783">783</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L784" href="#L784">784</a> 		cache.put(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L785" href="#L785">785</a> 		cache.put(<span class="jxr_string">"key2"</span>, <span class="jxr_string">"value2"</span>);
-<a class="jxr_linenumber" name="L786" href="#L786">786</a> 		assertTrue(cache.containsValue(<span class="jxr_string">"value1"</span>));
-<a class="jxr_linenumber" name="L787" href="#L787">787</a> 		cache.clear();
-<a class="jxr_linenumber" name="L788" href="#L788">788</a> 		assertFalse(cache.containsValue(<span class="jxr_string">"value1"</span>));
-<a class="jxr_linenumber" name="L789" href="#L789">789</a> 		assertFalse(cache.containsValue(<span class="jxr_string">"value2"</span>));
-<a class="jxr_linenumber" name="L790" href="#L790">790</a> 	}
-<a class="jxr_linenumber" name="L791" href="#L791">791</a> 
-<a class="jxr_linenumber" name="L792" href="#L792">792</a> 	@Test <strong class="jxr_keyword">void</strong> a54_containsValue_nullValue() {
-<a class="jxr_linenumber" name="L793" href="#L793">793</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L794" href="#L794">794</a> 		<em class="jxr_comment">// Null values can't be cached, so containsValue(null) should return false</em>
-<a class="jxr_linenumber" name="L795" href="#L795">795</a> 		cache.get(<span class="jxr_string">"key1"</span>, () -&gt; <strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="L796" href="#L796">796</a> 		assertFalse(cache.containsValue(<strong class="jxr_keyword">null</strong>));
-<a class="jxr_linenumber" name="L797" href="#L797">797</a> 	}
-<a class="jxr_linenumber" name="L798" href="#L798">798</a> 
-<a class="jxr_linenumber" name="L799" href="#L799">799</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L800" href="#L800">800</a> 	<em class="jxr_comment">// Array key support</em>
-<a class="jxr_linenumber" name="L801" href="#L801">801</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L802" href="#L802">802</a> 
-<a class="jxr_linenumber" name="L803" href="#L803">803</a> 	@Test <strong class="jxr_keyword">void</strong> a46_arrayKeys_contentBasedEquality() {
-<a class="jxr_linenumber" name="L804" href="#L804">804</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String[].<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L805" href="#L805">805</a> 
-<a class="jxr_linenumber" name="L806" href="#L806">806</a> 		<strong class="jxr_keyword">var</strong> key1 = <strong class="jxr_keyword">new</strong> String[]{<span class="jxr_string">"a"</span>, <span class="jxr_string">"b"</span>, <span class="jxr_string">"c"</span>};
-<a class="jxr_linenumber" name="L807" href="#L807">807</a> 		<strong class="jxr_keyword">var</strong> key2 = <strong class="jxr_keyword">new</strong> String[]{<span class="jxr_string">"a"</span>, <span class="jxr_string">"b"</span>, <span class="jxr_string">"c"</span>}; <em class="jxr_comment">// Same content, different instance</em>
-<a class="jxr_linenumber" name="L808" href="#L808">808</a> 
-<a class="jxr_linenumber" name="L809" href="#L809">809</a> 		cache.get(key1, () -&gt; <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L810" href="#L810">810</a> 		<em class="jxr_comment">// Should be a cache hit even though it's a different array instance</em>
-<a class="jxr_linenumber" name="L811" href="#L811">811</a> 		<strong class="jxr_keyword">var</strong> result = cache.get(key2, () -&gt; <span class="jxr_string">"should not be called"</span>);
-<a class="jxr_linenumber" name="L812" href="#L812">812</a> 		assertEquals(<span class="jxr_string">"value1"</span>, result);
-<a class="jxr_linenumber" name="L813" href="#L813">813</a> 		assertEquals(1, cache.getCacheHits());
-<a class="jxr_linenumber" name="L814" href="#L814">814</a> 		assertSize(1, cache);
-<a class="jxr_linenumber" name="L815" href="#L815">815</a> 	}
-<a class="jxr_linenumber" name="L816" href="#L816">816</a> 
-<a class="jxr_linenumber" name="L817" href="#L817">817</a> 	@Test <strong class="jxr_keyword">void</strong> a47_arrayKeys_differentContent() {
-<a class="jxr_linenumber" name="L818" href="#L818">818</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String[].<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L819" href="#L819">819</a> 
-<a class="jxr_linenumber" name="L820" href="#L820">820</a> 		<strong class="jxr_keyword">var</strong> key1 = <strong class="jxr_keyword">new</strong> String[]{<span class="jxr_string">"a"</span>, <span class="jxr_string">"b"</span>, <span class="jxr_string">"c"</span>};
-<a class="jxr_linenumber" name="L821" href="#L821">821</a> 		<strong class="jxr_keyword">var</strong> key2 = <strong class="jxr_keyword">new</strong> String[]{<span class="jxr_string">"a"</span>, <span class="jxr_string">"b"</span>, <span class="jxr_string">"d"</span>}; <em class="jxr_comment">// Different content</em>
-<a class="jxr_linenumber" name="L822" href="#L822">822</a> 
-<a class="jxr_linenumber" name="L823" href="#L823">823</a> 		cache.get(key1, () -&gt; <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L824" href="#L824">824</a> 		<strong class="jxr_keyword">var</strong> result = cache.get(key2, () -&gt; <span class="jxr_string">"value2"</span>);
-<a class="jxr_linenumber" name="L825" href="#L825">825</a> 		assertEquals(<span class="jxr_string">"value2"</span>, result);
-<a class="jxr_linenumber" name="L826" href="#L826">826</a> 		assertSize(2, cache);
-<a class="jxr_linenumber" name="L827" href="#L827">827</a> 	}
-<a class="jxr_linenumber" name="L828" href="#L828">828</a> 
-<a class="jxr_linenumber" name="L829" href="#L829">829</a> 	@Test <strong class="jxr_keyword">void</strong> a48_arrayKeys_put() {
-<a class="jxr_linenumber" name="L830" href="#L830">830</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String[].<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L831" href="#L831">831</a> 
-<a class="jxr_linenumber" name="L832" href="#L832">832</a> 		<strong class="jxr_keyword">var</strong> key1 = <strong class="jxr_keyword">new</strong> String[]{<span class="jxr_string">"a"</span>, <span class="jxr_string">"b"</span>};
-<a class="jxr_linenumber" name="L833" href="#L833">833</a> 		<strong class="jxr_keyword">var</strong> key2 = <strong class="jxr_keyword">new</strong> String[]{<span class="jxr_string">"a"</span>, <span class="jxr_string">"b"</span>}; <em class="jxr_comment">// Same content</em>
-<a class="jxr_linenumber" name="L834" href="#L834">834</a> 
-<a class="jxr_linenumber" name="L835" href="#L835">835</a> 		cache.put(key1, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L836" href="#L836">836</a> 		assertTrue(cache.containsKey(key2));
-<a class="jxr_linenumber" name="L837" href="#L837">837</a> 		assertEquals(<span class="jxr_string">"value1"</span>, cache.get(key2, () -&gt; <span class="jxr_string">"should not be called"</span>));
-<a class="jxr_linenumber" name="L838" href="#L838">838</a> 	}
-<a class="jxr_linenumber" name="L839" href="#L839">839</a> 
-<a class="jxr_linenumber" name="L840" href="#L840">840</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L841" href="#L841">841</a> 	<em class="jxr_comment">// Null value handling</em>
-<a class="jxr_linenumber" name="L842" href="#L842">842</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L843" href="#L843">843</a> 
-<a class="jxr_linenumber" name="L844" href="#L844">844</a> 	@Test <strong class="jxr_keyword">void</strong> a49_nullValue_notCached() {
-<a class="jxr_linenumber" name="L845" href="#L845">845</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L846" href="#L846">846</a> 		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
-<a class="jxr_linenumber" name="L847" href="#L847">847</a> 
-<a class="jxr_linenumber" name="L848" href="#L848">848</a> 		<em class="jxr_comment">// Supplier returns null - should not be cached</em>
-<a class="jxr_linenumber" name="L849" href="#L849">849</a> 		<strong class="jxr_keyword">var</strong> result1 = cache.get(<span class="jxr_string">"key1"</span>, () -&gt; {
-<a class="jxr_linenumber" name="L850" href="#L850">850</a> 			callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L851" href="#L851">851</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L852" href="#L852">852</a> 		});
-<a class="jxr_linenumber" name="L853" href="#L853">853</a> 		assertNull(result1);
-<a class="jxr_linenumber" name="L854" href="#L854">854</a> 		assertEquals(1, callCount.get());
-<a class="jxr_linenumber" name="L855" href="#L855">855</a> 
-<a class="jxr_linenumber" name="L856" href="#L856">856</a> 		<em class="jxr_comment">// Second call should invoke supplier again (not cached)</em>
-<a class="jxr_linenumber" name="L857" href="#L857">857</a> 		<strong class="jxr_keyword">var</strong> result2 = cache.get(<span class="jxr_string">"key1"</span>, () -&gt; {
-<a class="jxr_linenumber" name="L858" href="#L858">858</a> 			callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L859" href="#L859">859</a> 			<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L860" href="#L860">860</a> 		});
-<a class="jxr_linenumber" name="L861" href="#L861">861</a> 		assertNull(result2);
-<a class="jxr_linenumber" name="L862" href="#L862">862</a> 		assertEquals(2, callCount.get());
-<a class="jxr_linenumber" name="L863" href="#L863">863</a> 		assertTrue(cache.isEmpty(), <span class="jxr_string">"Null values should not be cached"</span>);
-<a class="jxr_linenumber" name="L864" href="#L864">864</a> 	}
-<a class="jxr_linenumber" name="L865" href="#L865">865</a> 
-<a class="jxr_linenumber" name="L866" href="#L866">866</a> 	@Test <strong class="jxr_keyword">void</strong> a50_nullValue_afterPut() {
-<a class="jxr_linenumber" name="L867" href="#L867">867</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
-<a class="jxr_linenumber" name="L868" href="#L868">868</a> 		cache.put(<span class="jxr_string">"key1"</span>, <span class="jxr_string">"value1"</span>);
-<a class="jxr_linenumber" name="L869" href="#L869">869</a> 		cache.put(<span class="jxr_string">"key1"</span>, <strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="L870" href="#L870">870</a> 		<em class="jxr_comment">// After putting null, the key should be removed</em>
-<a class="jxr_linenumber" name="L871" href="#L871">871</a> 		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
-<a class="jxr_linenumber" name="L872" href="#L872">872</a> 		<strong class="jxr_keyword">var</strong> result = cache.get(<span class="jxr_string">"key1"</span>, () -&gt; {
-<a class="jxr_linenumber" name="L873" href="#L873">873</a> 			callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L874" href="#L874">874</a> 			<strong class="jxr_keyword">return</strong> <span class="jxr_string">"supplied"</span>;
-<a class="jxr_linenumber" name="L875" href="#L875">875</a> 		});
-<a class="jxr_linenumber" name="L876" href="#L876">876</a> 		assertEquals(<span class="jxr_string">"supplied"</span>, result);
-<a class="jxr_linenumber" name="L877" href="#L877">877</a> 		assertEquals(1, callCount.get());
-<a class="jxr_linenumber" name="L878" href="#L878">878</a> 	}
-<a class="jxr_linenumber" name="L879" href="#L879">879</a> 
-<a class="jxr_linenumber" name="L880" href="#L880">880</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L881" href="#L881">881</a> 	<em class="jxr_comment">// create() static method</em>
-<a class="jxr_linenumber" name="L882" href="#L882">882</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L883" href="#L883">883</a> 
-<a class="jxr_linenumber" name="L884" href="#L884">884</a> 	@Test <strong class="jxr_keyword">void</strong> a51_create_basic() {
-<a class="jxr_linenumber" name="L885" href="#L885">885</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.&lt;String, String&gt;create()
-<a class="jxr_linenumber" name="L886" href="#L886">886</a> 			.supplier(k -&gt; <span class="jxr_string">"value-"</span> + k)
-<a class="jxr_linenumber" name="L887" href="#L887">887</a> 			.build();
-<a class="jxr_linenumber" name="L888" href="#L888">888</a> 
-<a class="jxr_linenumber" name="L889" href="#L889">889</a> 		<strong class="jxr_keyword">var</strong> result = cache.get(<span class="jxr_string">"test"</span>);
-<a class="jxr_linenumber" name="L890" href="#L890">890</a> 		assertEquals(<span class="jxr_string">"value-test"</span>, result);
-<a class="jxr_linenumber" name="L891" href="#L891">891</a> 		assertSize(1, cache);
-<a class="jxr_linenumber" name="L892" href="#L892">892</a> 	}
-<a class="jxr_linenumber" name="L893" href="#L893">893</a> 
-<a class="jxr_linenumber" name="L894" href="#L894">894</a> 	@Test <strong class="jxr_keyword">void</strong> a52_create_withConfiguration() {
-<a class="jxr_linenumber" name="L895" href="#L895">895</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.&lt;String, Integer&gt;create()
-<a class="jxr_linenumber" name="L896" href="#L896">896</a> 			.maxSize(50)
-<a class="jxr_linenumber" name="L897" href="#L897">897</a> 			.cacheMode(WEAK)
-<a class="jxr_linenumber" name="L898" href="#L898">898</a> 			.supplier(k -&gt; k.length())
-<a class="jxr_linenumber" name="L899" href="#L899">899</a> 			.build();
-<a class="jxr_linenumber" name="L900" href="#L900">900</a> 
-<a class="jxr_linenumber" name="L901" href="#L901">901</a> 		<strong class="jxr_keyword">var</strong> result = cache.get(<span class="jxr_string">"hello"</span>);
-<a class="jxr_linenumber" name="L902" href="#L902">902</a> 		assertEquals(5, result);
-<a class="jxr_linenumber" name="L903" href="#L903">903</a> 		assertSize(1, cache);
-<a class="jxr_linenumber" name="L904" href="#L904">904</a> 	}
-<a class="jxr_linenumber" name="L905" href="#L905">905</a> 
-<a class="jxr_linenumber" name="L906" href="#L906">906</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L907" href="#L907">907</a> 	<em class="jxr_comment">// disableCaching() builder method</em>
-<a class="jxr_linenumber" name="L908" href="#L908">908</a> 	<em class="jxr_comment">//====================================================================================================</em>
-<a class="jxr_linenumber" name="L909" href="#L909">909</a> 
-<a class="jxr_linenumber" name="L910" href="#L910">910</a> 	@Test <strong class="jxr_keyword">void</strong> a53_disableCaching() {
-<a class="jxr_linenumber" name="L911" href="#L911">911</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L912" href="#L912">912</a> 			.cacheMode(NONE)
-<a class="jxr_linenumber" name="L913" href="#L913">913</a> 			.build();
-<a class="jxr_linenumber" name="L914" href="#L914">914</a> 
-<a class="jxr_linenumber" name="L915" href="#L915">915</a> 		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
-<a class="jxr_linenumber" name="L916" href="#L916">916</a> 		cache.get(<span class="jxr_string">"key1"</span>, () -&gt; {
-<a class="jxr_linenumber" name="L917" href="#L917">917</a> 			callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L918" href="#L918">918</a> 			<strong class="jxr_keyword">return</strong> <span class="jxr_string">"value1"</span>;
-<a class="jxr_linenumber" name="L919" href="#L919">919</a> 		});
-<a class="jxr_linenumber" name="L920" href="#L920">920</a> 		cache.get(<span class="jxr_string">"key1"</span>, () -&gt; {
-<a class="jxr_linenumber" name="L921" href="#L921">921</a> 			callCount.incrementAndGet();
-<a class="jxr_linenumber" name="L922" href="#L922">922</a> 			<strong class="jxr_keyword">return</strong> <span class="jxr_string">"value1"</span>;
-<a class="jxr_linenumber" name="L923" href="#L923">923</a> 		});
-<a class="jxr_linenumber" name="L924" href="#L924">924</a> 
-<a class="jxr_linenumber" name="L925" href="#L925">925</a> 		assertEquals(2, callCount.get(), <span class="jxr_string">"Supplier should be called every time when disabled"</span>);
-<a class="jxr_linenumber" name="L926" href="#L926">926</a> 		assertTrue(cache.isEmpty());
-<a class="jxr_linenumber" name="L927" href="#L927">927</a> 		assertEquals(0, cache.getCacheHits());
-<a class="jxr_linenumber" name="L928" href="#L928">928</a> 	}
-<a class="jxr_linenumber" name="L929" href="#L929">929</a> }
-<a class="jxr_linenumber" name="L930" href="#L930">930</a> 
+<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.commons.collections.CacheMode.*;
+<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.juneau.junit.bct.BctAssertions.*;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.*;
+<a class="jxr_linenumber" name="L22" href="#L22">22</a>  
+<a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> java.util.concurrent.*;
+<a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> java.util.concurrent.atomic.*;
+<a class="jxr_linenumber" name="L25" href="#L25">25</a>  
+<a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> org.apache.juneau.*;
+<a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">import</strong> org.junit.jupiter.api.*;
+<a class="jxr_linenumber" name="L28" href="#L28">28</a>  
+<a class="jxr_linenumber" name="L29" href="#L29">29</a>  <strong class="jxr_keyword">class</strong> <a name="Cache_Test" href="../../../../../org/apache/juneau/commons/collections/Cache_Test.html#Cache_Test">Cache_Test</a> <strong class="jxr_keyword">extends</strong> <a name="TestBase" href="../../../../../org/apache/juneau/TestBase.html#TestBase">TestBase</a> {
+<a class="jxr_linenumber" name="L30" href="#L30">30</a>  
+<a class="jxr_linenumber" name="L31" href="#L31">31</a>  	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L32" href="#L32">32</a>  	<em class="jxr_comment">// Basic cache operations - get, hit, miss</em>
+<a class="jxr_linenumber" name="L33" href="#L33">33</a>  	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L34" href="#L34">34</a>  
+<a class="jxr_linenumber" name="L35" href="#L35">35</a>  	@Test <strong class="jxr_keyword">void</strong> a01_basicGet_cacheMiss() {
+<a class="jxr_linenumber" name="L36" href="#L36">36</a>  		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L37" href="#L37">37</a>  		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
+<a class="jxr_linenumber" name="L38" href="#L38">38</a>  
+<a class="jxr_linenumber" name="L39" href="#L39">39</a>  		<strong class="jxr_keyword">var</strong> result = cache.get(<span class="jxr_string">"key1"</span>, () -&gt; {
+<a class="jxr_linenumber" name="L40" href="#L40">40</a>  			callCount.incrementAndGet();
+<a class="jxr_linenumber" name="L41" href="#L41">41</a>  			<strong class="jxr_keyword">return</strong> <span class="jxr_string">"value1"</span>;
+<a class="jxr_linenumber" name="L42" href="#L42">42</a>  		});
+<a class="jxr_linenumber" name="L43" href="#L43">43</a>  
+<a class="jxr_linenumber" name="L44" href="#L44">44</a>  		assertEquals(<span class="jxr_string">"value1"</span>, result);
+<a class="jxr_linenumber" name="L45" href="#L45">45</a>  		assertEquals(1, callCount.get());
+<a class="jxr_linenumber" name="L46" href="#L46">46</a>  		assertSize(1, cache);
+<a class="jxr_linenumber" name="L47" href="#L47">47</a>  		assertEquals(0, cache.getCacheHits());
+<a class="jxr_linenumber" name="L48" href="#L48">48</a>  	}
+<a class="jxr_linenumber" name="L49" href="#L49">49</a>  
+<a class="jxr_linenumber" name="L50" href="#L50">50</a>  	@Test <strong class="jxr_keyword">void</strong> a02_basicGet_cacheHit() {
+<a class="jxr_linenumber" name="L51" href="#L51">51</a>  		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L52" href="#L52">52</a>  		<strong class="jxr_keyword">var</strong> callCount = <strong class="jxr_keyword">new</strong> AtomicInteger();
+<a class="jxr_linenumber" name="L53" href="#L53">53</a>  
+<a class="jxr_linenumber" name="L54" href="#L54">54</a>  		<em class="jxr_comment">// First call - cache miss</em>
+<a class="jxr_linenumber" name="L55" href="#L55">55</a>  		<strong class="jxr_keyword">var</strong> result1 = cache.get(<span class="jxr_string">"key1"</span>, () -&gt; {
+<a class="jxr_linenumber" name="L56" href="#L56">56</a>  			callCount.incrementAndGet();
+<a class="jxr_linenumber" name="L57" href="#L57">57</a>  			<strong class="jxr_keyword">return</strong> <span class="jxr_string">"value1"</span>;
+<a class="jxr_linenumber" name="L58" href="#L58">58</a>  		});
+<a class="jxr_linenumber" name="L59" href="#L59">59</a>  
+<a class="jxr_linenumber" name="L60" href="#L60">60</a>  		<em class="jxr_comment">// Second call - cache hit</em>
+<a class="jxr_linenumber" name="L61" href="#L61">61</a>  		<strong class="jxr_keyword">var</strong> result2 = cache.get(<span class="jxr_string">"key1"</span>, () -&gt; {
+<a class="jxr_linenumber" name="L62" href="#L62">62</a>  			callCount.incrementAndGet();
+<a class="jxr_linenumber" name="L63" href="#L63">63</a>  			<strong class="jxr_keyword">return</strong> <span class="jxr_string">"should not be called"</span>;
+<a class="jxr_linenumber" name="L64" href="#L64">64</a>  		});
+<a class="jxr_linenumber" name="L65" href="#L65">65</a>  
+<a class="jxr_linenumber" name="L66" href="#L66">66</a>  		assertEquals(<span class="jxr_string">"value1"</span>, result1);
+<a class="jxr_linenumber" name="L67" href="#L67">67</a>  		assertEquals(<span class="jxr_string">"value1"</span>, result2);
+<a class="jxr_linenumber" name="L68" href="#L68">68</a>  		assertSame(result1, result2); <em class="jxr_comment">// Same instance</em>
+<a class="jxr_linenumber" name="L69" href="#L69">69</a>  		assertEquals(1, callCount.get()); <em class="jxr_comment">// Supplier only called once</em>
+<a class="jxr_linenumber" name="L70" href="#L70">70</a>  		assertSize(1, cache);
+<a class="jxr_linenumber" name="L71" href="#L71">71</a>  		assertEquals(1, cache.getCacheHits());
+<a class="jxr_linenumber" name="L72" href="#L72">72</a>  	}
+<a class="jxr_linenumber" name="L73" href="#L73">73</a>  
+<a class="jxr_linenumber" name="L74" href="#L74">74</a>  	@Test <strong class="jxr_keyword">void</strong> a03_multipleKeys() {
+<a class="jxr_linenumber" name="L75" href="#L75">75</a>  		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L76" href="#L76">76</a>  
+<a class="jxr_linenumber" name="L77" href="#L77">77</a>  		<strong class="jxr_keyword">var</strong> v1 = cache.get(<span class="jxr_string">"one"</span>, () -&gt; 1);
+<a class="jxr_linenumber" name="L78" href="#L78">78</a>  		<strong class="jxr_keyword">var</strong> v2 = cache.get(<span class="jxr_string">"two"</span>, () -&gt; 2);
+<a class="jxr_linenumber" name="L79" href="#L79">79</a>  		<strong class="jxr_keyword">var</strong> v3 = cache.get(<span class="jxr_string">"three"</span>, () -&gt; 3);
+<a class="jxr_linenumber" name="L80" href="#L80">80</a>  
+<a class="jxr_linenumber" name="L81" href="#L81">81</a>  		assertEquals(1, v1);
+<a class="jxr_linenumber" name="L82" href="#L82">82</a>  		assertEquals(2, v2);
+<a class="jxr_linenumber" name="L83" href="#L83">83</a>  		assertEquals(3, v3);
+<a class="jxr_linenumber" name="L84" href="#L84">84</a>  		assertSize(3, cache);
+<a class="jxr_linenumber" name="L85" href="#L85">85</a>  		assertEquals(0, cache.getCacheHits());
+<a class="jxr_linenumber" name="L86" href="#L86">86</a>  
+<a class="jxr_linenumber" name="L87" href="#L87">87</a>  		<em class="jxr_comment">// Verify all cached</em>
+<a class="jxr_linenumber" name="L88" href="#L88">88</a>  		<strong class="jxr_keyword">var</strong> v1Again = cache.get(<span class="jxr_string">"one"</span>, () -&gt; 999);
+<a class="jxr_linenumber" name="L89" href="#L89">89</a>  		<strong class="jxr_keyword">var</strong> v2Again = cache.get(<span class="jxr_string">"two"</span>, () -&gt; 999);
+<a class="jxr_linenumber" name="L90" href="#L90">90</a>  		<strong class="jxr_keyword">var</strong> v3Again = cache.get(<span class="jxr_string">"three"</span>, () -&gt; 999);
+<a class="jxr_linenumber" name="L91" href="#L91">91</a>  
+<a class="jxr_linenumber" name="L92" href="#L92">92</a>  		assertEquals(1, v1Again);
+<a class="jxr_linenumber" name="L93" href="#L93">93</a>  		assertEquals(2, v2Again);
+<a class="jxr_linenumber" name="L94" href="#L94">94</a>  		assertEquals(3, v3Again);
+<a class="jxr_linenumber" name="L95" href="#L95">95</a>  		assertEquals(3, cache.getCacheHits());
+<a class="jxr_linenumber" name="L96" href="#L96">96</a>  	}
+<a class="jxr_linenumber" name="L97" href="#L97">97</a>  
+<a class="jxr_linenumber" name="L98" href="#L98">98</a>  	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L99" href="#L99">99</a>  	<em class="jxr_comment">// Null key handling</em>
+<a class="jxr_linenumber" name="L100" href="#L100">100</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L101" href="#L101">101</a> 
+<a class="jxr_linenumber" name="L102" href="#L102">102</a> 	@Test <strong class="jxr_keyword">void</strong> a04_nullKey_allowed() {
+<a class="jxr_linenumber" name="L103" href="#L103">103</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, String.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L104" href="#L104">104</a> 			.supplier(k -&gt; <span class="jxr_string">"value-"</span> + k)
+<a class="jxr_linenumber" name="L105" href="#L105">105</a> 			.build();
+<a class="jxr_linenumber" name="L106" href="#L106">106</a> 
+<a class="jxr_linenumber" name="L107" href="#L107">107</a> 		<em class="jxr_comment">// Null keys are now allowed</em>
+<a class="jxr_linenumber" name="L108" href="#L108">108</a> 		assertEquals(<span class="jxr_string">"value-null"</span>, cache.get(<strong class="jxr_keyword">null</strong>, () -&gt; <span class="jxr_string">"value-null"</span>));
+<a class="jxr_linenumber" name="L109" href="#L109">109</a> 		
+<a class="jxr_linenumber" name="L110" href="#L110">110</a> 		<em class="jxr_comment">// Verify caching works with null keys</em>
+<a class="jxr_linenumber" name="L111" href="#L111">111</a> 		assertEquals(<span class="jxr_string">"value-null"</span>, cache.get(<strong class="jxr_keyword">null</strong>)); <em class="jxr_comment">// Cached (hit #1)</em>
+<a class="jxr_linenumber" name="L112" href="#L112">112</a> 		assertEquals(1, cache.getCacheHits());
+<a class="jxr_linenumber" name="L113" href="#L113">113</a> 		
+<a class="jxr_linenumber" name="L114" href="#L114">114</a> 		assertEquals(<span class="jxr_string">"value-null"</span>, cache.get(<strong class="jxr_keyword">null</strong>)); <em class="jxr_comment">// Cached (hit #2)</em>
+<a class="jxr_linenumber" name="L115" href="#L115">115</a> 		assertEquals(2, cache.getCacheHits());
+<a class="jxr_linenumber" name="L116" href="#L116">116</a> 	}
+<a class="jxr_linenumber" name="L117" href="#L117">117</a> 
+<a class="jxr_linenumber" name="L118" href="#L118">118</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L119" href="#L119">119</a> 	<em class="jxr_comment">// Size and clear operations</em>
+<a class="jxr_linenumber" name="L120" href="#L120">120</a> 	<em class="jxr_comment">//====================================================================================================</em>
+<a class="jxr_linenumber" name="L121" href="#L121">121</a> 
+<a class="jxr_linenumber" name="L122" href="#L122">122</a> 	@Test <strong class="jxr_keyword">void</strong> a06_size() {
+<a class="jxr_linenumber" name="L123" href="#L123">123</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L124" href="#L124">124</a> 
+<a class="jxr_linenumber" name="L125" href="#L125">125</a> 		assertEmpty(cache);
+<a class="jxr_linenumber" name="L126" href="#L126">126</a> 
+<a class="jxr_linenumber" name="L127" href="#L127">127</a> 		cache.get(<span class="jxr_string">"one"</span>, () -&gt; 1);
+<a class="jxr_linenumber" name="L128" href="#L128">128</a> 		assertSize(1, cache);
+<a class="jxr_linenumber" name="L129" href="#L129">129</a> 
+<a class="jxr_linenumber" name="L130" href="#L130">130</a> 		cache.get(<span class="jxr_string">"two"</span>, () -&gt; 2);
+<a class="jxr_linenumber" name="L131" href="#L131">131</a> 		assertSize(2, cache);
+<a class="jxr_linenumber" name="L132" href="#L132">132</a> 
+<a class="jxr_linenumber" name="L133" href="#L133">133</a> 		cache.get(<span class="jxr_string">"three"</span>, () -&gt; 3);
+<a class="jxr_linenumber" name="L134" href="#L134">134</a> 		assertSize(3, cache);
+<a class="jxr_linenumber" name="L135" href="#L135">135</a> 
+<a class="jxr_linenumber" name="L136" href="#L136">136</a> 		<em class="jxr_comment">// Accessing existing key doesn't change size</em>
+<a class="jxr_linenumber" name="L137" href="#L137">137</a> 		cache.get(<span class="jxr_string">"one"</span>, () -&gt; 999);
+<a class="jxr_linenumber" name="L138" href="#L138">138</a> 		assertSize(3, cache);
+<a class="jxr_linenumber" name="L139" href="#L139">139</a> 	}
+<a class="jxr_linenumber" name="L140" href="#L140">140</a> 
+<a class="jxr_linenumber" name="L141" href="#L141">141</a> 	@Test <strong class="jxr_keyword">void</strong> a07_clear() {
+<a class="jxr_linenumber" name="L142" href="#L142">142</a> 		<strong class="jxr_keyword">var</strong> cache = Cache.of(String.<strong class="jxr_keyword">class</strong>, Integer.<strong class="jxr_keyword">class</strong>).build();
+<a class="jxr_linenumber" name="L143" href="#L143">143</a> 
+<a class="jxr_linenumber" name="L144" href="#L144">144</a> 		cache.get(<span class="jxr_string">"one"</span>, () -&gt; 1);
+<a class="jxr_linenumber" name="L145" href="#L145">145</a> 		cache.get(<span class="jxr_string">"two"</span>, () -&gt; 2);
+<a class="jxr_linenumber" name="L146" href="#L146">146</a> 		cache.get(<span class="jxr_string">"one"</span>, () -&gt; 999); <em class="jxr_comment">// Cache hit</em>
+<a class="jxr_linenumber" name="L147" href="#L147">147</a> 
+<a class="jxr_linenumber" name="L148" href="#L148">148</a> 		assertSize(2, cache);
+<a class="jxr_linenumber" name="L149" href="#L149">149</a> 		assertEquals(1, cache.getCacheHits());
+<a class="jxr_linenumber" name="L150" href="#L150">150</a> 
+<a class="jxr_linenumber" name="L151" href="#L151">151</a> 		cache.clear();
+<a class="jxr_linenumber" name="L152" href="#L152">152</a> 
... 106589 lines suppressed ...