You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2026/06/07 19:02:38 UTC
(juneau) branch master updated: Fix stale marshall.* package references in SPI files, test assertions, and Spring Boot auto-configuration metadata after Group 1/2 package rename
This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new a3f8237daa Fix stale marshall.* package references in SPI files, test assertions, and Spring Boot auto-configuration metadata after Group 1/2 package rename
a3f8237daa is described below
commit a3f8237daa6acbaa1dc74c5a3dee69dab65a56e2
Author: James Bognar <ja...@apache.org>
AuthorDate: Sun Jun 7 15:02:29 2026 -0400
Fix stale marshall.* package references in SPI files, test assertions, and Spring Boot auto-configuration metadata after Group 1/2 package rename
---
.../org/apache/juneau/bean/atom/AtomBuilder.java | 2 +-
.../java/org/apache/juneau/bean/atom/Category.java | 6 +-
.../java/org/apache/juneau/bean/atom/Common.java | 4 +-
.../org/apache/juneau/bean/atom/CommonEntry.java | 4 +-
.../java/org/apache/juneau/bean/atom/Content.java | 4 +-
.../java/org/apache/juneau/bean/atom/Entry.java | 2 +-
.../java/org/apache/juneau/bean/atom/Feed.java | 6 +-
.../org/apache/juneau/bean/atom/Generator.java | 6 +-
.../java/org/apache/juneau/bean/atom/Icon.java | 6 +-
.../main/java/org/apache/juneau/bean/atom/Id.java | 6 +-
.../java/org/apache/juneau/bean/atom/Link.java | 6 +-
.../java/org/apache/juneau/bean/atom/Logo.java | 6 +-
.../java/org/apache/juneau/bean/atom/Text.java | 4 +-
.../org/apache/juneau/bean/atom/package-info.java | 2 +-
.../java/org/apache/juneau/bean/atom/package.html | 18 +-
.../java/org/apache/juneau/bean/LinkString.java | 8 +-
.../java/org/apache/juneau/bean/hal/HalLink.java | 4 +-
.../apache/juneau/bean/hal/HalLinkOrArraySwap.java | 8 +-
.../org/apache/juneau/bean/hal/HalResource.java | 4 +-
.../juneau/bean/hal/HalResourceOrArraySwap.java | 8 +-
.../org/apache/juneau/bean/hal/package-info.java | 6 +-
.../main/java/org/apache/juneau/bean/html5/A.java | 2 +-
.../java/org/apache/juneau/bean/html5/Abbr.java | 2 +-
.../java/org/apache/juneau/bean/html5/Address.java | 2 +-
.../java/org/apache/juneau/bean/html5/Area.java | 2 +-
.../java/org/apache/juneau/bean/html5/Article.java | 2 +-
.../java/org/apache/juneau/bean/html5/Aside.java | 2 +-
.../java/org/apache/juneau/bean/html5/Audio.java | 2 +-
.../main/java/org/apache/juneau/bean/html5/B.java | 2 +-
.../java/org/apache/juneau/bean/html5/Base.java | 2 +-
.../java/org/apache/juneau/bean/html5/Bdi.java | 2 +-
.../java/org/apache/juneau/bean/html5/Bdo.java | 2 +-
.../org/apache/juneau/bean/html5/Blockquote.java | 2 +-
.../java/org/apache/juneau/bean/html5/Body.java | 2 +-
.../main/java/org/apache/juneau/bean/html5/Br.java | 2 +-
.../java/org/apache/juneau/bean/html5/Button.java | 2 +-
.../java/org/apache/juneau/bean/html5/Canvas.java | 2 +-
.../java/org/apache/juneau/bean/html5/Caption.java | 2 +-
.../java/org/apache/juneau/bean/html5/Cite.java | 2 +-
.../java/org/apache/juneau/bean/html5/Code.java | 2 +-
.../java/org/apache/juneau/bean/html5/Col.java | 2 +-
.../org/apache/juneau/bean/html5/Colgroup.java | 2 +-
.../java/org/apache/juneau/bean/html5/Data.java | 2 +-
.../org/apache/juneau/bean/html5/Datalist.java | 2 +-
.../main/java/org/apache/juneau/bean/html5/Dd.java | 2 +-
.../java/org/apache/juneau/bean/html5/Del.java | 2 +-
.../java/org/apache/juneau/bean/html5/Dfn.java | 2 +-
.../java/org/apache/juneau/bean/html5/Div.java | 2 +-
.../main/java/org/apache/juneau/bean/html5/Dl.java | 2 +-
.../main/java/org/apache/juneau/bean/html5/Dt.java | 2 +-
.../main/java/org/apache/juneau/bean/html5/Em.java | 2 +-
.../java/org/apache/juneau/bean/html5/Embed.java | 2 +-
.../org/apache/juneau/bean/html5/Fieldset.java | 2 +-
.../org/apache/juneau/bean/html5/Figcaption.java | 2 +-
.../java/org/apache/juneau/bean/html5/Figure.java | 2 +-
.../java/org/apache/juneau/bean/html5/Footer.java | 2 +-
.../java/org/apache/juneau/bean/html5/Form.java | 2 +-
.../main/java/org/apache/juneau/bean/html5/H1.java | 2 +-
.../main/java/org/apache/juneau/bean/html5/H2.java | 2 +-
.../main/java/org/apache/juneau/bean/html5/H3.java | 2 +-
.../main/java/org/apache/juneau/bean/html5/H4.java | 2 +-
.../main/java/org/apache/juneau/bean/html5/H5.java | 2 +-
.../main/java/org/apache/juneau/bean/html5/H6.java | 2 +-
.../java/org/apache/juneau/bean/html5/Head.java | 2 +-
.../java/org/apache/juneau/bean/html5/Header.java | 2 +-
.../main/java/org/apache/juneau/bean/html5/Hr.java | 2 +-
.../java/org/apache/juneau/bean/html5/Html.java | 2 +-
.../juneau/bean/html5/HtmlBeanDictionary.java | 2 +-
.../org/apache/juneau/bean/html5/HtmlElement.java | 12 +-
.../juneau/bean/html5/HtmlElementContainer.java | 6 +-
.../apache/juneau/bean/html5/HtmlElementMixed.java | 6 +-
.../juneau/bean/html5/HtmlElementRawText.java | 2 +-
.../apache/juneau/bean/html5/HtmlElementText.java | 2 +-
.../apache/juneau/bean/html5/HtmlElementVoid.java | 4 +-
.../org/apache/juneau/bean/html5/HtmlText.java | 4 +-
.../main/java/org/apache/juneau/bean/html5/I.java | 2 +-
.../java/org/apache/juneau/bean/html5/Iframe.java | 2 +-
.../java/org/apache/juneau/bean/html5/Img.java | 2 +-
.../java/org/apache/juneau/bean/html5/Input.java | 2 +-
.../java/org/apache/juneau/bean/html5/Ins.java | 2 +-
.../java/org/apache/juneau/bean/html5/Kbd.java | 2 +-
.../java/org/apache/juneau/bean/html5/Keygen.java | 2 +-
.../java/org/apache/juneau/bean/html5/Label.java | 2 +-
.../java/org/apache/juneau/bean/html5/Legend.java | 2 +-
.../main/java/org/apache/juneau/bean/html5/Li.java | 2 +-
.../java/org/apache/juneau/bean/html5/Link.java | 2 +-
.../java/org/apache/juneau/bean/html5/Main.java | 2 +-
.../java/org/apache/juneau/bean/html5/Map.java | 2 +-
.../java/org/apache/juneau/bean/html5/Mark.java | 2 +-
.../java/org/apache/juneau/bean/html5/Meta.java | 2 +-
.../java/org/apache/juneau/bean/html5/Meter.java | 2 +-
.../java/org/apache/juneau/bean/html5/Nav.java | 2 +-
.../org/apache/juneau/bean/html5/Noscript.java | 2 +-
.../java/org/apache/juneau/bean/html5/Object_.java | 2 +-
.../main/java/org/apache/juneau/bean/html5/Ol.java | 2 +-
.../org/apache/juneau/bean/html5/Optgroup.java | 2 +-
.../java/org/apache/juneau/bean/html5/Option.java | 2 +-
.../java/org/apache/juneau/bean/html5/Output.java | 2 +-
.../main/java/org/apache/juneau/bean/html5/P.java | 2 +-
.../java/org/apache/juneau/bean/html5/Param.java | 2 +-
.../java/org/apache/juneau/bean/html5/Pre.java | 6 +-
.../org/apache/juneau/bean/html5/Progress.java | 2 +-
.../main/java/org/apache/juneau/bean/html5/Q.java | 2 +-
.../main/java/org/apache/juneau/bean/html5/Rb.java | 2 +-
.../main/java/org/apache/juneau/bean/html5/Rp.java | 2 +-
.../main/java/org/apache/juneau/bean/html5/Rt.java | 2 +-
.../java/org/apache/juneau/bean/html5/Rtc.java | 2 +-
.../java/org/apache/juneau/bean/html5/Ruby.java | 2 +-
.../main/java/org/apache/juneau/bean/html5/S.java | 2 +-
.../java/org/apache/juneau/bean/html5/Samp.java | 2 +-
.../java/org/apache/juneau/bean/html5/Script.java | 2 +-
.../java/org/apache/juneau/bean/html5/Section.java | 2 +-
.../java/org/apache/juneau/bean/html5/Select.java | 2 +-
.../java/org/apache/juneau/bean/html5/Small.java | 2 +-
.../java/org/apache/juneau/bean/html5/Source.java | 2 +-
.../java/org/apache/juneau/bean/html5/Span.java | 2 +-
.../java/org/apache/juneau/bean/html5/Strong.java | 2 +-
.../java/org/apache/juneau/bean/html5/Style.java | 2 +-
.../java/org/apache/juneau/bean/html5/Sub.java | 2 +-
.../java/org/apache/juneau/bean/html5/Sup.java | 2 +-
.../java/org/apache/juneau/bean/html5/Table.java | 2 +-
.../java/org/apache/juneau/bean/html5/Tbody.java | 2 +-
.../main/java/org/apache/juneau/bean/html5/Td.java | 2 +-
.../org/apache/juneau/bean/html5/Template.java | 2 +-
.../org/apache/juneau/bean/html5/Textarea.java | 2 +-
.../java/org/apache/juneau/bean/html5/Tfoot.java | 2 +-
.../main/java/org/apache/juneau/bean/html5/Th.java | 2 +-
.../java/org/apache/juneau/bean/html5/Thead.java | 2 +-
.../java/org/apache/juneau/bean/html5/Time.java | 2 +-
.../java/org/apache/juneau/bean/html5/Title.java | 2 +-
.../main/java/org/apache/juneau/bean/html5/Tr.java | 2 +-
.../java/org/apache/juneau/bean/html5/Track.java | 2 +-
.../main/java/org/apache/juneau/bean/html5/U.java | 2 +-
.../main/java/org/apache/juneau/bean/html5/Ul.java | 2 +-
.../java/org/apache/juneau/bean/html5/Var.java | 2 +-
.../java/org/apache/juneau/bean/html5/Video.java | 2 +-
.../java/org/apache/juneau/bean/html5/Wbr.java | 2 +-
.../org/apache/juneau/bean/html5/package2.html | 18 +-
.../juneau/bean/jsonapi/JsonApiDocument.java | 4 +-
.../apache/juneau/bean/jsonapi/JsonApiError.java | 4 +-
.../juneau/bean/jsonapi/JsonApiErrorSource.java | 4 +-
.../apache/juneau/bean/jsonapi/JsonApiLink.java | 4 +-
.../bean/jsonapi/JsonApiLinkOrStringSwap.java | 8 +-
.../juneau/bean/jsonapi/JsonApiRelationship.java | 4 +-
.../juneau/bean/jsonapi/JsonApiResource.java | 4 +-
.../bean/jsonapi/JsonApiResourceIdentifier.java | 4 +-
.../apache/juneau/bean/jsonapi/JsonApiVersion.java | 4 +-
.../apache/juneau/bean/jsonapi/package-info.java | 8 +-
.../org/apache/juneau/bean/jsonpatch/AddOp.java | 2 +-
.../org/apache/juneau/bean/jsonpatch/CopyOp.java | 2 +-
.../juneau/bean/jsonpatch/JsonPatchOperation.java | 4 +-
.../org/apache/juneau/bean/jsonpatch/MoveOp.java | 2 +-
.../org/apache/juneau/bean/jsonpatch/RemoveOp.java | 2 +-
.../apache/juneau/bean/jsonpatch/ReplaceOp.java | 2 +-
.../org/apache/juneau/bean/jsonpatch/TestOp.java | 2 +-
.../apache/juneau/bean/jsonpatch/package-info.java | 2 +-
.../apache/juneau/bean/jsonschema/JsonSchema.java | 10 +-
.../bean/jsonschema/JsonSchemaBeanGenerator.java | 28 +-
.../juneau/bean/jsonschema/JsonSchemaMap.java | 4 +-
.../JsonSchemaPropertyValidatorFactory.java | 2 +-
.../juneau/bean/jsonschema/JsonSchemaRef.java | 2 +-
.../bean/jsonschema/JsonSchemaValidator.java | 4 +-
.../juneau/bean/jsonschema/package-info.java | 10 +-
.../juneau/bean/mcp/BlobResourceContents.java | 2 +-
.../apache/juneau/bean/mcp/CallToolRequest.java | 2 +-
.../org/apache/juneau/bean/mcp/CallToolResult.java | 2 +-
.../apache/juneau/bean/mcp/ClientCapabilities.java | 2 +-
.../java/org/apache/juneau/bean/mcp/Content.java | 2 +-
.../juneau/bean/mcp/EmbeddedResourceContent.java | 2 +-
.../apache/juneau/bean/mcp/GetPromptRequest.java | 2 +-
.../apache/juneau/bean/mcp/GetPromptResult.java | 2 +-
.../org/apache/juneau/bean/mcp/ImageContent.java | 2 +-
.../org/apache/juneau/bean/mcp/Implementation.java | 2 +-
.../apache/juneau/bean/mcp/InitializeRequest.java | 2 +-
.../apache/juneau/bean/mcp/InitializeResult.java | 2 +-
.../org/apache/juneau/bean/mcp/JsonRpcError.java | 2 +-
.../org/apache/juneau/bean/mcp/JsonRpcRequest.java | 2 +-
.../apache/juneau/bean/mcp/JsonRpcResponse.java | 2 +-
.../org/apache/juneau/bean/mcp/JsonSchema.java | 2 +-
.../apache/juneau/bean/mcp/ListPromptsResult.java | 2 +-
.../juneau/bean/mcp/ListResourcesResult.java | 2 +-
.../apache/juneau/bean/mcp/ListToolsResult.java | 2 +-
.../apache/juneau/bean/mcp/LoggingCapability.java | 2 +-
.../org/apache/juneau/bean/mcp/McpException.java | 2 +-
.../java/org/apache/juneau/bean/mcp/Prompt.java | 2 +-
.../org/apache/juneau/bean/mcp/PromptArgument.java | 2 +-
.../apache/juneau/bean/mcp/PromptCapability.java | 2 +-
.../org/apache/juneau/bean/mcp/PromptMessage.java | 2 +-
.../juneau/bean/mcp/ReadResourceRequest.java | 2 +-
.../apache/juneau/bean/mcp/ReadResourceResult.java | 2 +-
.../java/org/apache/juneau/bean/mcp/Resource.java | 2 +-
.../apache/juneau/bean/mcp/ResourceCapability.java | 2 +-
.../apache/juneau/bean/mcp/ResourceContents.java | 2 +-
.../apache/juneau/bean/mcp/RootsCapability.java | 2 +-
.../apache/juneau/bean/mcp/ServerCapabilities.java | 2 +-
.../org/apache/juneau/bean/mcp/TextContent.java | 2 +-
.../juneau/bean/mcp/TextResourceContents.java | 2 +-
.../main/java/org/apache/juneau/bean/mcp/Tool.java | 2 +-
.../org/apache/juneau/bean/mcp/ToolCapability.java | 2 +-
.../org/apache/juneau/bean/mcp/package-info.java | 2 +-
.../org/apache/juneau/bean/openapi3/Callback.java | 2 +-
.../apache/juneau/bean/openapi3/Components.java | 2 +-
.../org/apache/juneau/bean/openapi3/Contact.java | 4 +-
.../apache/juneau/bean/openapi3/Discriminator.java | 4 +-
.../org/apache/juneau/bean/openapi3/Encoding.java | 4 +-
.../org/apache/juneau/bean/openapi3/Example.java | 2 +-
.../bean/openapi3/ExternalDocumentation.java | 4 +-
.../apache/juneau/bean/openapi3/HeaderInfo.java | 2 +-
.../java/org/apache/juneau/bean/openapi3/Info.java | 2 +-
.../org/apache/juneau/bean/openapi3/Items.java | 6 +-
.../org/apache/juneau/bean/openapi3/License.java | 4 +-
.../java/org/apache/juneau/bean/openapi3/Link.java | 2 +-
.../org/apache/juneau/bean/openapi3/MediaType.java | 2 +-
.../org/apache/juneau/bean/openapi3/OAuthFlow.java | 2 +-
.../apache/juneau/bean/openapi3/OAuthFlows.java | 2 +-
.../org/apache/juneau/bean/openapi3/OpenApi.java | 6 +-
.../juneau/bean/openapi3/OpenApiBuilder.java | 2 +-
.../juneau/bean/openapi3/OpenApiElement.java | 8 +-
.../org/apache/juneau/bean/openapi3/Operation.java | 2 +-
.../org/apache/juneau/bean/openapi3/Parameter.java | 4 +-
.../org/apache/juneau/bean/openapi3/PathItem.java | 2 +-
.../juneau/bean/openapi3/RequestBodyInfo.java | 4 +-
.../org/apache/juneau/bean/openapi3/Response.java | 4 +-
.../apache/juneau/bean/openapi3/SchemaInfo.java | 2 +-
.../juneau/bean/openapi3/SecurityRequirement.java | 2 +-
.../juneau/bean/openapi3/SecuritySchemeInfo.java | 2 +-
.../org/apache/juneau/bean/openapi3/Server.java | 4 +-
.../juneau/bean/openapi3/ServerVariable.java | 2 +-
.../java/org/apache/juneau/bean/openapi3/Tag.java | 2 +-
.../java/org/apache/juneau/bean/openapi3/Xml.java | 2 +-
.../apache/juneau/bean/openapi3/ui/OpenApiUI.java | 8 +-
.../apache/juneau/bean/openapi3/ui/RedocUI.java | 6 +-
.../org/apache/juneau/bean/rfc7807/Problem.java | 2 +-
.../apache/juneau/bean/rfc7807/package-info.java | 2 +-
.../org/apache/juneau/bean/swagger/Contact.java | 2 +-
.../juneau/bean/swagger/ExternalDocumentation.java | 4 +-
.../org/apache/juneau/bean/swagger/HeaderInfo.java | 4 +-
.../java/org/apache/juneau/bean/swagger/Info.java | 2 +-
.../java/org/apache/juneau/bean/swagger/Items.java | 4 +-
.../org/apache/juneau/bean/swagger/License.java | 4 +-
.../org/apache/juneau/bean/swagger/Operation.java | 2 +-
.../apache/juneau/bean/swagger/ParameterInfo.java | 4 +-
.../apache/juneau/bean/swagger/ResponseInfo.java | 2 +-
.../org/apache/juneau/bean/swagger/SchemaInfo.java | 2 +-
.../apache/juneau/bean/swagger/SecurityScheme.java | 4 +-
.../org/apache/juneau/bean/swagger/Swagger.java | 8 +-
.../apache/juneau/bean/swagger/SwaggerBuilder.java | 2 +-
.../apache/juneau/bean/swagger/SwaggerElement.java | 6 +-
.../java/org/apache/juneau/bean/swagger/Tag.java | 2 +-
.../java/org/apache/juneau/bean/swagger/Xml.java | 2 +-
.../apache/juneau/bean/swagger/ui/SwaggerUI.java | 8 +-
.../org/apache/juneau/assertions/AnyAssertion.java | 4 +-
.../apache/juneau/assertions/ArrayAssertion.java | 4 +-
.../org/apache/juneau/assertions/Assertion.java | 8 +-
.../juneau/assertions/AssertionPredicate.java | 2 +-
.../juneau/assertions/AssertionPredicates.java | 2 +-
.../org/apache/juneau/assertions/Assertions.java | 70 +-
.../apache/juneau/assertions/BeanAssertion.java | 2 +-
.../juneau/assertions/BeanListAssertion.java | 2 +-
.../apache/juneau/assertions/BooleanAssertion.java | 2 +-
.../juneau/assertions/ByteArrayAssertion.java | 2 +-
.../juneau/assertions/CollectionAssertion.java | 2 +-
.../juneau/assertions/ComparableAssertion.java | 2 +-
.../apache/juneau/assertions/DateAssertion.java | 2 +-
.../juneau/assertions/FluentAnyAssertion.java | 8 +-
.../juneau/assertions/FluentArrayAssertion.java | 4 +-
.../juneau/assertions/FluentBeanAssertion.java | 2 +-
.../juneau/assertions/FluentBeanListAssertion.java | 2 +-
.../juneau/assertions/FluentBooleanAssertion.java | 4 +-
.../assertions/FluentByteArrayAssertion.java | 2 +-
.../assertions/FluentCollectionAssertion.java | 4 +-
.../assertions/FluentComparableAssertion.java | 4 +-
.../juneau/assertions/FluentDateAssertion.java | 4 +-
.../juneau/assertions/FluentIntegerAssertion.java | 2 +-
.../juneau/assertions/FluentListAssertion.java | 4 +-
.../juneau/assertions/FluentLongAssertion.java | 2 +-
.../juneau/assertions/FluentMapAssertion.java | 4 +-
.../juneau/assertions/FluentObjectAssertion.java | 8 +-
.../assertions/FluentPrimitiveArrayAssertion.java | 6 +-
.../juneau/assertions/FluentStringAssertion.java | 4 +-
.../assertions/FluentStringListAssertion.java | 2 +-
.../assertions/FluentThrowableAssertion.java | 4 +-
.../juneau/assertions/FluentVersionAssertion.java | 2 +-
.../assertions/FluentZonedDateTimeAssertion.java | 4 +-
.../apache/juneau/assertions/IntegerAssertion.java | 2 +-
.../apache/juneau/assertions/ListAssertion.java | 2 +-
.../apache/juneau/assertions/LongAssertion.java | 2 +-
.../org/apache/juneau/assertions/MapAssertion.java | 2 +-
.../apache/juneau/assertions/ObjectAssertion.java | 2 +-
.../juneau/assertions/PrimitiveArrayAssertion.java | 2 +-
.../apache/juneau/assertions/StringAssertion.java | 2 +-
.../juneau/assertions/StringListAssertion.java | 2 +-
.../juneau/assertions/ThrowableAssertion.java | 2 +-
.../java/org/apache/juneau/assertions/Verify.java | 2 +-
.../apache/juneau/assertions/VersionAssertion.java | 2 +-
.../juneau/assertions/ZonedDateTimeAssertion.java | 2 +-
.../main/java/org/apache/juneau/config/Config.java | 12 +-
.../main/java/org/apache/juneau/config/Entry.java | 10 +-
.../java/org/apache/juneau/config/Section.java | 4 +-
.../apache/juneau/config/internal/ConfigMap.java | 4 +-
.../org/apache/juneau/config/mod/XorEncodeMod.java | 2 +-
.../apache/juneau/config/store/ConfigStore.java | 2 +-
.../java/org/apache/juneau/jena/Constants.java | 123 -
.../java/org/apache/juneau/jena/JsonLdParser.java | 97 -
.../org/apache/juneau/jena/JsonLdSerializer.java | 93 -
.../main/java/org/apache/juneau/jena/N3Parser.java | 93 -
.../java/org/apache/juneau/jena/N3Serializer.java | 93 -
.../java/org/apache/juneau/jena/NQuadsParser.java | 93 -
.../org/apache/juneau/jena/NQuadsSerializer.java | 93 -
.../java/org/apache/juneau/jena/NTripleParser.java | 97 -
.../org/apache/juneau/jena/NTripleSerializer.java | 93 -
.../src/main/java/org/apache/juneau/jena/Rdf.java | 94 -
.../java/org/apache/juneau/jena/RdfAnnotation.java | 159 -
.../main/java/org/apache/juneau/jena/RdfApply.java | 89 -
.../org/apache/juneau/jena/RdfApplyAnnotation.java | 218 -
.../java/org/apache/juneau/jena/RdfBeanMeta.java | 65 -
.../apache/juneau/jena/RdfBeanPropertyMeta.java | 117 -
.../java/org/apache/juneau/jena/RdfClassMeta.java | 85 -
.../apache/juneau/jena/RdfCollectionFormat.java | 61 -
.../java/org/apache/juneau/jena/RdfConfig.java | 852 ---
.../apache/juneau/jena/RdfConfigAnnotation.java | 146 -
.../java/org/apache/juneau/jena/RdfJsonParser.java | 96 -
.../org/apache/juneau/jena/RdfJsonSerializer.java | 91 -
.../org/apache/juneau/jena/RdfMetaProvider.java | 55 -
.../main/java/org/apache/juneau/jena/RdfNs.java | 53 -
.../java/org/apache/juneau/jena/RdfParser.java | 1177 -----
.../org/apache/juneau/jena/RdfParserSession.java | 612 ---
.../org/apache/juneau/jena/RdfProtoParser.java | 92 -
.../org/apache/juneau/jena/RdfProtoSerializer.java | 87 -
.../java/org/apache/juneau/jena/RdfSchema.java | 108 -
.../java/org/apache/juneau/jena/RdfSerializer.java | 1516 ------
.../apache/juneau/jena/RdfSerializerSession.java | 612 ---
.../org/apache/juneau/jena/RdfStreamParser.java | 270 -
.../apache/juneau/jena/RdfStreamParserSession.java | 627 ---
.../apache/juneau/jena/RdfStreamSerializer.java | 342 --
.../juneau/jena/RdfStreamSerializerSession.java | 498 --
.../org/apache/juneau/jena/RdfThriftParser.java | 92 -
.../apache/juneau/jena/RdfThriftSerializer.java | 87 -
.../main/java/org/apache/juneau/jena/RdfUtils.java | 107 -
.../apache/juneau/jena/RdfXmlAbbrevSerializer.java | 103 -
.../java/org/apache/juneau/jena/RdfXmlParser.java | 108 -
.../org/apache/juneau/jena/RdfXmlSerializer.java | 104 -
.../java/org/apache/juneau/jena/TriGParser.java | 93 -
.../org/apache/juneau/jena/TriGSerializer.java | 93 -
.../java/org/apache/juneau/jena/TriXParser.java | 96 -
.../org/apache/juneau/jena/TriXSerializer.java | 103 -
.../java/org/apache/juneau/jena/TurtleParser.java | 97 -
.../org/apache/juneau/jena/TurtleSerializer.java | 94 -
.../java/org/apache/juneau/jena/package-info.java | 20 -
.../org/apache/juneau/marshall/jena/Constants.java | 123 +
.../apache/juneau/marshall/jena/JsonLdParser.java | 97 +
.../juneau/marshall/jena/JsonLdSerializer.java | 93 +
.../org/apache/juneau/marshall/jena/N3Parser.java | 93 +
.../apache/juneau/marshall/jena/N3Serializer.java | 93 +
.../apache/juneau/marshall/jena/NQuadsParser.java | 93 +
.../juneau/marshall/jena/NQuadsSerializer.java | 93 +
.../apache/juneau/marshall/jena/NTripleParser.java | 97 +
.../juneau/marshall/jena/NTripleSerializer.java | 93 +
.../java/org/apache/juneau/marshall/jena/Rdf.java | 94 +
.../apache/juneau/marshall/jena/RdfAnnotation.java | 159 +
.../org/apache/juneau/marshall/jena/RdfApply.java | 89 +
.../juneau/marshall/jena/RdfApplyAnnotation.java | 218 +
.../apache/juneau/marshall/jena/RdfBeanMeta.java | 65 +
.../juneau/marshall/jena/RdfBeanPropertyMeta.java | 117 +
.../apache/juneau/marshall/jena/RdfClassMeta.java | 85 +
.../juneau/marshall/jena/RdfCollectionFormat.java | 61 +
.../org/apache/juneau/marshall/jena/RdfConfig.java | 852 +++
.../juneau/marshall/jena/RdfConfigAnnotation.java | 146 +
.../apache/juneau/marshall/jena/RdfJsonParser.java | 96 +
.../juneau/marshall/jena/RdfJsonSerializer.java | 91 +
.../juneau/marshall/jena/RdfMetaProvider.java | 55 +
.../org/apache/juneau/marshall/jena/RdfNs.java | 53 +
.../org/apache/juneau/marshall/jena/RdfParser.java | 1177 +++++
.../juneau/marshall/jena/RdfParserSession.java | 612 +++
.../juneau/marshall/jena/RdfProtoParser.java | 92 +
.../juneau/marshall/jena/RdfProtoSerializer.java | 87 +
.../org/apache/juneau/marshall/jena/RdfSchema.java | 108 +
.../apache/juneau/marshall/jena/RdfSerializer.java | 1516 ++++++
.../juneau/marshall/jena/RdfSerializerSession.java | 612 +++
.../juneau/marshall/jena/RdfStreamParser.java | 270 +
.../marshall/jena/RdfStreamParserSession.java | 627 +++
.../juneau/marshall/jena/RdfStreamSerializer.java | 342 ++
.../marshall/jena/RdfStreamSerializerSession.java | 498 ++
.../juneau/marshall/jena/RdfThriftParser.java | 92 +
.../juneau/marshall/jena/RdfThriftSerializer.java | 87 +
.../org/apache/juneau/marshall/jena/RdfUtils.java | 107 +
.../marshall/jena/RdfXmlAbbrevSerializer.java | 103 +
.../apache/juneau/marshall/jena/RdfXmlParser.java | 108 +
.../juneau/marshall/jena/RdfXmlSerializer.java | 104 +
.../apache/juneau/marshall/jena/TriGParser.java | 93 +
.../juneau/marshall/jena/TriGSerializer.java | 93 +
.../apache/juneau/marshall/jena/TriXParser.java | 96 +
.../juneau/marshall/jena/TriXSerializer.java | 103 +
.../apache/juneau/marshall/jena/TurtleParser.java | 97 +
.../juneau/marshall/jena/TurtleSerializer.java | 94 +
.../juneau/marshall/jena/marshaller/JsonLd.java | 173 +
.../apache/juneau/marshall/jena/marshaller/N3.java | 244 +
.../juneau/marshall/jena/marshaller/NQuads.java | 165 +
.../juneau/marshall/jena/marshaller/NTriple.java | 245 +
.../juneau/marshall/jena/marshaller/RdfJson.java | 164 +
.../juneau/marshall/jena/marshaller/RdfProto.java | 154 +
.../juneau/marshall/jena/marshaller/RdfThrift.java | 154 +
.../juneau/marshall/jena/marshaller/RdfXml.java | 256 +
.../marshall/jena/marshaller/RdfXmlAbbrev.java | 256 +
.../juneau/marshall/jena/marshaller/TriG.java | 165 +
.../juneau/marshall/jena/marshaller/TriX.java | 175 +
.../juneau/marshall/jena/marshaller/Turtle.java | 245 +
.../apache/juneau/marshall/jena/package-info.java | 20 +
.../java/org/apache/juneau/marshaller/JsonLd.java | 172 -
.../main/java/org/apache/juneau/marshaller/N3.java | 243 -
.../java/org/apache/juneau/marshaller/NQuads.java | 164 -
.../java/org/apache/juneau/marshaller/NTriple.java | 244 -
.../java/org/apache/juneau/marshaller/RdfJson.java | 163 -
.../org/apache/juneau/marshaller/RdfProto.java | 153 -
.../org/apache/juneau/marshaller/RdfThrift.java | 153 -
.../java/org/apache/juneau/marshaller/RdfXml.java | 255 -
.../org/apache/juneau/marshaller/RdfXmlAbbrev.java | 255 -
.../java/org/apache/juneau/marshaller/TriG.java | 164 -
.../java/org/apache/juneau/marshaller/TriX.java | 174 -
.../java/org/apache/juneau/marshaller/Turtle.java | 244 -
.../java/org/apache/juneau/AnnotationApplier.java | 260 -
.../java/org/apache/juneau/AnnotationWork.java | 75 -
.../java/org/apache/juneau/AnnotationWorkList.java | 148 -
.../org/apache/juneau/BasicAssertionError.java | 50 -
.../org/apache/juneau/BasicRuntimeException.java | 71 -
.../org/apache/juneau/BeanConfigAnnotation.java | 98 -
.../main/java/org/apache/juneau/BeanCtorApply.java | 98 -
.../org/apache/juneau/BeanCtorApplyAnnotation.java | 224 -
.../java/org/apache/juneau/BeanDictionaryList.java | 85 -
.../java/org/apache/juneau/BeanDictionaryMap.java | 133 -
.../java/org/apache/juneau/BeanIgnoreApply.java | 101 -
.../apache/juneau/BeanIgnoreApplyAnnotation.java | 224 -
.../main/java/org/apache/juneau/BeanMapLoader.java | 74 -
.../main/java/org/apache/juneau/BeanPropApply.java | 98 -
.../org/apache/juneau/BeanPropApplyAnnotation.java | 224 -
.../main/java/org/apache/juneau/BeanRegistry.java | 218 -
.../main/java/org/apache/juneau/BeanTypeApply.java | 101 -
.../org/apache/juneau/BeanTypeApplyAnnotation.java | 224 -
.../java/org/apache/juneau/BigNumberFormat.java | 236 -
.../main/java/org/apache/juneau/BinaryFormat.java | 157 -
.../main/java/org/apache/juneau/BooleanFormat.java | 206 -
.../java/org/apache/juneau/CalendarFormat.java | 214 -
.../main/java/org/apache/juneau/ClassFormat.java | 331 --
.../src/main/java/org/apache/juneau/ClassMeta.java | 1959 -------
.../apache/juneau/ClassMetaRuntimeException.java | 100 -
.../java/org/apache/juneau/ConfigException.java | 73 -
.../src/main/java/org/apache/juneau/Constants.java | 39 -
.../src/main/java/org/apache/juneau/Context.java | 1026 ----
.../main/java/org/apache/juneau/ContextApply.java | 46 -
.../org/apache/juneau/ContextRuntimeException.java | 69 -
.../java/org/apache/juneau/ContextSession.java | 316 --
.../java/org/apache/juneau/CurrencyFormat.java | 241 -
.../main/java/org/apache/juneau/DateFormat.java | 169 -
.../main/java/org/apache/juneau/DetailLevel.java | 33 -
.../java/org/apache/juneau/DurationFormat.java | 174 -
.../main/java/org/apache/juneau/Enablement.java | 90 -
.../main/java/org/apache/juneau/EnumFormat.java | 178 -
.../src/main/java/org/apache/juneau/Example.java | 90 -
.../java/org/apache/juneau/ExampleAnnotation.java | 124 -
.../main/java/org/apache/juneau/ExampleApply.java | 99 -
.../org/apache/juneau/ExampleApplyAnnotation.java | 223 -
.../java/org/apache/juneau/ExtendedBeanMeta.java | 49 -
.../apache/juneau/ExtendedBeanPropertyMeta.java | 46 -
.../java/org/apache/juneau/ExtendedClassMeta.java | 55 -
.../main/java/org/apache/juneau/ExtendedMeta.java | 26 -
.../org/apache/juneau/ExternalDocsAnnotation.java | 161 -
.../main/java/org/apache/juneau/FloatFormat.java | 269 -
.../juneau/InvalidDataConversionException.java | 91 -
.../java/org/apache/juneau/ItemsAnnotation.java | 774 ---
.../main/java/org/apache/juneau/ListOperation.java | 44 -
.../main/java/org/apache/juneau/LocaleFormat.java | 97 -
.../main/java/org/apache/juneau/Marshalled.java | 337 --
.../org/apache/juneau/MarshalledAnnotation.java | 543 --
.../java/org/apache/juneau/MarshalledApply.java | 99 -
.../apache/juneau/MarshalledApplyAnnotation.java | 223 -
.../main/java/org/apache/juneau/MarshalledAs.java | 41 -
.../juneau/MarshalledBeanMetaInitializer.java | 213 -
.../java/org/apache/juneau/MarshalledConfig.java | 376 --
.../apache/juneau/MarshalledConfigAnnotation.java | 82 -
.../java/org/apache/juneau/MarshalledFilter.java | 770 ---
.../java/org/apache/juneau/MarshalledIgnore.java | 70 -
.../apache/juneau/MarshalledIgnoreAnnotation.java | 105 -
.../org/apache/juneau/MarshalledIgnoreApply.java | 99 -
.../juneau/MarshalledIgnoreApplyAnnotation.java | 217 -
.../java/org/apache/juneau/MarshalledProp.java | 225 -
.../apache/juneau/MarshalledPropAnnotation.java | 428 --
.../org/apache/juneau/MarshalledPropApply.java | 96 -
.../juneau/MarshalledPropApplyAnnotation.java | 217 -
.../juneau/MarshalledPropertyPostProcessor.java | 1081 ----
.../java/org/apache/juneau/MarshallingContext.java | 5574 --------------------
.../org/apache/juneau/MarshallingContextable.java | 3196 -----------
.../juneau/MarshallingRecursionException.java | 42 -
.../java/org/apache/juneau/MarshallingSession.java | 1417 -----
.../apache/juneau/MarshallingTraverseContext.java | 377 --
.../apache/juneau/MarshallingTraverseSession.java | 410 --
.../main/java/org/apache/juneau/NameProperty.java | 101 -
.../org/apache/juneau/NamePropertyAnnotation.java | 105 -
.../java/org/apache/juneau/NamePropertyApply.java | 85 -
.../apache/juneau/NamePropertyApplyAnnotation.java | 189 -
.../java/org/apache/juneau/ParentProperty.java | 100 -
.../apache/juneau/ParentPropertyAnnotation.java | 105 -
.../org/apache/juneau/ParentPropertyApply.java | 85 -
.../juneau/ParentPropertyApplyAnnotation.java | 189 -
.../main/java/org/apache/juneau/PeriodFormat.java | 62 -
.../java/org/apache/juneau/SchemaAnnotation.java | 1717 ------
.../main/java/org/apache/juneau/SchemaApply.java | 101 -
.../org/apache/juneau/SchemaApplyAnnotation.java | 223 -
.../java/org/apache/juneau/SubItemsAnnotation.java | 823 ---
.../src/main/java/org/apache/juneau/Swap.java | 139 -
.../java/org/apache/juneau/SwapAnnotation.java | 200 -
.../src/main/java/org/apache/juneau/SwapApply.java | 99 -
.../org/apache/juneau/SwapApplyAnnotation.java | 223 -
.../java/org/apache/juneau/TemporalFormat.java | 457 --
.../java/org/apache/juneau/TimeZoneFormat.java | 138 -
.../src/main/java/org/apache/juneau/Uri.java | 57 -
.../main/java/org/apache/juneau/UriAnnotation.java | 105 -
.../src/main/java/org/apache/juneau/UriApply.java | 99 -
.../java/org/apache/juneau/UriApplyAnnotation.java | 223 -
.../main/java/org/apache/juneau/UriContext.java | 465 --
.../main/java/org/apache/juneau/UriRelativity.java | 34 -
.../main/java/org/apache/juneau/UriResolution.java | 43 -
.../main/java/org/apache/juneau/UriResolver.java | 340 --
.../main/java/org/apache/juneau/UuidFormat.java | 176 -
.../src/main/java/org/apache/juneau/bson/Bson.java | 50 -
.../org/apache/juneau/bson/BsonAnnotation.java | 101 -
.../java/org/apache/juneau/bson/BsonApply.java | 89 -
.../apache/juneau/bson/BsonApplyAnnotation.java | 218 -
.../apache/juneau/bson/BsonBeanPropertyMeta.java | 50 -
.../java/org/apache/juneau/bson/BsonClassMeta.java | 40 -
.../java/org/apache/juneau/bson/BsonConfig.java | 79 -
.../apache/juneau/bson/BsonConfigAnnotation.java | 79 -
.../org/apache/juneau/bson/BsonDecimal128.java | 229 -
.../org/apache/juneau/bson/BsonInputStream.java | 388 --
.../org/apache/juneau/bson/BsonMetaProvider.java | 46 -
.../org/apache/juneau/bson/BsonOutputStream.java | 327 --
.../java/org/apache/juneau/bson/BsonParser.java | 263 -
.../org/apache/juneau/bson/BsonParserSession.java | 297 --
.../org/apache/juneau/bson/BsonSerializer.java | 336 --
.../apache/juneau/bson/BsonSerializerSession.java | 352 --
.../main/java/org/apache/juneau/bson/DataType.java | 100 -
.../java/org/apache/juneau/bson/package-info.java | 47 -
.../src/main/java/org/apache/juneau/cbor/Cbor.java | 49 -
.../org/apache/juneau/cbor/CborAnnotation.java | 106 -
.../java/org/apache/juneau/cbor/CborApply.java | 89 -
.../apache/juneau/cbor/CborApplyAnnotation.java | 218 -
.../apache/juneau/cbor/CborBeanPropertyMeta.java | 50 -
.../java/org/apache/juneau/cbor/CborClassMeta.java | 40 -
.../java/org/apache/juneau/cbor/CborConfig.java | 76 -
.../apache/juneau/cbor/CborConfigAnnotation.java | 79 -
.../org/apache/juneau/cbor/CborInputStream.java | 328 --
.../org/apache/juneau/cbor/CborMetaProvider.java | 46 -
.../org/apache/juneau/cbor/CborOutputStream.java | 398 --
.../java/org/apache/juneau/cbor/CborParser.java | 201 -
.../org/apache/juneau/cbor/CborParserSession.java | 279 -
.../org/apache/juneau/cbor/CborSerializer.java | 299 --
.../apache/juneau/cbor/CborSerializerSession.java | 304 --
.../main/java/org/apache/juneau/cbor/DataType.java | 48 -
.../java/org/apache/juneau/cbor/package-info.java | 48 -
.../org/apache/juneau/collections/JsonList.java | 733 ---
.../org/apache/juneau/collections/JsonMap.java | 736 ---
.../apache/juneau/collections/MarshalledList.java | 883 ----
.../apache/juneau/collections/MarshalledMap.java | 1628 ------
.../juneau/collections/ResolvingMarshalledMap.java | 134 -
.../apache/juneau/collections/package-info.java | 55 -
.../java/org/apache/juneau/cp/BasicFileFinder.java | 303 --
.../org/apache/juneau/cp/ContextBeanCreator.java | 184 -
.../main/java/org/apache/juneau/cp/FileFinder.java | 270 -
.../main/java/org/apache/juneau/cp/Messages.java | 533 --
.../java/org/apache/juneau/cp/package-info.java | 20 -
.../src/main/java/org/apache/juneau/csv/Csv.java | 49 -
.../java/org/apache/juneau/csv/CsvAnnotation.java | 73 -
.../main/java/org/apache/juneau/csv/CsvApply.java | 57 -
.../org/apache/juneau/csv/CsvApplyAnnotation.java | 106 -
.../org/apache/juneau/csv/CsvBeanPropertyMeta.java | 47 -
.../apache/juneau/csv/CsvByteArrayCellFormat.java | 34 -
.../java/org/apache/juneau/csv/CsvCellParser.java | 218 -
.../org/apache/juneau/csv/CsvCellSerializer.java | 236 -
.../java/org/apache/juneau/csv/CsvClassMeta.java | 37 -
.../main/java/org/apache/juneau/csv/CsvConfig.java | 48 -
.../org/apache/juneau/csv/CsvConfigAnnotation.java | 73 -
.../org/apache/juneau/csv/CsvMetaProvider.java | 43 -
.../main/java/org/apache/juneau/csv/CsvParser.java | 265 -
.../org/apache/juneau/csv/CsvParserSession.java | 437 --
.../main/java/org/apache/juneau/csv/CsvReader.java | 229 -
.../java/org/apache/juneau/csv/CsvSerializer.java | 269 -
.../apache/juneau/csv/CsvSerializerSession.java | 544 --
.../main/java/org/apache/juneau/csv/CsvWriter.java | 222 -
.../java/org/apache/juneau/csv/package-info.java | 23 -
.../java/org/apache/juneau/encoders/Encoder.java | 67 -
.../org/apache/juneau/encoders/EncoderMatch.java | 49 -
.../org/apache/juneau/encoders/EncoderSet.java | 411 --
.../org/apache/juneau/encoders/Finishable.java | 39 -
.../org/apache/juneau/encoders/GzipEncoder.java | 59 -
.../apache/juneau/encoders/IdentityEncoder.java | 63 -
.../org/apache/juneau/encoders/package-info.java | 20 -
.../main/java/org/apache/juneau/hjson/Hjson.java | 42 -
.../org/apache/juneau/hjson/HjsonAnnotation.java | 36 -
.../java/org/apache/juneau/hjson/HjsonApply.java | 89 -
.../apache/juneau/hjson/HjsonApplyAnnotation.java | 218 -
.../apache/juneau/hjson/HjsonBeanPropertyMeta.java | 43 -
.../org/apache/juneau/hjson/HjsonClassMeta.java | 35 -
.../java/org/apache/juneau/hjson/HjsonConfig.java | 108 -
.../apache/juneau/hjson/HjsonConfigAnnotation.java | 74 -
.../org/apache/juneau/hjson/HjsonMetaProvider.java | 42 -
.../java/org/apache/juneau/hjson/HjsonParser.java | 199 -
.../apache/juneau/hjson/HjsonParserSession.java | 349 --
.../org/apache/juneau/hjson/HjsonSerializer.java | 333 --
.../juneau/hjson/HjsonSerializerSession.java | 303 --
.../org/apache/juneau/hjson/HjsonTokenizer.java | 488 --
.../java/org/apache/juneau/hjson/HjsonWriter.java | 323 --
.../java/org/apache/juneau/hjson/package-info.java | 63 -
.../main/java/org/apache/juneau/hocon/Hocon.java | 42 -
.../org/apache/juneau/hocon/HoconAnnotation.java | 36 -
.../java/org/apache/juneau/hocon/HoconApply.java | 89 -
.../apache/juneau/hocon/HoconApplyAnnotation.java | 218 -
.../apache/juneau/hocon/HoconBeanPropertyMeta.java | 43 -
.../org/apache/juneau/hocon/HoconClassMeta.java | 35 -
.../java/org/apache/juneau/hocon/HoconConfig.java | 120 -
.../apache/juneau/hocon/HoconConfigAnnotation.java | 75 -
.../org/apache/juneau/hocon/HoconMetaProvider.java | 42 -
.../java/org/apache/juneau/hocon/HoconParser.java | 172 -
.../apache/juneau/hocon/HoconParserSession.java | 518 --
.../org/apache/juneau/hocon/HoconResolver.java | 223 -
.../org/apache/juneau/hocon/HoconSerializer.java | 366 --
.../juneau/hocon/HoconSerializerSession.java | 332 --
.../org/apache/juneau/hocon/HoconTokenizer.java | 587 ---
.../java/org/apache/juneau/hocon/HoconValue.java | 366 --
.../java/org/apache/juneau/hocon/HoconWriter.java | 348 --
.../java/org/apache/juneau/hocon/package-info.java | 57 -
.../java/org/apache/juneau/html/AnchorText.java | 73 -
.../java/org/apache/juneau/html/AsideFloat.java | 75 -
.../apache/juneau/html/BasicHtmlDocTemplate.java | 401 --
.../src/main/java/org/apache/juneau/html/Html.java | 166 -
.../org/apache/juneau/html/HtmlAnnotation.java | 243 -
.../java/org/apache/juneau/html/HtmlApply.java | 101 -
.../apache/juneau/html/HtmlApplyAnnotation.java | 218 -
.../apache/juneau/html/HtmlBeanPropertyMeta.java | 218 -
.../java/org/apache/juneau/html/HtmlClassMeta.java | 144 -
.../java/org/apache/juneau/html/HtmlConfig.java | 283 -
.../apache/juneau/html/HtmlConfigAnnotation.java | 86 -
.../java/org/apache/juneau/html/HtmlDocConfig.java | 643 ---
.../juneau/html/HtmlDocConfigAnnotation.java | 78 -
.../org/apache/juneau/html/HtmlDocSerializer.java | 1161 ----
.../juneau/html/HtmlDocSerializerSession.java | 307 --
.../org/apache/juneau/html/HtmlDocTemplate.java | 83 -
.../java/org/apache/juneau/html/HtmlFormat.java | 55 -
.../main/java/org/apache/juneau/html/HtmlLink.java | 76 -
.../org/apache/juneau/html/HtmlLinkAnnotation.java | 146 -
.../java/org/apache/juneau/html/HtmlLinkApply.java | 101 -
.../juneau/html/HtmlLinkApplyAnnotation.java | 193 -
.../org/apache/juneau/html/HtmlMetaProvider.java | 46 -
.../java/org/apache/juneau/html/HtmlParser.java | 155 -
.../org/apache/juneau/html/HtmlParserSession.java | 859 ---
.../java/org/apache/juneau/html/HtmlRender.java | 68 -
.../juneau/html/HtmlSchemaDocSerializer.java | 278 -
.../html/HtmlSchemaDocSerializerSession.java | 95 -
.../apache/juneau/html/HtmlSchemaSerializer.java | 341 --
.../juneau/html/HtmlSchemaSerializerSession.java | 95 -
.../org/apache/juneau/html/HtmlSerializer.java | 881 ----
.../apache/juneau/html/HtmlSerializerSession.java | 1080 ----
.../juneau/html/HtmlStrippedDocSerializer.java | 154 -
.../html/HtmlStrippedDocSerializerSession.java | 112 -
.../main/java/org/apache/juneau/html/HtmlTag.java | 157 -
.../java/org/apache/juneau/html/HtmlWidget.java | 79 -
.../java/org/apache/juneau/html/HtmlWidgetMap.java | 45 -
.../java/org/apache/juneau/html/HtmlWidgetVar.java | 70 -
.../java/org/apache/juneau/html/HtmlWriter.java | 447 --
.../org/apache/juneau/html/SimpleHtmlWriter.java | 393 --
.../java/org/apache/juneau/html/package-info.java | 20 -
.../apache/juneau/httppart/BaseHttpPartParser.java | 159 -
.../juneau/httppart/BaseHttpPartParserSession.java | 26 -
.../juneau/httppart/BaseHttpPartSerializer.java | 98 -
.../httppart/BaseHttpPartSerializerSession.java | 26 -
.../java/org/apache/juneau/httppart/Constants.java | 150 -
.../java/org/apache/juneau/httppart/HttpPart.java | 77 -
.../juneau/httppart/HttpPartMarshalling.java | 64 -
.../org/apache/juneau/httppart/HttpPartParser.java | 126 -
.../juneau/httppart/HttpPartParserSession.java | 52 -
.../org/apache/juneau/httppart/HttpPartSchema.java | 4707 -----------------
.../apache/juneau/httppart/HttpPartSerializer.java | 114 -
.../juneau/httppart/HttpPartSerializerSession.java | 53 -
.../apache/juneau/httppart/SimplePartParser.java | 125 -
.../juneau/httppart/SimplePartParserSession.java | 41 -
.../juneau/httppart/SimplePartSerializer.java | 105 -
.../httppart/SimplePartSerializerSession.java | 39 -
.../org/apache/juneau/httppart/package-info.java | 20 -
.../src/main/java/org/apache/juneau/ini/Ini.java | 62 -
.../java/org/apache/juneau/ini/IniAnnotation.java | 48 -
.../main/java/org/apache/juneau/ini/IniApply.java | 89 -
.../org/apache/juneau/ini/IniApplyAnnotation.java | 218 -
.../org/apache/juneau/ini/IniBeanPropertyMeta.java | 82 -
.../java/org/apache/juneau/ini/IniClassMeta.java | 52 -
.../main/java/org/apache/juneau/ini/IniConfig.java | 80 -
.../org/apache/juneau/ini/IniConfigAnnotation.java | 72 -
.../org/apache/juneau/ini/IniMetaProvider.java | 42 -
.../main/java/org/apache/juneau/ini/IniParser.java | 171 -
.../org/apache/juneau/ini/IniParserSession.java | 307 --
.../java/org/apache/juneau/ini/IniSerializer.java | 279 -
.../apache/juneau/ini/IniSerializerSession.java | 351 --
.../main/java/org/apache/juneau/ini/IniWriter.java | 168 -
.../java/org/apache/juneau/ini/package-info.java | 39 -
.../org/apache/juneau/internal/ClassUtils2.java | 67 -
.../org/apache/juneau/internal/ConverterUtils.java | 163 -
.../apache/juneau/internal/DelegateBeanMap.java | 173 -
.../org/apache/juneau/internal/DelegateList.java | 64 -
.../org/apache/juneau/internal/DelegateMap.java | 89 -
.../org/apache/juneau/internal/FilteredKeyMap.java | 126 -
.../org/apache/juneau/internal/package-info.java | 20 -
.../main/java/org/apache/juneau/jcs/JcsConfig.java | 53 -
.../org/apache/juneau/jcs/JcsConfigAnnotation.java | 53 -
.../java/org/apache/juneau/jcs/JcsSerializer.java | 184 -
.../apache/juneau/jcs/JcsSerializerSession.java | 312 --
.../main/java/org/apache/juneau/jcs/JcsWriter.java | 120 -
.../java/org/apache/juneau/jcs/package-info.java | 27 -
.../src/main/java/org/apache/juneau/json/Json.java | 98 -
.../org/apache/juneau/json/JsonAnnotation.java | 127 -
.../java/org/apache/juneau/json/JsonApply.java | 101 -
.../apache/juneau/json/JsonApplyAnnotation.java | 224 -
.../apache/juneau/json/JsonBeanPropertyMeta.java | 51 -
.../java/org/apache/juneau/json/JsonClassMeta.java | 57 -
.../java/org/apache/juneau/json/JsonConfig.java | 133 -
.../apache/juneau/json/JsonConfigAnnotation.java | 87 -
.../org/apache/juneau/json/JsonMetaProvider.java | 46 -
.../java/org/apache/juneau/json/JsonParser.java | 300 --
.../org/apache/juneau/json/JsonParserSession.java | 918 ----
.../apache/juneau/json/JsonSchemaSerializer.java | 313 --
.../juneau/json/JsonSchemaSerializerSession.java | 118 -
.../org/apache/juneau/json/JsonSerializer.java | 421 --
.../apache/juneau/json/JsonSerializerSession.java | 418 --
.../java/org/apache/juneau/json/JsonWriter.java | 380 --
.../java/org/apache/juneau/json/package-info.java | 35 -
.../java/org/apache/juneau/json5/Json5List.java | 467 --
.../java/org/apache/juneau/json5/Json5Map.java | 571 --
.../java/org/apache/juneau/json5/Json5Parser.java | 153 -
.../apache/juneau/json5/Json5ParserSession.java | 240 -
.../org/apache/juneau/json5/Json5Serializer.java | 174 -
.../juneau/json5/Json5SerializerSession.java | 94 -
.../java/org/apache/juneau/json5/package-info.java | 28 -
.../java/org/apache/juneau/jsonl/JsonlConfig.java | 47 -
.../apache/juneau/jsonl/JsonlConfigAnnotation.java | 76 -
.../java/org/apache/juneau/jsonl/JsonlParser.java | 121 -
.../apache/juneau/jsonl/JsonlParserSession.java | 132 -
.../org/apache/juneau/jsonl/JsonlSerializer.java | 132 -
.../juneau/jsonl/JsonlSerializerSession.java | 118 -
.../java/org/apache/juneau/jsonl/package-info.java | 43 -
.../juneau/jsonschema/BasicBeanDefMapper.java | 72 -
.../jsonschema/JsonSchemaBeanPropertyMeta.java | 74 -
.../juneau/jsonschema/JsonSchemaClassMeta.java | 65 -
.../apache/juneau/jsonschema/JsonSchemaConfig.java | 375 --
.../jsonschema/JsonSchemaConfigAnnotation.java | 68 -
.../juneau/jsonschema/JsonSchemaGenerator.java | 572 --
.../jsonschema/JsonSchemaGeneratorSession.java | 514 --
.../juneau/jsonschema/JsonSchemaMetaProvider.java | 46 -
.../juneau/jsonschema/MarshallingDefMapper.java | 60 -
.../org/apache/juneau/jsonschema/SchemaUtils.java | 128 -
.../org/apache/juneau/jsonschema/TypeCategory.java | 98 -
.../org/apache/juneau/jsonschema/package-info.java | 20 -
.../java/org/apache/juneau/markdown/Markdown.java | 97 -
.../apache/juneau/markdown/MarkdownAnnotation.java | 61 -
.../org/apache/juneau/markdown/MarkdownApply.java | 89 -
.../juneau/markdown/MarkdownApplyAnnotation.java | 218 -
.../juneau/markdown/MarkdownBeanPropertyMeta.java | 122 -
.../apache/juneau/markdown/MarkdownClassMeta.java | 76 -
.../org/apache/juneau/markdown/MarkdownConfig.java | 48 -
.../juneau/markdown/MarkdownConfigAnnotation.java | 75 -
.../apache/juneau/markdown/MarkdownDocParser.java | 176 -
.../juneau/markdown/MarkdownDocParserSession.java | 392 --
.../juneau/markdown/MarkdownDocSerializer.java | 256 -
.../markdown/MarkdownDocSerializerSession.java | 255 -
.../org/apache/juneau/markdown/MarkdownFormat.java | 54 -
.../juneau/markdown/MarkdownMetaProvider.java | 43 -
.../org/apache/juneau/markdown/MarkdownParser.java | 238 -
.../juneau/markdown/MarkdownParserSession.java | 814 ---
.../apache/juneau/markdown/MarkdownSerializer.java | 275 -
.../juneau/markdown/MarkdownSerializerSession.java | 542 --
.../org/apache/juneau/markdown/MarkdownWriter.java | 266 -
.../org/apache/juneau/markdown/package-info.java | 32 -
.../apache/juneau/marshall/AnnotationApplier.java | 260 +
.../org/apache/juneau/marshall/AnnotationWork.java | 75 +
.../apache/juneau/marshall/AnnotationWorkList.java | 148 +
.../juneau/marshall/BasicAssertionError.java | 50 +
.../juneau/marshall/BasicRuntimeException.java | 71 +
.../juneau/marshall/BeanConfigAnnotation.java | 98 +
.../org/apache/juneau/marshall/BeanCtorApply.java | 98 +
.../juneau/marshall/BeanCtorApplyAnnotation.java | 224 +
.../apache/juneau/marshall/BeanDictionaryList.java | 85 +
.../apache/juneau/marshall/BeanDictionaryMap.java | 133 +
.../apache/juneau/marshall/BeanIgnoreApply.java | 101 +
.../juneau/marshall/BeanIgnoreApplyAnnotation.java | 224 +
.../org/apache/juneau/marshall/BeanMapLoader.java | 74 +
.../org/apache/juneau/marshall/BeanPropApply.java | 98 +
.../juneau/marshall/BeanPropApplyAnnotation.java | 224 +
.../org/apache/juneau/marshall/BeanRegistry.java | 218 +
.../org/apache/juneau/marshall/BeanTypeApply.java | 101 +
.../juneau/marshall/BeanTypeApplyAnnotation.java | 224 +
.../apache/juneau/marshall/BigNumberFormat.java | 236 +
.../org/apache/juneau/marshall/BinaryFormat.java | 157 +
.../org/apache/juneau/marshall/BooleanFormat.java | 206 +
.../org/apache/juneau/marshall/CalendarFormat.java | 214 +
.../org/apache/juneau/marshall/ClassFormat.java | 331 ++
.../java/org/apache/juneau/marshall/ClassMeta.java | 1959 +++++++
.../juneau/marshall/ClassMetaRuntimeException.java | 100 +
.../apache/juneau/marshall/ConfigException.java | 73 +
.../java/org/apache/juneau/marshall/Constants.java | 39 +
.../java/org/apache/juneau/marshall/Context.java | 1026 ++++
.../org/apache/juneau/{ => marshall}/Context.txt | 0
.../org/apache/juneau/marshall/ContextApply.java | 46 +
.../juneau/marshall/ContextRuntimeException.java | 69 +
.../org/apache/juneau/marshall/ContextSession.java | 316 ++
.../juneau/{ => marshall}/ContextSession.txt | 0
.../org/apache/juneau/marshall/CurrencyFormat.java | 241 +
.../org/apache/juneau/marshall/DateFormat.java | 169 +
.../org/apache/juneau/marshall/DetailLevel.java | 33 +
.../org/apache/juneau/marshall/DurationFormat.java | 174 +
.../org/apache/juneau/marshall/Enablement.java | 90 +
.../org/apache/juneau/marshall/EnumFormat.java | 178 +
.../java/org/apache/juneau/marshall/Example.java | 90 +
.../apache/juneau/marshall/ExampleAnnotation.java | 124 +
.../org/apache/juneau/marshall/ExampleApply.java | 99 +
.../juneau/marshall/ExampleApplyAnnotation.java | 223 +
.../apache/juneau/marshall/ExtendedBeanMeta.java | 49 +
.../juneau/marshall/ExtendedBeanPropertyMeta.java | 46 +
.../apache/juneau/marshall/ExtendedClassMeta.java | 55 +
.../org/apache/juneau/marshall/ExtendedMeta.java | 26 +
.../juneau/marshall/ExternalDocsAnnotation.java | 161 +
.../org/apache/juneau/marshall/FloatFormat.java | 269 +
.../marshall/InvalidDataConversionException.java | 91 +
.../apache/juneau/marshall/ItemsAnnotation.java | 774 +++
.../org/apache/juneau/marshall/ListOperation.java | 44 +
.../org/apache/juneau/marshall/LocaleFormat.java | 97 +
.../org/apache/juneau/marshall/Marshalled.java | 337 ++
.../juneau/marshall/MarshalledAnnotation.java | 543 ++
.../apache/juneau/marshall/MarshalledApply.java | 99 +
.../juneau/marshall/MarshalledApplyAnnotation.java | 223 +
.../org/apache/juneau/marshall/MarshalledAs.java | 41 +
.../marshall/MarshalledBeanMetaInitializer.java | 213 +
.../apache/juneau/marshall/MarshalledConfig.java | 376 ++
.../marshall/MarshalledConfigAnnotation.java | 82 +
.../apache/juneau/marshall/MarshalledFilter.java | 770 +++
.../apache/juneau/marshall/MarshalledIgnore.java | 70 +
.../marshall/MarshalledIgnoreAnnotation.java | 105 +
.../juneau/marshall/MarshalledIgnoreApply.java | 99 +
.../marshall/MarshalledIgnoreApplyAnnotation.java | 217 +
.../org/apache/juneau/marshall/MarshalledProp.java | 225 +
.../juneau/marshall/MarshalledPropAnnotation.java | 428 ++
.../juneau/marshall/MarshalledPropApply.java | 96 +
.../marshall/MarshalledPropApplyAnnotation.java | 217 +
.../marshall/MarshalledPropertyPostProcessor.java | 1081 ++++
.../apache/juneau/marshall/MarshallingContext.java | 5574 ++++++++++++++++++++
.../juneau/marshall/MarshallingContextable.java | 3196 +++++++++++
.../marshall/MarshallingRecursionException.java | 42 +
.../apache/juneau/marshall/MarshallingSession.java | 1417 +++++
.../marshall/MarshallingTraverseContext.java | 377 ++
.../marshall/MarshallingTraverseSession.java | 410 ++
.../org/apache/juneau/marshall/NameProperty.java | 101 +
.../juneau/marshall/NamePropertyAnnotation.java | 105 +
.../apache/juneau/marshall/NamePropertyApply.java | 85 +
.../marshall/NamePropertyApplyAnnotation.java | 189 +
.../org/apache/juneau/marshall/ParentProperty.java | 100 +
.../juneau/marshall/ParentPropertyAnnotation.java | 105 +
.../juneau/marshall/ParentPropertyApply.java | 85 +
.../marshall/ParentPropertyApplyAnnotation.java | 189 +
.../org/apache/juneau/marshall/PeriodFormat.java | 62 +
.../apache/juneau/marshall/SchemaAnnotation.java | 1717 ++++++
.../org/apache/juneau/marshall/SchemaApply.java | 101 +
.../juneau/marshall/SchemaApplyAnnotation.java | 223 +
.../apache/juneau/marshall/SubItemsAnnotation.java | 823 +++
.../main/java/org/apache/juneau/marshall/Swap.java | 139 +
.../org/apache/juneau/marshall/SwapAnnotation.java | 200 +
.../java/org/apache/juneau/marshall/SwapApply.java | 99 +
.../juneau/marshall/SwapApplyAnnotation.java | 223 +
.../org/apache/juneau/marshall/TemporalFormat.java | 457 ++
.../org/apache/juneau/marshall/TimeZoneFormat.java | 138 +
.../main/java/org/apache/juneau/marshall/Uri.java | 57 +
.../org/apache/juneau/marshall/UriAnnotation.java | 105 +
.../java/org/apache/juneau/marshall/UriApply.java | 99 +
.../apache/juneau/marshall/UriApplyAnnotation.java | 223 +
.../org/apache/juneau/marshall/UriContext.java | 465 ++
.../org/apache/juneau/marshall/UriRelativity.java | 34 +
.../org/apache/juneau/marshall/UriResolution.java | 43 +
.../org/apache/juneau/marshall/UriResolver.java | 340 ++
.../org/apache/juneau/marshall/UuidFormat.java | 176 +
.../java/org/apache/juneau/marshall/bson/Bson.java | 50 +
.../juneau/marshall/bson/BsonAnnotation.java | 101 +
.../org/apache/juneau/marshall/bson/BsonApply.java | 89 +
.../juneau/marshall/bson/BsonApplyAnnotation.java | 218 +
.../juneau/marshall/bson/BsonBeanPropertyMeta.java | 50 +
.../apache/juneau/marshall/bson/BsonClassMeta.java | 40 +
.../apache/juneau/marshall/bson/BsonConfig.java | 79 +
.../juneau/marshall/bson/BsonConfigAnnotation.java | 79 +
.../juneau/marshall/bson/BsonDecimal128.java | 229 +
.../juneau/marshall/bson/BsonInputStream.java | 388 ++
.../juneau/marshall/bson/BsonMetaProvider.java | 46 +
.../juneau/marshall/bson/BsonOutputStream.java | 327 ++
.../apache/juneau/marshall/bson/BsonParser.java | 263 +
.../juneau/marshall/bson/BsonParserSession.java | 297 ++
.../juneau/marshall/bson/BsonSerializer.java | 336 ++
.../marshall/bson/BsonSerializerSession.java | 352 ++
.../org/apache/juneau/marshall/bson/DataType.java | 100 +
.../apache/juneau/marshall/bson/package-info.java | 47 +
.../java/org/apache/juneau/marshall/cbor/Cbor.java | 49 +
.../juneau/marshall/cbor/CborAnnotation.java | 106 +
.../org/apache/juneau/marshall/cbor/CborApply.java | 89 +
.../juneau/marshall/cbor/CborApplyAnnotation.java | 218 +
.../juneau/marshall/cbor/CborBeanPropertyMeta.java | 50 +
.../apache/juneau/marshall/cbor/CborClassMeta.java | 40 +
.../apache/juneau/marshall/cbor/CborConfig.java | 76 +
.../juneau/marshall/cbor/CborConfigAnnotation.java | 79 +
.../juneau/marshall/cbor/CborInputStream.java | 328 ++
.../juneau/marshall/cbor/CborMetaProvider.java | 46 +
.../juneau/marshall/cbor/CborOutputStream.java | 398 ++
.../apache/juneau/marshall/cbor/CborParser.java | 201 +
.../juneau/marshall/cbor/CborParserSession.java | 279 +
.../juneau/marshall/cbor/CborSerializer.java | 299 ++
.../marshall/cbor/CborSerializerSession.java | 304 ++
.../org/apache/juneau/marshall/cbor/DataType.java | 48 +
.../apache/juneau/marshall/cbor/package-info.java | 48 +
.../juneau/marshall/collections/JsonList.java | 733 +++
.../juneau/marshall/collections/JsonMap.java | 736 +++
.../marshall/collections/MarshalledList.java | 883 ++++
.../juneau/marshall/collections/MarshalledMap.java | 1628 ++++++
.../collections/ResolvingMarshalledMap.java | 134 +
.../juneau/marshall/collections/package-info.java | 55 +
.../apache/juneau/marshall/cp/BasicFileFinder.java | 303 ++
.../juneau/marshall/cp/ContextBeanCreator.java | 184 +
.../org/apache/juneau/marshall/cp/FileFinder.java | 270 +
.../org/apache/juneau/marshall/cp/Messages.java | 533 ++
.../apache/juneau/marshall/cp/package-info.java | 20 +
.../java/org/apache/juneau/marshall/csv/Csv.java | 49 +
.../apache/juneau/marshall/csv/CsvAnnotation.java | 73 +
.../org/apache/juneau/marshall/csv/CsvApply.java | 57 +
.../juneau/marshall/csv/CsvApplyAnnotation.java | 106 +
.../juneau/marshall/csv/CsvBeanPropertyMeta.java | 47 +
.../marshall/csv/CsvByteArrayCellFormat.java | 34 +
.../apache/juneau/marshall/csv/CsvCellParser.java | 218 +
.../juneau/marshall/csv/CsvCellSerializer.java | 236 +
.../apache/juneau/marshall/csv/CsvClassMeta.java | 37 +
.../org/apache/juneau/marshall/csv/CsvConfig.java | 48 +
.../juneau/marshall/csv/CsvConfigAnnotation.java | 73 +
.../juneau/marshall/csv/CsvMetaProvider.java | 43 +
.../org/apache/juneau/marshall/csv/CsvParser.java | 265 +
.../juneau/marshall/csv/CsvParserSession.java | 437 ++
.../org/apache/juneau/marshall/csv/CsvReader.java | 229 +
.../apache/juneau/marshall/csv/CsvSerializer.java | 269 +
.../juneau/marshall/csv/CsvSerializerSession.java | 544 ++
.../org/apache/juneau/marshall/csv/CsvWriter.java | 222 +
.../apache/juneau/marshall/csv/package-info.java | 23 +
.../apache/juneau/marshall/encoders/Encoder.java | 67 +
.../juneau/marshall/encoders/EncoderMatch.java | 49 +
.../juneau/marshall/encoders/EncoderSet.java | 411 ++
.../juneau/marshall/encoders/Finishable.java | 39 +
.../juneau/marshall/encoders/GzipEncoder.java | 59 +
.../juneau/marshall/encoders/IdentityEncoder.java | 63 +
.../juneau/marshall/encoders/package-info.java | 20 +
.../org/apache/juneau/marshall/hjson/Hjson.java | 42 +
.../juneau/marshall/hjson/HjsonAnnotation.java | 36 +
.../apache/juneau/marshall/hjson/HjsonApply.java | 89 +
.../marshall/hjson/HjsonApplyAnnotation.java | 218 +
.../marshall/hjson/HjsonBeanPropertyMeta.java | 43 +
.../juneau/marshall/hjson/HjsonClassMeta.java | 35 +
.../apache/juneau/marshall/hjson/HjsonConfig.java | 108 +
.../marshall/hjson/HjsonConfigAnnotation.java | 74 +
.../juneau/marshall/hjson/HjsonMetaProvider.java | 42 +
.../apache/juneau/marshall/hjson/HjsonParser.java | 199 +
.../juneau/marshall/hjson/HjsonParserSession.java | 349 ++
.../juneau/marshall/hjson/HjsonSerializer.java | 333 ++
.../marshall/hjson/HjsonSerializerSession.java | 303 ++
.../juneau/marshall/hjson/HjsonTokenizer.java | 488 ++
.../apache/juneau/marshall/hjson/HjsonWriter.java | 323 ++
.../apache/juneau/marshall/hjson/package-info.java | 63 +
.../org/apache/juneau/marshall/hocon/Hocon.java | 42 +
.../juneau/marshall/hocon/HoconAnnotation.java | 36 +
.../apache/juneau/marshall/hocon/HoconApply.java | 89 +
.../marshall/hocon/HoconApplyAnnotation.java | 218 +
.../marshall/hocon/HoconBeanPropertyMeta.java | 43 +
.../juneau/marshall/hocon/HoconClassMeta.java | 35 +
.../apache/juneau/marshall/hocon/HoconConfig.java | 120 +
.../marshall/hocon/HoconConfigAnnotation.java | 75 +
.../juneau/marshall/hocon/HoconMetaProvider.java | 42 +
.../apache/juneau/marshall/hocon/HoconParser.java | 172 +
.../juneau/marshall/hocon/HoconParserSession.java | 518 ++
.../juneau/marshall/hocon/HoconResolver.java | 223 +
.../juneau/marshall/hocon/HoconSerializer.java | 366 ++
.../marshall/hocon/HoconSerializerSession.java | 332 ++
.../juneau/marshall/hocon/HoconTokenizer.java | 587 +++
.../apache/juneau/marshall/hocon/HoconValue.java | 366 ++
.../apache/juneau/marshall/hocon/HoconWriter.java | 348 ++
.../apache/juneau/marshall/hocon/package-info.java | 57 +
.../apache/juneau/marshall/html/AnchorText.java | 73 +
.../apache/juneau/marshall/html/AsideFloat.java | 75 +
.../juneau/marshall/html/BasicHtmlDocTemplate.java | 401 ++
.../java/org/apache/juneau/marshall/html/Html.java | 166 +
.../juneau/marshall/html/HtmlAnnotation.java | 243 +
.../org/apache/juneau/marshall/html/HtmlApply.java | 101 +
.../juneau/marshall/html/HtmlApplyAnnotation.java | 218 +
.../juneau/marshall/html/HtmlBeanPropertyMeta.java | 218 +
.../apache/juneau/marshall/html/HtmlClassMeta.java | 144 +
.../apache/juneau/marshall/html/HtmlConfig.java | 283 +
.../juneau/marshall/html/HtmlConfigAnnotation.java | 86 +
.../apache/juneau/marshall/html/HtmlDocConfig.java | 643 +++
.../marshall/html/HtmlDocConfigAnnotation.java | 78 +
.../juneau/marshall/html/HtmlDocSerializer.java | 1161 ++++
.../marshall/html/HtmlDocSerializerSession.java | 307 ++
.../juneau/marshall/html/HtmlDocTemplate.java | 83 +
.../apache/juneau/marshall/html/HtmlFormat.java | 55 +
.../org/apache/juneau/marshall/html/HtmlLink.java | 76 +
.../juneau/marshall/html/HtmlLinkAnnotation.java | 146 +
.../apache/juneau/marshall/html/HtmlLinkApply.java | 101 +
.../marshall/html/HtmlLinkApplyAnnotation.java | 193 +
.../juneau/marshall/html/HtmlMetaProvider.java | 46 +
.../apache/juneau/marshall/html/HtmlParser.java | 155 +
.../juneau/marshall/html/HtmlParserSession.java | 859 +++
.../apache/juneau/marshall/html/HtmlRender.java | 68 +
.../marshall/html/HtmlSchemaDocSerializer.java | 278 +
.../html/HtmlSchemaDocSerializerSession.java | 95 +
.../juneau/marshall/html/HtmlSchemaSerializer.java | 341 ++
.../marshall/html/HtmlSchemaSerializerSession.java | 95 +
.../juneau/marshall/html/HtmlSerializer.java | 881 ++++
.../marshall/html/HtmlSerializerSession.java | 1080 ++++
.../marshall/html/HtmlStrippedDocSerializer.java | 154 +
.../html/HtmlStrippedDocSerializerSession.java | 112 +
.../org/apache/juneau/marshall/html/HtmlTag.java | 157 +
.../apache/juneau/marshall/html/HtmlWidget.java | 79 +
.../apache/juneau/marshall/html/HtmlWidgetMap.java | 45 +
.../apache/juneau/marshall/html/HtmlWidgetVar.java | 70 +
.../apache/juneau/marshall/html/HtmlWriter.java | 447 ++
.../juneau/marshall/html/SimpleHtmlWriter.java | 393 ++
.../apache/juneau/marshall/html/package-info.java | 20 +
.../marshall/httppart/BaseHttpPartParser.java | 159 +
.../httppart/BaseHttpPartParserSession.java | 26 +
.../marshall/httppart/BaseHttpPartSerializer.java | 98 +
.../httppart/BaseHttpPartSerializerSession.java | 26 +
.../apache/juneau/marshall/httppart/Constants.java | 150 +
.../apache/juneau/marshall/httppart/HttpPart.java | 77 +
.../marshall/httppart/HttpPartMarshalling.java | 64 +
.../juneau/marshall/httppart/HttpPartParser.java | 126 +
.../marshall/httppart/HttpPartParserSession.java | 52 +
.../juneau/marshall/httppart/HttpPartSchema.java | 4707 +++++++++++++++++
.../marshall/httppart/HttpPartSerializer.java | 114 +
.../httppart/HttpPartSerializerSession.java | 53 +
.../juneau/marshall/httppart/SimplePartParser.java | 125 +
.../marshall/httppart/SimplePartParserSession.java | 41 +
.../marshall/httppart/SimplePartSerializer.java | 105 +
.../httppart/SimplePartSerializerSession.java | 39 +
.../juneau/marshall/httppart/package-info.java | 20 +
.../java/org/apache/juneau/marshall/ini/Ini.java | 62 +
.../apache/juneau/marshall/ini/IniAnnotation.java | 48 +
.../org/apache/juneau/marshall/ini/IniApply.java | 89 +
.../juneau/marshall/ini/IniApplyAnnotation.java | 218 +
.../juneau/marshall/ini/IniBeanPropertyMeta.java | 82 +
.../apache/juneau/marshall/ini/IniClassMeta.java | 52 +
.../org/apache/juneau/marshall/ini/IniConfig.java | 80 +
.../juneau/marshall/ini/IniConfigAnnotation.java | 72 +
.../juneau/marshall/ini/IniMetaProvider.java | 42 +
.../org/apache/juneau/marshall/ini/IniParser.java | 171 +
.../juneau/marshall/ini/IniParserSession.java | 307 ++
.../apache/juneau/marshall/ini/IniSerializer.java | 279 +
.../juneau/marshall/ini/IniSerializerSession.java | 351 ++
.../org/apache/juneau/marshall/ini/IniWriter.java | 168 +
.../apache/juneau/marshall/ini/package-info.java | 39 +
.../juneau/marshall/internal/ClassUtils2.java | 67 +
.../juneau/marshall/internal/ConverterUtils.java | 163 +
.../juneau/marshall/internal/DelegateBeanMap.java | 173 +
.../juneau/marshall/internal/DelegateList.java | 64 +
.../juneau/marshall/internal/DelegateMap.java | 89 +
.../juneau/marshall/internal/FilteredKeyMap.java | 126 +
.../juneau/marshall/internal/package-info.java | 20 +
.../org/apache/juneau/marshall/jcs/JcsConfig.java | 53 +
.../juneau/marshall/jcs/JcsConfigAnnotation.java | 53 +
.../apache/juneau/marshall/jcs/JcsSerializer.java | 184 +
.../juneau/marshall/jcs/JcsSerializerSession.java | 312 ++
.../org/apache/juneau/marshall/jcs/JcsWriter.java | 120 +
.../apache/juneau/marshall/jcs/package-info.java | 27 +
.../java/org/apache/juneau/marshall/json/Json.java | 98 +
.../juneau/marshall/json/JsonAnnotation.java | 127 +
.../org/apache/juneau/marshall/json/JsonApply.java | 101 +
.../juneau/marshall/json/JsonApplyAnnotation.java | 224 +
.../juneau/marshall/json/JsonBeanPropertyMeta.java | 51 +
.../apache/juneau/marshall/json/JsonClassMeta.java | 57 +
.../apache/juneau/marshall/json/JsonConfig.java | 133 +
.../juneau/marshall/json/JsonConfigAnnotation.java | 87 +
.../juneau/marshall/json/JsonMetaProvider.java | 46 +
.../apache/juneau/marshall/json/JsonParser.java | 300 ++
.../juneau/marshall/json/JsonParserSession.java | 918 ++++
.../juneau/marshall/json/JsonSchemaSerializer.java | 313 ++
.../marshall/json/JsonSchemaSerializerSession.java | 118 +
.../juneau/marshall/json/JsonSerializer.java | 421 ++
.../marshall/json/JsonSerializerSession.java | 418 ++
.../apache/juneau/marshall/json/JsonWriter.java | 380 ++
.../apache/juneau/marshall/json/package-info.java | 35 +
.../apache/juneau/marshall/json5/Json5List.java | 467 ++
.../org/apache/juneau/marshall/json5/Json5Map.java | 571 ++
.../apache/juneau/marshall/json5/Json5Parser.java | 153 +
.../juneau/marshall/json5/Json5ParserSession.java | 240 +
.../juneau/marshall/json5/Json5Serializer.java | 174 +
.../marshall/json5/Json5SerializerSession.java | 94 +
.../apache/juneau/marshall/json5/package-info.java | 28 +
.../apache/juneau/marshall/jsonl/JsonlConfig.java | 47 +
.../marshall/jsonl/JsonlConfigAnnotation.java | 76 +
.../apache/juneau/marshall/jsonl/JsonlParser.java | 121 +
.../juneau/marshall/jsonl/JsonlParserSession.java | 132 +
.../juneau/marshall/jsonl/JsonlSerializer.java | 132 +
.../marshall/jsonl/JsonlSerializerSession.java | 118 +
.../apache/juneau/marshall/jsonl/package-info.java | 43 +
.../marshall/jsonschema/BasicBeanDefMapper.java | 72 +
.../jsonschema/JsonSchemaBeanPropertyMeta.java | 74 +
.../marshall/jsonschema/JsonSchemaClassMeta.java | 65 +
.../marshall/jsonschema/JsonSchemaConfig.java | 375 ++
.../jsonschema/JsonSchemaConfigAnnotation.java | 68 +
.../marshall/jsonschema/JsonSchemaGenerator.java | 572 ++
.../jsonschema/JsonSchemaGeneratorSession.java | 514 ++
.../jsonschema/JsonSchemaMetaProvider.java | 46 +
.../marshall/jsonschema/MarshallingDefMapper.java | 60 +
.../juneau/marshall/jsonschema/SchemaUtils.java | 128 +
.../juneau/marshall/jsonschema/TypeCategory.java | 98 +
.../juneau/marshall/jsonschema/package-info.java | 20 +
.../apache/juneau/marshall/markdown/Markdown.java | 97 +
.../marshall/markdown/MarkdownAnnotation.java | 61 +
.../juneau/marshall/markdown/MarkdownApply.java | 89 +
.../marshall/markdown/MarkdownApplyAnnotation.java | 218 +
.../markdown/MarkdownBeanPropertyMeta.java | 122 +
.../marshall/markdown/MarkdownClassMeta.java | 76 +
.../juneau/marshall/markdown/MarkdownConfig.java | 48 +
.../markdown/MarkdownConfigAnnotation.java | 75 +
.../marshall/markdown/MarkdownDocParser.java | 176 +
.../markdown/MarkdownDocParserSession.java | 392 ++
.../marshall/markdown/MarkdownDocSerializer.java | 256 +
.../markdown/MarkdownDocSerializerSession.java | 255 +
.../juneau/marshall/markdown/MarkdownFormat.java | 54 +
.../marshall/markdown/MarkdownMetaProvider.java | 43 +
.../juneau/marshall/markdown/MarkdownParser.java | 238 +
.../marshall/markdown/MarkdownParserSession.java | 814 +++
.../marshall/markdown/MarkdownSerializer.java | 275 +
.../markdown/MarkdownSerializerSession.java | 542 ++
.../juneau/marshall/markdown/MarkdownWriter.java | 266 +
.../juneau/marshall/markdown/package-info.java | 32 +
.../apache/juneau/marshall/marshaller/Bson.java | 216 +
.../apache/juneau/marshall/marshaller/Cbor.java | 174 +
.../juneau/marshall/marshaller/CharMarshaller.java | 119 +
.../org/apache/juneau/marshall/marshaller/Csv.java | 242 +
.../apache/juneau/marshall/marshaller/Hjson.java | 171 +
.../apache/juneau/marshall/marshaller/Hocon.java | 158 +
.../apache/juneau/marshall/marshaller/Html.java | 227 +
.../org/apache/juneau/marshall/marshaller/Ini.java | 180 +
.../org/apache/juneau/marshall/marshaller/Jcs.java | 241 +
.../apache/juneau/marshall/marshaller/Json.java | 237 +
.../apache/juneau/marshall/marshaller/Json5.java | 242 +
.../apache/juneau/marshall/marshaller/Jsonl.java | 236 +
.../juneau/marshall/marshaller/Markdown.java | 231 +
.../juneau/marshall/marshaller/MarkdownDoc.java | 226 +
.../juneau/marshall/marshaller/MarshallUtils.java | 1973 +++++++
.../juneau/marshall/marshaller/Marshaller.java | 247 +
.../apache/juneau/marshall/marshaller/MsgPack.java | 216 +
.../apache/juneau/marshall/marshaller/OpenApi.java | 267 +
.../apache/juneau/marshall/marshaller/Parquet.java | 227 +
.../juneau/marshall/marshaller/PlainText.java | 227 +
.../apache/juneau/marshall/marshaller/Proto.java | 175 +
.../org/apache/juneau/marshall/marshaller/Sse.java | 154 +
.../marshall/marshaller/StreamMarshaller.java | 128 +
.../apache/juneau/marshall/marshaller/Toml.java | 168 +
.../org/apache/juneau/marshall/marshaller/Uon.java | 237 +
.../juneau/marshall/marshaller/UrlEncoding.java | 227 +
.../org/apache/juneau/marshall/marshaller/Xml.java | 253 +
.../apache/juneau/marshall/marshaller/Yaml.java | 247 +
.../juneau/marshall/marshaller/package-info.java | 20 +
.../apache/juneau/marshall/msgpack/DataType.java | 78 +
.../apache/juneau/marshall/msgpack/MsgPack.java | 51 +
.../juneau/marshall/msgpack/MsgPackAnnotation.java | 106 +
.../juneau/marshall/msgpack/MsgPackApply.java | 89 +
.../marshall/msgpack/MsgPackApplyAnnotation.java | 218 +
.../marshall/msgpack/MsgPackBeanPropertyMeta.java | 51 +
.../juneau/marshall/msgpack/MsgPackClassMeta.java | 41 +
.../juneau/marshall/msgpack/MsgPackConfig.java | 81 +
.../marshall/msgpack/MsgPackConfigAnnotation.java | 78 +
.../marshall/msgpack/MsgPackInputStream.java | 528 ++
.../marshall/msgpack/MsgPackMetaProvider.java | 46 +
.../marshall/msgpack/MsgPackOutputStream.java | 461 ++
.../juneau/marshall/msgpack/MsgPackParser.java | 199 +
.../marshall/msgpack/MsgPackParserSession.java | 271 +
.../juneau/marshall/msgpack/MsgPackSerializer.java | 259 +
.../marshall/msgpack/MsgPackSerializerSession.java | 316 ++
.../juneau/marshall/msgpack/package-info.java | 20 +
.../org/apache/juneau/marshall/oapi/OpenApi.java | 51 +
.../juneau/marshall/oapi/OpenApiAnnotation.java | 106 +
.../apache/juneau/marshall/oapi/OpenApiApply.java | 89 +
.../marshall/oapi/OpenApiApplyAnnotation.java | 218 +
.../marshall/oapi/OpenApiBeanPropertyMeta.java | 51 +
.../juneau/marshall/oapi/OpenApiClassMeta.java | 41 +
.../apache/juneau/marshall/oapi/OpenApiConfig.java | 114 +
.../marshall/oapi/OpenApiConfigAnnotation.java | 83 +
.../juneau/marshall/oapi/OpenApiMetaProvider.java | 46 +
.../apache/juneau/marshall/oapi/OpenApiParser.java | 280 +
.../juneau/marshall/oapi/OpenApiParserSession.java | 389 ++
.../juneau/marshall/oapi/OpenApiSerializer.java | 292 +
.../marshall/oapi/OpenApiSerializerSession.java | 440 ++
.../apache/juneau/marshall/oapi/package-info.java | 20 +
.../marshall/objecttools/AbstractMatcher.java | 38 +
.../juneau/marshall/objecttools/Equality.java | 42 +
.../marshall/objecttools/MatcherFactory.java | 45 +
.../marshall/objecttools/NumberMatcherFactory.java | 340 ++
.../marshall/objecttools/ObjectIntrospector.java | 255 +
.../juneau/marshall/objecttools/ObjectMerger.java | 169 +
.../marshall/objecttools/ObjectPaginator.java | 135 +
.../juneau/marshall/objecttools/ObjectRest.java | 1051 ++++
.../marshall/objecttools/ObjectRestException.java | 95 +
.../marshall/objecttools/ObjectSearcher.java | 305 ++
.../juneau/marshall/objecttools/ObjectSorter.java | 201 +
.../juneau/marshall/objecttools/ObjectTool.java | 41 +
.../juneau/marshall/objecttools/ObjectViewer.java | 158 +
.../juneau/marshall/objecttools/PageArgs.java | 71 +
.../marshall/objecttools/PatternException.java | 52 +
.../juneau/marshall/objecttools/SearchArgs.java | 108 +
.../juneau/marshall/objecttools/SortArgs.java | 126 +
.../marshall/objecttools/StringMatcherFactory.java | 194 +
.../marshall/objecttools/TimeMatcherFactory.java | 384 ++
.../juneau/marshall/objecttools/ViewArgs.java | 91 +
.../juneau/marshall/objecttools/package-info.java | 20 +
.../org/apache/juneau/marshall/package-info.java | 21 +
.../juneau/marshall/parquet/CompressionCodec.java | 96 +
.../apache/juneau/marshall/parquet/Parquet.java | 41 +
.../juneau/marshall/parquet/ParquetAnnotation.java | 44 +
.../juneau/marshall/parquet/ParquetApply.java | 89 +
.../marshall/parquet/ParquetApplyAnnotation.java | 218 +
.../marshall/parquet/ParquetBeanPropertyMeta.java | 43 +
.../juneau/marshall/parquet/ParquetClassMeta.java | 35 +
.../marshall/parquet/ParquetColumnReader.java | 174 +
.../marshall/parquet/ParquetColumnWriter.java | 151 +
.../juneau/marshall/parquet/ParquetConfig.java | 54 +
.../marshall/parquet/ParquetConfigAnnotation.java | 97 +
.../marshall/parquet/ParquetCycleHandling.java | 38 +
.../marshall/parquet/ParquetMetaProvider.java | 42 +
.../juneau/marshall/parquet/ParquetParser.java | 152 +
.../marshall/parquet/ParquetParserSession.java | 1377 +++++
.../marshall/parquet/ParquetSchemaBuilder.java | 329 ++
.../marshall/parquet/ParquetSchemaElement.java | 231 +
.../juneau/marshall/parquet/ParquetSerializer.java | 292 +
.../marshall/parquet/ParquetSerializerSession.java | 865 +++
.../marshall/parquet/RleBitPackingDecoder.java | 128 +
.../marshall/parquet/RleBitPackingEncoder.java | 150 +
.../marshall/parquet/ThriftCompactDecoder.java | 253 +
.../marshall/parquet/ThriftCompactEncoder.java | 177 +
.../juneau/marshall/parquet/package-info.java | 37 +
.../juneau/marshall/parser/InputStreamParser.java | 156 +
.../marshall/parser/InputStreamParserSession.java | 168 +
.../juneau/marshall/parser/ParseException.java | 178 +
.../org/apache/juneau/marshall/parser/Parser.java | 986 ++++
.../juneau/marshall/parser/ParserConfig.java | 260 +
.../marshall/parser/ParserConfigAnnotation.java | 117 +
.../juneau/marshall/parser/ParserInputStream.java | 67 +
.../juneau/marshall/parser/ParserListener.java | 76 +
.../apache/juneau/marshall/parser/ParserMatch.java | 57 +
.../apache/juneau/marshall/parser/ParserPipe.java | 357 ++
.../juneau/marshall/parser/ParserReader.java | 465 ++
.../juneau/marshall/parser/ParserSession.java | 1415 +++++
.../apache/juneau/marshall/parser/ParserSet.java | 647 +++
.../apache/juneau/marshall/parser/Position.java | 99 +
.../juneau/marshall/parser/Positionable.java | 34 +
.../juneau/marshall/parser/ReaderParser.java | 269 +
.../marshall/parser/ReaderParserSession.java | 236 +
.../juneau/marshall/parser/package-info.java | 20 +
.../juneau/marshall/plaintext/PlainText.java | 47 +
.../marshall/plaintext/PlainTextAnnotation.java | 103 +
.../juneau/marshall/plaintext/PlainTextApply.java | 89 +
.../plaintext/PlainTextApplyAnnotation.java | 218 +
.../plaintext/PlainTextBeanPropertyMeta.java | 47 +
.../marshall/plaintext/PlainTextClassMeta.java | 37 +
.../juneau/marshall/plaintext/PlainTextConfig.java | 48 +
.../plaintext/PlainTextConfigAnnotation.java | 73 +
.../marshall/plaintext/PlainTextMetaProvider.java | 43 +
.../juneau/marshall/plaintext/PlainTextParser.java | 159 +
.../marshall/plaintext/PlainTextParserSession.java | 84 +
.../marshall/plaintext/PlainTextSerializer.java | 157 +
.../plaintext/PlainTextSerializerSession.java | 89 +
.../juneau/marshall/plaintext/package-info.java | 20 +
.../org/apache/juneau/marshall/proto/Proto.java | 60 +
.../juneau/marshall/proto/ProtoAnnotation.java | 125 +
.../apache/juneau/marshall/proto/ProtoApply.java | 89 +
.../marshall/proto/ProtoApplyAnnotation.java | 218 +
.../marshall/proto/ProtoBeanPropertyMeta.java | 69 +
.../juneau/marshall/proto/ProtoClassMeta.java | 40 +
.../apache/juneau/marshall/proto/ProtoConfig.java | 81 +
.../marshall/proto/ProtoConfigAnnotation.java | 79 +
.../juneau/marshall/proto/ProtoMetaProvider.java | 46 +
.../apache/juneau/marshall/proto/ProtoParser.java | 177 +
.../juneau/marshall/proto/ProtoParserSession.java | 387 ++
.../juneau/marshall/proto/ProtoSerializer.java | 286 +
.../marshall/proto/ProtoSerializerSession.java | 479 ++
.../apache/juneau/marshall/proto/ProtoToken.java | 95 +
.../juneau/marshall/proto/ProtoTokenizer.java | 561 ++
.../apache/juneau/marshall/proto/ProtoWriter.java | 339 ++
.../apache/juneau/marshall/proto/package-info.java | 44 +
.../serializer/OutputStreamSerializer.java | 164 +
.../serializer/OutputStreamSerializerSession.java | 187 +
.../marshall/serializer/SerializeException.java | 144 +
.../juneau/marshall/serializer/Serializer.java | 1208 +++++
.../marshall/serializer/SerializerConfig.java | 672 +++
.../serializer/SerializerConfigAnnotation.java | 131 +
.../marshall/serializer/SerializerListener.java | 59 +
.../marshall/serializer/SerializerMatch.java | 57 +
.../juneau/marshall/serializer/SerializerPipe.java | 210 +
.../marshall/serializer/SerializerSession.java | 1447 +++++
.../juneau/marshall/serializer/SerializerSet.java | 708 +++
.../marshall/serializer/SerializerWriter.java | 429 ++
.../marshall/serializer/WriterSerializer.java | 587 +++
.../serializer/WriterSerializerSession.java | 336 ++
.../juneau/marshall/serializer/package-info.java | 20 +
.../org/apache/juneau/marshall/soap/SoapXml.java | 49 +
.../juneau/marshall/soap/SoapXmlAnnotation.java | 73 +
.../apache/juneau/marshall/soap/SoapXmlApply.java | 57 +
.../marshall/soap/SoapXmlApplyAnnotation.java | 106 +
.../marshall/soap/SoapXmlBeanPropertyMeta.java | 47 +
.../juneau/marshall/soap/SoapXmlClassMeta.java | 37 +
.../apache/juneau/marshall/soap/SoapXmlConfig.java | 59 +
.../marshall/soap/SoapXmlConfigAnnotation.java | 55 +
.../juneau/marshall/soap/SoapXmlMetaProvider.java | 43 +
.../juneau/marshall/soap/SoapXmlSerializer.java | 200 +
.../marshall/soap/SoapXmlSerializerSession.java | 127 +
.../apache/juneau/marshall/soap/package-info.java | 20 +
.../org/apache/juneau/marshall/sse/SseEvent.java | 195 +
.../apache/juneau/marshall/sse/SseEventReader.java | 274 +
.../org/apache/juneau/marshall/sse/SseParser.java | 133 +
.../juneau/marshall/sse/SseParserSession.java | 110 +
.../apache/juneau/marshall/sse/SseSerializer.java | 174 +
.../juneau/marshall/sse/SseSerializerSession.java | 161 +
.../apache/juneau/marshall/sse/package-info.java | 39 +
.../apache/juneau/marshall/swap/AutoListSwap.java | 204 +
.../apache/juneau/marshall/swap/AutoMapSwap.java | 204 +
.../juneau/marshall/swap/AutoNumberSwap.java | 262 +
.../juneau/marshall/swap/AutoObjectSwap.java | 205 +
.../juneau/marshall/swap/AutoStringSwap.java | 54 +
.../org/apache/juneau/marshall/swap/Builder.java | 31 +
.../apache/juneau/marshall/swap/BuilderSwap.java | 289 +
.../apache/juneau/marshall/swap/DefaultSwaps.java | 99 +
.../juneau/marshall/swap/FunctionalSwap.java | 84 +
.../org/apache/juneau/marshall/swap/MapSwap.java | 52 +
.../apache/juneau/marshall/swap/ObjectSwap.java | 429 ++
.../apache/juneau/marshall/swap/StringSwap.java | 64 +
.../org/apache/juneau/marshall/swap/Surrogate.java | 92 +
.../apache/juneau/marshall/swap/SurrogateSwap.java | 112 +
.../apache/juneau/marshall/swap/package-info.java | 20 +
.../apache/juneau/marshall/swaps/BinarySwap.java | 96 +
.../juneau/marshall/swaps/ClassFormatSwap.java | 67 +
.../marshall/swaps/DefaultingTemporalAccessor.java | 154 +
.../juneau/marshall/swaps/InputStreamSwap.java | 130 +
.../marshall/swaps/MarshallingStringSwap.java | 51 +
.../juneau/marshall/swaps/MatchResultSwap.java | 50 +
.../juneau/marshall/swaps/ParsedReaderSwap.java | 137 +
.../apache/juneau/marshall/swaps/ReaderSwap.java | 43 +
.../marshall/swaps/StackTraceElementSwap.java | 78 +
.../juneau/marshall/swaps/StringFormatSwap.java | 51 +
.../org/apache/juneau/marshall/swaps/UrlSwap.java | 42 +
.../apache/juneau/marshall/swaps/package-info.java | 20 +
.../apache/juneau/marshall/toml/TomlConfig.java | 47 +
.../juneau/marshall/toml/TomlConfigAnnotation.java | 69 +
.../apache/juneau/marshall/toml/TomlParser.java | 199 +
.../juneau/marshall/toml/TomlParserSession.java | 525 ++
.../juneau/marshall/toml/TomlSerializer.java | 286 +
.../marshall/toml/TomlSerializerSession.java | 438 ++
.../apache/juneau/marshall/toml/TomlTokenizer.java | 585 ++
.../apache/juneau/marshall/toml/TomlWriter.java | 273 +
.../apache/juneau/marshall/toml/package-info.java | 35 +
.../apache/juneau/marshall/uon/ParamFormat.java | 53 +
.../java/org/apache/juneau/marshall/uon/Uon.java | 52 +
.../apache/juneau/marshall/uon/UonAnnotation.java | 76 +
.../org/apache/juneau/marshall/uon/UonApply.java | 57 +
.../juneau/marshall/uon/UonApplyAnnotation.java | 106 +
.../juneau/marshall/uon/UonBeanPropertyMeta.java | 51 +
.../apache/juneau/marshall/uon/UonClassMeta.java | 41 +
.../org/apache/juneau/marshall/uon/UonConfig.java | 185 +
.../juneau/marshall/uon/UonConfigAnnotation.java | 89 +
.../juneau/marshall/uon/UonMetaProvider.java | 46 +
.../org/apache/juneau/marshall/uon/UonParser.java | 411 ++
.../juneau/marshall/uon/UonParserSession.java | 973 ++++
.../org/apache/juneau/marshall/uon/UonReader.java | 215 +
.../apache/juneau/marshall/uon/UonSerializer.java | 607 +++
.../juneau/marshall/uon/UonSerializerSession.java | 461 ++
.../org/apache/juneau/marshall/uon/UonUtils.java | 69 +
.../org/apache/juneau/marshall/uon/UonWriter.java | 323 ++
.../apache/juneau/marshall/uon/package-info.java | 20 +
.../juneau/marshall/urlencoding/UrlEncoding.java | 65 +
.../urlencoding/UrlEncodingAnnotation.java | 126 +
.../marshall/urlencoding/UrlEncodingApply.java | 98 +
.../urlencoding/UrlEncodingApplyAnnotation.java | 218 +
.../urlencoding/UrlEncodingBeanPropertyMeta.java | 50 +
.../marshall/urlencoding/UrlEncodingClassMeta.java | 53 +
.../marshall/urlencoding/UrlEncodingConfig.java | 85 +
.../urlencoding/UrlEncodingConfigAnnotation.java | 80 +
.../urlencoding/UrlEncodingMetaProvider.java | 46 +
.../marshall/urlencoding/UrlEncodingParser.java | 243 +
.../urlencoding/UrlEncodingParserSession.java | 544 ++
.../urlencoding/UrlEncodingSerializer.java | 375 ++
.../urlencoding/UrlEncodingSerializerSession.java | 386 ++
.../juneau/marshall/urlencoding/package-info.java | 20 +
.../org/apache/juneau/marshall/utils/BeanDiff.java | 256 +
.../apache/juneau/marshall/utils/Iso8601Utils.java | 592 +++
.../utils/MarshallingContextConverter.java | 162 +
.../marshall/utils/StringExpressionMatcher.java | 362 ++
.../apache/juneau/marshall/utils/package-info.java | 20 +
.../org/apache/juneau/marshall/xml/Namespace.java | 194 +
.../java/org/apache/juneau/marshall/xml/Xml.java | 181 +
.../apache/juneau/marshall/xml/XmlAnnotation.java | 183 +
.../org/apache/juneau/marshall/xml/XmlApply.java | 101 +
.../juneau/marshall/xml/XmlApplyAnnotation.java | 218 +
.../apache/juneau/marshall/xml/XmlBeanMeta.java | 267 +
.../juneau/marshall/xml/XmlBeanPropertyMeta.java | 155 +
.../apache/juneau/marshall/xml/XmlClassMeta.java | 99 +
.../org/apache/juneau/marshall/xml/XmlConfig.java | 316 ++
.../juneau/marshall/xml/XmlConfigAnnotation.java | 96 +
.../juneau/marshall/xml/XmlDocSerializer.java | 100 +
.../marshall/xml/XmlDocSerializerSession.java | 94 +
.../juneau/marshall/xml/XmlEventAllocator.java | 39 +
.../org/apache/juneau/marshall/xml/XmlFormat.java | 183 +
.../juneau/marshall/xml/XmlMetaProvider.java | 54 +
.../java/org/apache/juneau/marshall/xml/XmlNs.java | 53 +
.../org/apache/juneau/marshall/xml/XmlParser.java | 457 ++
.../juneau/marshall/xml/XmlParserSession.java | 947 ++++
.../org/apache/juneau/marshall/xml/XmlReader.java | 272 +
.../apache/juneau/marshall/xml/XmlReporter.java | 39 +
.../apache/juneau/marshall/xml/XmlResolver.java | 39 +
.../org/apache/juneau/marshall/xml/XmlSchema.java | 107 +
.../apache/juneau/marshall/xml/XmlSerializer.java | 756 +++
.../juneau/marshall/xml/XmlSerializerSession.java | 1068 ++++
.../org/apache/juneau/marshall/xml/XmlUtils.java | 605 +++
.../org/apache/juneau/marshall/xml/XmlWriter.java | 712 +++
.../apache/juneau/marshall/xml/package-info.java | 20 +
.../apache/juneau/marshall/yaml/YamlConfig.java | 77 +
.../juneau/marshall/yaml/YamlConfigAnnotation.java | 71 +
.../apache/juneau/marshall/yaml/YamlParser.java | 176 +
.../juneau/marshall/yaml/YamlParserSession.java | 1404 +++++
.../juneau/marshall/yaml/YamlSerializer.java | 298 ++
.../marshall/yaml/YamlSerializerSession.java | 329 ++
.../apache/juneau/marshall/yaml/YamlWriter.java | 412 ++
.../apache/juneau/marshall/yaml/package-info.java | 20 +
.../java/org/apache/juneau/marshaller/Bson.java | 216 -
.../java/org/apache/juneau/marshaller/Cbor.java | 174 -
.../apache/juneau/marshaller/CharMarshaller.java | 119 -
.../java/org/apache/juneau/marshaller/Csv.java | 242 -
.../java/org/apache/juneau/marshaller/Hjson.java | 171 -
.../java/org/apache/juneau/marshaller/Hocon.java | 158 -
.../java/org/apache/juneau/marshaller/Html.java | 227 -
.../java/org/apache/juneau/marshaller/Ini.java | 180 -
.../java/org/apache/juneau/marshaller/Jcs.java | 241 -
.../java/org/apache/juneau/marshaller/Json.java | 237 -
.../java/org/apache/juneau/marshaller/Json5.java | 242 -
.../java/org/apache/juneau/marshaller/Jsonl.java | 236 -
.../org/apache/juneau/marshaller/Markdown.java | 231 -
.../org/apache/juneau/marshaller/MarkdownDoc.java | 226 -
.../apache/juneau/marshaller/MarshallUtils.java | 1973 -------
.../org/apache/juneau/marshaller/Marshaller.java | 247 -
.../java/org/apache/juneau/marshaller/MsgPack.java | 216 -
.../java/org/apache/juneau/marshaller/OpenApi.java | 267 -
.../java/org/apache/juneau/marshaller/Parquet.java | 227 -
.../org/apache/juneau/marshaller/PlainText.java | 227 -
.../java/org/apache/juneau/marshaller/Proto.java | 175 -
.../java/org/apache/juneau/marshaller/Sse.java | 154 -
.../apache/juneau/marshaller/StreamMarshaller.java | 128 -
.../java/org/apache/juneau/marshaller/Toml.java | 168 -
.../java/org/apache/juneau/marshaller/Uon.java | 237 -
.../org/apache/juneau/marshaller/UrlEncoding.java | 227 -
.../java/org/apache/juneau/marshaller/Xml.java | 253 -
.../java/org/apache/juneau/marshaller/Yaml.java | 247 -
.../org/apache/juneau/marshaller/package-info.java | 20 -
.../java/org/apache/juneau/msgpack/DataType.java | 78 -
.../java/org/apache/juneau/msgpack/MsgPack.java | 51 -
.../apache/juneau/msgpack/MsgPackAnnotation.java | 106 -
.../org/apache/juneau/msgpack/MsgPackApply.java | 89 -
.../juneau/msgpack/MsgPackApplyAnnotation.java | 218 -
.../juneau/msgpack/MsgPackBeanPropertyMeta.java | 51 -
.../apache/juneau/msgpack/MsgPackClassMeta.java | 41 -
.../org/apache/juneau/msgpack/MsgPackConfig.java | 81 -
.../juneau/msgpack/MsgPackConfigAnnotation.java | 78 -
.../apache/juneau/msgpack/MsgPackInputStream.java | 528 --
.../apache/juneau/msgpack/MsgPackMetaProvider.java | 46 -
.../apache/juneau/msgpack/MsgPackOutputStream.java | 461 --
.../org/apache/juneau/msgpack/MsgPackParser.java | 199 -
.../juneau/msgpack/MsgPackParserSession.java | 271 -
.../apache/juneau/msgpack/MsgPackSerializer.java | 259 -
.../juneau/msgpack/MsgPackSerializerSession.java | 316 --
.../org/apache/juneau/msgpack/package-info.java | 20 -
.../main/java/org/apache/juneau/oapi/OpenApi.java | 51 -
.../org/apache/juneau/oapi/OpenApiAnnotation.java | 106 -
.../java/org/apache/juneau/oapi/OpenApiApply.java | 89 -
.../apache/juneau/oapi/OpenApiApplyAnnotation.java | 218 -
.../juneau/oapi/OpenApiBeanPropertyMeta.java | 51 -
.../org/apache/juneau/oapi/OpenApiClassMeta.java | 41 -
.../java/org/apache/juneau/oapi/OpenApiConfig.java | 114 -
.../juneau/oapi/OpenApiConfigAnnotation.java | 83 -
.../apache/juneau/oapi/OpenApiMetaProvider.java | 46 -
.../java/org/apache/juneau/oapi/OpenApiParser.java | 280 -
.../apache/juneau/oapi/OpenApiParserSession.java | 389 --
.../org/apache/juneau/oapi/OpenApiSerializer.java | 292 -
.../juneau/oapi/OpenApiSerializerSession.java | 440 --
.../java/org/apache/juneau/oapi/package-info.java | 20 -
.../apache/juneau/objecttools/AbstractMatcher.java | 38 -
.../org/apache/juneau/objecttools/Equality.java | 42 -
.../apache/juneau/objecttools/MatcherFactory.java | 45 -
.../juneau/objecttools/NumberMatcherFactory.java | 340 --
.../juneau/objecttools/ObjectIntrospector.java | 255 -
.../apache/juneau/objecttools/ObjectMerger.java | 169 -
.../apache/juneau/objecttools/ObjectPaginator.java | 135 -
.../org/apache/juneau/objecttools/ObjectRest.java | 1051 ----
.../juneau/objecttools/ObjectRestException.java | 95 -
.../apache/juneau/objecttools/ObjectSearcher.java | 305 --
.../apache/juneau/objecttools/ObjectSorter.java | 201 -
.../org/apache/juneau/objecttools/ObjectTool.java | 41 -
.../apache/juneau/objecttools/ObjectViewer.java | 158 -
.../org/apache/juneau/objecttools/PageArgs.java | 71 -
.../juneau/objecttools/PatternException.java | 52 -
.../org/apache/juneau/objecttools/SearchArgs.java | 108 -
.../org/apache/juneau/objecttools/SortArgs.java | 126 -
.../juneau/objecttools/StringMatcherFactory.java | 194 -
.../juneau/objecttools/TimeMatcherFactory.java | 384 --
.../org/apache/juneau/objecttools/ViewArgs.java | 91 -
.../apache/juneau/objecttools/package-info.java | 20 -
.../main/java/org/apache/juneau/package-info.java | 21 -
.../apache/juneau/parquet/CompressionCodec.java | 96 -
.../java/org/apache/juneau/parquet/Parquet.java | 41 -
.../apache/juneau/parquet/ParquetAnnotation.java | 44 -
.../org/apache/juneau/parquet/ParquetApply.java | 89 -
.../juneau/parquet/ParquetApplyAnnotation.java | 218 -
.../juneau/parquet/ParquetBeanPropertyMeta.java | 43 -
.../apache/juneau/parquet/ParquetClassMeta.java | 35 -
.../apache/juneau/parquet/ParquetColumnReader.java | 174 -
.../apache/juneau/parquet/ParquetColumnWriter.java | 151 -
.../org/apache/juneau/parquet/ParquetConfig.java | 54 -
.../juneau/parquet/ParquetConfigAnnotation.java | 97 -
.../juneau/parquet/ParquetCycleHandling.java | 38 -
.../apache/juneau/parquet/ParquetMetaProvider.java | 42 -
.../org/apache/juneau/parquet/ParquetParser.java | 152 -
.../juneau/parquet/ParquetParserSession.java | 1377 -----
.../juneau/parquet/ParquetSchemaBuilder.java | 329 --
.../juneau/parquet/ParquetSchemaElement.java | 231 -
.../apache/juneau/parquet/ParquetSerializer.java | 292 -
.../juneau/parquet/ParquetSerializerSession.java | 865 ---
.../juneau/parquet/RleBitPackingDecoder.java | 128 -
.../juneau/parquet/RleBitPackingEncoder.java | 150 -
.../juneau/parquet/ThriftCompactDecoder.java | 253 -
.../juneau/parquet/ThriftCompactEncoder.java | 177 -
.../org/apache/juneau/parquet/package-info.java | 37 -
.../apache/juneau/parser/InputStreamParser.java | 156 -
.../juneau/parser/InputStreamParserSession.java | 168 -
.../org/apache/juneau/parser/ParseException.java | 178 -
.../main/java/org/apache/juneau/parser/Parser.java | 986 ----
.../org/apache/juneau/parser/ParserConfig.java | 260 -
.../juneau/parser/ParserConfigAnnotation.java | 117 -
.../apache/juneau/parser/ParserInputStream.java | 67 -
.../org/apache/juneau/parser/ParserListener.java | 76 -
.../java/org/apache/juneau/parser/ParserMatch.java | 57 -
.../java/org/apache/juneau/parser/ParserPipe.java | 357 --
.../org/apache/juneau/parser/ParserReader.java | 465 --
.../org/apache/juneau/parser/ParserSession.java | 1415 -----
.../java/org/apache/juneau/parser/ParserSet.java | 647 ---
.../java/org/apache/juneau/parser/Position.java | 99 -
.../org/apache/juneau/parser/Positionable.java | 34 -
.../org/apache/juneau/parser/ReaderParser.java | 269 -
.../apache/juneau/parser/ReaderParserSession.java | 236 -
.../org/apache/juneau/parser/package-info.java | 20 -
.../org/apache/juneau/plaintext/PlainText.java | 47 -
.../juneau/plaintext/PlainTextAnnotation.java | 103 -
.../apache/juneau/plaintext/PlainTextApply.java | 89 -
.../juneau/plaintext/PlainTextApplyAnnotation.java | 218 -
.../plaintext/PlainTextBeanPropertyMeta.java | 47 -
.../juneau/plaintext/PlainTextClassMeta.java | 37 -
.../apache/juneau/plaintext/PlainTextConfig.java | 48 -
.../plaintext/PlainTextConfigAnnotation.java | 73 -
.../juneau/plaintext/PlainTextMetaProvider.java | 43 -
.../apache/juneau/plaintext/PlainTextParser.java | 159 -
.../juneau/plaintext/PlainTextParserSession.java | 84 -
.../juneau/plaintext/PlainTextSerializer.java | 157 -
.../plaintext/PlainTextSerializerSession.java | 89 -
.../org/apache/juneau/plaintext/package-info.java | 20 -
.../main/java/org/apache/juneau/proto/Proto.java | 60 -
.../org/apache/juneau/proto/ProtoAnnotation.java | 125 -
.../java/org/apache/juneau/proto/ProtoApply.java | 89 -
.../apache/juneau/proto/ProtoApplyAnnotation.java | 218 -
.../apache/juneau/proto/ProtoBeanPropertyMeta.java | 69 -
.../org/apache/juneau/proto/ProtoClassMeta.java | 40 -
.../java/org/apache/juneau/proto/ProtoConfig.java | 81 -
.../apache/juneau/proto/ProtoConfigAnnotation.java | 79 -
.../org/apache/juneau/proto/ProtoMetaProvider.java | 46 -
.../java/org/apache/juneau/proto/ProtoParser.java | 177 -
.../apache/juneau/proto/ProtoParserSession.java | 387 --
.../org/apache/juneau/proto/ProtoSerializer.java | 286 -
.../juneau/proto/ProtoSerializerSession.java | 479 --
.../java/org/apache/juneau/proto/ProtoToken.java | 95 -
.../org/apache/juneau/proto/ProtoTokenizer.java | 561 --
.../java/org/apache/juneau/proto/ProtoWriter.java | 339 --
.../java/org/apache/juneau/proto/package-info.java | 44 -
.../juneau/serializer/OutputStreamSerializer.java | 164 -
.../serializer/OutputStreamSerializerSession.java | 187 -
.../juneau/serializer/SerializeException.java | 144 -
.../org/apache/juneau/serializer/Serializer.java | 1208 -----
.../apache/juneau/serializer/SerializerConfig.java | 672 ---
.../serializer/SerializerConfigAnnotation.java | 131 -
.../juneau/serializer/SerializerListener.java | 59 -
.../apache/juneau/serializer/SerializerMatch.java | 57 -
.../apache/juneau/serializer/SerializerPipe.java | 210 -
.../juneau/serializer/SerializerSession.java | 1447 -----
.../apache/juneau/serializer/SerializerSet.java | 708 ---
.../apache/juneau/serializer/SerializerWriter.java | 429 --
.../apache/juneau/serializer/WriterSerializer.java | 587 ---
.../juneau/serializer/WriterSerializerSession.java | 336 --
.../org/apache/juneau/serializer/package-info.java | 20 -
.../main/java/org/apache/juneau/soap/SoapXml.java | 49 -
.../org/apache/juneau/soap/SoapXmlAnnotation.java | 73 -
.../java/org/apache/juneau/soap/SoapXmlApply.java | 57 -
.../apache/juneau/soap/SoapXmlApplyAnnotation.java | 106 -
.../juneau/soap/SoapXmlBeanPropertyMeta.java | 47 -
.../org/apache/juneau/soap/SoapXmlClassMeta.java | 37 -
.../java/org/apache/juneau/soap/SoapXmlConfig.java | 59 -
.../juneau/soap/SoapXmlConfigAnnotation.java | 55 -
.../apache/juneau/soap/SoapXmlMetaProvider.java | 43 -
.../org/apache/juneau/soap/SoapXmlSerializer.java | 200 -
.../juneau/soap/SoapXmlSerializerSession.java | 127 -
.../java/org/apache/juneau/soap/package-info.java | 20 -
.../main/java/org/apache/juneau/sse/SseEvent.java | 195 -
.../java/org/apache/juneau/sse/SseEventReader.java | 274 -
.../main/java/org/apache/juneau/sse/SseParser.java | 133 -
.../org/apache/juneau/sse/SseParserSession.java | 110 -
.../java/org/apache/juneau/sse/SseSerializer.java | 174 -
.../apache/juneau/sse/SseSerializerSession.java | 161 -
.../java/org/apache/juneau/sse/package-info.java | 39 -
.../java/org/apache/juneau/swap/AutoListSwap.java | 204 -
.../java/org/apache/juneau/swap/AutoMapSwap.java | 204 -
.../org/apache/juneau/swap/AutoNumberSwap.java | 262 -
.../org/apache/juneau/swap/AutoObjectSwap.java | 205 -
.../org/apache/juneau/swap/AutoStringSwap.java | 54 -
.../main/java/org/apache/juneau/swap/Builder.java | 31 -
.../java/org/apache/juneau/swap/BuilderSwap.java | 289 -
.../java/org/apache/juneau/swap/DefaultSwaps.java | 99 -
.../org/apache/juneau/swap/FunctionalSwap.java | 84 -
.../main/java/org/apache/juneau/swap/MapSwap.java | 52 -
.../java/org/apache/juneau/swap/ObjectSwap.java | 429 --
.../java/org/apache/juneau/swap/StringSwap.java | 64 -
.../java/org/apache/juneau/swap/Surrogate.java | 92 -
.../java/org/apache/juneau/swap/SurrogateSwap.java | 112 -
.../java/org/apache/juneau/swap/package-info.java | 20 -
.../java/org/apache/juneau/swaps/BinarySwap.java | 96 -
.../org/apache/juneau/swaps/ClassFormatSwap.java | 67 -
.../juneau/swaps/DefaultingTemporalAccessor.java | 154 -
.../org/apache/juneau/swaps/InputStreamSwap.java | 130 -
.../apache/juneau/swaps/MarshallingStringSwap.java | 51 -
.../org/apache/juneau/swaps/MatchResultSwap.java | 50 -
.../org/apache/juneau/swaps/ParsedReaderSwap.java | 137 -
.../java/org/apache/juneau/swaps/ReaderSwap.java | 43 -
.../apache/juneau/swaps/StackTraceElementSwap.java | 78 -
.../org/apache/juneau/swaps/StringFormatSwap.java | 51 -
.../main/java/org/apache/juneau/swaps/UrlSwap.java | 42 -
.../java/org/apache/juneau/swaps/package-info.java | 20 -
.../java/org/apache/juneau/toml/TomlConfig.java | 47 -
.../apache/juneau/toml/TomlConfigAnnotation.java | 69 -
.../java/org/apache/juneau/toml/TomlParser.java | 199 -
.../org/apache/juneau/toml/TomlParserSession.java | 525 --
.../org/apache/juneau/toml/TomlSerializer.java | 286 -
.../apache/juneau/toml/TomlSerializerSession.java | 438 --
.../java/org/apache/juneau/toml/TomlTokenizer.java | 585 --
.../java/org/apache/juneau/toml/TomlWriter.java | 273 -
.../java/org/apache/juneau/toml/package-info.java | 35 -
.../java/org/apache/juneau/uon/ParamFormat.java | 53 -
.../src/main/java/org/apache/juneau/uon/Uon.java | 52 -
.../java/org/apache/juneau/uon/UonAnnotation.java | 76 -
.../main/java/org/apache/juneau/uon/UonApply.java | 57 -
.../org/apache/juneau/uon/UonApplyAnnotation.java | 106 -
.../org/apache/juneau/uon/UonBeanPropertyMeta.java | 51 -
.../java/org/apache/juneau/uon/UonClassMeta.java | 41 -
.../main/java/org/apache/juneau/uon/UonConfig.java | 185 -
.../org/apache/juneau/uon/UonConfigAnnotation.java | 89 -
.../org/apache/juneau/uon/UonMetaProvider.java | 46 -
.../main/java/org/apache/juneau/uon/UonParser.java | 411 --
.../org/apache/juneau/uon/UonParserSession.java | 973 ----
.../main/java/org/apache/juneau/uon/UonReader.java | 215 -
.../java/org/apache/juneau/uon/UonSerializer.java | 607 ---
.../apache/juneau/uon/UonSerializerSession.java | 461 --
.../main/java/org/apache/juneau/uon/UonUtils.java | 69 -
.../main/java/org/apache/juneau/uon/UonWriter.java | 323 --
.../java/org/apache/juneau/uon/package-info.java | 20 -
.../org/apache/juneau/urlencoding/UrlEncoding.java | 65 -
.../juneau/urlencoding/UrlEncodingAnnotation.java | 126 -
.../juneau/urlencoding/UrlEncodingApply.java | 98 -
.../urlencoding/UrlEncodingApplyAnnotation.java | 218 -
.../urlencoding/UrlEncodingBeanPropertyMeta.java | 50 -
.../juneau/urlencoding/UrlEncodingClassMeta.java | 53 -
.../juneau/urlencoding/UrlEncodingConfig.java | 85 -
.../urlencoding/UrlEncodingConfigAnnotation.java | 80 -
.../urlencoding/UrlEncodingMetaProvider.java | 46 -
.../juneau/urlencoding/UrlEncodingParser.java | 243 -
.../urlencoding/UrlEncodingParserSession.java | 544 --
.../juneau/urlencoding/UrlEncodingSerializer.java | 375 --
.../urlencoding/UrlEncodingSerializerSession.java | 386 --
.../apache/juneau/urlencoding/package-info.java | 20 -
.../java/org/apache/juneau/utils/BeanDiff.java | 256 -
.../java/org/apache/juneau/utils/Iso8601Utils.java | 592 ---
.../juneau/utils/MarshallingContextConverter.java | 162 -
.../juneau/utils/StringExpressionMatcher.java | 362 --
.../java/org/apache/juneau/utils/package-info.java | 20 -
.../main/java/org/apache/juneau/xml/Namespace.java | 194 -
.../src/main/java/org/apache/juneau/xml/Xml.java | 181 -
.../java/org/apache/juneau/xml/XmlAnnotation.java | 183 -
.../main/java/org/apache/juneau/xml/XmlApply.java | 101 -
.../org/apache/juneau/xml/XmlApplyAnnotation.java | 218 -
.../java/org/apache/juneau/xml/XmlBeanMeta.java | 267 -
.../org/apache/juneau/xml/XmlBeanPropertyMeta.java | 155 -
.../java/org/apache/juneau/xml/XmlClassMeta.java | 99 -
.../main/java/org/apache/juneau/xml/XmlConfig.java | 316 --
.../org/apache/juneau/xml/XmlConfigAnnotation.java | 96 -
.../org/apache/juneau/xml/XmlDocSerializer.java | 100 -
.../apache/juneau/xml/XmlDocSerializerSession.java | 94 -
.../org/apache/juneau/xml/XmlEventAllocator.java | 39 -
.../main/java/org/apache/juneau/xml/XmlFormat.java | 183 -
.../org/apache/juneau/xml/XmlMetaProvider.java | 54 -
.../src/main/java/org/apache/juneau/xml/XmlNs.java | 53 -
.../main/java/org/apache/juneau/xml/XmlParser.java | 457 --
.../org/apache/juneau/xml/XmlParserSession.java | 947 ----
.../main/java/org/apache/juneau/xml/XmlReader.java | 272 -
.../java/org/apache/juneau/xml/XmlReporter.java | 39 -
.../java/org/apache/juneau/xml/XmlResolver.java | 39 -
.../main/java/org/apache/juneau/xml/XmlSchema.java | 107 -
.../java/org/apache/juneau/xml/XmlSerializer.java | 756 ---
.../apache/juneau/xml/XmlSerializerSession.java | 1068 ----
.../main/java/org/apache/juneau/xml/XmlUtils.java | 605 ---
.../main/java/org/apache/juneau/xml/XmlWriter.java | 712 ---
.../java/org/apache/juneau/xml/package-info.java | 20 -
.../java/org/apache/juneau/yaml/YamlConfig.java | 77 -
.../apache/juneau/yaml/YamlConfigAnnotation.java | 71 -
.../java/org/apache/juneau/yaml/YamlParser.java | 176 -
.../org/apache/juneau/yaml/YamlParserSession.java | 1404 -----
.../org/apache/juneau/yaml/YamlSerializer.java | 298 --
.../apache/juneau/yaml/YamlSerializerSession.java | 329 --
.../java/org/apache/juneau/yaml/YamlWriter.java | 412 --
.../java/org/apache/juneau/yaml/package-info.java | 20 -
juneau-examples/juneau-examples-core/README.md | 2 +-
.../apache/juneau/examples/bean/BeanExample.java | 6 +-
.../juneau/examples/bean/atom/AtomHtmlExample.java | 2 +-
.../juneau/examples/bean/atom/AtomJsonExample.java | 2 +-
.../juneau/examples/bean/atom/AtomXmlExample.java | 2 +-
.../examples/core/html/HtmlComplexExample.java | 2 +-
.../examples/core/html/HtmlSimpleExample.java | 2 +-
.../examples/core/json/JsonComplexExample.java | 2 +-
.../core/json/JsonConfigurationExample.java | 4 +-
.../examples/core/json/JsonSimpleExample.java | 4 +-
.../juneau/examples/core/oapi/OapiExample.java | 4 +-
.../examples/core/uon/UonComplexExample.java | 2 +-
.../juneau/examples/core/uon/UonExample.java | 2 +-
.../examples/core/xml/XmlComplexExample.java | 2 +-
.../examples/core/xml/XmlConfigurationExample.java | 2 +-
.../juneau/examples/core/xml/XmlSimpleExample.java | 2 +-
.../apache/juneau/examples/parser/ImageParser.java | 4 +-
.../examples/serializer/ImageSerializer.java | 2 +-
.../juneau/examples/rest/ContentComboTestBase.java | 20 +-
.../juneau/examples/rest/RootResourcesTest.java | 6 +-
.../juneau/examples/rest/SamplesMicroservice.java | 4 +-
.../org/apache/juneau/examples/rest/TestUtils.java | 8 +-
.../apache/juneau/examples/rest/_TestSuite.java | 2 +-
.../juneau-examples-rest-jetty.cfg | 14 +-
.../juneau-examples-rest-jetty.launch | 2 +-
.../juneau-examples-rest-springboot.launch | 2 +-
.../rest/springboot/HelloWorldResource.java | 2 +-
.../examples/rest/springboot/RootResources.java | 4 +-
.../juneau/examples/rest/HelloWorldResource.java | 2 +-
.../juneau/examples/rest/HtmlBeansResource.java | 2 +-
.../juneau/examples/rest/PhotosResource.java | 2 +-
.../juneau/examples/rest/RequestEchoResource.java | 6 +-
.../apache/juneau/examples/rest/RootResources.java | 4 +-
.../juneau/examples/rest/SseDemoResource.java | 2 +-
.../juneau/examples/rest/UtilityBeansResource.java | 2 +-
.../juneau/examples/rest/dto/AtomFeedResource.java | 6 +-
.../juneau/examples/rest/dto/DtoExamples.java | 4 +-
.../examples/rest/dto/JsonSchemaResource.java | 4 +-
.../logs/jetty-requests.log.181709835 | 0
.../logs/jetty-requests.log.182606363 | 0
.../logs/jetty-requests.log.182858282 | 0
.../logs/jetty-requests.log.183154630 | 0
.../logs/jetty-requests.log.183430609 | 0
.../logs/jetty-requests.log.184323619 | 0
.../logs/jetty-requests.log.184626596 | 0
.../logs/jetty-requests.log.184923030 | 0
.../logs/jetty-requests.log.185222705 | 0
.../logs/jetty-requests.log.185449241 | 0
.../logs/jetty-requests.log.185846749 | 0
.../juneau/microservice/jetty/JettyLogger.java | 2 +-
.../microservice/jetty/JettyServerComponent.java | 4 +-
.../jetty/resources/DebugResource.java | 2 +-
.../src/main/resources/juneau.cfg | 10 +-
.../juneau/microservice/tomcat/TomcatLogger.java | 6 +-
.../microservice/tomcat/TomcatServerComponent.java | 4 +-
.../microservice/tomcat/TomcatServerFactory.java | 2 +-
.../apache/juneau/microservice/Microservice.java | 6 +-
.../juneau/microservice/console/ConfigCommand.java | 2 +-
.../juneau/microservice/console/ExitCommand.java | 2 +-
.../juneau/microservice/console/HelpCommand.java | 2 +-
.../microservice/console/RestartCommand.java | 2 +-
.../microservice/resources/ConfigResource.java | 4 +-
.../microservice/resources/DirectoryResource.java | 2 +-
.../microservice/resources/LogsResource.java | 2 +-
.../my-springboot-microservice.launch.2 | 2 +-
.../my-springboot-microservice.launch | 2 +-
.../springboot/template/HelloWorldResource.java | 2 +-
.../springboot/template/RootResources.java | 4 +-
.../build-overlay/my-tomcat-microservice.launch.2 | 2 +-
.../my-tomcat-microservice.cfg | 10 +-
.../my-tomcat-microservice.launch | 2 +-
.../tomcat/template/RootResources.java | 2 +-
.../apachehttpclient45/ApacheHc45Transport.java | 2 +-
.../ApacheHc45TransportBuilder.java | 2 +-
.../ApacheHc45TransportProvider.java | 2 +-
.../apachehttpclient50/ApacheHc5Transport.java | 2 +-
.../ApacheHc5TransportBuilder.java | 2 +-
.../ApacheHc5TransportProvider.java | 2 +-
.../rest/client/classic/ResponseContent.java | 14 +-
.../juneau/rest/client/classic/ResponseHeader.java | 8 +-
.../juneau/rest/client/classic/RestClient.java | 116 +-
.../juneau/rest/client/classic/RestRequest.java | 34 +-
.../juneau/rest/client/classic/RestResponse.java | 6 +-
.../assertion/FluentResponseBodyAssertion.java | 2 +-
.../assertion/FluentResponseHeaderAssertion.java | 2 +-
.../FluentResponseStatusLineAssertion.java | 2 +-
.../classic/remote/RemoteMetadataException.java | 2 +-
.../client/classic/remote/RemoteOperationArg.java | 2 +-
.../client/classic/remote/RemoteOperationMeta.java | 4 +-
.../classic/remote/RemoteOperationReturn.java | 2 +-
.../rest/client/jetty/JettyHttpTransport.java | 2 +-
.../client/jetty/JettyHttpTransportBuilder.java | 2 +-
.../client/jetty/JettyHttpTransportProvider.java | 2 +-
.../juneau/rest/client/okhttp/OkHttpTransport.java | 2 +-
.../rest/client/okhttp/OkHttpTransportBuilder.java | 2 +-
.../client/okhttp/OkHttpTransportProvider.java | 2 +-
.../apache/juneau/rest/client/BasicRestLogger.java | 2 +-
.../apache/juneau/rest/client/BodyConverter.java | 2 +-
.../apache/juneau/rest/client/HttpTransport.java | 2 +-
.../juneau/rest/client/HttpTransportBuilder.java | 2 +-
.../apache/juneau/rest/client/ResponseBody.java | 2 +-
.../apache/juneau/rest/client/ResponseHeader.java | 2 +-
.../juneau/rest/client/RestCallInterceptor.java | 2 +-
.../apache/juneau/rest/client/RestLogEntry.java | 2 +-
.../juneau/rest/client/RestLogLevelResolver.java | 2 +-
.../org/apache/juneau/rest/client/RestLogger.java | 2 +-
.../org/apache/juneau/rest/client/RestRequest.java | 2 +-
.../apache/juneau/rest/client/RestResponse.java | 2 +-
.../rest/client/assertion/ResponseAssertion.java | 2 +-
.../client/assertion/ResponseBodyAssertion.java | 2 +-
.../client/assertion/ResponseHeaderAssertion.java | 2 +-
.../juneau/rest/client/assertion/package-info.java | 4 +-
.../juneau/rest/client/remote/RemoteClient.java | 12 +-
.../apache/juneau/http/classic/HttpEntities.java | 4 +-
.../apache/juneau/http/classic/HttpHeaders.java | 4 +-
.../org/apache/juneau/http/classic/HttpParts.java | 2 +-
.../http/classic/entity/SerializedEntity.java | 4 +-
.../juneau/http/classic/header/BasicHeader.java | 2 +-
.../http/classic/header/BasicMediaTypeHeader.java | 4 +-
.../juneau/http/classic/header/HeaderBeanMeta.java | 2 +-
.../http/classic/header/SerializedHeader.java | 6 +-
.../apache/juneau/http/classic/part/BasicPart.java | 2 +-
.../juneau/http/classic/part/PartBeanMeta.java | 2 +-
.../juneau/http/classic/part/SerializedPart.java | 8 +-
.../http/classic/response/BasicHttpException.java | 2 +-
.../http/classic/response/BasicHttpResponse.java | 2 +-
.../org/apache/juneau/http/ContactAnnotation.java | 2 +-
.../main/java/org/apache/juneau/http/Content.java | 2 +-
.../java/org/apache/juneau/http/HttpBodies.java | 2 +-
.../main/java/org/apache/juneau/http/HttpBody.java | 2 +-
.../java/org/apache/juneau/http/HttpHeader.java | 2 +-
.../java/org/apache/juneau/http/HttpHeaders.java | 2 +-
.../main/java/org/apache/juneau/http/HttpPart.java | 2 +-
.../java/org/apache/juneau/http/HttpParts.java | 4 +-
.../org/apache/juneau/http/HttpRequestLine.java | 2 +-
.../java/org/apache/juneau/http/HttpResource.java | 2 +-
.../java/org/apache/juneau/http/HttpResponses.java | 2 +-
.../org/apache/juneau/http/HttpStatusLine.java | 2 +-
.../org/apache/juneau/http/LicenseAnnotation.java | 2 +-
.../src/main/java/org/apache/juneau/http/Path.java | 2 +-
.../org/apache/juneau/http/ResponseAnnotation.java | 4 +-
.../java/org/apache/juneau/http/TagAnnotation.java | 4 +-
.../apache/juneau/http/entity/ByteArrayBody.java | 2 +-
.../org/apache/juneau/http/entity/FileBody.java | 2 +-
.../apache/juneau/http/entity/HttpBodyBean.java | 2 +-
.../apache/juneau/http/entity/MultipartBody.java | 2 +-
.../org/apache/juneau/http/entity/StreamBody.java | 2 +-
.../org/apache/juneau/http/entity/StringBody.java | 2 +-
.../apache/juneau/http/entity/package-info.java | 2 +-
.../java/org/apache/juneau/http/header/Accept.java | 2 +-
.../apache/juneau/http/header/AcceptCharset.java | 2 +-
.../apache/juneau/http/header/AcceptEncoding.java | 2 +-
.../apache/juneau/http/header/AcceptLanguage.java | 2 +-
.../apache/juneau/http/header/AcceptRanges.java | 2 +-
.../java/org/apache/juneau/http/header/Age.java | 2 +-
.../java/org/apache/juneau/http/header/Allow.java | 2 +-
.../apache/juneau/http/header/Authorization.java | 2 +-
.../apache/juneau/http/header/CacheControl.java | 2 +-
.../apache/juneau/http/header/ClientVersion.java | 2 +-
.../org/apache/juneau/http/header/Connection.java | 2 +-
.../juneau/http/header/ContentDisposition.java | 2 +-
.../apache/juneau/http/header/ContentEncoding.java | 2 +-
.../apache/juneau/http/header/ContentLanguage.java | 2 +-
.../apache/juneau/http/header/ContentLength.java | 2 +-
.../apache/juneau/http/header/ContentLocation.java | 2 +-
.../apache/juneau/http/header/ContentRange.java | 2 +-
.../java/org/apache/juneau/http/header/Date.java | 2 +-
.../java/org/apache/juneau/http/header/Debug.java | 2 +-
.../java/org/apache/juneau/http/header/Expect.java | 2 +-
.../org/apache/juneau/http/header/Expires.java | 2 +-
.../org/apache/juneau/http/header/Forwarded.java | 2 +-
.../java/org/apache/juneau/http/header/From.java | 2 +-
.../java/org/apache/juneau/http/header/Host.java | 2 +-
.../apache/juneau/http/header/HttpHeaderBean.java | 2 +-
.../apache/juneau/http/header/HttpHeaderList.java | 2 +-
.../juneau/http/header/HttpMediaRangesHeader.java | 2 +-
.../juneau/http/header/HttpMediaTypeHeader.java | 2 +-
.../juneau/http/header/HttpStringHeader.java | 2 +-
.../org/apache/juneau/http/header/IfMatch.java | 2 +-
.../apache/juneau/http/header/IfModifiedSince.java | 2 +-
.../org/apache/juneau/http/header/IfNoneMatch.java | 2 +-
.../org/apache/juneau/http/header/IfRange.java | 2 +-
.../juneau/http/header/IfUnmodifiedSince.java | 2 +-
.../apache/juneau/http/header/LastModified.java | 2 +-
.../org/apache/juneau/http/header/Location.java | 2 +-
.../org/apache/juneau/http/header/MaxForwards.java | 2 +-
.../org/apache/juneau/http/header/NoTrace.java | 2 +-
.../java/org/apache/juneau/http/header/Origin.java | 2 +-
.../java/org/apache/juneau/http/header/Pragma.java | 2 +-
.../juneau/http/header/ProxyAuthenticate.java | 2 +-
.../juneau/http/header/ProxyAuthorization.java | 2 +-
.../java/org/apache/juneau/http/header/Range.java | 2 +-
.../org/apache/juneau/http/header/Referer.java | 2 +-
.../org/apache/juneau/http/header/RetryAfter.java | 2 +-
.../java/org/apache/juneau/http/header/Server.java | 2 +-
.../java/org/apache/juneau/http/header/TE.java | 2 +-
.../java/org/apache/juneau/http/header/Thrown.java | 2 +-
.../org/apache/juneau/http/header/Trailer.java | 2 +-
.../juneau/http/header/TransferEncoding.java | 2 +-
.../org/apache/juneau/http/header/Upgrade.java | 2 +-
.../org/apache/juneau/http/header/UserAgent.java | 2 +-
.../java/org/apache/juneau/http/header/Vary.java | 2 +-
.../java/org/apache/juneau/http/header/Via.java | 2 +-
.../org/apache/juneau/http/header/Warning.java | 2 +-
.../apache/juneau/http/header/WwwAuthenticate.java | 2 +-
.../apache/juneau/http/header/package-info.java | 2 +-
.../org/apache/juneau/http/part/HttpPartBean.java | 2 +-
.../org/apache/juneau/http/part/HttpPartList.java | 2 +-
.../java/org/apache/juneau/http/part/PartList.java | 2 +-
.../org/apache/juneau/http/part/package-info.java | 2 +-
.../juneau/http/remote/RrpcInterfaceMeta.java | 2 +-
.../http/remote/RrpcInterfaceMethodMeta.java | 2 +-
.../juneau/http/request/HttpRequestLineBean.java | 2 +-
.../apache/juneau/http/request/package-info.java | 2 +-
.../juneau/http/resource/HttpResourceBean.java | 2 +-
.../apache/juneau/http/resource/package-info.java | 2 +-
.../org/apache/juneau/http/response/Accepted.java | 2 +-
.../juneau/http/response/AlreadyReported.java | 2 +-
.../apache/juneau/http/response/BadGateway.java | 2 +-
.../apache/juneau/http/response/BadRequest.java | 2 +-
.../juneau/http/response/BasicHttpException.java | 2 +-
.../juneau/http/response/BasicHttpResponse.java | 2 +-
.../org/apache/juneau/http/response/Conflict.java | 2 +-
.../org/apache/juneau/http/response/Continue.java | 2 +-
.../org/apache/juneau/http/response/Created.java | 2 +-
.../apache/juneau/http/response/EarlyHints.java | 2 +-
.../juneau/http/response/ExpectationFailed.java | 2 +-
.../juneau/http/response/FailedDependency.java | 2 +-
.../org/apache/juneau/http/response/Forbidden.java | 2 +-
.../org/apache/juneau/http/response/Found.java | 2 +-
.../juneau/http/response/GatewayTimeout.java | 2 +-
.../java/org/apache/juneau/http/response/Gone.java | 2 +-
.../juneau/http/response/HttpResponseMessage.java | 2 +-
.../juneau/http/response/HttpStatusLineBean.java | 2 +-
.../http/response/HttpVersionNotSupported.java | 2 +-
.../org/apache/juneau/http/response/IMUsed.java | 2 +-
.../juneau/http/response/InsufficientStorage.java | 2 +-
.../juneau/http/response/InternalServerError.java | 2 +-
.../juneau/http/response/LengthRequired.java | 2 +-
.../org/apache/juneau/http/response/Locked.java | 2 +-
.../apache/juneau/http/response/LoopDetected.java | 2 +-
.../juneau/http/response/MethodNotAllowed.java | 2 +-
.../juneau/http/response/MisdirectedRequest.java | 2 +-
.../juneau/http/response/MovedPermanently.java | 2 +-
.../apache/juneau/http/response/MultiStatus.java | 2 +-
.../juneau/http/response/MultipleChoices.java | 2 +-
.../response/NetworkAuthenticationRequired.java | 2 +-
.../org/apache/juneau/http/response/NoContent.java | 2 +-
.../http/response/NonAuthoritativeInformation.java | 2 +-
.../apache/juneau/http/response/NotAcceptable.java | 2 +-
.../apache/juneau/http/response/NotExtended.java | 2 +-
.../org/apache/juneau/http/response/NotFound.java | 2 +-
.../juneau/http/response/NotImplemented.java | 2 +-
.../apache/juneau/http/response/NotModified.java | 2 +-
.../java/org/apache/juneau/http/response/Ok.java | 2 +-
.../juneau/http/response/PartialContent.java | 2 +-
.../juneau/http/response/PayloadTooLarge.java | 2 +-
.../juneau/http/response/PermanentRedirect.java | 2 +-
.../juneau/http/response/PreconditionFailed.java | 2 +-
.../juneau/http/response/PreconditionRequired.java | 2 +-
.../apache/juneau/http/response/Processing.java | 2 +-
.../juneau/http/response/RangeNotSatisfiable.java | 2 +-
.../http/response/RequestHeaderFieldsTooLarge.java | 2 +-
.../apache/juneau/http/response/ResetContent.java | 2 +-
.../org/apache/juneau/http/response/SeeOther.java | 2 +-
.../juneau/http/response/ServiceUnavailable.java | 2 +-
.../juneau/http/response/SwitchingProtocols.java | 2 +-
.../juneau/http/response/TemporaryRedirect.java | 2 +-
.../juneau/http/response/TooManyRequests.java | 2 +-
.../apache/juneau/http/response/Unauthorized.java | 2 +-
.../http/response/UnavailableForLegalReasons.java | 2 +-
.../juneau/http/response/UnprocessableEntity.java | 2 +-
.../juneau/http/response/UnsupportedMediaType.java | 2 +-
.../juneau/http/response/UpgradeRequired.java | 2 +-
.../apache/juneau/http/response/UriTooLong.java | 2 +-
.../org/apache/juneau/http/response/UseProxy.java | 2 +-
.../http/response/VariantAlsoNegotiates.java | 2 +-
.../apache/juneau/http/response/package-info.java | 2 +-
.../juneau/httppart/bean/RequestBeanMeta.java | 4 +-
.../httppart/bean/RequestBeanPropertyMeta.java | 2 +-
.../juneau/httppart/bean/ResponseBeanMeta.java | 4 +-
.../httppart/bean/ResponseBeanPropertyMeta.java | 2 +-
.../apache/juneau/rest/mock/MockHttpTransport.java | 2 +-
.../apache/juneau/rest/mock/MockRestClient.java | 6 +-
.../juneau/rest/mock/MockServletRequest.java | 2 +-
.../juneau/rest/mock/classic/MockRestClient.java | 10 +-
.../juneau/rest/mock/classic/MockRestRequest.java | 10 +-
.../juneau/rest/mock/classic/MockRestResponse.java | 2 +-
.../reactive/ReactiveOptIn_BareServer_Test.java | 2 +-
.../juneau/rest/server/mcp/McpDispatcher.java | 2 +-
.../juneau/rest/server/mcp/McpRestServlet.java | 2 +-
.../juneau/rest/server/mcp/McpTypedHandlers.java | 2 +-
.../rest/server/mcp/McpTypedToolHandler.java | 2 +-
.../rdf/config/BasicUniversalJenaConfig.java | 26 +-
.../server/reactive/ReactiveResponseProcessor.java | 6 +-
.../server/springboot/BasicSpringRestServlet.java | 4 +-
.../springboot/BasicSpringRestServletGroup.java | 2 +-
.../juneau/rest/server/AbstractRestBuilder.java | 6 +-
.../java/org/apache/juneau/rest/server/Attr.java | 4 +-
.../juneau/rest/server/OpSwaggerAnnotation.java | 4 +-
.../java/org/apache/juneau/rest/server/Rest.java | 36 +-
.../apache/juneau/rest/server/RestAnnotation.java | 8 +-
.../org/apache/juneau/rest/server/RestBuilder.java | 6 +-
.../org/apache/juneau/rest/server/RestContext.java | 26 +-
.../org/apache/juneau/rest/server/RestDelete.java | 6 +-
.../juneau/rest/server/RestDeleteAnnotation.java | 4 +-
.../juneau/rest/server/RestDestroyAnnotation.java | 2 +-
.../juneau/rest/server/RestEndCallAnnotation.java | 2 +-
.../org/apache/juneau/rest/server/RestGet.java | 12 +-
.../juneau/rest/server/RestGetAnnotation.java | 6 +-
.../juneau/rest/server/RestInitAnnotation.java | 2 +-
.../java/org/apache/juneau/rest/server/RestOp.java | 18 +-
.../juneau/rest/server/RestOpAnnotation.java | 6 +-
.../apache/juneau/rest/server/RestOpContext.java | 12 +-
.../apache/juneau/rest/server/RestOpSession.java | 2 +-
.../org/apache/juneau/rest/server/RestOptions.java | 12 +-
.../juneau/rest/server/RestOptionsAnnotation.java | 6 +-
.../org/apache/juneau/rest/server/RestPatch.java | 18 +-
.../juneau/rest/server/RestPatchAnnotation.java | 6 +-
.../org/apache/juneau/rest/server/RestPost.java | 18 +-
.../juneau/rest/server/RestPostAnnotation.java | 6 +-
.../apache/juneau/rest/server/RestPostCall.java | 6 +-
.../juneau/rest/server/RestPostCallAnnotation.java | 2 +-
.../juneau/rest/server/RestPostInitAnnotation.java | 2 +-
.../org/apache/juneau/rest/server/RestPreCall.java | 6 +-
.../juneau/rest/server/RestPreCallAnnotation.java | 2 +-
.../org/apache/juneau/rest/server/RestPut.java | 18 +-
.../juneau/rest/server/RestPutAnnotation.java | 6 +-
.../org/apache/juneau/rest/server/RestRequest.java | 16 +-
.../apache/juneau/rest/server/RestResponse.java | 14 +-
.../org/apache/juneau/rest/server/RestSession.java | 2 +-
.../rest/server/RestStartCallAnnotation.java | 2 +-
.../juneau/rest/server/SwaggerAnnotation.java | 4 +-
.../apache/juneau/rest/server/arg/ContentArg.java | 2 +-
.../apache/juneau/rest/server/arg/FormDataArg.java | 6 +-
.../apache/juneau/rest/server/arg/HeaderArg.java | 6 +-
.../rest/server/arg/InputStreamParserArg.java | 2 +-
.../apache/juneau/rest/server/arg/ParserArg.java | 2 +-
.../org/apache/juneau/rest/server/arg/PathArg.java | 8 +-
.../juneau/rest/server/arg/PathRemainderArg.java | 4 +-
.../apache/juneau/rest/server/arg/QueryArg.java | 6 +-
.../juneau/rest/server/arg/ReaderParserArg.java | 2 +-
.../juneau/rest/server/arg/RequestBeanArg.java | 2 +-
.../juneau/rest/server/arg/ResponseBeanArg.java | 2 +-
.../juneau/rest/server/arg/ResponseHeaderArg.java | 4 +-
.../juneau/rest/server/arg/RestContextArgs.java | 6 +-
.../juneau/rest/server/arg/RestOpContextArgs.java | 6 +-
.../juneau/rest/server/arg/RestRequestArgs.java | 6 +-
.../assertions/FluentProtocolVersionAssertion.java | 2 +-
.../assertions/FluentRequestContentAssertion.java | 2 +-
.../FluentRequestFormParamAssertion.java | 2 +-
.../assertions/FluentRequestHeaderAssertion.java | 2 +-
.../assertions/FluentRequestLineAssertion.java | 2 +-
.../FluentRequestQueryParamAssertion.java | 2 +-
.../juneau/rest/server/beans/BeanDescription.java | 2 +-
.../rest/server/beans/ResourceDescription.java | 2 +-
.../juneau/rest/server/beans/RouteDescription.java | 2 +-
.../rest/server/config/BasicJson5Config.java | 6 +-
.../juneau/rest/server/config/BasicJsonConfig.java | 8 +-
.../rest/server/config/BasicJsonHtmlConfig.java | 10 +-
.../rest/server/config/BasicOpenApiConfig.java | 6 +-
.../rest/server/config/BasicProtoConfig.java | 2 +-
.../juneau/rest/server/config/BasicTomlConfig.java | 2 +-
.../rest/server/config/BasicUniversalConfig.java | 50 +-
.../juneau/rest/server/config/BasicYamlConfig.java | 2 +-
.../juneau/rest/server/config/DefaultConfig.java | 6 +-
.../rest/server/config/DefaultHtmlConfig.java | 2 +-
.../rest/server/convention/VersionProvider.java | 2 +-
.../rest/server/converter/Introspectable.java | 6 +-
.../juneau/rest/server/converter/Queryable.java | 4 +-
.../rest/server/converter/RestConverter.java | 2 +-
.../juneau/rest/server/converter/Traversable.java | 6 +-
.../rest/server/debug/BasicDebugEnablement.java | 2 +-
.../juneau/rest/server/debug/DebugEnablement.java | 4 +-
.../rest/server/debug/DebugEnablementMap.java | 2 +-
.../juneau/rest/server/docs/OpenApiMixin.java | 10 +-
.../apache/juneau/rest/server/docs/RedocMixin.java | 6 +-
.../juneau/rest/server/docs/SwaggerMixin.java | 6 +-
.../juneau/rest/server/docs/SwaggerUiMixin.java | 6 +-
.../rest/server/httppart/BasicNamedAttribute.java | 2 +-
.../rest/server/httppart/RequestAttributes.java | 2 +-
.../rest/server/httppart/RequestContent.java | 12 +-
.../rest/server/httppart/RequestFormParam.java | 4 +-
.../rest/server/httppart/RequestFormParamList.java | 2 +-
.../juneau/rest/server/httppart/RequestHeader.java | 4 +-
.../rest/server/httppart/RequestHeaderList.java | 2 +-
.../rest/server/httppart/RequestHttpPart.java | 8 +-
.../rest/server/httppart/RequestPathParam.java | 4 +-
.../rest/server/httppart/RequestPathParamList.java | 2 +-
.../rest/server/httppart/RequestQueryParam.java | 4 +-
.../server/httppart/RequestQueryParamList.java | 4 +-
.../rest/server/httppart/ResponsePartMeta.java | 2 +-
.../rest/server/logger/BasicTestCallLogger.java | 2 +-
.../juneau/rest/server/logger/CallLogger.java | 4 +-
.../juneau/rest/server/logger/CallLoggerRule.java | 2 +-
.../rest/server/openapi/BasicOpenApiProvider.java | 4 +-
.../openapi/BasicOpenApiProviderSession.java | 10 +-
.../rest/server/openapi/OpenApiException.java | 2 +-
.../rest/server/openapi/OpenApiProvider.java | 4 +-
.../juneau/rest/server/ops/AdminProvider.java | 2 +-
.../apache/juneau/rest/server/ops/EchoMixin.java | 2 +-
.../juneau/rest/server/ops/NavigationMixin.java | 2 +-
.../apache/juneau/rest/server/ops/StatsMixin.java | 2 +-
.../server/processor/PlainTextPojoProcessor.java | 2 +-
.../server/processor/ProblemDetailsProcessor.java | 4 +-
.../server/processor/ResponseBeanProcessor.java | 2 +-
.../server/processor/ResponseProcessorList.java | 2 +-
.../server/processor/SerializedPojoProcessor.java | 6 +-
.../juneau/rest/server/remote/RrpcServlet.java | 4 +-
.../juneau/rest/server/rrpc/RrpcRestOpSession.java | 2 +-
.../rest/server/servlet/BasicRestResource.java | 4 +-
.../server/servlet/BasicRestResourceGroup.java | 2 +-
.../rest/server/servlet/BasicRestServlet.java | 4 +-
.../rest/server/servlet/BasicRestServletGroup.java | 2 +-
.../juneau/rest/server/sse/SseBroadcaster.java | 2 +-
.../juneau/rest/server/sse/SseHeartbeat.java | 2 +-
.../juneau/rest/server/sse/SseResponseSupport.java | 2 +-
.../juneau/rest/server/sse/SseSubscription.java | 2 +-
.../rest/server/staticfile/BasicStaticFiles.java | 2 +-
.../juneau/rest/server/staticfile/StaticFiles.java | 2 +-
.../juneau/rest/server/stats/RestContextStats.java | 2 +-
.../rest/server/swagger/BasicSwaggerProvider.java | 4 +-
.../swagger/BasicSwaggerProviderSession.java | 18 +-
.../rest/server/swagger/SwaggerException.java | 2 +-
.../rest/server/swagger/SwaggerProvider.java | 4 +-
.../rest/server/util/FinishablePrintWriter.java | 2 +-
.../server/util/FinishableServletOutputStream.java | 2 +-
.../apache/juneau/rest/server/util/RestUtils.java | 6 +-
.../server/validation/ValidationViolation.java | 2 +-
.../juneau/rest/server/vars/LocalizationVar.java | 2 +-
.../apache/juneau/rest/server/vars/OpenApiVar.java | 2 +-
.../juneau/rest/server/vars/RequestSwaggerVar.java | 4 +-
.../apache/juneau/rest/server/vars/RequestVar.java | 2 +-
.../rest/server/vars/SerializedRequestAttrVar.java | 2 +-
.../apache/juneau/rest/server/vars/SwaggerVar.java | 2 +-
.../org/apache/juneau/rest/server/vars/UrlVar.java | 2 +-
.../juneau/rest/server/widget/MenuItemWidget.java | 2 +-
.../juneau/rest/server/widget/PoweredByApache.java | 2 +-
.../juneau/rest/server/widget/PoweredByJuneau.java | 2 +-
.../apache/juneau/rest/server/widget/Tooltip.java | 2 +-
.../apache/juneau/rest/server/widget/Widget.java | 4 +-
.../juneau-sc-server/juneau-server-config.cfg | 12 +-
.../server/config/repository/ConfigItem.java | 2 +-
.../server/config/rest/LoadConfigResource.java | 2 +-
juneau-utest/README.md | 2 +-
.../jmh-results/observability-2026-05-28.json | 2 +-
.../apache/juneau/AnnotationInheritance_Test.java | 5 +-
.../java/org/apache/juneau/Annotations_Test.java | 1 +
.../java/org/apache/juneau/BasicBeans_Test.java | 2 +-
.../apache/juneau/BasicRuntimeException_Test.java | 7 +-
.../apache/juneau/BeanConfigAnnotation_Test.java | 7 +-
.../org/apache/juneau/BeanCtorAnnotation_Test.java | 1 +
.../apache/juneau/BeanIgnoreAnnotation_Test.java | 1 +
.../java/org/apache/juneau/BeanIgnore_Test.java | 3 +-
.../java/org/apache/juneau/BeanMapErrors_Test.java | 1 +
.../java/org/apache/juneau/BeanMapLoader_Test.java | 7 +-
.../test/java/org/apache/juneau/BeanMap_Test.java | 19 +-
.../juneau/BeanProp_StarPlainField_Test.java | 1 +
.../org/apache/juneau/BeanPropertyValue_Test.java | 1 +
.../juneau/BeanProxyInvocationHandler_Test.java | 1 +
.../java/org/apache/juneau/BeanStreaming_Test.java | 6 +-
.../test/java/org/apache/juneau/BeanTester.java | 2 +-
.../BeanTraverseProperties_ComboRoundTripTest.java | 3 +-
.../java/org/apache/juneau/BenchmarkRunner.java | 8 +-
.../java/org/apache/juneau/ClassMeta_Test.java | 313 --
.../test/java/org/apache/juneau/ComboInput.java | 1 +
.../org/apache/juneau/ComboRoundTripTest_Base.java | 1 +
.../org/apache/juneau/ComboRoundTrip_Tester.java | 33 +-
.../org/apache/juneau/ComboSerialize_Tester.java | 31 +-
.../org/apache/juneau/ContextPropertiesTest.java | 2 +-
.../org/apache/juneau/ContextSession_Test.java | 21 +-
.../org/apache/juneau/DataConversion_Test.java | 5 +-
.../apache/juneau/DynaBean_ComboRoundTripTest.java | 5 +-
.../org/apache/juneau/ExampleAnnotation_Test.java | 1 +
.../org/apache/juneau/IgnoredClasses_Test.java | 2 +-
.../java/org/apache/juneau/JacocoDummy_Test.java | 4 +-
.../test/java/org/apache/juneau/JsonList_Test.java | 8 +-
.../test/java/org/apache/juneau/JsonMap_Test.java | 10 +-
.../apache/juneau/MarshalledAnnotation_Test.java | 1 +
.../juneau/MarshalledConfigAnnotation_Test.java | 9 +-
.../org/apache/juneau/MarshalledConfig_Test.java | 9 +-
.../org/apache/juneau/MarshalledFilter_Test.java | 3 +-
.../juneau/MarshalledIgnoreAnnotation_Test.java | 1 +
.../org/apache/juneau/MarshalledIgnore_Test.java | 3 +-
.../juneau/MarshalledPropAnnotation_Test.java | 1 +
.../MarshalledPropertyPostProcessor_Test.java | 518 --
.../java/org/apache/juneau/Marshalled_Test.java | 5 +-
.../org/apache/juneau/MarshallingContext_Test.java | 177 -
.../MarshallingContext_ValidateSchema_Test.java | 43 +-
.../org/apache/juneau/MarshallingSession_Test.java | 3 +-
.../java/org/apache/juneau/MaxIndent_Test.java | 12 +-
.../apache/juneau/NamePropertyAnnotation_Test.java | 1 +
.../java/org/apache/juneau/ObjectSwap_Test.java | 9 +-
.../juneau/ParentPropertyAnnotation_Test.java | 1 +
.../org/apache/juneau/ParserGenerics_Test.java | 2 +-
.../java/org/apache/juneau/ParserReader_Test.java | 2 +-
.../java/org/apache/juneau/PojoExamplesTest.java | 5 +-
.../test/java/org/apache/juneau/ProxyBeanTest.java | 2 +-
.../juneau/ReadWriteOnlyProperties_Test.java | 5 +-
.../SerializerProperties_ComboRoundTripTest.java | 11 +-
.../org/apache/juneau/SwapAnnotation_Test.java | 1 +
.../src/test/java/org/apache/juneau/TestUtils.java | 8 +-
.../java/org/apache/juneau/UriAnnotation_Test.java | 1 +
.../java/org/apache/juneau/Visibility_Test.java | 2 +-
.../java/org/apache/juneau/XmlValidatorParser.java | 5 +-
.../juneau/a/rttests/DTOs_RoundTripTest.java | 2 +-
.../juneau/a/rttests/Enum_RoundTripTest.java | 2 +-
.../juneau/a/rttests/Generics_RoundTripTest.java | 2 +-
.../juneau/a/rttests/JsonMaps_RoundTripTest.java | 4 +-
.../a/rttests/NameProperty_RoundTripTest.java | 2 +-
.../a/rttests/ParentProperty_RoundTripTest.java | 2 +-
.../juneau/a/rttests/Records_RoundTripTest.java | 6 +-
.../a/rttests/RoundTripAddClassAttrs_Test.java | 29 +-
.../a/rttests/RoundTripBeanChannel_Test.java | 4 +-
.../juneau/a/rttests/RoundTripBeanMaps_Test.java | 29 +-
.../a/rttests/RoundTripBeansWithBuilders_Test.java | 29 +-
.../juneau/a/rttests/RoundTripDateTime_Test.java | 40 +-
.../a/rttests/RoundTripLargeObjects_Test.java | 30 +-
.../juneau/a/rttests/RoundTripMaps_Test.java | 35 +-
.../juneau/a/rttests/RoundTripTest_Base.java | 36 +-
.../a/rttests/RoundTripTransformBeans_Test.java | 35 +-
.../apache/juneau/a/rttests/RoundTrip_Tester.java | 6 +-
.../a/rttests/SimpleObjects_RoundTripTest.java | 2 +-
.../a/rttests/TrimStrings_RoundTripTest.java | 8 +-
.../juneau/assertions/AnyAssertion_Test.java | 3 +-
.../juneau/assertions/ArrayAssertion_Test.java | 3 +-
.../assertions/AssertionPredicates_Test.java | 1 +
.../apache/juneau/assertions/Assertion_Test.java | 1 +
.../juneau/assertions/BeanAssertion_Test.java | 3 +-
.../juneau/assertions/BeanListAssertion_Test.java | 3 +-
.../juneau/assertions/BooleanAssertion_Test.java | 3 +-
.../juneau/assertions/ByteArrayAssertion_Test.java | 3 +-
.../assertions/CollectionAssertion_Test.java | 3 +-
.../assertions/ComparableAssertion_Test.java | 3 +-
.../juneau/assertions/DateAssertion_Test.java | 3 +-
.../juneau/assertions/IntegerAssertion_Test.java | 3 +-
.../juneau/assertions/ListAssertion_Test.java | 3 +-
.../juneau/assertions/LongAssertion_Test.java | 3 +-
.../juneau/assertions/MapAssertion_Test.java | 3 +-
.../juneau/assertions/ObjectAssertion_Test.java | 3 +-
.../assertions/PrimitiveArrayAssertion_Test.java | 3 +-
.../juneau/assertions/StringAssertion_Test.java | 3 +-
.../assertions/StringListAssertion_Test.java | 3 +-
.../juneau/assertions/ThrowableAssertion_Test.java | 3 +-
.../juneau/assertions/VersionAssertion_Test.java | 3 +-
.../assertions/ZonedDateTimeAssertion_Test.java | 3 +-
.../java/org/apache/juneau/bean/atom/AtomTest.java | 2 +-
.../apache/juneau/bean/hal/Hal_RoundTrip_Test.java | 2 +-
.../org/apache/juneau/bean/html5/Audio_Test.java | 2 +-
.../html5/Html5Template_ComboRoundTripTest.java | 1 +
.../bean/jsonapi/JsonApi_RoundTrip_Test.java | 4 +-
.../bean/jsonpatch/JsonPatch_RoundTrip_Test.java | 4 +-
.../jsonschema/JsonSchemaBeanGenerator_Test.java | 9 +-
.../JsonSchemaPropertySimpleArray_Test.java | 2 +-
.../JsonSchemaPropertyValidatorFactory_Test.java | 2 +-
.../bean/jsonschema/JsonSchemaProperty_Test.java | 2 +-
.../juneau/bean/jsonschema/JsonSchemaRef_Test.java | 2 +-
.../bean/jsonschema/JsonSchemaValidator_Test.java | 2 +-
.../juneau/bean/jsonschema/JsonSchema_Test.java | 2 +-
.../juneau/bean/mcp/McpBeans_RoundTrip_Test.java | 4 +-
.../apache/juneau/bean/openapi3/Items_Test.java | 2 +-
.../juneau/bean/openapi3/ui/OpenApiUI_Test.java | 1 +
.../juneau/bean/openapi3/ui/RedocUI_Test.java | 1 +
.../bean/rfc7807/Problem_RoundTrip_Test.java | 2 +-
.../juneau/bean/swagger/HeaderInfo_Test.java | 2 +-
.../org/apache/juneau/bean/swagger/Items_Test.java | 2 +-
.../juneau/bean/swagger/ParameterInfo_Test.java | 2 +-
.../juneau/bean/swagger/ResponseInfo_Test.java | 2 +-
.../juneau/bean/swagger/SchemaInfo_Test.java | 2 +-
.../apache/juneau/bean/swagger/Swagger_Test.java | 2 +-
.../juneau/bean/swagger/ui/SwaggerUI_Test.java | 5 +-
.../apache/juneau/bson/BsonAnnotation_Test.java | 163 -
.../apache/juneau/bson/BsonArrayDebug_Test.java | 57 -
.../apache/juneau/bson/BsonCompatibility_Test.java | 123 -
.../org/apache/juneau/bson/BsonEdgeCases_Test.java | 100 -
.../apache/juneau/bson/BsonInputStream_Test.java | 781 ---
.../org/apache/juneau/bson/BsonIntArray_Test.java | 101 -
.../org/apache/juneau/bson/BsonMediaType_Test.java | 50 -
.../apache/juneau/bson/BsonOutputStream_Test.java | 198 -
.../org/apache/juneau/bson/BsonParser_Test.java | 77 -
.../org/apache/juneau/bson/BsonRoundTrip_Test.java | 118 -
.../apache/juneau/bson/BsonSerializer_Test.java | 113 -
.../apache/juneau/bson/BsonTrimStrings_Test.java | 53 -
.../apache/juneau/cbor/CborAnnotation_Test.java | 178 -
.../apache/juneau/cbor/CborCompliance_Test.java | 103 -
.../org/apache/juneau/cbor/CborEdgeCases_Test.java | 105 -
.../apache/juneau/cbor/CborInputStream_Test.java | 130 -
.../org/apache/juneau/cbor/CborMediaType_Test.java | 50 -
.../apache/juneau/cbor/CborOutputStream_Test.java | 238 -
.../apache/juneau/cbor/CborParserSession_Test.java | 365 --
.../org/apache/juneau/cbor/CborParser_Test.java | 165 -
.../org/apache/juneau/cbor/CborRoundTrip_Test.java | 141 -
.../apache/juneau/cbor/CborSerializer_Test.java | 286 -
.../apache/juneau/collections/JsonList_Test.java | 6 +-
.../apache/juneau/collections/JsonMap_Test.java | 6 +-
.../juneau/collections/MarshalledList_Test.java | 3 +-
.../juneau/collections/MarshalledMap_Test.java | 4 +-
.../collections/ResolvingMarshalledMapTest.java | 2 +
.../commons/inject/BeanStoreOverridable_Test.java | 6 +-
.../juneau/commons/reflect/ClassInfo_Test.java | 1 +
.../apache/juneau/config/ConfigInterfaceTest.java | 2 +-
.../juneau/config/ConfigMapListener_Test.java | 1 +
.../org/apache/juneau/config/ConfigMap_Test.java | 1 +
.../java/org/apache/juneau/config/Config_Test.java | 21 +-
.../juneau/config/store/ConfigFileStoreTest.java | 1 +
.../java/org/apache/juneau/cp/FileFinder_Test.java | 1 +
.../java/org/apache/juneau/cp/Messages_Test.java | 1 +
.../org/apache/juneau/csv/CsvAnnotation_Test.java | 182 -
.../apache/juneau/csv/CsvCellSerializer_Test.java | 317 --
.../java/org/apache/juneau/csv/CsvConfig_Test.java | 68 -
.../apache/juneau/csv/CsvParserSession_Test.java | 450 --
.../java/org/apache/juneau/csv/CsvParser_Test.java | 294 --
.../juneau/csv/CsvSerializerSession_Test.java | 682 ---
.../test/java/org/apache/juneau/csv/Csv_Test.java | 569 --
.../EncoderSet_OverridingBeanStore_Test.java | 1 +
.../apache/juneau/encoders/EncoderSet_Test.java | 1 +
.../apache/juneau/hjson/HjsonAnnotation_Test.java | 137 -
.../apache/juneau/hjson/HjsonEdgeCases_Test.java | 157 -
.../apache/juneau/hjson/HjsonMediaType_Test.java | 56 -
.../org/apache/juneau/hjson/HjsonParser_Test.java | 156 -
.../apache/juneau/hjson/HjsonRoundTrip_Test.java | 169 -
.../apache/juneau/hjson/HjsonSerializer_Test.java | 151 -
.../apache/juneau/hjson/HjsonTokenizer_Test.java | 170 -
.../apache/juneau/hocon/HoconAnnotation_Test.java | 137 -
.../apache/juneau/hocon/HoconEdgeCases_Test.java | 116 -
.../apache/juneau/hocon/HoconMediaType_Test.java | 57 -
.../org/apache/juneau/hocon/HoconMerging_Test.java | 84 -
.../juneau/hocon/HoconParserSession_Test.java | 647 ---
.../org/apache/juneau/hocon/HoconParser_Test.java | 325 --
.../org/apache/juneau/hocon/HoconPath_Test.java | 78 -
.../apache/juneau/hocon/HoconRoundTrip_Test.java | 193 -
.../juneau/hocon/HoconSerializerSession_Test.java | 675 ---
.../apache/juneau/hocon/HoconSerializer_Test.java | 250 -
.../juneau/hocon/HoconSubstitution_Test.java | 85 -
.../apache/juneau/hocon/HoconTokenizer_Test.java | 934 ----
...sicHtmlDocTemplate_Navlink_RequestUri_Test.java | 56 -
.../org/apache/juneau/html/BasicHtml_Test.java | 3118 -----------
.../org/apache/juneau/html/CommonParser_Test.java | 151 -
.../java/org/apache/juneau/html/Common_Test.java | 349 --
.../apache/juneau/html/HtmlAnnotation_Test.java | 110 -
.../juneau/html/HtmlConfigAnnotation_Test.java | 120 -
.../juneau/html/HtmlDocConfigAnnotation_Test.java | 392 --
.../org/apache/juneau/html/HtmlDocConfig_Test.java | 670 ---
.../html/HtmlDocSerializer_Builder_Test.java | 316 --
.../juneau/html/HtmlLinkAnnotation_Test.java | 92 -
.../juneau/html/HtmlSchemaSerializer_Test.java | 83 -
.../java/org/apache/juneau/html/Html_Test.java | 450 --
.../apache/juneau/html/SimpleHtmlWriter_Test.java | 262 -
.../apache/juneau/http/AnnotationUtils_Test.java | 1 +
.../apache/juneau/http/ContactAnnotation_Test.java | 1 +
.../org/apache/juneau/http/HttpParts_Test.java | 1 +
.../apache/juneau/http/LicenseAnnotation_Test.java | 1 +
.../juneau/http/MediaRanges_FindMatch_Test.java | 2 +-
.../juneau/http/ResponseAnnotation_Test.java | 1 +
.../org/apache/juneau/http/TagAnnotation_Test.java | 1 +
.../apache/juneau/http/classic/BasicPart_Test.java | 2 +-
.../juneau/http/classic/HttpEntities_Test.java | 6 +-
.../juneau/http/classic/HttpHeaders_Test.java | 2 +-
.../apache/juneau/http/classic/HttpParts_Test.java | 1 +
.../juneau/http/classic/SerializedHeader_Test.java | 8 +-
.../http/classic/SerializedHttpEntity_Test.java | 10 +-
.../juneau/http/classic/SerializedPart_Test.java | 8 +-
.../http/classic/entity/SerializedEntity_Test.java | 2 +-
.../classic/header/ContentType_Match_Test.java | 2 +-
.../http/classic/header/HeaderList_Test.java | 4 +-
.../juneau/http/classic/part/PartList_Test.java | 4 +-
.../http/remote/Remote_ContentAnnotation_Test.java | 6 +-
.../remote/Remote_FormDataAnnotation_Test.java | 6 +-
.../http/remote/Remote_HeaderAnnotation_Test.java | 4 +-
.../http/remote/Remote_PathAnnotation_Test.java | 4 +-
.../http/remote/Remote_QueryAnnotation_Test.java | 4 +-
.../http/remote/Remote_RequestAnnotation_Test.java | 2 +-
.../remote/Remote_ResponseAnnotation_Test.java | 2 +-
.../org/apache/juneau/http/remote/Remote_Test.java | 2 +-
.../juneau/http/remote/RrpcInterface_Test.java | 16 +-
.../juneau/httppart/HttpPartSchema_Body_Test.java | 801 ---
.../httppart/HttpPartSchema_FormData_Test.java | 692 ---
.../httppart/HttpPartSchema_Header_Test.java | 654 ---
.../HttpPartSchema_JakartaValidation_Test.java | 326 --
.../juneau/httppart/HttpPartSchema_Path_Test.java | 718 ---
.../juneau/httppart/HttpPartSchema_Query_Test.java | 687 ---
.../HttpPartSchema_ResponseHeader_Test.java | 641 ---
.../httppart/HttpPartSchema_Response_Test.java | 586 --
.../httppart/HttpPartSchema_Validation_Test.java | 1379 -----
.../juneau/httppart/OpenApiPartParser_Test.java | 1065 ----
.../httppart/OpenApiPartSerializer_Test.java | 1028 ----
.../httppart/SchemaValidationException_Test.java | 78 -
.../apache/juneau/httppart/UonPartParser_Test.java | 277 -
.../httppart/bean/HttpPartBeanMeta_Test.java | 6 +-
.../juneau/httppart/bean/MethodInfoUtils_Test.java | 50 +-
.../org/apache/juneau/ini/IniAnnotation_Test.java | 237 -
.../java/org/apache/juneau/ini/IniParser_Test.java | 129 -
.../org/apache/juneau/ini/IniRoundTrip_Test.java | 186 -
.../org/apache/juneau/ini/IniSerializer_Test.java | 221 -
.../org/apache/juneau/jcs/JcsCanonical_Test.java | 131 -
.../org/apache/juneau/jcs/JcsEdgeCases_Test.java | 99 -
.../org/apache/juneau/jcs/JcsNumbers_Test.java | 134 -
.../org/apache/juneau/jcs/JcsSorting_Test.java | 117 -
.../org/apache/juneau/jcs/JcsStrings_Test.java | 104 -
.../org/apache/juneau/jena/RdfAnnotation_Test.java | 80 -
.../juneau/jena/RdfConfigAnnotation_Test.java | 340 --
.../org/apache/juneau/jena/RdfParser_Test.java | 456 --
.../org/apache/juneau/jena/RdfSerializer_Test.java | 614 ---
.../java/org/apache/juneau/jena/RdfUtils_Test.java | 223 -
.../org/apache/juneau/json/CommonParser_Test.java | 158 -
.../java/org/apache/juneau/json/Common_Test.java | 304 --
.../apache/juneau/json/JsonAnnotation_Test.java | 116 -
.../juneau/json/JsonConfigAnnotationTest.java | 107 -
.../juneau/json/JsonParserEdgeCases_Test.java | 476 --
.../org/apache/juneau/json/JsonParser_Test.java | 265 -
.../juneau/json/JsonSchemaSerializer_Test.java | 53 -
.../java/org/apache/juneau/json/Json_Test.java | 375 --
.../org/apache/juneau/json5/CommonParser_Test.java | 160 -
.../java/org/apache/juneau/json5/Common_Test.java | 304 --
.../org/apache/juneau/json5/Json5List_Test.java | 216 -
.../org/apache/juneau/json5/Json5Map_Test.java | 236 -
.../apache/juneau/jsonl/JsonlEdgeCases_Test.java | 125 -
.../apache/juneau/jsonl/JsonlMediaType_Test.java | 70 -
.../org/apache/juneau/jsonl/JsonlParser_Test.java | 129 -
.../apache/juneau/jsonl/JsonlRoundTrip_Test.java | 157 -
.../java/org/apache/juneau/jsonl/Jsonl_Test.java | 167 -
.../jsonschema/ExternalDocsAnnotation_Test.java | 90 -
.../juneau/jsonschema/ItemsAnnotation_Test.java | 220 -
.../jsonschema/JsonSchemaConfigAnnotationTest.java | 119 -
.../juneau/jsonschema/JsonSchemaGeneratorTest.java | 1570 ------
.../juneau/jsonschema/SchemaAnnotation_Test.java | 654 ---
.../jsonschema/SchemaApplyAnnotation_Test.java | 131 -
.../apache/juneau/jsonschema/SchemaUtils_Test.java | 127 -
.../juneau/jsonschema/SubItemsAnnotation_Test.java | 315 --
.../juneau/markdown/MarkdownAiUseCase_Test.java | 1 +
.../juneau/markdown/MarkdownAnnotation_Test.java | 1 +
.../juneau/markdown/MarkdownDocParser_Test.java | 1 +
.../markdown/MarkdownDocSerializer_Test.java | 1 +
.../juneau/markdown/MarkdownEdgeCases_Test.java | 28 +-
.../juneau/markdown/MarkdownMediaType_Test.java | 1 +
.../markdown/MarkdownParserSession_Test.java | 6 +-
.../juneau/markdown/MarkdownParser_Test.java | 3 +-
.../juneau/markdown/MarkdownSerializer_Test.java | 36 +-
.../juneau/markdown/MarkdownWriter_Test.java | 3 +-
.../org/apache/juneau/marshall/ClassMeta_Test.java | 314 ++
.../MarshalledPropertyPostProcessor_Test.java | 510 ++
.../juneau/marshall/MarshallingContext_Test.java | 178 +
.../juneau/marshall/bson/BsonAnnotation_Test.java | 163 +
.../juneau/marshall/bson/BsonArrayDebug_Test.java | 57 +
.../marshall/bson/BsonCompatibility_Test.java | 123 +
.../juneau/marshall/bson/BsonEdgeCases_Test.java | 100 +
.../juneau/marshall/bson/BsonInputStream_Test.java | 781 +++
.../juneau/marshall/bson/BsonIntArray_Test.java | 101 +
.../juneau/marshall/bson/BsonMediaType_Test.java | 50 +
.../marshall/bson/BsonOutputStream_Test.java | 198 +
.../juneau/marshall/bson/BsonParser_Test.java | 77 +
.../juneau/marshall/bson/BsonRoundTrip_Test.java | 118 +
.../juneau/marshall/bson/BsonSerializer_Test.java | 113 +
.../juneau/marshall/bson/BsonTrimStrings_Test.java | 53 +
.../juneau/marshall/cbor/CborAnnotation_Test.java | 179 +
.../juneau/marshall/cbor/CborCompliance_Test.java | 103 +
.../juneau/marshall/cbor/CborEdgeCases_Test.java | 105 +
.../juneau/marshall/cbor/CborInputStream_Test.java | 130 +
.../juneau/marshall/cbor/CborMediaType_Test.java | 50 +
.../marshall/cbor/CborOutputStream_Test.java | 238 +
.../marshall/cbor/CborParserSession_Test.java | 365 ++
.../juneau/marshall/cbor/CborParser_Test.java | 165 +
.../juneau/marshall/cbor/CborRoundTrip_Test.java | 141 +
.../juneau/marshall/cbor/CborSerializer_Test.java | 287 +
.../juneau/marshall/csv/CsvAnnotation_Test.java | 183 +
.../marshall/csv/CsvCellSerializer_Test.java | 317 ++
.../apache/juneau/marshall/csv/CsvConfig_Test.java | 69 +
.../juneau/marshall/csv/CsvParserSession_Test.java | 451 ++
.../apache/juneau/marshall/csv/CsvParser_Test.java | 294 ++
.../marshall/csv/CsvSerializerSession_Test.java | 682 +++
.../org/apache/juneau/marshall/csv/Csv_Test.java | 570 ++
.../marshall/hjson/HjsonAnnotation_Test.java | 137 +
.../juneau/marshall/hjson/HjsonEdgeCases_Test.java | 157 +
.../juneau/marshall/hjson/HjsonMediaType_Test.java | 56 +
.../juneau/marshall/hjson/HjsonParser_Test.java | 156 +
.../juneau/marshall/hjson/HjsonRoundTrip_Test.java | 169 +
.../marshall/hjson/HjsonSerializer_Test.java | 151 +
.../juneau/marshall/hjson/HjsonTokenizer_Test.java | 170 +
.../marshall/hocon/HoconAnnotation_Test.java | 137 +
.../juneau/marshall/hocon/HoconEdgeCases_Test.java | 116 +
.../juneau/marshall/hocon/HoconMediaType_Test.java | 56 +
.../juneau/marshall/hocon/HoconMerging_Test.java | 84 +
.../marshall/hocon/HoconParserSession_Test.java | 648 +++
.../juneau/marshall/hocon/HoconParser_Test.java | 325 ++
.../juneau/marshall/hocon/HoconPath_Test.java | 78 +
.../juneau/marshall/hocon/HoconRoundTrip_Test.java | 193 +
.../hocon/HoconSerializerSession_Test.java | 676 +++
.../marshall/hocon/HoconSerializer_Test.java | 250 +
.../marshall/hocon/HoconSubstitution_Test.java | 85 +
.../juneau/marshall/hocon/HoconTokenizer_Test.java | 934 ++++
...sicHtmlDocTemplate_Navlink_RequestUri_Test.java | 56 +
.../juneau/marshall/html/BasicHtml_Test.java | 3119 +++++++++++
.../juneau/marshall/html/CommonParser_Test.java | 152 +
.../apache/juneau/marshall/html/Common_Test.java | 350 ++
.../juneau/marshall/html/HtmlAnnotation_Test.java | 111 +
.../marshall/html/HtmlConfigAnnotation_Test.java | 121 +
.../html/HtmlDocConfigAnnotation_Test.java | 393 ++
.../juneau/marshall/html/HtmlDocConfig_Test.java | 670 +++
.../html/HtmlDocSerializer_Builder_Test.java | 316 ++
.../marshall/html/HtmlLinkAnnotation_Test.java | 93 +
.../marshall/html/HtmlSchemaSerializer_Test.java | 83 +
.../org/apache/juneau/marshall/html/Html_Test.java | 451 ++
.../marshall/html/SimpleHtmlWriter_Test.java | 262 +
.../httppart/HttpPartSchema_Body_Test.java | 801 +++
.../httppart/HttpPartSchema_FormData_Test.java | 692 +++
.../httppart/HttpPartSchema_Header_Test.java | 654 +++
.../HttpPartSchema_JakartaValidation_Test.java | 326 ++
.../httppart/HttpPartSchema_Path_Test.java | 718 +++
.../httppart/HttpPartSchema_Query_Test.java | 687 +++
.../HttpPartSchema_ResponseHeader_Test.java | 641 +++
.../httppart/HttpPartSchema_Response_Test.java | 586 ++
.../httppart/HttpPartSchema_Validation_Test.java | 1379 +++++
.../marshall/httppart/OpenApiPartParser_Test.java | 1065 ++++
.../httppart/OpenApiPartSerializer_Test.java | 1028 ++++
.../httppart/SchemaValidationException_Test.java | 78 +
.../marshall/httppart/UonPartParser_Test.java | 278 +
.../juneau/marshall/ini/IniAnnotation_Test.java | 237 +
.../apache/juneau/marshall/ini/IniParser_Test.java | 129 +
.../juneau/marshall/ini/IniRoundTrip_Test.java | 186 +
.../juneau/marshall/ini/IniSerializer_Test.java | 221 +
.../juneau/marshall/jcs/JcsCanonical_Test.java | 131 +
.../juneau/marshall/jcs/JcsEdgeCases_Test.java | 99 +
.../juneau/marshall/jcs/JcsNumbers_Test.java | 134 +
.../juneau/marshall/jcs/JcsSorting_Test.java | 117 +
.../juneau/marshall/jcs/JcsStrings_Test.java | 104 +
.../juneau/marshall/jena/RdfAnnotation_Test.java | 80 +
.../marshall/jena/RdfConfigAnnotation_Test.java | 341 ++
.../juneau/marshall/jena/RdfParser_Test.java | 457 ++
.../juneau/marshall/jena/RdfSerializer_Test.java | 615 +++
.../apache/juneau/marshall/jena/RdfUtils_Test.java | 223 +
.../juneau/marshall/json/CommonParser_Test.java | 159 +
.../apache/juneau/marshall/json/Common_Test.java | 305 ++
.../juneau/marshall/json/JsonAnnotation_Test.java | 117 +
.../marshall/json/JsonConfigAnnotationTest.java | 108 +
.../marshall/json/JsonParserEdgeCases_Test.java | 476 ++
.../juneau/marshall/json/JsonParser_Test.java | 265 +
.../marshall/json/JsonSchemaSerializer_Test.java | 53 +
.../org/apache/juneau/marshall/json/Json_Test.java | 375 ++
.../juneau/marshall/json5/CommonParser_Test.java | 161 +
.../apache/juneau/marshall/json5/Common_Test.java | 305 ++
.../juneau/marshall/json5/Json5List_Test.java | 216 +
.../juneau/marshall/json5/Json5Map_Test.java | 236 +
.../juneau/marshall/jsonl/JsonlEdgeCases_Test.java | 125 +
.../juneau/marshall/jsonl/JsonlMediaType_Test.java | 70 +
.../juneau/marshall/jsonl/JsonlParser_Test.java | 130 +
.../juneau/marshall/jsonl/JsonlRoundTrip_Test.java | 158 +
.../apache/juneau/marshall/jsonl/Jsonl_Test.java | 168 +
.../jsonschema/ExternalDocsAnnotation_Test.java | 91 +
.../marshall/jsonschema/ItemsAnnotation_Test.java | 221 +
.../jsonschema/JsonSchemaConfigAnnotationTest.java | 120 +
.../jsonschema/JsonSchemaGeneratorTest.java | 1571 ++++++
.../marshall/jsonschema/SchemaAnnotation_Test.java | 655 +++
.../jsonschema/SchemaApplyAnnotation_Test.java | 132 +
.../marshall/jsonschema/SchemaUtils_Test.java | 127 +
.../jsonschema/SubItemsAnnotation_Test.java | 316 ++
.../marshall/msgpack/MsgPackAnnotation_Test.java | 183 +
.../msgpack/MsgPackConfigAnnotationTest.java | 100 +
.../marshall/msgpack/MsgPackMediaType_Test.java | 90 +
.../marshall/msgpack/MsgPackParser_Test.java | 127 +
.../marshall/msgpack/MsgPackSerializerTest.java | 224 +
.../marshall/oapi/OpenApiAnnotation_Test.java | 151 +
.../oapi/OpenApiConfigAnnotation_Test.java | 69 +
.../apache/juneau/marshall/oapi/OpenApi_Test.java | 869 +++
.../objecttools/ObjectIntrospector_Test.java | 57 +
.../marshall/objecttools/ObjectMerger_Test.java | 82 +
.../marshall/objecttools/ObjectPaginator_Test.java | 103 +
.../marshall/objecttools/ObjectRest_Test.java | 1213 +++++
.../marshall/objecttools/ObjectSearcher_Test.java | 887 ++++
.../marshall/objecttools/ObjectSorter_Test.java | 246 +
.../marshall/objecttools/ObjectViewer_Test.java | 315 ++
.../marshall/parquet/ParquetAnnotation_Test.java | 177 +
.../marshall/parquet/ParquetLogicalType_Test.java | 143 +
.../parquet/ParquetParserSession_Test.java | 356 ++
.../marshall/parquet/ParquetParser_Test.java | 85 +
.../marshall/parquet/ParquetRoundTrip_Test.java | 281 +
.../marshall/parquet/ParquetSerializer_Test.java | 115 +
.../parser/ParserConfigAnnotationTest.java | 154 +
.../juneau/marshall/parser/ParserSession_Test.java | 975 ++++
.../parser/ParserSet_OverridingBeanStore_Test.java | 72 +
.../juneau/marshall/parser/ParserSet_Test.java | 236 +
.../plaintext/PlainTextAnnotation_Test.java | 151 +
.../plaintext/PlainTextConfigAnnotation_Test.java | 69 +
.../marshall/proto/ProtoAnnotation_Test.java | 206 +
.../juneau/marshall/proto/ProtoEdgeCases_Test.java | 132 +
.../juneau/marshall/proto/ProtoMediaType_Test.java | 52 +
.../juneau/marshall/proto/ProtoParser_Test.java | 190 +
.../juneau/marshall/proto/ProtoRoundTrip_Test.java | 228 +
.../proto/ProtoSerializerSession_Test.java | 591 +++
.../marshall/proto/ProtoSerializer_Test.java | 256 +
.../juneau/marshall/proto/ProtoTokenizer_Test.java | 613 +++
.../ReaderObject_ComboSerializeTest.java | 328 ++
.../SerializerConfigAnnotation_Test.java | 277 +
.../serializer/SerializerSession_Test.java | 1245 +++++
.../SerializerSet_OverridingBeanStore_Test.java | 74 +
.../marshall/serializer/SerializerSet_Test.java | 333 ++
.../apache/juneau/marshall/serializer/TestURI.java | 94 +
.../juneau/marshall/serializer/TestURIc.java | 94 +
.../marshall/serializer/UriResolution_Test.java | 759 +++
.../serializer/WriterFluentSetters_Test.java | 148 +
.../marshall/soap/SoapXmlAnnotation_Test.java | 151 +
.../marshall/soap/SoapXmlConfigAnnotationTest.java | 85 +
.../org/apache/juneau/marshall/sse/Sse_Test.java | 740 +++
.../marshall/toml/TomlSerializerSession_Test.java | 633 +++
.../juneau/marshall/toml/TomlSerializer_Test.java | 68 +
.../juneau/marshall/toml/TomlTokenizer_Test.java | 916 ++++
.../juneau/marshall/toml/TomlWriter_Test.java | 613 +++
.../org/apache/juneau/marshall/toml/Toml_Test.java | 631 +++
.../marshall/transform/AutoListSwapTest.java | 431 ++
.../juneau/marshall/transform/AutoMapSwapTest.java | 426 ++
.../marshall/transform/AutoNumberSwapTest.java | 821 +++
.../marshall/transform/AutoObjectSwapTest.java | 412 ++
.../BeanDictionary_ComboRoundTripTest.java | 652 +++
.../juneau/marshall/transforms/BeanMap_Test.java | 99 +
.../BigNumberFormat_BigDecimal_RoundTrip_Test.java | 511 ++
.../BigNumberFormat_BigInteger_RoundTrip_Test.java | 448 ++
.../marshall/transforms/BigNumberFormat_Test.java | 218 +
.../transforms/BinaryEnumFormatPlacement_Test.java | 176 +
.../transforms/BinaryFormat_RoundTrip_Test.java | 449 ++
.../marshall/transforms/BinaryFormat_Test.java | 163 +
...leanFloatCurrencyClassFormatPlacement_Test.java | 264 +
.../transforms/BooleanFormat_RoundTrip_Test.java | 439 ++
.../marshall/transforms/BooleanFormat_Test.java | 130 +
.../transforms/Builder_ComboRoundTripTest.java | 379 ++
.../BuiltInDateTimeSerialization_Test.java | 331 ++
.../ByteArrayBase64Swap_ComboRoundTripTest.java | 389 ++
.../transforms/CalendarFormat_RoundTrip_Test.java | 480 ++
.../marshall/transforms/CalendarFormat_Test.java | 133 +
.../ClassFormatSwap_SessionClassLoader_Test.java | 174 +
.../transforms/ClassFormat_RoundTrip_Test.java | 411 ++
.../marshall/transforms/ClassFormat_Test.java | 273 +
.../transforms/CurrencyFormat_RoundTrip_Test.java | 456 ++
.../marshall/transforms/CurrencyFormat_Test.java | 205 +
.../transforms/DateFormat_RoundTrip_Test.java | 438 ++
.../marshall/transforms/DateFormat_Test.java | 106 +
.../DateTimeLocaleFormatPlacement_Test.java | 227 +
.../marshall/transforms/DefaultSwaps_Test.java | 732 +++
.../transforms/DurationAndPeriodFormat_Test.java | 115 +
.../transforms/DurationFormatPlacement_Test.java | 80 +
.../transforms/DurationFormat_RoundTrip_Test.java | 406 ++
.../transforms/EnumFormat_RoundTrip_Test.java | 404 ++
.../marshall/transforms/EnumFormat_Test.java | 181 +
.../FloatFormat_Double_RoundTrip_Test.java | 529 ++
.../FloatFormat_Float_RoundTrip_Test.java | 520 ++
.../marshall/transforms/FloatFormat_Test.java | 220 +
.../InputStreamBase64_OneWayStringSwapTest.java | 51 +
.../transforms/LocaleFormat_RoundTrip_Test.java | 442 ++
.../marshall/transforms/LocaleFormat_Test.java | 61 +
.../marshall/transforms/MarshalledFilter_Test.java | 181 +
.../juneau/marshall/transforms/ObjectSwapTest.java | 97 +
.../transforms/OneWayStringSwapTest_Base.java | 33 +
.../transforms/OneWayStringSwap_Tester.java | 109 +
.../transforms/PeriodFormat_RoundTrip_Test.java | 429 ++
.../marshall/transforms/ReaderFilter_Test.java | 101 +
.../ReaderObjectSwap_ComboSerializeTest.java | 427 ++
.../marshall/transforms/ReaderSwap_Test.java | 51 +
.../transforms/RoundTripObjectSwapTest_Base.java | 39 +
.../transforms/RoundTripObjectSwap_Tester.java | 124 +
.../transforms/StackTraceElementSwap_Test.java | 60 +
.../transforms/StreamableSerializationTest.java | 242 +
.../marshall/transforms/StringSwapTest_Base.java | 39 +
.../marshall/transforms/StringSwap_Tester.java | 128 +
.../SwapsAnnotation_ComboSerializeTest.java | 784 +++
.../TemporalFormat_Instant_RoundTrip_Test.java | 442 ++
...emporalFormat_LocalDateTime_RoundTrip_Test.java | 417 ++
.../TemporalFormat_LocalDate_RoundTrip_Test.java | 421 ++
.../TemporalFormat_LocalTime_RoundTrip_Test.java | 420 ++
.../TemporalFormat_MonthDay_RoundTrip_Test.java | 420 ++
...mporalFormat_OffsetDateTime_RoundTrip_Test.java | 428 ++
.../TemporalFormat_OffsetTime_RoundTrip_Test.java | 419 ++
.../marshall/transforms/TemporalFormat_Test.java | 240 +
.../TemporalFormat_YearMonth_RoundTrip_Test.java | 422 ++
.../TemporalFormat_Year_RoundTrip_Test.java | 422 ++
...emporalFormat_ZonedDateTime_RoundTrip_Test.java | 427 ++
.../transforms/TimeZoneFormat_RoundTrip_Test.java | 439 ++
.../marshall/transforms/TimeZoneFormat_Test.java | 70 +
.../TopLevelDefaultSwapsRoundTrip_Test.java | 99 +
.../UuidBigNumberFormatPlacement_Test.java | 170 +
.../transforms/UuidFormat_RoundTrip_Test.java | 426 ++
.../marshall/transforms/UuidFormat_Test.java | 136 +
.../juneau/marshall/uon/CommonParser_UonTest.java | 159 +
.../apache/juneau/marshall/uon/Common_UonTest.java | 228 +
.../juneau/marshall/uon/UonAnnotation_Test.java | 180 +
.../marshall/uon/UonConfigAnnotationTest.java | 116 +
.../juneau/marshall/uon/UonParserReader_Test.java | 221 +
.../juneau/marshall/uon/UonParserSession_Test.java | 655 +++
.../apache/juneau/marshall/uon/UonParser_Test.java | 535 ++
.../juneau/marshall/uon/UonSerializer_Test.java | 361 ++
.../urlencoding/CommonParser_UrlEncodingTest.java | 164 +
.../urlencoding/Common_UrlEncodingTest.java | 212 +
.../apache/juneau/marshall/urlencoding/DTOs.java | 143 +
.../apache/juneau/marshall/urlencoding/DTOs2.java | 147 +
.../urlencoding/UrlEncodingAnnotation_Test.java | 117 +
.../UrlEncodingConfigAnnotationTest.java | 103 +
.../urlencoding/UrlEncodingParserSession_Test.java | 554 ++
.../urlencoding/UrlEncodingParser_Test.java | 734 +++
.../urlencoding/UrlEncodingSerializer_Test.java | 582 ++
.../apache/juneau/marshall/xml/BasicXml_Test.java | 1776 +++++++
.../juneau/marshall/xml/CommonParser_Test.java | 158 +
.../apache/juneau/marshall/xml/CommonXml_Test.java | 83 +
.../apache/juneau/marshall/xml/Common_Test.java | 248 +
.../juneau/marshall/xml/InvalidXmlBeans_Test.java | 235 +
.../juneau/marshall/xml/XmlAnnotation_Test.java | 101 +
.../juneau/marshall/xml/XmlCollapsed_Test.java | 389 ++
.../marshall/xml/XmlConfigAnnotationTest.java | 180 +
.../juneau/marshall/xml/XmlContent_Test.java | 249 +
.../marshall/xml/XmlIgnoreComments_Test.java | 1237 +++++
.../juneau/marshall/xml/XmlParserSession_Test.java | 510 ++
.../apache/juneau/marshall/xml/XmlParser_Test.java | 92 +
.../apache/juneau/marshall/xml/XmlUtils_Test.java | 442 ++
.../org/apache/juneau/marshall/xml/Xml_Test.java | 984 ++++
.../org/apache/juneau/marshall/xml/xml1a/T1.java | 41 +
.../org/apache/juneau/marshall/xml/xml1a/T2.java | 41 +
.../org/apache/juneau/marshall/xml/xml1b/T3.java | 40 +
.../org/apache/juneau/marshall/xml/xml1b/T4.java | 40 +
.../org/apache/juneau/marshall/xml/xml1b/T5.java | 41 +
.../org/apache/juneau/marshall/xml/xml1b/T6.java | 41 +
.../org/apache/juneau/marshall/xml/xml1b/T7.java | 41 +
.../juneau/marshall/xml/xml1b/package-info.java | 23 +
.../org/apache/juneau/marshall/xml/xml1c/T8.java | 36 +
.../org/apache/juneau/marshall/xml/xml1c/T9.java | 26 +
.../juneau/marshall/xml/xml1c/package-info.java | 32 +
.../marshall/yaml/YamlBufferUnderflow_Test.java | 184 +
.../juneau/marshall/yaml/YamlMarshaller_Test.java | 75 +
.../juneau/marshall/yaml/YamlParser_Test.java | 138 +
.../org/apache/juneau/marshall/yaml/Yaml_Test.java | 1595 ++++++
.../org/apache/juneau/marshaller/Bson_Test.java | 3 +-
.../org/apache/juneau/marshaller/Cbor_Test.java | 1 +
.../juneau/marshaller/CharRdfMarshallers_Test.java | 3 +-
.../org/apache/juneau/marshaller/Csv_Test.java | 3 +-
.../org/apache/juneau/marshaller/Hjson_Test.java | 1 +
.../org/apache/juneau/marshaller/Hocon_Test.java | 1 +
.../org/apache/juneau/marshaller/Html_Test.java | 3 +-
.../org/apache/juneau/marshaller/Ini_Test.java | 1 +
.../org/apache/juneau/marshaller/Jcs_Test.java | 3 +-
.../org/apache/juneau/marshaller/Json5_Test.java | 3 +-
.../org/apache/juneau/marshaller/Json_Test.java | 3 +-
.../org/apache/juneau/marshaller/Jsonl_Test.java | 3 +-
.../apache/juneau/marshaller/Markdown_Test.java | 6 +-
.../juneau/marshaller/MarshallUtils_Test.java | 5 +-
.../apache/juneau/marshaller/Marshall_Test.java | 1 +
.../org/apache/juneau/marshaller/MsgPack_Test.java | 3 +-
.../org/apache/juneau/marshaller/OpenApi_Test.java | 3 +-
.../org/apache/juneau/marshaller/Parquet_Test.java | 1 +
.../apache/juneau/marshaller/PlainText_Test.java | 3 +-
.../org/apache/juneau/marshaller/Proto_Test.java | 3 +-
.../apache/juneau/marshaller/RdfProto_Test.java | 3 +-
.../apache/juneau/marshaller/RdfThrift_Test.java | 3 +-
.../org/apache/juneau/marshaller/Uon_Test.java | 3 +-
.../apache/juneau/marshaller/UrlEncoding_Test.java | 3 +-
.../org/apache/juneau/marshaller/Xml_Test.java | 3 +-
.../observability/ObservabilityNoopBenchmark.java | 2 +-
.../apache/juneau/microservice/LogConfig_Test.java | 4 +-
.../microservice/Microservice_Lifecycle_Test.java | 8 +-
.../microservice/Microservice_Runtime_Test.java | 4 +-
.../microservice/tomcat/TomcatLogger_Test.java | 2 +-
.../juneau/msgpack/MsgPackAnnotation_Test.java | 182 -
.../msgpack/MsgPackConfigAnnotationTest.java | 99 -
.../juneau/msgpack/MsgPackMediaType_Test.java | 90 -
.../apache/juneau/msgpack/MsgPackParser_Test.java | 127 -
.../juneau/msgpack/MsgPackSerializerTest.java | 224 -
.../org/apache/juneau/mstat/ThrownStore_Test.java | 6 +-
.../apache/juneau/oapi/OpenApiAnnotation_Test.java | 150 -
.../juneau/oapi/OpenApiConfigAnnotation_Test.java | 68 -
.../java/org/apache/juneau/oapi/OpenApi_Test.java | 869 ---
.../objecttools/ObjectIntrospector_Test.java | 57 -
.../juneau/objecttools/ObjectMerger_Test.java | 82 -
.../juneau/objecttools/ObjectPaginator_Test.java | 102 -
.../apache/juneau/objecttools/ObjectRest_Test.java | 1212 -----
.../juneau/objecttools/ObjectSearcher_Test.java | 886 ----
.../juneau/objecttools/ObjectSorter_Test.java | 245 -
.../juneau/objecttools/ObjectViewer_Test.java | 314 --
.../juneau/parquet/ParquetAnnotation_Test.java | 177 -
.../juneau/parquet/ParquetLogicalType_Test.java | 143 -
.../juneau/parquet/ParquetParserSession_Test.java | 356 --
.../apache/juneau/parquet/ParquetParser_Test.java | 85 -
.../juneau/parquet/ParquetRoundTrip_Test.java | 280 -
.../juneau/parquet/ParquetSerializer_Test.java | 115 -
.../juneau/parser/ParserConfigAnnotationTest.java | 153 -
.../apache/juneau/parser/ParserSession_Test.java | 976 ----
.../parser/ParserSet_OverridingBeanStore_Test.java | 72 -
.../org/apache/juneau/parser/ParserSet_Test.java | 235 -
.../juneau/plaintext/PlainTextAnnotation_Test.java | 150 -
.../plaintext/PlainTextConfigAnnotation_Test.java | 68 -
.../apache/juneau/proto/ProtoAnnotation_Test.java | 205 -
.../apache/juneau/proto/ProtoEdgeCases_Test.java | 133 -
.../apache/juneau/proto/ProtoMediaType_Test.java | 53 -
.../org/apache/juneau/proto/ProtoParser_Test.java | 190 -
.../apache/juneau/proto/ProtoRoundTrip_Test.java | 229 -
.../juneau/proto/ProtoSerializerSession_Test.java | 591 ---
.../apache/juneau/proto/ProtoSerializer_Test.java | 256 -
.../apache/juneau/proto/ProtoTokenizer_Test.java | 613 ---
.../client/classic/RestCallException_Test.java | 4 +-
.../client/classic/RestClient_BasicCalls_Test.java | 2 +-
.../rest/client/classic/RestClient_Body_Test.java | 2 +-
.../classic/RestClient_CallbackStrings_Test.java | 2 +-
.../classic/RestClient_Config_Context_Test.java | 5 +-
.../RestClient_Config_MarshallingContext_Test.java | 13 +-
.../classic/RestClient_Config_OpenApi_Test.java | 4 +-
.../classic/RestClient_Config_RestClient_Test.java | 13 +-
.../classic/RestClient_Config_Serializer_Test.java | 5 +-
.../client/classic/RestClient_FormData_Test.java | 10 +-
.../client/classic/RestClient_Headers_Test.java | 10 +-
.../RestClient_Logging_StreamClosed_Test.java | 3 +-
.../client/classic/RestClient_Logging_Test.java | 3 +-
.../client/classic/RestClient_Marshalls_Test.java | 2 +-
.../rest/client/classic/RestClient_Paths_Test.java | 4 +-
.../rest/client/classic/RestClient_Query_Test.java | 6 +-
.../classic/RestClient_Response_Body_Test.java | 7 +-
.../classic/RestClient_Response_Headers_Test.java | 1 +
.../client/classic/RestClient_Response_Test.java | 2 +-
.../rest/client/classic/RestClient_Test.java | 2 +-
.../mixin/MixinInheritance_Converters_Test.java | 2 +-
.../rest/mixin/MixinInheritance_Encoders_Test.java | 2 +-
.../rest/mixin/MixinInheritance_Messages_Test.java | 2 +-
.../mixin/MixinInheritance_VarResolver_Test.java | 2 +-
.../reactive/ReactiveResponseProcessor_Test.java | 4 +-
.../rest/reactive/bridge/ReactiveBridge_Test.java | 4 +-
.../rest/server/AbstractRestBuilder_Test.java | 11 +-
.../apache/juneau/rest/server/Content_Test.java | 13 +-
.../apache/juneau/rest/server/FormData_Test.java | 6 +-
.../rest/server/Header_AcceptCharset_Test.java | 2 +-
.../rest/server/Header_AcceptEncoding_Test.java | 2 +-
.../juneau/rest/server/Header_Accept_Test.java | 2 +-
.../org/apache/juneau/rest/server/Header_Test.java | 4 +-
.../rest/server/MarshalledConfig_Swaps_Test.java | 9 +-
.../org/apache/juneau/rest/server/Nls_Test.java | 2 +-
.../rest/server/OpSwaggerAnnotation_Test.java | 1 +
.../juneau/rest/server/PathRemainder_Test.java | 2 +-
.../org/apache/juneau/rest/server/Path_Test.java | 4 +-
.../org/apache/juneau/rest/server/Paths_Test.java | 2 +-
.../org/apache/juneau/rest/server/Query_Test.java | 4 +-
.../apache/juneau/rest/server/Response_Test.java | 4 +-
.../juneau/rest/server/RestAnnotation_Test.java | 9 +-
.../RestContext_ValueAgainstConfig_Test.java | 4 +-
.../rest/server/RestDeleteAnnotation_Test.java | 3 +-
.../rest/server/RestDestroyAnnotation_Test.java | 1 +
.../rest/server/RestEndCallAnnotation_Test.java | 1 +
.../rest/server/RestEtag_RoundTrip_Test.java | 2 +-
.../juneau/rest/server/RestGetAnnotation_Test.java | 5 +-
.../rest/server/RestInitAnnotation_Test.java | 1 +
.../apache/juneau/rest/server/RestInit_Test.java | 2 +-
.../juneau/rest/server/RestOpAnnotation_Test.java | 7 +-
.../juneau/rest/server/RestOpInvoker_Test.java | 2 +-
.../rest/server/RestOp_MarshalledConfig_Test.java | 1 +
.../juneau/rest/server/RestOp_Params_Test.java | 12 +-
.../juneau/rest/server/RestOp_ReqHeaders_Test.java | 2 +-
.../juneau/rest/server/RestOp_Throws_Test.java | 4 +-
.../rest/server/RestOptionsAnnotation_Test.java | 5 +-
.../rest/server/RestPatchAnnotation_Test.java | 7 +-
.../rest/server/RestPostAnnotation_Test.java | 7 +-
.../rest/server/RestPostCallAnnotation_Test.java | 1 +
.../rest/server/RestPostInitAnnotation_Test.java | 1 +
.../juneau/rest/server/RestPostInit_Test.java | 2 +-
.../rest/server/RestPreCallAnnotation_Test.java | 1 +
.../juneau/rest/server/RestPreCall_Test.java | 2 +-
.../juneau/rest/server/RestPutAnnotation_Test.java | 7 +-
.../rest/server/RestRequest_Coverage_Test.java | 4 +-
.../server/RestRequest_SessionProperties_Test.java | 2 +-
.../rest/server/RestResponse_DownloadAs_Test.java | 2 +-
.../server/RestResponse_SetSerializer_Test.java | 6 +-
.../juneau/rest/server/RestResponse_Test.java | 4 +-
.../rest/server/RestStartCallAnnotation_Test.java | 1 +
.../juneau/rest/server/RestStartCall_Test.java | 2 +-
.../rest/server/Rest_AllowContentParam_Test.java | 2 +-
.../server/Rest_AnnotationInheritance_Test.java | 4 +-
.../server/Rest_DefaultRequestAttributes_Test.java | 4 +-
.../juneau/rest/server/Rest_Encoders_Test.java | 2 +-
.../juneau/rest/server/Rest_Messages_Test.java | 4 +-
.../server/Rest_PredefinedStatusCodes_Test.java | 2 +-
.../apache/juneau/rest/server/Rest_RVars_Test.java | 2 +-
.../rest/server/Rest_SseBroadcaster_IT_Test.java | 2 +-
.../juneau/rest/server/Restx_Parsers_Test.java | 2 +-
.../juneau/rest/server/Restx_ReqAttrs_Test.java | 2 +-
.../juneau/rest/server/Restx_Serializers_Test.java | 4 +-
.../StandaloneServlets_JettyMicroservice_Test.java | 2 +-
.../juneau/rest/server/SwaggerAnnotation_Test.java | 1 +
.../juneau/rest/server/Swagger_Response_Test.java | 1 -
.../apache/juneau/rest/server/Swagger_Test.java | 5 +-
.../rest/server/VirtualThreadDispatch_Test.java | 2 +-
.../rest/server/beans/BeanDescription_Test.java | 2 +-
.../server/beans/ResourceDescription_Test.java | 2 +-
.../convention/VersionMixin_AsMixin_Test.java | 2 +-
.../VersionMixin_JettyMicroservice_Test.java | 4 +-
.../server/convention/VersionResource_Test.java | 2 +-
.../server/convention/VersionServlet_Test.java | 2 +-
.../rest/server/debug/DebugEnablement_Test.java | 1 +
.../docs/BasicApiDocs_JettyMicroservice_Test.java | 4 +-
.../server/httppart/RequestAttributes_Test.java | 2 +-
.../server/httppart/RequestFormParamList_Test.java | 5 +-
.../server/httppart/RequestPathParamList_Test.java | 7 +-
.../httppart/RequestQueryParamList_Test.java | 7 +-
.../juneau/rest/server/logger/CallLogger_Test.java | 1 +
.../logger/CallLogger_ValueAdoption_Test.java | 1 +
.../juneau/rest/server/logger/RestLogger_Test.java | 1 +
.../juneau/rest/server/mcp/McpDispatcher_Test.java | 2 +-
.../rest/server/mcp/McpRestServlet_Test.java | 8 +-
.../rest/server/mcp/McpTypedHandlers_Test.java | 2 +-
.../openapi/BasicOpenApiProviderSession_Test.java | 3 +-
.../server/openapi/OpenApiSchemaReuse_Test.java | 2 +-
.../server/openapi/OpenApiYamlRoundTrip_Test.java | 2 +-
.../rest/server/ops/AdminMixin_AsMixin_Test.java | 2 +-
.../ops/AdminMixin_RateLimitSnapshot_Test.java | 2 +-
.../juneau/rest/server/ops/AdminServlet_Test.java | 2 +-
.../rest/server/ops/EchoMixin_AsMixin_Test.java | 2 +-
.../ops/EchoMixin_JettyMicroservice_Test.java | 4 +-
.../server/ops/MixinHtmlDocInheritance_Test.java | 2 +-
.../server/ops/RouteIndexMixin_AsMixin_Test.java | 2 +-
.../RouteIndexMixin_ContentNegotiation_Test.java | 2 +-
.../processor/AsyncResponseProcessor_Test.java | 2 +-
.../rest/server/sse/SseBroadcaster_Test.java | 2 +-
.../rest/server/sse/SseResponseSupport_Test.java | 2 +-
.../StaticFilesMixin_JettyMicroservice_Test.java | 4 +-
.../BasicSwaggerProviderSession_Coverage_Test.java | 2 +
.../server/tracing/TracerHook_Contract_Test.java | 3 +-
.../util/BoundedServletInputStream_Test.java | 18 +-
.../juneau/rest/server/util/RestUtils_Test.java | 4 +-
.../rest/server/util/UrlPathMatcher_Test.java | 2 +-
.../juneau/rest/server/widget/RestWidget_Test.java | 2 +-
.../rest/test/client/ThirdPartyProxyResource.java | 2 +-
.../rest/test/client/ThirdPartyProxy_Test.java | 18 +-
.../validation/RestValidation_Content_Test.java | 2 +-
.../RestValidation_CustomValidator_Test.java | 2 +-
.../RestValidation_MissingProvider_Test.java | 2 +-
.../validation/RestValidation_Nested_Test.java | 2 +-
.../RestValidation_OffByDefault_Test.java | 2 +-
.../RestValidation_ProblemDetails_Test.java | 3 +-
.../ReaderObject_ComboSerializeTest.java | 328 --
.../SerializerConfigAnnotation_Test.java | 276 -
.../juneau/serializer/SerializerSession_Test.java | 1232 -----
.../SerializerSet_OverridingBeanStore_Test.java | 74 -
.../juneau/serializer/SerializerSet_Test.java | 332 --
.../java/org/apache/juneau/serializer/TestURI.java | 94 -
.../org/apache/juneau/serializer/TestURIc.java | 94 -
.../juneau/serializer/UriResolution_Test.java | 758 ---
.../serializer/WriterFluentSetters_Test.java | 148 -
.../apache/juneau/soap/SoapXmlAnnotation_Test.java | 150 -
.../juneau/soap/SoapXmlConfigAnnotationTest.java | 84 -
.../test/java/org/apache/juneau/sse/Sse_Test.java | 740 ---
.../org/apache/juneau/testutils/pojos/ABean.java | 2 +-
.../testutils/pojos/ImplicitSwappedObject.java | 2 +-
.../juneau/testutils/pojos/SwappedObject.java | 2 +-
.../juneau/testutils/pojos/SwappedObjectSwap.java | 8 +-
.../org/apache/juneau/testutils/pojos/TestURI.java | 4 +-
.../apache/juneau/testutils/pojos/TypedBean.java | 2 +-
.../juneau/testutils/pojos/TypedBeanImpl.java | 2 +-
.../org/apache/juneau/testutils/pojos/XBeans.java | 4 +-
.../juneau/toml/TomlSerializerSession_Test.java | 633 ---
.../apache/juneau/toml/TomlSerializer_Test.java | 68 -
.../org/apache/juneau/toml/TomlTokenizer_Test.java | 916 ----
.../org/apache/juneau/toml/TomlWriter_Test.java | 612 ---
.../java/org/apache/juneau/toml/Toml_Test.java | 631 ---
.../apache/juneau/transform/AutoListSwapTest.java | 430 --
.../apache/juneau/transform/AutoMapSwapTest.java | 425 --
.../juneau/transform/AutoNumberSwapTest.java | 820 ---
.../juneau/transform/AutoObjectSwapTest.java | 411 --
.../BeanDictionary_ComboRoundTripTest.java | 651 ---
.../org/apache/juneau/transforms/BeanMap_Test.java | 98 -
.../BigNumberFormat_BigDecimal_RoundTrip_Test.java | 510 --
.../BigNumberFormat_BigInteger_RoundTrip_Test.java | 447 --
.../juneau/transforms/BigNumberFormat_Test.java | 218 -
.../transforms/BinaryEnumFormatPlacement_Test.java | 176 -
.../transforms/BinaryFormat_RoundTrip_Test.java | 448 --
.../juneau/transforms/BinaryFormat_Test.java | 163 -
...leanFloatCurrencyClassFormatPlacement_Test.java | 264 -
.../transforms/BooleanFormat_RoundTrip_Test.java | 438 --
.../juneau/transforms/BooleanFormat_Test.java | 130 -
.../transforms/Builder_ComboRoundTripTest.java | 379 --
.../BuiltInDateTimeSerialization_Test.java | 331 --
.../ByteArrayBase64Swap_ComboRoundTripTest.java | 388 --
.../transforms/CalendarFormat_RoundTrip_Test.java | 479 --
.../juneau/transforms/CalendarFormat_Test.java | 133 -
.../ClassFormatSwap_SessionClassLoader_Test.java | 174 -
.../transforms/ClassFormat_RoundTrip_Test.java | 410 --
.../apache/juneau/transforms/ClassFormat_Test.java | 273 -
.../transforms/CurrencyFormat_RoundTrip_Test.java | 455 --
.../juneau/transforms/CurrencyFormat_Test.java | 205 -
.../transforms/DateFormat_RoundTrip_Test.java | 437 --
.../apache/juneau/transforms/DateFormat_Test.java | 106 -
.../DateTimeLocaleFormatPlacement_Test.java | 226 -
.../juneau/transforms/DefaultSwaps_Test.java | 731 ---
.../transforms/DurationAndPeriodFormat_Test.java | 115 -
.../transforms/DurationFormatPlacement_Test.java | 80 -
.../transforms/DurationFormat_RoundTrip_Test.java | 405 --
.../transforms/EnumFormat_RoundTrip_Test.java | 403 --
.../apache/juneau/transforms/EnumFormat_Test.java | 181 -
.../FloatFormat_Double_RoundTrip_Test.java | 528 --
.../FloatFormat_Float_RoundTrip_Test.java | 519 --
.../apache/juneau/transforms/FloatFormat_Test.java | 220 -
.../InputStreamBase64_OneWayStringSwapTest.java | 51 -
.../transforms/LocaleFormat_RoundTrip_Test.java | 441 --
.../juneau/transforms/LocaleFormat_Test.java | 61 -
.../juneau/transforms/MarshalledFilter_Test.java | 180 -
.../apache/juneau/transforms/ObjectSwapTest.java | 97 -
.../transforms/OneWayStringSwapTest_Base.java | 33 -
.../juneau/transforms/OneWayStringSwap_Tester.java | 109 -
.../transforms/PeriodFormat_RoundTrip_Test.java | 428 --
.../juneau/transforms/ReaderFilter_Test.java | 101 -
.../ReaderObjectSwap_ComboSerializeTest.java | 426 --
.../apache/juneau/transforms/ReaderSwap_Test.java | 51 -
.../transforms/RoundTripObjectSwapTest_Base.java | 39 -
.../transforms/RoundTripObjectSwap_Tester.java | 124 -
.../transforms/StackTraceElementSwap_Test.java | 60 -
.../transforms/StreamableSerializationTest.java | 242 -
.../juneau/transforms/StringSwapTest_Base.java | 39 -
.../juneau/transforms/StringSwap_Tester.java | 128 -
.../SwapsAnnotation_ComboSerializeTest.java | 783 ---
.../TemporalFormat_Instant_RoundTrip_Test.java | 441 --
...emporalFormat_LocalDateTime_RoundTrip_Test.java | 416 --
.../TemporalFormat_LocalDate_RoundTrip_Test.java | 420 --
.../TemporalFormat_LocalTime_RoundTrip_Test.java | 419 --
.../TemporalFormat_MonthDay_RoundTrip_Test.java | 419 --
...mporalFormat_OffsetDateTime_RoundTrip_Test.java | 427 --
.../TemporalFormat_OffsetTime_RoundTrip_Test.java | 418 --
.../juneau/transforms/TemporalFormat_Test.java | 240 -
.../TemporalFormat_YearMonth_RoundTrip_Test.java | 421 --
.../TemporalFormat_Year_RoundTrip_Test.java | 421 --
...emporalFormat_ZonedDateTime_RoundTrip_Test.java | 426 --
.../transforms/TimeZoneFormat_RoundTrip_Test.java | 438 --
.../juneau/transforms/TimeZoneFormat_Test.java | 70 -
.../TopLevelDefaultSwapsRoundTrip_Test.java | 99 -
.../UuidBigNumberFormatPlacement_Test.java | 170 -
.../transforms/UuidFormat_RoundTrip_Test.java | 425 --
.../apache/juneau/transforms/UuidFormat_Test.java | 136 -
.../apache/juneau/uon/CommonParser_UonTest.java | 158 -
.../java/org/apache/juneau/uon/Common_UonTest.java | 228 -
.../org/apache/juneau/uon/UonAnnotation_Test.java | 179 -
.../apache/juneau/uon/UonConfigAnnotationTest.java | 115 -
.../apache/juneau/uon/UonParserReader_Test.java | 221 -
.../apache/juneau/uon/UonParserSession_Test.java | 646 ---
.../java/org/apache/juneau/uon/UonParser_Test.java | 535 --
.../org/apache/juneau/uon/UonSerializer_Test.java | 361 --
.../urlencoding/CommonParser_UrlEncodingTest.java | 163 -
.../juneau/urlencoding/Common_UrlEncodingTest.java | 212 -
.../java/org/apache/juneau/urlencoding/DTOs.java | 143 -
.../java/org/apache/juneau/urlencoding/DTOs2.java | 147 -
.../urlencoding/UrlEncodingAnnotation_Test.java | 116 -
.../UrlEncodingConfigAnnotationTest.java | 102 -
.../urlencoding/UrlEncodingParserSession_Test.java | 554 --
.../juneau/urlencoding/UrlEncodingParser_Test.java | 733 ---
.../urlencoding/UrlEncodingSerializer_Test.java | 581 --
.../juneau/utest/utils/FakeReaderParser.java | 6 +-
.../juneau/utest/utils/FakeStreamParser.java | 4 +-
.../juneau/utest/utils/FakeStreamSerializer.java | 2 +-
.../juneau/utest/utils/FakeWriterSerializer.java | 4 +-
.../org/apache/juneau/utils/BeanDiff_Test.java | 2 +
.../org/apache/juneau/utils/FilteredMapTest.java | 5 +-
.../org/apache/juneau/utils/ParserReaderTest.java | 2 +-
.../juneau/utils/StringExpressionMatcher_Test.java | 1 +
.../utils/UriContextResolutionCombo_Test.java | 5 +-
.../juneau/utils/UriContextUriCombo_Test.java | 1 +
.../java/org/apache/juneau/xml/BasicXml_Test.java | 1775 -------
.../org/apache/juneau/xml/CommonParser_Test.java | 158 -
.../java/org/apache/juneau/xml/CommonXml_Test.java | 83 -
.../java/org/apache/juneau/xml/Common_Test.java | 247 -
.../apache/juneau/xml/InvalidXmlBeans_Test.java | 235 -
.../org/apache/juneau/xml/XmlAnnotation_Test.java | 100 -
.../org/apache/juneau/xml/XmlCollapsed_Test.java | 388 --
.../apache/juneau/xml/XmlConfigAnnotationTest.java | 179 -
.../org/apache/juneau/xml/XmlContent_Test.java | 248 -
.../apache/juneau/xml/XmlIgnoreComments_Test.java | 1236 -----
.../apache/juneau/xml/XmlParserSession_Test.java | 510 --
.../java/org/apache/juneau/xml/XmlParser_Test.java | 92 -
.../java/org/apache/juneau/xml/XmlUtils_Test.java | 442 --
.../test/java/org/apache/juneau/xml/Xml_Test.java | 983 ----
.../test/java/org/apache/juneau/xml/xml1a/T1.java | 41 -
.../test/java/org/apache/juneau/xml/xml1a/T2.java | 41 -
.../test/java/org/apache/juneau/xml/xml1b/T3.java | 40 -
.../test/java/org/apache/juneau/xml/xml1b/T4.java | 40 -
.../test/java/org/apache/juneau/xml/xml1b/T5.java | 41 -
.../test/java/org/apache/juneau/xml/xml1b/T6.java | 41 -
.../test/java/org/apache/juneau/xml/xml1b/T7.java | 41 -
.../org/apache/juneau/xml/xml1b/package-info.java | 23 -
.../test/java/org/apache/juneau/xml/xml1c/T8.java | 36 -
.../test/java/org/apache/juneau/xml/xml1c/T9.java | 26 -
.../org/apache/juneau/xml/xml1c/package-info.java | 32 -
.../juneau/yaml/YamlBufferUnderflow_Test.java | 184 -
.../apache/juneau/yaml/YamlMarshaller_Test.java | 75 -
.../org/apache/juneau/yaml/YamlParser_Test.java | 138 -
.../java/org/apache/juneau/yaml/Yaml_Test.java | 1595 ------
3109 files changed, 255150 insertions(+), 254802 deletions(-)
diff --git a/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/AtomBuilder.java b/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/AtomBuilder.java
index cf3d53dcd8..31e2af2a83 100644
--- a/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/AtomBuilder.java
+++ b/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/AtomBuilder.java
@@ -19,7 +19,7 @@ package org.apache.juneau.bean.atom;
import java.net.*;
import java.util.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
diff --git a/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Category.java b/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Category.java
index 2a1aba173e..957363c44a 100644
--- a/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Category.java
+++ b/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Category.java
@@ -17,12 +17,12 @@
package org.apache.juneau.bean.atom;
import static org.apache.juneau.commons.utils.StringUtils.*;
-import static org.apache.juneau.xml.XmlFormat.*;
+import static org.apache.juneau.marshall.xml.XmlFormat.*;
import java.net.*;
-import org.apache.juneau.*;
-import org.apache.juneau.xml.*;
+import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshall.xml.*;
/**
* Represents a category or tag associated with a feed or entry.
diff --git a/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Common.java b/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Common.java
index 1fc19f7a39..7c975a101c 100644
--- a/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Common.java
+++ b/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Common.java
@@ -17,11 +17,11 @@
package org.apache.juneau.bean.atom;
import static org.apache.juneau.commons.utils.StringUtils.*;
-import static org.apache.juneau.xml.XmlFormat.*;
+import static org.apache.juneau.marshall.xml.XmlFormat.*;
import java.net.*;
-import org.apache.juneau.xml.*;
+import org.apache.juneau.marshall.xml.*;
/**
* Base class for all Atom elements, providing common attributes.
diff --git a/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/CommonEntry.java b/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/CommonEntry.java
index d0a9b625f7..7abb084500 100644
--- a/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/CommonEntry.java
+++ b/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/CommonEntry.java
@@ -18,12 +18,12 @@ package org.apache.juneau.bean.atom;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.xml.XmlFormat.*;
+import static org.apache.juneau.marshall.xml.XmlFormat.*;
import java.util.*;
import org.apache.juneau.commons.time.*;
-import org.apache.juneau.xml.*;
+import org.apache.juneau.marshall.xml.*;
/**
* Base class for feed-level and entry-level Atom elements.
diff --git a/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Content.java b/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Content.java
index a116d5d42f..de98366b85 100644
--- a/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Content.java
+++ b/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Content.java
@@ -17,11 +17,11 @@
package org.apache.juneau.bean.atom;
import static org.apache.juneau.commons.utils.StringUtils.*;
-import static org.apache.juneau.xml.XmlFormat.*;
+import static org.apache.juneau.marshall.xml.XmlFormat.*;
import java.net.*;
-import org.apache.juneau.xml.*;
+import org.apache.juneau.marshall.xml.*;
/**
* Represents the content of an Atom entry.
diff --git a/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Entry.java b/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Entry.java
index 440fad722b..21fb52ebe2 100644
--- a/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Entry.java
+++ b/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Entry.java
@@ -21,8 +21,8 @@ import static org.apache.juneau.commons.utils.Utils.*;
import java.util.*;
-import org.apache.juneau.*;
import org.apache.juneau.commons.time.*;
+import org.apache.juneau.marshall.*;
/**
* Represents an individual entry within an Atom feed or as a standalone Atom document.
diff --git a/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Feed.java b/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Feed.java
index a92dfbd198..0932f64e93 100644
--- a/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Feed.java
+++ b/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Feed.java
@@ -16,12 +16,12 @@
*/
package org.apache.juneau.bean.atom;
-import static org.apache.juneau.xml.XmlFormat.*;
+import static org.apache.juneau.marshall.xml.XmlFormat.*;
import java.util.*;
-import org.apache.juneau.*;
-import org.apache.juneau.xml.*;
+import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshall.xml.*;
/**
* Represents a top-level Atom feed document.
diff --git a/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Generator.java b/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Generator.java
index c2efa9dfcf..d94c687555 100644
--- a/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Generator.java
+++ b/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Generator.java
@@ -17,12 +17,12 @@
package org.apache.juneau.bean.atom;
import static org.apache.juneau.commons.utils.StringUtils.*;
-import static org.apache.juneau.xml.XmlFormat.*;
+import static org.apache.juneau.marshall.xml.XmlFormat.*;
import java.net.*;
-import org.apache.juneau.*;
-import org.apache.juneau.xml.*;
+import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshall.xml.*;
/**
* Identifies the software agent used to generate an Atom feed.
diff --git a/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Icon.java b/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Icon.java
index 69f0eab7e9..91a85b4009 100644
--- a/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Icon.java
+++ b/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Icon.java
@@ -17,12 +17,12 @@
package org.apache.juneau.bean.atom;
import static org.apache.juneau.commons.utils.StringUtils.*;
-import static org.apache.juneau.xml.XmlFormat.*;
+import static org.apache.juneau.marshall.xml.XmlFormat.*;
import java.net.*;
-import org.apache.juneau.*;
-import org.apache.juneau.xml.*;
+import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshall.xml.*;
/**
* Represents a small icon image for visual identification of a feed.
diff --git a/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Id.java b/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Id.java
index 0d5ab47b98..fecd311d14 100644
--- a/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Id.java
+++ b/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Id.java
@@ -16,10 +16,10 @@
*/
package org.apache.juneau.bean.atom;
-import static org.apache.juneau.xml.XmlFormat.*;
+import static org.apache.juneau.marshall.xml.XmlFormat.*;
-import org.apache.juneau.*;
-import org.apache.juneau.xml.*;
+import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshall.xml.*;
/**
* Represents a permanent, universally unique identifier for a feed or entry.
diff --git a/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Link.java b/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Link.java
index 08bf018653..b486dbdabf 100644
--- a/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Link.java
+++ b/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Link.java
@@ -16,10 +16,10 @@
*/
package org.apache.juneau.bean.atom;
-import static org.apache.juneau.xml.XmlFormat.*;
+import static org.apache.juneau.marshall.xml.XmlFormat.*;
-import org.apache.juneau.*;
-import org.apache.juneau.xml.*;
+import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshall.xml.*;
/**
* Represents a reference from an entry or feed to a Web resource.
diff --git a/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Logo.java b/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Logo.java
index 8e8e0d616f..50c03ed199 100644
--- a/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Logo.java
+++ b/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Logo.java
@@ -17,12 +17,12 @@
package org.apache.juneau.bean.atom;
import static org.apache.juneau.commons.utils.StringUtils.*;
-import static org.apache.juneau.xml.XmlFormat.*;
+import static org.apache.juneau.marshall.xml.XmlFormat.*;
import java.net.*;
-import org.apache.juneau.*;
-import org.apache.juneau.xml.*;
+import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshall.xml.*;
/**
* Represents a larger logo image for visual identification of a feed.
diff --git a/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Text.java b/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Text.java
index c976d07e89..3954034f20 100644
--- a/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Text.java
+++ b/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/Text.java
@@ -16,9 +16,9 @@
*/
package org.apache.juneau.bean.atom;
-import static org.apache.juneau.xml.XmlFormat.*;
+import static org.apache.juneau.marshall.xml.XmlFormat.*;
-import org.apache.juneau.xml.*;
+import org.apache.juneau.marshall.xml.*;
/**
* Represents human-readable text in an Atom document.
diff --git a/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/package-info.java b/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/package-info.java
index 4ff2127c80..d31eb76e07 100644
--- a/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/package-info.java
+++ b/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/package-info.java
@@ -35,4 +35,4 @@
// @formatter:on
package org.apache.juneau.bean.atom;
-import org.apache.juneau.xml.*;
+import org.apache.juneau.marshall.xml.*;
diff --git a/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/package.html b/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/package.html
index e1093a5958..2dad90251f 100644
--- a/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/package.html
+++ b/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/package.html
@@ -42,7 +42,7 @@
</p>
<p>
The examples shown here are pulled from the <code>AtomFeedResource</code> class in the
- <code>org.apache.juneau.sample.war</code> project.
+ <code>org.apache.juneau.marshall.sample.war</code> project.
</p>
@@ -53,11 +53,11 @@
<p>
The Juneau ATOM feed DTOs are simply beans with fluent-style setters.
<br>The following code shows a feed being created programmatically using the
- {@link org.apache.juneau.bean.atom.AtomBuilder} class.
+ {@link org.apache.juneau.marshall.bean.atom.AtomBuilder} class.
</p>
<p class='bjava'>
- <jk>import static</jk> org.apache.juneau.bean.atom.AtomBuilder.*;
+ <jk>import static</jk> org.apache.juneau.marshall.bean.atom.AtomBuilder.*;
Feed <jv>feed</jv> =
<jsm>feed</jsm>(<js>"tag:juneau.apache.org"</js>, <js>"Juneau ATOM specification"</js>, <js>"2016-01-02T03:04:05Z"</js>)
@@ -91,7 +91,7 @@
);
</p>
<p>
- To serialize this to ATOM, use the {@link org.apache.juneau.xml.XmlSerializer} class:
+ To serialize this to ATOM, use the {@link org.apache.juneau.marshall.xml.XmlSerializer} class:
</p>
<h5 class='figure'>Example with no namespaces</h5>
@@ -274,7 +274,7 @@
<h4 class='topic'>1.1.1 - ATOM/JSON</h4>
<div class='topic'>
<p>
- The {@link org.apache.juneau.json.JsonSerializer} class can also be used to produce ATOM in JSON format.
+ The {@link org.apache.juneau.marshall.json.JsonSerializer} class can also be used to produce ATOM in JSON format.
</p>
<h5 class='figure'>ATOM/JSON example</h5>
@@ -372,7 +372,7 @@
<h4 class='topic'>1.1.2 - ATOM/RDF/XML</h4>
<div class='topic'>
<p>
- The {@link org.apache.juneau.jena.RdfSerializer} class and subclasses can also be used to produce ATOM
+ The {@link org.apache.juneau.marshall.jena.RdfSerializer} class and subclasses can also be used to produce ATOM
in various RDF formats.
</p>
@@ -493,10 +493,10 @@
<h4 class='topic'>1.1.3 - ATOM/HTML</h4>
<div class='topic'>
<p>
- The {@link org.apache.juneau.html.HtmlSerializer} class can be used to produce ATOM in HTML format.
+ The {@link org.apache.juneau.marshall.html.HtmlSerializer} class can be used to produce ATOM in HTML format.
</p>
<p>
- The following is the output produced by the <code>AtomFeedResource</code> in the <code>org.apache.juneau.sample.war</code> project:
+ The following is the output produced by the <code>AtomFeedResource</code> in the <code>org.apache.juneau.marshall.sample.war</code> project:
</p>
<h5 class='figure'>Example ATOM/HTML results</h5>
@@ -510,7 +510,7 @@
<h3 class='topic'>1.2 - Parsing ATOM feeds</h3>
<div class='topic'>
<p>
- Use the {@link org.apache.juneau.xml.XmlParser} to convert ATOM/XML feeds back into their original POJOs:
+ Use the {@link org.apache.juneau.marshall.xml.XmlParser} to convert ATOM/XML feeds back into their original POJOs:
</p>
<p class='bjava'>
<jc>// Create a serializer with readable output with namespaces</jc>
diff --git a/juneau-bean/juneau-bean-common/src/main/java/org/apache/juneau/bean/LinkString.java b/juneau-bean/juneau-bean-common/src/main/java/org/apache/juneau/bean/LinkString.java
index c29248d565..c082478a3b 100644
--- a/juneau-bean/juneau-bean-common/src/main/java/org/apache/juneau/bean/LinkString.java
+++ b/juneau-bean/juneau-bean-common/src/main/java/org/apache/juneau/bean/LinkString.java
@@ -23,10 +23,10 @@ import java.text.*;
import org.apache.juneau.commons.bean.*;
import org.apache.juneau.commons.httppart.*;
-import org.apache.juneau.html.*;
-import org.apache.juneau.oapi.*;
-import org.apache.juneau.objecttools.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.html.*;
+import org.apache.juneau.marshall.oapi.*;
+import org.apache.juneau.marshall.objecttools.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Simple bean that implements a hyperlink for the HTML serializer.
diff --git a/juneau-bean/juneau-bean-hal/src/main/java/org/apache/juneau/bean/hal/HalLink.java b/juneau-bean/juneau-bean-hal/src/main/java/org/apache/juneau/bean/hal/HalLink.java
index d6f4a0f6b3..6f49a56425 100644
--- a/juneau-bean/juneau-bean-hal/src/main/java/org/apache/juneau/bean/hal/HalLink.java
+++ b/juneau-bean/juneau-bean-hal/src/main/java/org/apache/juneau/bean/hal/HalLink.java
@@ -16,8 +16,8 @@
*/
package org.apache.juneau.bean.hal;
-import org.apache.juneau.*;
-import org.apache.juneau.json.*;
+import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshall.json.*;
/**
* Represents a HAL Link Object as defined by
diff --git a/juneau-bean/juneau-bean-hal/src/main/java/org/apache/juneau/bean/hal/HalLinkOrArraySwap.java b/juneau-bean/juneau-bean-hal/src/main/java/org/apache/juneau/bean/hal/HalLinkOrArraySwap.java
index 4a4ef3c14e..7a3711e34c 100644
--- a/juneau-bean/juneau-bean-hal/src/main/java/org/apache/juneau/bean/hal/HalLinkOrArraySwap.java
+++ b/juneau-bean/juneau-bean-hal/src/main/java/org/apache/juneau/bean/hal/HalLinkOrArraySwap.java
@@ -18,10 +18,10 @@ package org.apache.juneau.bean.hal;
import java.util.*;
-import org.apache.juneau.*;
-import org.apache.juneau.parser.*;
-import org.apache.juneau.serializer.*;
-import org.apache.juneau.swap.*;
+import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshall.parser.*;
+import org.apache.juneau.marshall.serializer.*;
+import org.apache.juneau.marshall.swap.*;
/**
* Per-property {@link ObjectSwap} applied to HAL {@code _links} maps so that each map entry round-trips
diff --git a/juneau-bean/juneau-bean-hal/src/main/java/org/apache/juneau/bean/hal/HalResource.java b/juneau-bean/juneau-bean-hal/src/main/java/org/apache/juneau/bean/hal/HalResource.java
index 03397916b5..156e23ae43 100644
--- a/juneau-bean/juneau-bean-hal/src/main/java/org/apache/juneau/bean/hal/HalResource.java
+++ b/juneau-bean/juneau-bean-hal/src/main/java/org/apache/juneau/bean/hal/HalResource.java
@@ -22,9 +22,9 @@ import static org.apache.juneau.commons.utils.Utils.*;
import java.util.*;
-import org.apache.juneau.*;
import org.apache.juneau.commons.bean.*;
-import org.apache.juneau.json.*;
+import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshall.json.*;
/**
* Represents a HAL Resource Object as defined by
diff --git a/juneau-bean/juneau-bean-hal/src/main/java/org/apache/juneau/bean/hal/HalResourceOrArraySwap.java b/juneau-bean/juneau-bean-hal/src/main/java/org/apache/juneau/bean/hal/HalResourceOrArraySwap.java
index 58be476399..46ae7b99e8 100644
--- a/juneau-bean/juneau-bean-hal/src/main/java/org/apache/juneau/bean/hal/HalResourceOrArraySwap.java
+++ b/juneau-bean/juneau-bean-hal/src/main/java/org/apache/juneau/bean/hal/HalResourceOrArraySwap.java
@@ -18,10 +18,10 @@ package org.apache.juneau.bean.hal;
import java.util.*;
-import org.apache.juneau.*;
-import org.apache.juneau.parser.*;
-import org.apache.juneau.serializer.*;
-import org.apache.juneau.swap.*;
+import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshall.parser.*;
+import org.apache.juneau.marshall.serializer.*;
+import org.apache.juneau.marshall.swap.*;
/**
* Per-property {@link ObjectSwap} applied to HAL {@code _embedded} maps so that each map entry round-trips
diff --git a/juneau-bean/juneau-bean-hal/src/main/java/org/apache/juneau/bean/hal/package-info.java b/juneau-bean/juneau-bean-hal/src/main/java/org/apache/juneau/bean/hal/package-info.java
index 3152413162..1ed3e824c0 100644
--- a/juneau-bean/juneau-bean-hal/src/main/java/org/apache/juneau/bean/hal/package-info.java
+++ b/juneau-bean/juneau-bean-hal/src/main/java/org/apache/juneau/bean/hal/package-info.java
@@ -16,7 +16,7 @@
*/
/**
- * Juneau {@link org.apache.juneau.Marshalled @Marshalled} types for the
+ * Juneau {@link org.apache.juneau.marshall.Marshalled @Marshalled} types for the
* <a href="https://stateless.group/hal_specification.html">HAL (Hypertext Application Language)</a>
* hypermedia format, also covered by
* <a href="https://datatracker.ietf.org/doc/html/draft-kelly-json-hal-08">draft-kelly-json-hal-08</a>.
@@ -26,7 +26,7 @@
* <p>
* HAL is a JSON-based hypermedia format used by RESTful APIs to express links and embedded resources alongside the
* payload itself. This module provides typed Juneau beans modeling the HAL wire format — no marshaller is needed; the
- * existing {@link org.apache.juneau.json.JsonSerializer} / {@link org.apache.juneau.json.JsonParser} already produce
+ * existing {@link org.apache.juneau.marshall.json.JsonSerializer} / {@link org.apache.juneau.marshall.json.JsonParser} already produce
* and consume {@code application/hal+json}. The matching {@code ContentType} constant is
* {@code org.apache.juneau.http.header.ContentType#APPLICATION_HAL_JSON} (in {@code juneau-rest-common}).
*
@@ -39,7 +39,7 @@
* the multi-link branch inside an {@code _links} map.
* <li>{@link org.apache.juneau.bean.hal.HalResourceArray} - {@code LinkedList<HalResource>}
* used as the multi-resource branch inside an {@code _embedded} map.
- * <li>{@link org.apache.juneau.bean.hal.HalLinkOrArraySwap} - {@link org.apache.juneau.swap.ObjectSwap}
+ * <li>{@link org.apache.juneau.bean.hal.HalLinkOrArraySwap} - {@link org.apache.juneau.marshall.swap.ObjectSwap}
* that materializes each {@code _links} value as either a single {@link org.apache.juneau.bean.hal.HalLink}
* (JSON object) or a {@link org.apache.juneau.bean.hal.HalLinkArray} (JSON array) per spec.
* <li>{@link org.apache.juneau.bean.hal.HalResourceOrArraySwap} - The {@code _embedded} analogue.
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/A.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/A.java
index 00dbc6c96c..f8cd4d7af1 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/A.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/A.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.html5;
import java.net.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-a-element"><a></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Abbr.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Abbr.java
index 533d0cd7c5..6138ef1ba9 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Abbr.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Abbr.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-abbr-element"><abbr></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Address.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Address.java
index 51f9e78605..38dab8d23d 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Address.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Address.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-address-element"><address></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Area.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Area.java
index 1f5c27eaa7..1519b359ec 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Area.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Area.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.html5;
import java.net.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#the-area-element"><area></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Article.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Article.java
index 7b52e666d4..3eced64fa7 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Article.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Article.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-article-element"><article></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Aside.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Aside.java
index 415eadd62b..1005c1720c 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Aside.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Aside.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-aside-element"><aside></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Audio.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Audio.java
index 33270696be..c80e5f45e9 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Audio.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Audio.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.html5;
import java.net.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#the-audio-element"><audio></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/B.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/B.java
index 4064328388..f5ab133920 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/B.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/B.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-b-element"><b></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Base.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Base.java
index 1f7bfa296d..bb0c53c75f 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Base.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Base.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.html5;
import java.net.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/document-metadata.html#the-base-element"><base></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Bdi.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Bdi.java
index 654d42d3f8..f21e8ac82a 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Bdi.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Bdi.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-bdi-element"><bdi></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Bdo.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Bdo.java
index 0dcf189c5e..447a122d95 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Bdo.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Bdo.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-bdo-element"><bdo></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Blockquote.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Blockquote.java
index 3f850b3a02..40dfa7c923 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Blockquote.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Blockquote.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#the-blockquote-element"><blockquote></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Body.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Body.java
index d5c847590c..a6abcf231c 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Body.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Body.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-body-element"><body></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Br.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Br.java
index 8d37a84261..ca68c58fce 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Br.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Br.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-br-element"><br></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Button.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Button.java
index 1eaf9fd579..932215384a 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Button.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Button.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.html5;
import java.net.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-button-element"><button></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Canvas.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Canvas.java
index 41c35c55a8..dde4386980 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Canvas.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Canvas.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/scripting-1.html#the-canvas-element"><canvas></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Caption.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Caption.java
index be210b7dde..ef22967905 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Caption.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Caption.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#the-caption-element"><caption></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Cite.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Cite.java
index 80ea657214..a80f159ebd 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Cite.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Cite.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-cite-element"><cite></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Code.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Code.java
index 81f8e27df7..3d219276bb 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Code.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Code.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-code-element"><code></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Col.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Col.java
index 0c66a07670..0bdd19a6ea 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Col.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Col.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#the-col-element"><col></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Colgroup.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Colgroup.java
index 9765ee2d3f..40b013cfa0 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Colgroup.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Colgroup.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.html5;
import java.util.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#the-colgroup-element"><colgroup></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Data.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Data.java
index b23ff994bd..e5d265b0ca 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Data.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Data.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-data-element"><data></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Datalist.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Datalist.java
index d39b436b5c..d36df55227 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Datalist.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Datalist.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.html5;
import java.util.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-datalist-element"><datalist></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Dd.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Dd.java
index 08a2de2be8..beff154b47 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Dd.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Dd.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#the-dd-element"><dd></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Del.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Del.java
index 15aa9982a0..998b81656d 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Del.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Del.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/edits.html#the-del-element"><del></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Dfn.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Dfn.java
index 6107925a44..fc4cb5239b 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Dfn.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Dfn.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-dfn-element"><dfn></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Div.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Div.java
index 3fddeb9f05..a74c3dc77d 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Div.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Div.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#the-div-element"><div></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Dl.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Dl.java
index 0ff0a25df6..1433210995 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Dl.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Dl.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.html5;
import java.util.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#the-dl-element"><dl></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Dt.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Dt.java
index 1408ba3833..a03686fa0c 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Dt.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Dt.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#the-dt-element"><dt></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Em.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Em.java
index f0f2489238..029c92294b 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Em.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Em.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-em-element"><em></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Embed.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Embed.java
index 1ed4f84bb3..3bb0003438 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Embed.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Embed.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.html5;
import java.net.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#the-embed-element"><embed></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Fieldset.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Fieldset.java
index 111be327ce..bb1439045b 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Fieldset.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Fieldset.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-fieldset-element"><fieldset></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Figcaption.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Figcaption.java
index ec6293dd5d..92b2bc1f95 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Figcaption.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Figcaption.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#the-figcaption-element"><figcaption></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Figure.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Figure.java
index 782facedfb..84dac36ab2 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Figure.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Figure.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.html5;
import java.util.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#the-figure-element"><figure></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Footer.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Footer.java
index 192d9bebcc..83f8703bf3 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Footer.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Footer.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-footer-element"><footer></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Form.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Form.java
index 51302ae281..ff25776e0f 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Form.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Form.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.html5;
import java.net.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-form-element"><form></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/H1.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/H1.java
index 14da135175..14486244f1 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/H1.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/H1.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements"><h1></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/H2.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/H2.java
index 36e4ec44ac..4fb49daaf4 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/H2.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/H2.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements"><h2></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/H3.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/H3.java
index dcd2ff3e99..58b6ecc28e 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/H3.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/H3.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements"><h3></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/H4.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/H4.java
index 68ddb28157..b65f9cdc4b 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/H4.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/H4.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements"><h4></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/H5.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/H5.java
index b08304053f..8df5fe919b 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/H5.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/H5.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements"><h5></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/H6.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/H6.java
index fa0cb798a8..63678ee786 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/H6.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/H6.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements"><h6></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Head.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Head.java
index 2b6e24026f..54de2a05ce 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Head.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Head.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.html5;
import java.util.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/document-metadata.html#the-head-element"><head></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Header.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Header.java
index 9c89634218..4d254642f9 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Header.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Header.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-header-element"><header></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Hr.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Hr.java
index 84746e94bf..795e2ef4e4 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Hr.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Hr.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#the-hr-element"><hr></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Html.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Html.java
index a704e4621f..8e334dae55 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Html.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Html.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.html5;
import java.util.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/semantics.html#the-html-element"><html></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlBeanDictionary.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlBeanDictionary.java
index 0758d6cfa1..8c9575fa0d 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlBeanDictionary.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlBeanDictionary.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* Defines the Java classes that make up the HTML DTO type dictionary.
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlElement.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlElement.java
index d90405ffea..ad3fce14d7 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlElement.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlElement.java
@@ -19,16 +19,16 @@ package org.apache.juneau.bean.html5;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.html.HtmlFormat.*;
-import static org.apache.juneau.xml.XmlFormat.*;
+import static org.apache.juneau.marshall.html.HtmlFormat.*;
+import static org.apache.juneau.marshall.xml.XmlFormat.*;
import java.net.*;
-import org.apache.juneau.*;
import org.apache.juneau.commons.bean.*;
import org.apache.juneau.commons.conversion.*;
-import org.apache.juneau.html.*;
-import org.apache.juneau.xml.*;
+import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshall.html.*;
+import org.apache.juneau.marshall.xml.*;
/**
* Superclass for all HTML elements.
@@ -41,7 +41,7 @@ import org.apache.juneau.xml.*;
* </ul>
*/
-@org.apache.juneau.html.Html(format = XML)
+@org.apache.juneau.marshall.html.Html(format = XML)
public abstract class HtmlElement {
private java.util.Map<String,Object> attrs;
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlElementContainer.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlElementContainer.java
index abe22e72b6..2faf00067b 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlElementContainer.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlElementContainer.java
@@ -16,14 +16,14 @@
*/
package org.apache.juneau.bean.html5;
-import static org.apache.juneau.xml.XmlFormat.*;
+import static org.apache.juneau.marshall.xml.XmlFormat.*;
import java.util.*;
-import org.apache.juneau.*;
import org.apache.juneau.commons.bean.*;
import org.apache.juneau.commons.conversion.*;
-import org.apache.juneau.xml.*;
+import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshall.xml.*;
/**
* A subclass of HTML elements that contain only other elements, not text.
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlElementMixed.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlElementMixed.java
index 28c76b0c1a..9f0d17d8ee 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlElementMixed.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlElementMixed.java
@@ -16,14 +16,14 @@
*/
package org.apache.juneau.bean.html5;
-import static org.apache.juneau.xml.XmlFormat.*;
+import static org.apache.juneau.marshall.xml.XmlFormat.*;
import java.util.*;
-import org.apache.juneau.*;
import org.apache.juneau.commons.bean.*;
import org.apache.juneau.commons.conversion.*;
-import org.apache.juneau.xml.*;
+import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshall.xml.*;
/**
* A subclass of HTML elements that contain mixed content (elements and text).
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlElementRawText.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlElementRawText.java
index fa39fa9723..faf66850cc 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlElementRawText.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlElementRawText.java
@@ -17,7 +17,7 @@
package org.apache.juneau.bean.html5;
import org.apache.juneau.commons.bean.*;
-import org.apache.juneau.xml.*;
+import org.apache.juneau.marshall.xml.*;
/**
* A subclass of HTML elements that contain <a href="https://www.w3.org/TR/html51/syntax.html#raw-text">raw text</a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlElementText.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlElementText.java
index 6ef4ac8946..0aebff55ad 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlElementText.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlElementText.java
@@ -17,7 +17,7 @@
package org.apache.juneau.bean.html5;
import org.apache.juneau.commons.bean.*;
-import org.apache.juneau.xml.*;
+import org.apache.juneau.marshall.xml.*;
/**
* A subclass of HTML elements that contain text only.
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlElementVoid.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlElementVoid.java
index 0f7dc7ba9d..7424ac0a3c 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlElementVoid.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlElementVoid.java
@@ -16,9 +16,9 @@
*/
package org.apache.juneau.bean.html5;
-import static org.apache.juneau.xml.XmlFormat.*;
+import static org.apache.juneau.marshall.xml.XmlFormat.*;
-import org.apache.juneau.xml.*;
+import org.apache.juneau.marshall.xml.*;
/**
* A subclass of HTML elements that have no content or end tags.
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlText.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlText.java
index feec6f7c9f..0edbf2b9b9 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlText.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlText.java
@@ -16,9 +16,9 @@
*/
package org.apache.juneau.bean.html5;
-import static org.apache.juneau.xml.XmlFormat.*;
+import static org.apache.juneau.marshall.xml.XmlFormat.*;
-import org.apache.juneau.xml.*;
+import org.apache.juneau.marshall.xml.*;
/**
* An object that gets serialized as raw XML by the XML and HTML serializers.
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/I.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/I.java
index 42c8b3770a..4948d98c19 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/I.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/I.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-i-element"><i></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Iframe.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Iframe.java
index 38be42b85b..e31740f1c3 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Iframe.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Iframe.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.html5;
import java.net.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#the-iframe-element"><iframe></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Img.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Img.java
index b1b8391a1c..a2b569a677 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Img.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Img.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.html5;
import java.net.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#the-img-element"><img></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Input.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Input.java
index 8f2fa46df8..f96043bdc1 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Input.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Input.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.html5;
import java.net.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-input-element"><input></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Ins.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Ins.java
index cf1af4ac75..e514504faa 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Ins.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Ins.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/edits.html#the-ins-element"><ins></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Kbd.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Kbd.java
index e863eb658f..f322cc056b 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Kbd.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Kbd.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-kbd-element"><kbd></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Keygen.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Keygen.java
index c57c79e8f6..8534571f1f 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Keygen.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Keygen.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-keygen-element"><keygen></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Label.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Label.java
index 017fb0a448..fdb641cb8d 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Label.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Label.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-label-element"><label></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Legend.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Legend.java
index 420c3781a3..b5aff12fd7 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Legend.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Legend.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-legend-element"><legend></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Li.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Li.java
index fd32944b4b..969f8defe9 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Li.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Li.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#the-li-element"><li></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Link.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Link.java
index 7ea5e95e74..ac2b4e221f 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Link.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Link.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.html5;
import java.net.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/document-metadata.html#the-link-element"><link></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Main.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Main.java
index 01337a4238..b857be4d11 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Main.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Main.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.html5;
import java.util.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#the-main-element"><main></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Map.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Map.java
index 1d45dd36d5..646f720596 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Map.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Map.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.html5;
import java.util.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#the-map-element"><map></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Mark.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Mark.java
index 19aaea1ba1..cbfa8c44ff 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Mark.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Mark.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-mark-element"><mark></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Meta.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Meta.java
index cb244e200d..c3e70626b9 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Meta.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Meta.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/document-metadata.html#the-meta-element"><meta></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Meter.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Meter.java
index 83e0076ea6..387c9e9a45 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Meter.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Meter.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-meter-element"><meter></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Nav.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Nav.java
index 0d1c5c3199..5a3e9f7954 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Nav.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Nav.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-nav-element"><nav></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Noscript.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Noscript.java
index 4246f9d6a8..5e19dbea65 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Noscript.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Noscript.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/scripting-1.html#the-noscript-element"><noscript></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Object_.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Object_.java
index 0515cb5a93..a717649e80 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Object_.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Object_.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.html5;
import java.net.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#the-object-element"><object></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Ol.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Ol.java
index 9dd0be58d4..928e66d363 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Ol.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Ol.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.html5;
import java.util.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#the-ol-element"><ol></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Optgroup.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Optgroup.java
index 7bad2b06a9..7a17d24419 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Optgroup.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Optgroup.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.html5;
import java.util.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-optgroup-element"><optgroup></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Option.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Option.java
index 1985c6e6f5..776a2fdf04 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Option.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Option.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-option-element"><option></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Output.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Output.java
index f46b346e3c..de6badbd1e 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Output.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Output.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-output-element"><output></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/P.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/P.java
index 119a657f13..f7e77db6f7 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/P.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/P.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#the-p-element"><p></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Param.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Param.java
index 825d88a988..7ac585abaa 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Param.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Param.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#the-param-element"><param></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Pre.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Pre.java
index 9f26c72c8f..449be235d4 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Pre.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Pre.java
@@ -16,13 +16,13 @@
*/
package org.apache.juneau.bean.html5;
-import static org.apache.juneau.xml.XmlFormat.*;
+import static org.apache.juneau.marshall.xml.XmlFormat.*;
import java.util.*;
-import org.apache.juneau.*;
import org.apache.juneau.commons.bean.*;
-import org.apache.juneau.xml.*;
+import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshall.xml.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#the-pre-element"><pre></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Progress.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Progress.java
index e25d5ecf83..b7f48e4d47 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Progress.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Progress.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-progress-element"><progress></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Q.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Q.java
index c0745146bb..f37a9fa7d4 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Q.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Q.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-q-element"><q></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Rb.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Rb.java
index a8fc773bd5..c4208dc108 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Rb.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Rb.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-rb-element"><rb></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Rp.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Rp.java
index 8aba31c2a2..213fd924c2 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Rp.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Rp.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-rp-element"><rp></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Rt.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Rt.java
index be565531d7..57c5bed536 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Rt.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Rt.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-rt-element"><rt></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Rtc.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Rtc.java
index 5f1c0154be..0affa2a02b 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Rtc.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Rtc.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-rtc-element"><rtc></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Ruby.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Ruby.java
index 9a18eeb81d..426f51d3d5 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Ruby.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Ruby.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-ruby-element"><ruby></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/S.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/S.java
index 23d4e1ab59..115890bfa5 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/S.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/S.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-s-element"><s></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Samp.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Samp.java
index ebe37db26f..f218a8a3b7 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Samp.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Samp.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-samp-element"><samp></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Script.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Script.java
index b61e95500d..0ca37289f8 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Script.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Script.java
@@ -20,7 +20,7 @@ import static org.apache.juneau.commons.utils.StringUtils.*;
import java.net.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/scripting-1.html#the-script-element"><script></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Section.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Section.java
index 88bb460bed..9b4479e210 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Section.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Section.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-section-element"><section></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Select.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Select.java
index 9562deb214..ad329ebd3b 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Select.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Select.java
@@ -20,7 +20,7 @@ import static org.apache.juneau.commons.utils.Utils.*;
import java.util.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-select-element"><select></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Small.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Small.java
index cf166745a6..deef4f2aa8 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Small.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Small.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-small-element"><small></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Source.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Source.java
index 34e55cef95..01299564e6 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Source.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Source.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.html5;
import java.net.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#the-source-element"><source></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Span.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Span.java
index 8ecec8e3f4..041e949e56 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Span.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Span.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-span-element"><span></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Strong.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Strong.java
index 242943ae8c..7452124b69 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Strong.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Strong.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-strong-element"><strong></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Style.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Style.java
index ff0a5d1d3e..32c8b5daf4 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Style.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Style.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.html5;
import static org.apache.juneau.commons.utils.StringUtils.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/document-metadata.html#the-style-element"><style></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Sub.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Sub.java
index fbcdcc0afb..e48461605c 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Sub.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Sub.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-sub-and-sup-elements"><sub></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Sup.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Sup.java
index 560c9a6789..42dad161b9 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Sup.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Sup.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-sub-and-sup-elements"><sup></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Table.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Table.java
index 71cb8f2417..dd5756f23a 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Table.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Table.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.html5;
import java.util.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#the-table-element"><table></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Tbody.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Tbody.java
index 468c8d396e..3ca46a236f 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Tbody.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Tbody.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.html5;
import java.util.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#the-tbody-element"><tbody></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Td.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Td.java
index 39ebc5e20a..a8c8e38054 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Td.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Td.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#the-td-element"><td></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Template.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Template.java
index 14a13193dc..8e03b3c099 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Template.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Template.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/scripting-1.html#the-template-element"><template></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Textarea.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Textarea.java
index 9bef19b539..ccc08107a4 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Textarea.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Textarea.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-textarea-element"><textarea></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Tfoot.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Tfoot.java
index 371a940dfb..bbdb53a24a 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Tfoot.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Tfoot.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.html5;
import java.util.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#the-tfoot-element"><tfoot></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Th.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Th.java
index 2e87a7a9c3..041b18ca2a 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Th.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Th.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#the-th-element"><th></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Thead.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Thead.java
index bab91e317c..0e9f5f4cf8 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Thead.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Thead.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.html5;
import java.util.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#the-thead-element"><thead></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Time.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Time.java
index 188b47b2d1..f24e1d2f96 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Time.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Time.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-time-element"><time></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Title.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Title.java
index 2bb37e0270..f0f79a8681 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Title.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Title.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/document-metadata.html#the-title-element"><title></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Tr.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Tr.java
index 6e209dc070..b5c5507706 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Tr.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Tr.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.html5;
import java.util.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#the-tr-element"><tr></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Track.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Track.java
index 995a522239..2747b1ecd7 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Track.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Track.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.html5;
import java.net.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#the-track-element"><track></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/U.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/U.java
index be892edf8d..0e1004aabc 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/U.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/U.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-u-element"><u></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Ul.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Ul.java
index 64f5c9f8ad..83852e1af4 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Ul.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Ul.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.html5;
import java.util.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#the-ul-element"><ul></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Var.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Var.java
index 2d67588124..bcd2172173 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Var.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Var.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-var-element"><var></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Video.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Video.java
index 0657eeddbb..3449afa041 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Video.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Video.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.html5;
import java.net.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#the-video-element"><video></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Wbr.java b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Wbr.java
index 3c78ae7344..0646bdaddf 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Wbr.java
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Wbr.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.html5;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-wbr-element"><wbr></a>
diff --git a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/package2.html b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/package2.html
index 2c063344e7..b02ac98a00 100644
--- a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/package2.html
+++ b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/package2.html
@@ -53,7 +53,7 @@
serializers, or to other languages such as JSON using the JSON serializers.
</p>
<p>
- The {@link org.apache.juneau.bean.html5.HtmlBuilder} class is a utility class with predefined static methods
+ The {@link org.apache.juneau.marshall.bean.html5.HtmlBuilder} class is a utility class with predefined static methods
that allow you to easily construct DTO instances in a minimal amount of code.
</p>
<p>
@@ -66,7 +66,7 @@
</tr>
<tr>
<td class='code'>
- <jk>import static</jk> org.apache.juneau.bean.html5.HtmlBuilder.*;
+ <jk>import static</jk> org.apache.juneau.marshall.bean.html5.HtmlBuilder.*;
Object mytable =
<jsm>table</jsm>(
@@ -91,7 +91,7 @@
</tr>
<tr>
<td class='code'>
- <jk>import static</jk> org.apache.juneau.bean.html5.HtmlBuilder.*;
+ <jk>import static</jk> org.apache.juneau.marshall.bean.html5.HtmlBuilder.*;
Object mytable =
<jsm>table</jsm>(
@@ -137,7 +137,7 @@
</tr>
<tr>
<td class='code'>
- <jk>import static</jk> org.apache.juneau.bean.html5.HtmlBuilder.*;
+ <jk>import static</jk> org.apache.juneau.marshall.bean.html5.HtmlBuilder.*;
Object mydiv =
<jsm>div</jsm>().align(<js>"center"</js>).onmouseover(<js>"alert(\"boo!\");"</js>)
@@ -155,7 +155,7 @@
</tr>
<tr>
<td class='code'>
- <jk>import static</jk> org.apache.juneau.bean.html5.HtmlBuilder.*;
+ <jk>import static</jk> org.apache.juneau.marshall.bean.html5.HtmlBuilder.*;
Object myform =
<jsm>form</jsm>().action(<js>"/submit"</js>).method(<js>"POST"</js>)
@@ -189,7 +189,7 @@
<h3 class='topic'>1.2 - Parsing HTML5</h3>
<div class='topic'>
<p>
- Use the {@link org.apache.juneau.html.HtmlParser} to convert HTML5 documents back into their original POJOs:
+ Use the {@link org.apache.juneau.marshall.html.HtmlParser} to convert HTML5 documents back into their original POJOs:
</p>
<p class='bjava'>
<jc>// Get an HTML parser to convert our generated HTML5 documents back into POJOs.</jc>
@@ -217,7 +217,7 @@
</p>
<p>
The following example shows how an HTML5 form template object can be created that gets serialized as a
- populated HTML5 {@link org.apache.juneau.bean.html5.Form} bean.
+ populated HTML5 {@link org.apache.juneau.marshall.bean.html5.Form} bean.
It takes advantage of the special <code>swap(MarshallingSession)</code> method that serializers will use to
convert the object to a serialized form before serialization.
The return type of this method can be any serializable type.
@@ -225,7 +225,7 @@
This gets serialized as an HTML form.
</p>
<p class='bjava'>
- <jk>import static</jk> org.apache.juneau.bean.html5.HtmlBuilder.*;
+ <jk>import static</jk> org.apache.juneau.marshall.bean.html5.HtmlBuilder.*;
<jd>/**
* A simple HTML form template whose serialized form is an HTML5 Form object.
@@ -267,7 +267,7 @@
constructor.
</p>
<p class='bjava'>
- <jk>import static</jk> org.apache.juneau.bean.html5.HtmlBuilder.*;
+ <jk>import static</jk> org.apache.juneau.marshall.bean.html5.HtmlBuilder.*;
<jd>/**
* A simple HTML form template whose serialized form is an HTML5 Form object.
diff --git a/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiDocument.java b/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiDocument.java
index e7837a28f5..faaa7a77ac 100644
--- a/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiDocument.java
+++ b/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiDocument.java
@@ -21,9 +21,9 @@ import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import java.util.*;
-import org.apache.juneau.*;
import org.apache.juneau.commons.bean.*;
-import org.apache.juneau.json.*;
+import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshall.json.*;
/**
* Represents the top-level JSON:API document as defined by
diff --git a/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiError.java b/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiError.java
index f4df02814b..f05d85533c 100644
--- a/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiError.java
+++ b/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiError.java
@@ -18,9 +18,9 @@ package org.apache.juneau.bean.jsonapi;
import java.util.*;
-import org.apache.juneau.*;
import org.apache.juneau.commons.bean.*;
-import org.apache.juneau.json.*;
+import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshall.json.*;
/**
* Represents a JSON:API Error Object as defined by
diff --git a/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiErrorSource.java b/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiErrorSource.java
index 2d4667c15e..1dfb13b4ed 100644
--- a/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiErrorSource.java
+++ b/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiErrorSource.java
@@ -16,8 +16,8 @@
*/
package org.apache.juneau.bean.jsonapi;
-import org.apache.juneau.*;
-import org.apache.juneau.json.*;
+import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshall.json.*;
/**
* Represents the {@code source} sub-object of a JSON:API Error Object.
diff --git a/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiLink.java b/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiLink.java
index 11ac037424..7f86c2900a 100644
--- a/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiLink.java
+++ b/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiLink.java
@@ -18,8 +18,8 @@ package org.apache.juneau.bean.jsonapi;
import java.util.*;
-import org.apache.juneau.*;
-import org.apache.juneau.json.*;
+import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshall.json.*;
/**
* Represents a JSON:API Link Object as defined by
diff --git a/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiLinkOrStringSwap.java b/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiLinkOrStringSwap.java
index b9befc3cf0..0d97872c79 100644
--- a/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiLinkOrStringSwap.java
+++ b/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiLinkOrStringSwap.java
@@ -18,10 +18,10 @@ package org.apache.juneau.bean.jsonapi;
import java.util.*;
-import org.apache.juneau.*;
-import org.apache.juneau.parser.*;
-import org.apache.juneau.serializer.*;
-import org.apache.juneau.swap.*;
+import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshall.parser.*;
+import org.apache.juneau.marshall.serializer.*;
+import org.apache.juneau.marshall.swap.*;
/**
* Per-property {@link ObjectSwap} applied to JSON:API {@code links} maps so that each map entry round-trips
diff --git a/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiRelationship.java b/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiRelationship.java
index cb5ad353e7..97b17975ac 100644
--- a/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiRelationship.java
+++ b/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiRelationship.java
@@ -18,9 +18,9 @@ package org.apache.juneau.bean.jsonapi;
import java.util.*;
-import org.apache.juneau.*;
import org.apache.juneau.commons.bean.*;
-import org.apache.juneau.json.*;
+import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshall.json.*;
/**
* Represents a JSON:API Relationship Object as defined by
diff --git a/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiResource.java b/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiResource.java
index 8c9b1fe876..ebe7d8b6ae 100644
--- a/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiResource.java
+++ b/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiResource.java
@@ -20,9 +20,9 @@ import static org.apache.juneau.commons.utils.CollectionUtils.*;
import java.util.*;
-import org.apache.juneau.*;
import org.apache.juneau.commons.bean.*;
-import org.apache.juneau.json.*;
+import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshall.json.*;
/**
* Represents a JSON:API Resource Object as defined by
diff --git a/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiResourceIdentifier.java b/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiResourceIdentifier.java
index 14094d08fe..508461ceec 100644
--- a/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiResourceIdentifier.java
+++ b/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiResourceIdentifier.java
@@ -18,8 +18,8 @@ package org.apache.juneau.bean.jsonapi;
import java.util.*;
-import org.apache.juneau.*;
-import org.apache.juneau.json.*;
+import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshall.json.*;
/**
* Represents a JSON:API Resource Identifier Object as defined by
diff --git a/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiVersion.java b/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiVersion.java
index b4184fe96d..df90f5e2ec 100644
--- a/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiVersion.java
+++ b/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/JsonApiVersion.java
@@ -18,8 +18,8 @@ package org.apache.juneau.bean.jsonapi;
import java.util.*;
-import org.apache.juneau.*;
-import org.apache.juneau.json.*;
+import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshall.json.*;
/**
* Represents the JSON:API top-level {@code jsonapi} member.
diff --git a/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/package-info.java b/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/package-info.java
index 5bfb528d6c..9e2e8c4b42 100644
--- a/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/package-info.java
+++ b/juneau-bean/juneau-bean-jsonapi/src/main/java/org/apache/juneau/bean/jsonapi/package-info.java
@@ -16,7 +16,7 @@
*/
/**
- * Juneau {@link org.apache.juneau.Marshalled @Marshalled} types for the
+ * Juneau {@link org.apache.juneau.marshall.Marshalled @Marshalled} types for the
* <a href="https://jsonapi.org/format/">JSON:API v1.1</a> wire format.
*
* <h5 class='topic'>Overview</h5>
@@ -24,8 +24,8 @@
* <p>
* JSON:API is a media-type ({@code application/vnd.api+json}) for building APIs with shared conventions for
* resources, relationships, links, errors, and metadata. This module provides typed Juneau beans modeling the
- * JSON:API wire format - no marshaller is needed; the existing {@link org.apache.juneau.json.JsonSerializer} /
- * {@link org.apache.juneau.json.JsonParser} already produce and consume the wire format. The matching
+ * JSON:API wire format - no marshaller is needed; the existing {@link org.apache.juneau.marshall.json.JsonSerializer} /
+ * {@link org.apache.juneau.marshall.json.JsonParser} already produce and consume the wire format. The matching
* {@code ContentType} constant is {@code org.apache.juneau.http.header.ContentType#APPLICATION_VND_API_JSON}.
*
* <h5 class='topic'>Bean Classes</h5>
@@ -46,7 +46,7 @@
* <li>{@link org.apache.juneau.bean.jsonapi.JsonApiVersion} - The {@code jsonapi} member
* ({@code version}/{@code meta}).
* <li>{@link org.apache.juneau.bean.jsonapi.JsonApiLinkOrStringSwap} -
- * {@link org.apache.juneau.swap.ObjectSwap} for {@code links} map values; each value can be either a JSON
+ * {@link org.apache.juneau.marshall.swap.ObjectSwap} for {@code links} map values; each value can be either a JSON
* string URL or a {@link org.apache.juneau.bean.jsonapi.JsonApiLink} object per the spec.
* </ul>
*
diff --git a/juneau-bean/juneau-bean-jsonpatch/src/main/java/org/apache/juneau/bean/jsonpatch/AddOp.java b/juneau-bean/juneau-bean-jsonpatch/src/main/java/org/apache/juneau/bean/jsonpatch/AddOp.java
index 8d2d0caab5..da3cdbe652 100644
--- a/juneau-bean/juneau-bean-jsonpatch/src/main/java/org/apache/juneau/bean/jsonpatch/AddOp.java
+++ b/juneau-bean/juneau-bean-jsonpatch/src/main/java/org/apache/juneau/bean/jsonpatch/AddOp.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.jsonpatch;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* The JSON Patch {@code "add"} operation per
diff --git a/juneau-bean/juneau-bean-jsonpatch/src/main/java/org/apache/juneau/bean/jsonpatch/CopyOp.java b/juneau-bean/juneau-bean-jsonpatch/src/main/java/org/apache/juneau/bean/jsonpatch/CopyOp.java
index 25d28af477..edc8d18169 100644
--- a/juneau-bean/juneau-bean-jsonpatch/src/main/java/org/apache/juneau/bean/jsonpatch/CopyOp.java
+++ b/juneau-bean/juneau-bean-jsonpatch/src/main/java/org/apache/juneau/bean/jsonpatch/CopyOp.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.jsonpatch;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* The JSON Patch {@code "copy"} operation per
diff --git a/juneau-bean/juneau-bean-jsonpatch/src/main/java/org/apache/juneau/bean/jsonpatch/JsonPatchOperation.java b/juneau-bean/juneau-bean-jsonpatch/src/main/java/org/apache/juneau/bean/jsonpatch/JsonPatchOperation.java
index b49f2ca79b..7b428cc339 100644
--- a/juneau-bean/juneau-bean-jsonpatch/src/main/java/org/apache/juneau/bean/jsonpatch/JsonPatchOperation.java
+++ b/juneau-bean/juneau-bean-jsonpatch/src/main/java/org/apache/juneau/bean/jsonpatch/JsonPatchOperation.java
@@ -16,8 +16,8 @@
*/
package org.apache.juneau.bean.jsonpatch;
-import org.apache.juneau.*;
-import org.apache.juneau.json.*;
+import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshall.json.*;
/**
* Abstract base for a JSON Patch operation per
diff --git a/juneau-bean/juneau-bean-jsonpatch/src/main/java/org/apache/juneau/bean/jsonpatch/MoveOp.java b/juneau-bean/juneau-bean-jsonpatch/src/main/java/org/apache/juneau/bean/jsonpatch/MoveOp.java
index 0bfa808c7f..56afd58759 100644
--- a/juneau-bean/juneau-bean-jsonpatch/src/main/java/org/apache/juneau/bean/jsonpatch/MoveOp.java
+++ b/juneau-bean/juneau-bean-jsonpatch/src/main/java/org/apache/juneau/bean/jsonpatch/MoveOp.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.jsonpatch;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* The JSON Patch {@code "move"} operation per
diff --git a/juneau-bean/juneau-bean-jsonpatch/src/main/java/org/apache/juneau/bean/jsonpatch/RemoveOp.java b/juneau-bean/juneau-bean-jsonpatch/src/main/java/org/apache/juneau/bean/jsonpatch/RemoveOp.java
index 466aa87b53..1d3926552a 100644
--- a/juneau-bean/juneau-bean-jsonpatch/src/main/java/org/apache/juneau/bean/jsonpatch/RemoveOp.java
+++ b/juneau-bean/juneau-bean-jsonpatch/src/main/java/org/apache/juneau/bean/jsonpatch/RemoveOp.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.jsonpatch;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* The JSON Patch {@code "remove"} operation per
diff --git a/juneau-bean/juneau-bean-jsonpatch/src/main/java/org/apache/juneau/bean/jsonpatch/ReplaceOp.java b/juneau-bean/juneau-bean-jsonpatch/src/main/java/org/apache/juneau/bean/jsonpatch/ReplaceOp.java
index 5e37389495..0ea542ce9d 100644
--- a/juneau-bean/juneau-bean-jsonpatch/src/main/java/org/apache/juneau/bean/jsonpatch/ReplaceOp.java
+++ b/juneau-bean/juneau-bean-jsonpatch/src/main/java/org/apache/juneau/bean/jsonpatch/ReplaceOp.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.jsonpatch;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* The JSON Patch {@code "replace"} operation per
diff --git a/juneau-bean/juneau-bean-jsonpatch/src/main/java/org/apache/juneau/bean/jsonpatch/TestOp.java b/juneau-bean/juneau-bean-jsonpatch/src/main/java/org/apache/juneau/bean/jsonpatch/TestOp.java
index f690d3a987..9a9111b3bd 100644
--- a/juneau-bean/juneau-bean-jsonpatch/src/main/java/org/apache/juneau/bean/jsonpatch/TestOp.java
+++ b/juneau-bean/juneau-bean-jsonpatch/src/main/java/org/apache/juneau/bean/jsonpatch/TestOp.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.jsonpatch;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* The JSON Patch {@code "test"} operation per
diff --git a/juneau-bean/juneau-bean-jsonpatch/src/main/java/org/apache/juneau/bean/jsonpatch/package-info.java b/juneau-bean/juneau-bean-jsonpatch/src/main/java/org/apache/juneau/bean/jsonpatch/package-info.java
index 6a57a27168..df566c2037 100644
--- a/juneau-bean/juneau-bean-jsonpatch/src/main/java/org/apache/juneau/bean/jsonpatch/package-info.java
+++ b/juneau-bean/juneau-bean-jsonpatch/src/main/java/org/apache/juneau/bean/jsonpatch/package-info.java
@@ -16,7 +16,7 @@
*/
/**
- * Juneau {@link org.apache.juneau.Marshalled @Marshalled} types for
+ * Juneau {@link org.apache.juneau.marshall.Marshalled @Marshalled} types for
* <a href="https://datatracker.ietf.org/doc/html/rfc6902">JSON Patch (RFC 6902)</a>.
*
* <h5 class='topic'>Overview</h5>
diff --git a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchema.java b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchema.java
index ccdbbe9cd3..d40c056ff6 100644
--- a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchema.java
+++ b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchema.java
@@ -26,13 +26,13 @@ import java.lang.reflect.*;
import java.net.*;
import java.util.*;
-import org.apache.juneau.*;
import org.apache.juneau.commons.bean.*;
import org.apache.juneau.commons.reflect.*;
-import org.apache.juneau.json.*;
-import org.apache.juneau.parser.*;
-import org.apache.juneau.serializer.*;
-import org.apache.juneau.swap.*;
+import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshall.json.*;
+import org.apache.juneau.marshall.parser.*;
+import org.apache.juneau.marshall.serializer.*;
+import org.apache.juneau.marshall.swap.*;
/**
* Represents a top-level schema object bean in the JSON-Schema core specification.
diff --git a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaBeanGenerator.java b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaBeanGenerator.java
index 89eebfbde4..2a561e0708 100644
--- a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaBeanGenerator.java
+++ b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaBeanGenerator.java
@@ -21,10 +21,10 @@ import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import java.lang.reflect.*;
-import org.apache.juneau.collections.*;
-import org.apache.juneau.json.*;
-import org.apache.juneau.jsonschema.*;
-import org.apache.juneau.parser.*;
+import org.apache.juneau.marshall.collections.*;
+import org.apache.juneau.marshall.json.*;
+import org.apache.juneau.marshall.jsonschema.*;
+import org.apache.juneau.marshall.parser.*;
/**
* Bridge for generating typed {@link JsonSchema} beans from Java types.
@@ -144,61 +144,61 @@ public final class JsonSchemaBeanGenerator {
private Builder() {}
- /** Mirrors {@link org.apache.juneau.jsonschema.JsonSchemaGenerator.Builder#addDescriptionsTo(TypeCategory...)}. */
+ /** Mirrors {@link org.apache.juneau.marshall.jsonschema.JsonSchemaGenerator.Builder#addDescriptionsTo(TypeCategory...)}. */
public Builder addDescriptionsTo(TypeCategory...values) {
generatorBuilder.addDescriptionsTo(values);
return this;
}
- /** Mirrors {@link org.apache.juneau.jsonschema.JsonSchemaGenerator.Builder#addExamplesTo(TypeCategory...)}. */
+ /** Mirrors {@link org.apache.juneau.marshall.jsonschema.JsonSchemaGenerator.Builder#addExamplesTo(TypeCategory...)}. */
public Builder addExamplesTo(TypeCategory...values) {
generatorBuilder.addExamplesTo(values);
return this;
}
- /** Mirrors {@link org.apache.juneau.jsonschema.JsonSchemaGenerator.Builder#allowNestedDescriptions()}. */
+ /** Mirrors {@link org.apache.juneau.marshall.jsonschema.JsonSchemaGenerator.Builder#allowNestedDescriptions()}. */
public Builder allowNestedDescriptions() {
generatorBuilder.allowNestedDescriptions();
return this;
}
- /** Mirrors {@link org.apache.juneau.jsonschema.JsonSchemaGenerator.Builder#allowNestedDescriptions(boolean)}. */
+ /** Mirrors {@link org.apache.juneau.marshall.jsonschema.JsonSchemaGenerator.Builder#allowNestedDescriptions(boolean)}. */
public Builder allowNestedDescriptions(boolean value) {
generatorBuilder.allowNestedDescriptions(value);
return this;
}
- /** Mirrors {@link org.apache.juneau.jsonschema.JsonSchemaGenerator.Builder#allowNestedExamples()}. */
+ /** Mirrors {@link org.apache.juneau.marshall.jsonschema.JsonSchemaGenerator.Builder#allowNestedExamples()}. */
public Builder allowNestedExamples() {
generatorBuilder.allowNestedExamples();
return this;
}
- /** Mirrors {@link org.apache.juneau.jsonschema.JsonSchemaGenerator.Builder#allowNestedExamples(boolean)}. */
+ /** Mirrors {@link org.apache.juneau.marshall.jsonschema.JsonSchemaGenerator.Builder#allowNestedExamples(boolean)}. */
public Builder allowNestedExamples(boolean value) {
generatorBuilder.allowNestedExamples(value);
return this;
}
- /** Mirrors {@link org.apache.juneau.jsonschema.JsonSchemaGenerator.Builder#beanDefMapper(Class)}. */
+ /** Mirrors {@link org.apache.juneau.marshall.jsonschema.JsonSchemaGenerator.Builder#beanDefMapper(Class)}. */
public Builder beanDefMapper(Class<? extends MarshallingDefMapper> value) {
generatorBuilder.beanDefMapper(value);
return this;
}
- /** Mirrors {@link org.apache.juneau.jsonschema.JsonSchemaGenerator.Builder#ignoreTypes(String...)}. */
+ /** Mirrors {@link org.apache.juneau.marshall.jsonschema.JsonSchemaGenerator.Builder#ignoreTypes(String...)}. */
public Builder ignoreTypes(String...values) {
generatorBuilder.ignoreTypes(values);
return this;
}
- /** Mirrors {@link org.apache.juneau.jsonschema.JsonSchemaGenerator.Builder#useBeanDefs()}. */
+ /** Mirrors {@link org.apache.juneau.marshall.jsonschema.JsonSchemaGenerator.Builder#useBeanDefs()}. */
public Builder useBeanDefs() {
generatorBuilder.useBeanDefs();
return this;
}
- /** Mirrors {@link org.apache.juneau.jsonschema.JsonSchemaGenerator.Builder#useBeanDefs(boolean)}. */
+ /** Mirrors {@link org.apache.juneau.marshall.jsonschema.JsonSchemaGenerator.Builder#useBeanDefs(boolean)}. */
public Builder useBeanDefs(boolean value) {
generatorBuilder.useBeanDefs(value);
return this;
diff --git a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaMap.java b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaMap.java
index d73a7df728..9ac2710335 100644
--- a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaMap.java
+++ b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaMap.java
@@ -24,8 +24,8 @@ import java.io.*;
import java.net.*;
import java.util.concurrent.*;
-import org.apache.juneau.*;
-import org.apache.juneau.json5.*;
+import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshall.json5.*;
/**
* A container for retrieving JSON {@link JsonSchema} objects by URI.
diff --git a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaPropertyValidatorFactory.java b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaPropertyValidatorFactory.java
index e2a820f772..5d6386fb61 100644
--- a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaPropertyValidatorFactory.java
+++ b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaPropertyValidatorFactory.java
@@ -20,8 +20,8 @@ import static org.apache.juneau.commons.utils.Utils.*;
import java.util.*;
-import org.apache.juneau.collections.*;
import org.apache.juneau.commons.bean.*;
+import org.apache.juneau.marshall.collections.*;
/**
* {@link PropertyValidatorFactory} implementation backed by the typed {@link JsonSchema} bean.
diff --git a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaRef.java b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaRef.java
index 073e79b21d..ed4abb9bb0 100644
--- a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaRef.java
+++ b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaRef.java
@@ -19,7 +19,7 @@ package org.apache.juneau.bean.jsonschema;
import java.net.*;
import java.util.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
diff --git a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaValidator.java b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaValidator.java
index 149d3f8d4d..dd5bbc0658 100644
--- a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaValidator.java
+++ b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaValidator.java
@@ -24,10 +24,10 @@ import java.math.*;
import java.util.*;
import java.util.regex.*;
-import org.apache.juneau.collections.*;
import org.apache.juneau.commons.bean.*;
import org.apache.juneau.commons.httppart.*;
-import org.apache.juneau.json.*;
+import org.apache.juneau.marshall.collections.*;
+import org.apache.juneau.marshall.json.*;
/**
* Validates values against a {@link JsonSchema} bean per the JSON Schema Draft 2020-12 specification.
diff --git a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/package-info.java b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/package-info.java
index 8c087c243c..6397ccfc21 100644
--- a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/package-info.java
+++ b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/package-info.java
@@ -23,8 +23,8 @@
* <p>
* Juneau supports serializing and parsing of JSON Schema documents through the use of beans defined in the
* <c>org.apache.juneau.bean.jsonschema</c> package.
- * These beans are used with the existing {@link org.apache.juneau.json.JsonSerializer} and
- * {@link org.apache.juneau.json.JsonParser} classes to produce and consume JSON Schema documents.
+ * These beans are used with the existing {@link org.apache.juneau.marshall.json.JsonSerializer} and
+ * {@link org.apache.juneau.marshall.json.JsonParser} classes to produce and consume JSON Schema documents.
* </p>
*
* <p>
@@ -48,7 +48,7 @@
* <li>{@link org.apache.juneau.bean.jsonschema.JsonType} - An enum of possible JSON data types.
* <li>{@link org.apache.juneau.bean.jsonschema.JsonTypeArray} - An array of <c>JsonType</c> objects.
* <li>{@link org.apache.juneau.bean.jsonschema.JsonSchemaBeanGenerator} - Generates typed
- * <c>JsonSchema</c> beans from Java types via {@link org.apache.juneau.jsonschema.JsonSchemaGenerator}.
+ * <c>JsonSchema</c> beans from Java types via {@link org.apache.juneau.marshall.jsonschema.JsonSchemaGenerator}.
* </ul>
* <h5 class='topic'>Automatic Schema Generation</h5>
@@ -56,7 +56,7 @@
* <p>
* Use {@link org.apache.juneau.bean.jsonschema.JsonSchemaBeanGenerator} when you want typed DTO output from POJOs
* without manually building schema trees. It bridges the map-based output of
- * {@link org.apache.juneau.jsonschema.JsonSchemaGenerator} into <c>JsonSchema</c> beans.
+ * {@link org.apache.juneau.marshall.jsonschema.JsonSchemaGenerator} into <c>JsonSchema</c> beans.
* </p>
*
* <h5 class='topic'>Creating JSON Schema Documents</h5>
@@ -198,7 +198,7 @@
* <h5 class='topic'>Parsing JSON Schema Documents</h5>
*
* <p>
- * Use the {@link org.apache.juneau.json.JsonParser} to parse JSON Schema documents into DTOs:
+ * Use the {@link org.apache.juneau.marshall.json.JsonParser} to parse JSON Schema documents into DTOs:
* </p>
* <p class='bjava'>
* <jc>// Use parser to load JSON Schema document into JSON Schema DTOs</jc>
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/BlobResourceContents.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/BlobResourceContents.java
index 043b456877..afd0bd154a 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/BlobResourceContents.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/BlobResourceContents.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.mcp;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* Base64 blob body for {@code resources/read} results or embedded resource content.
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/CallToolRequest.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/CallToolRequest.java
index 0372620df1..493afdd72a 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/CallToolRequest.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/CallToolRequest.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.mcp;
import java.util.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* Parameters for {@value org.apache.juneau.bean.mcp.McpMethods#TOOLS_CALL}.
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/CallToolResult.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/CallToolResult.java
index f0f3e1a38e..082ae856c0 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/CallToolResult.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/CallToolResult.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.mcp;
import java.util.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* Result payload for {@value org.apache.juneau.bean.mcp.McpMethods#TOOLS_CALL}.
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ClientCapabilities.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ClientCapabilities.java
index 68f14c239c..f13e40c549 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ClientCapabilities.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ClientCapabilities.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.mcp;
import java.util.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* MCP client capability advertisement in {@link InitializeRequest}.
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/Content.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/Content.java
index 73ea030ef3..15eae9f1cc 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/Content.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/Content.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.mcp;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* Polymorphic MCP content block (tool results, prompt messages).
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/EmbeddedResourceContent.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/EmbeddedResourceContent.java
index 93a7e6b091..18b2b4c315 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/EmbeddedResourceContent.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/EmbeddedResourceContent.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.mcp;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* MCP {@code resource} content block (inline resource body).
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/GetPromptRequest.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/GetPromptRequest.java
index b17319781b..bd35fe80ba 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/GetPromptRequest.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/GetPromptRequest.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.mcp;
import java.util.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* Parameters for {@value org.apache.juneau.bean.mcp.McpMethods#PROMPTS_GET}.
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/GetPromptResult.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/GetPromptResult.java
index 04802a60e1..3777aca2a1 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/GetPromptResult.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/GetPromptResult.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.mcp;
import java.util.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* Result payload for {@value org.apache.juneau.bean.mcp.McpMethods#PROMPTS_GET}.
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ImageContent.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ImageContent.java
index 86e49f65c1..49e76cba03 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ImageContent.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ImageContent.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.mcp;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* MCP {@code image} content block (base64 data).
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/Implementation.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/Implementation.java
index c2e9f3f28b..7531a89e3b 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/Implementation.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/Implementation.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.mcp;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* MCP {@code Implementation} object ({@code name} / {@code version}).
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/InitializeRequest.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/InitializeRequest.java
index 750cf5b5ee..c69553c203 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/InitializeRequest.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/InitializeRequest.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.mcp;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* MCP {@code initialize} request parameters.
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/InitializeResult.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/InitializeResult.java
index 527b0d875b..84dca99492 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/InitializeResult.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/InitializeResult.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.mcp;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* MCP {@code initialize} result payload.
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/JsonRpcError.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/JsonRpcError.java
index 49770e2596..166b106ea6 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/JsonRpcError.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/JsonRpcError.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.mcp;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* JSON-RPC 2.0 error object.
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/JsonRpcRequest.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/JsonRpcRequest.java
index f9a1541e0a..e1c8ee644c 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/JsonRpcRequest.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/JsonRpcRequest.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.mcp;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* JSON-RPC 2.0 request envelope.
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/JsonRpcResponse.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/JsonRpcResponse.java
index 18830bb10e..e6bf3d3fb4 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/JsonRpcResponse.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/JsonRpcResponse.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.mcp;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* JSON-RPC 2.0 success or error response envelope.
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/JsonSchema.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/JsonSchema.java
index af4410a9ac..35151e3aa5 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/JsonSchema.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/JsonSchema.java
@@ -18,8 +18,8 @@ package org.apache.juneau.bean.mcp;
import java.util.*;
-import org.apache.juneau.*;
import org.apache.juneau.commons.bean.*;
+import org.apache.juneau.marshall.*;
/**
* JSON Schema subset used by MCP tool {@code inputSchema} objects.
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ListPromptsResult.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ListPromptsResult.java
index c7c995d6e5..cc6899a640 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ListPromptsResult.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ListPromptsResult.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.mcp;
import java.util.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* Result payload for {@value org.apache.juneau.bean.mcp.McpMethods#PROMPTS_LIST}.
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ListResourcesResult.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ListResourcesResult.java
index 2fb107568d..837985f280 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ListResourcesResult.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ListResourcesResult.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.mcp;
import java.util.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* Result payload for {@value org.apache.juneau.bean.mcp.McpMethods#RESOURCES_LIST}.
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ListToolsResult.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ListToolsResult.java
index aad2c79e23..368ba04cb6 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ListToolsResult.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ListToolsResult.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.mcp;
import java.util.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* Result payload for {@value org.apache.juneau.bean.mcp.McpMethods#TOOLS_LIST}.
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/LoggingCapability.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/LoggingCapability.java
index 9d917c46a7..57c92df4dd 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/LoggingCapability.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/LoggingCapability.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.mcp;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* Server logging capability marker (structure may grow with the spec).
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/McpException.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/McpException.java
index 616eed726b..c526bace36 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/McpException.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/McpException.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.mcp;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* Runtime exception carrying JSON-RPC error fields for mapping to {@link JsonRpcError}.
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/Prompt.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/Prompt.java
index 2b3da252e2..76ae1aee35 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/Prompt.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/Prompt.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.mcp;
import java.util.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* MCP prompt descriptor ({@code prompts/list} entry).
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/PromptArgument.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/PromptArgument.java
index 5364642f17..86738513a0 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/PromptArgument.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/PromptArgument.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.mcp;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* Declared argument for an MCP prompt.
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/PromptCapability.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/PromptCapability.java
index 778931ada3..48cd68f9ca 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/PromptCapability.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/PromptCapability.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.mcp;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* Server capability flags for prompts.
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/PromptMessage.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/PromptMessage.java
index 3c1685f9d0..1900a674ae 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/PromptMessage.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/PromptMessage.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.mcp;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* Single message line inside {@link GetPromptResult}.
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ReadResourceRequest.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ReadResourceRequest.java
index 8690bcb1e2..4f9ec94b30 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ReadResourceRequest.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ReadResourceRequest.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.mcp;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* Parameters for {@value org.apache.juneau.bean.mcp.McpMethods#RESOURCES_READ}.
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ReadResourceResult.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ReadResourceResult.java
index 21c7f179bf..43f2fb78a3 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ReadResourceResult.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ReadResourceResult.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.mcp;
import java.util.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* Result payload for {@value org.apache.juneau.bean.mcp.McpMethods#RESOURCES_READ}.
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/Resource.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/Resource.java
index 9ff0f46841..a8443fd86e 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/Resource.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/Resource.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.mcp;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* MCP resource descriptor ({@code resources/list} entry).
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ResourceCapability.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ResourceCapability.java
index ac39e6a9ac..ff1d1db8dd 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ResourceCapability.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ResourceCapability.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.mcp;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* Server capability flags for resources.
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ResourceContents.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ResourceContents.java
index 875aa30392..9796bc22c1 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ResourceContents.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ResourceContents.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.mcp;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* Polymorphic MCP resource body (text or base64 blob).
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/RootsCapability.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/RootsCapability.java
index 088a169f2d..ff9a16629e 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/RootsCapability.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/RootsCapability.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.mcp;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* Client roots capability.
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ServerCapabilities.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ServerCapabilities.java
index 2ea5538a13..9901dd15b4 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ServerCapabilities.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ServerCapabilities.java
@@ -18,7 +18,7 @@ package org.apache.juneau.bean.mcp;
import java.util.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* MCP server capability advertisement in {@link InitializeResult}.
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/TextContent.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/TextContent.java
index e1e888b3fc..5d5a66e107 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/TextContent.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/TextContent.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.mcp;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* MCP {@code text} content block.
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/TextResourceContents.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/TextResourceContents.java
index c66782c97a..95e045be0c 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/TextResourceContents.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/TextResourceContents.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.mcp;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* Text body for {@code resources/read} results or embedded resource content.
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/Tool.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/Tool.java
index d49a925a60..883a6991ae 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/Tool.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/Tool.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.mcp;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* MCP tool descriptor ({@code tools/list} entry).
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ToolCapability.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ToolCapability.java
index c43b8d3dc8..e9d7657da0 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ToolCapability.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/ToolCapability.java
@@ -16,7 +16,7 @@
*/
package org.apache.juneau.bean.mcp;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* Server capability flags for tools.
diff --git a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/package-info.java b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/package-info.java
index b5f23db053..d4a1070afc 100644
--- a/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/package-info.java
+++ b/juneau-bean/juneau-bean-mcp/src/main/java/org/apache/juneau/bean/mcp/package-info.java
@@ -16,6 +16,6 @@
*/
/**
- * Juneau {@link org.apache.juneau.Bean @Marshalled} types for the Model Context Protocol (MCP) wire format.
+ * Juneau {@link org.apache.juneau.marshall.Bean @Marshalled} types for the Model Context Protocol (MCP) wire format.
*/
package org.apache.juneau.bean.mcp;
diff --git a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Callback.java b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Callback.java
index 10c966c410..4a24c3a928 100644
--- a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Callback.java
+++ b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Callback.java
@@ -19,7 +19,7 @@ package org.apache.juneau.bean.openapi3;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.util.*;
diff --git a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Components.java b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Components.java
index a8d26e5534..079671080d 100644
--- a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Components.java
+++ b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Components.java
@@ -19,7 +19,7 @@ package org.apache.juneau.bean.openapi3;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.util.*;
diff --git a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Contact.java b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Contact.java
index e3c5ff4367..4abb83629c 100644
--- a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Contact.java
+++ b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Contact.java
@@ -20,13 +20,13 @@ import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.net.*;
import java.util.*;
-import org.apache.juneau.*;
import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.marshall.*;
/**
* Contact information for the exposed API.
diff --git a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Discriminator.java b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Discriminator.java
index f759a9c7d4..bfaa7c2959 100644
--- a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Discriminator.java
+++ b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Discriminator.java
@@ -19,12 +19,12 @@ package org.apache.juneau.bean.openapi3;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.util.*;
-import org.apache.juneau.*;
import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.marshall.*;
/**
* Used to aid in serialization, deserialization, and validation.
diff --git a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Encoding.java b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Encoding.java
index 26acb96668..35f6643dea 100644
--- a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Encoding.java
+++ b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Encoding.java
@@ -19,13 +19,13 @@ package org.apache.juneau.bean.openapi3;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.net.*;
import java.util.*;
-import org.apache.juneau.*;
import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.marshall.*;
/**
* A single encoding definition applied to a single schema property.
diff --git a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Example.java b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Example.java
index 31163e3296..4add9f199d 100644
--- a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Example.java
+++ b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Example.java
@@ -19,7 +19,7 @@ package org.apache.juneau.bean.openapi3;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.util.*;
diff --git a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/ExternalDocumentation.java b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/ExternalDocumentation.java
index de7932ee52..8961f06752 100644
--- a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/ExternalDocumentation.java
+++ b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/ExternalDocumentation.java
@@ -20,13 +20,13 @@ import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.net.*;
import java.util.*;
-import org.apache.juneau.*;
import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.marshall.*;
/**
* Allows referencing an external resource for extended documentation.
diff --git a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/HeaderInfo.java b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/HeaderInfo.java
index fa41bcb383..4654d1aada 100644
--- a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/HeaderInfo.java
+++ b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/HeaderInfo.java
@@ -19,7 +19,7 @@ package org.apache.juneau.bean.openapi3;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.util.*;
diff --git a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Info.java b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Info.java
index 2e9a189c3d..8084f18c1f 100644
--- a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Info.java
+++ b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Info.java
@@ -19,7 +19,7 @@ package org.apache.juneau.bean.openapi3;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.util.*;
diff --git a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Items.java b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Items.java
index 7edcc65262..bd65814d6c 100644
--- a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Items.java
+++ b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Items.java
@@ -22,14 +22,14 @@ import static org.apache.juneau.commons.utils.CollectionUtils.contains;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.util.*;
-import org.apache.juneau.collections.*;
import org.apache.juneau.commons.bean.*;
import org.apache.juneau.commons.collections.*;
-import org.apache.juneau.json5.*;
+import org.apache.juneau.marshall.collections.*;
+import org.apache.juneau.marshall.json5.*;
/**
* A limited subset of JSON-Schema's items object.
diff --git a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/License.java b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/License.java
index 40d8df634c..d85de2039d 100644
--- a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/License.java
+++ b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/License.java
@@ -20,13 +20,13 @@ import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.net.*;
import java.util.*;
-import org.apache.juneau.*;
import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.marshall.*;
/**
* License information for the exposed API.
diff --git a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Link.java b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Link.java
index 6eaf83effe..98445939e6 100644
--- a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Link.java
+++ b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Link.java
@@ -19,7 +19,7 @@ package org.apache.juneau.bean.openapi3;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.util.*;
diff --git a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/MediaType.java b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/MediaType.java
index 1ee315799b..c0d52fb0fb 100644
--- a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/MediaType.java
+++ b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/MediaType.java
@@ -19,7 +19,7 @@ package org.apache.juneau.bean.openapi3;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.util.*;
diff --git a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/OAuthFlow.java b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/OAuthFlow.java
index f6158cd7ef..181f6f12d6 100644
--- a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/OAuthFlow.java
+++ b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/OAuthFlow.java
@@ -19,7 +19,7 @@ package org.apache.juneau.bean.openapi3;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.util.*;
diff --git a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/OAuthFlows.java b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/OAuthFlows.java
index cadd26175a..192de1e546 100644
--- a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/OAuthFlows.java
+++ b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/OAuthFlows.java
@@ -19,7 +19,7 @@ package org.apache.juneau.bean.openapi3;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.util.*;
diff --git a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/OpenApi.java b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/OpenApi.java
index 094a3ef690..b5040fd62b 100644
--- a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/OpenApi.java
+++ b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/OpenApi.java
@@ -20,13 +20,13 @@ import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.util.*;
import org.apache.juneau.commons.collections.*;
-import org.apache.juneau.json.*;
-import org.apache.juneau.objecttools.*;
+import org.apache.juneau.marshall.json.*;
+import org.apache.juneau.marshall.objecttools.*;
/**
* This is the root document object for the OpenAPI specification.
diff --git a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/OpenApiBuilder.java b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/OpenApiBuilder.java
index db708e692a..0b1f2c6c7e 100644
--- a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/OpenApiBuilder.java
+++ b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/OpenApiBuilder.java
@@ -20,7 +20,7 @@ import static org.apache.juneau.commons.utils.StringUtils.*;
import java.net.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* Various useful static methods for creating OpenAPI elements.
diff --git a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/OpenApiElement.java b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/OpenApiElement.java
index 2b1a4c00df..9b89cba616 100644
--- a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/OpenApiElement.java
+++ b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/OpenApiElement.java
@@ -20,14 +20,14 @@ import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.util.*;
-import org.apache.juneau.*;
-import org.apache.juneau.collections.*;
import org.apache.juneau.commons.bean.*;
-import org.apache.juneau.json.*;
+import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshall.collections.*;
+import org.apache.juneau.marshall.json.*;
/**
* Root class for all Swagger beans.
diff --git a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Operation.java b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Operation.java
index 9189089d3c..a8cac408b5 100644
--- a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Operation.java
+++ b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Operation.java
@@ -19,7 +19,7 @@ package org.apache.juneau.bean.openapi3;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.util.*;
diff --git a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Parameter.java b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Parameter.java
index 30835c0526..cabbb5564c 100644
--- a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Parameter.java
+++ b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Parameter.java
@@ -20,12 +20,12 @@ import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.util.*;
import org.apache.juneau.commons.collections.*;
-import org.apache.juneau.marshaller.*;
+import org.apache.juneau.marshall.marshaller.*;
/**
* Describes a single operation parameter.
diff --git a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/PathItem.java b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/PathItem.java
index 9c891a4dc9..1e78c321c8 100644
--- a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/PathItem.java
+++ b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/PathItem.java
@@ -19,7 +19,7 @@ package org.apache.juneau.bean.openapi3;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.util.*;
diff --git a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/RequestBodyInfo.java b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/RequestBodyInfo.java
index d771a7a6f4..df9e8e206d 100644
--- a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/RequestBodyInfo.java
+++ b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/RequestBodyInfo.java
@@ -19,13 +19,13 @@ package org.apache.juneau.bean.openapi3;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.net.*;
import java.util.*;
-import org.apache.juneau.*;
import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.marshall.*;
/**
* Describes a single request body.
diff --git a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Response.java b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Response.java
index b72f29124e..9ad866618e 100644
--- a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Response.java
+++ b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Response.java
@@ -19,13 +19,13 @@ package org.apache.juneau.bean.openapi3;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.net.*;
import java.util.*;
-import org.apache.juneau.*;
import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.marshall.*;
/**
* Describes a single response from an API operation.
diff --git a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/SchemaInfo.java b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/SchemaInfo.java
index b02a643f64..6a4de647d6 100644
--- a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/SchemaInfo.java
+++ b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/SchemaInfo.java
@@ -19,7 +19,7 @@ package org.apache.juneau.bean.openapi3;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.util.*;
diff --git a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/SecurityRequirement.java b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/SecurityRequirement.java
index 500d47633a..8ab5f24c52 100644
--- a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/SecurityRequirement.java
+++ b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/SecurityRequirement.java
@@ -19,7 +19,7 @@ package org.apache.juneau.bean.openapi3;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.util.*;
diff --git a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/SecuritySchemeInfo.java b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/SecuritySchemeInfo.java
index eac6e5a0e7..c9305db30f 100644
--- a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/SecuritySchemeInfo.java
+++ b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/SecuritySchemeInfo.java
@@ -22,7 +22,7 @@ import static org.apache.juneau.commons.utils.CollectionUtils.contains;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.util.*;
diff --git a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Server.java b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Server.java
index 285928c446..142d4385d2 100644
--- a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Server.java
+++ b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Server.java
@@ -20,13 +20,13 @@ import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.net.*;
import java.util.*;
-import org.apache.juneau.*;
import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.marshall.*;
/**
* An object representing a Server.
diff --git a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/ServerVariable.java b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/ServerVariable.java
index e6af5c6511..7a31eca6bb 100644
--- a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/ServerVariable.java
+++ b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/ServerVariable.java
@@ -19,7 +19,7 @@ package org.apache.juneau.bean.openapi3;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.util.*;
diff --git a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Tag.java b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Tag.java
index c3011d6cc2..5a66f4c893 100644
--- a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Tag.java
+++ b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Tag.java
@@ -19,7 +19,7 @@ package org.apache.juneau.bean.openapi3;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.util.*;
diff --git a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Xml.java b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Xml.java
index b853e18d89..c2f71c6817 100644
--- a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Xml.java
+++ b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Xml.java
@@ -19,7 +19,7 @@ package org.apache.juneau.bean.openapi3;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.util.*;
diff --git a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/ui/OpenApiUI.java b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/ui/OpenApiUI.java
index 0369d1d3ae..12de4d1324 100644
--- a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/ui/OpenApiUI.java
+++ b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/ui/OpenApiUI.java
@@ -28,15 +28,15 @@ import static org.apache.juneau.commons.utils.Utils.*;
import java.util.*;
-import org.apache.juneau.*;
import org.apache.juneau.bean.html5.*;
import org.apache.juneau.bean.openapi3.*;
-import org.apache.juneau.collections.*;
import org.apache.juneau.commons.http.MediaType;
import org.apache.juneau.commons.inject.*;
import org.apache.juneau.commons.utils.*;
-import org.apache.juneau.cp.*;
-import org.apache.juneau.swap.*;
+import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshall.collections.*;
+import org.apache.juneau.marshall.cp.*;
+import org.apache.juneau.marshall.swap.*;
/**
* Generates an OpenAPI-UI interface from an OpenAPI document.
diff --git a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/ui/RedocUI.java b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/ui/RedocUI.java
index 9c358083ad..b9567bfb5a 100644
--- a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/ui/RedocUI.java
+++ b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/ui/RedocUI.java
@@ -20,13 +20,13 @@ import static org.apache.juneau.bean.html5.HtmlBuilder.*;
import static org.apache.juneau.commons.http.MediaType.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import org.apache.juneau.*;
import org.apache.juneau.bean.html5.*;
import org.apache.juneau.bean.openapi3.*;
import org.apache.juneau.commons.http.MediaType;
import org.apache.juneau.commons.inject.*;
-import org.apache.juneau.cp.*;
-import org.apache.juneau.swap.*;
+import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshall.cp.*;
+import org.apache.juneau.marshall.swap.*;
/**
* Generates a Redoc-style documentation interface from an OpenAPI 3.1 document.
diff --git a/juneau-bean/juneau-bean-rfc7807/src/main/java/org/apache/juneau/bean/rfc7807/Problem.java b/juneau-bean/juneau-bean-rfc7807/src/main/java/org/apache/juneau/bean/rfc7807/Problem.java
index e058e3a0dc..d87a36064b 100644
--- a/juneau-bean/juneau-bean-rfc7807/src/main/java/org/apache/juneau/bean/rfc7807/Problem.java
+++ b/juneau-bean/juneau-bean-rfc7807/src/main/java/org/apache/juneau/bean/rfc7807/Problem.java
@@ -19,8 +19,8 @@ package org.apache.juneau.bean.rfc7807;
import java.net.*;
import java.util.*;
-import org.apache.juneau.*;
import org.apache.juneau.commons.bean.*;
+import org.apache.juneau.marshall.*;
/**
* <a class="doclink" href="https://www.rfc-editor.org/rfc/rfc7807">RFC 7807 — Problem Details for HTTP APIs</a>
diff --git a/juneau-bean/juneau-bean-rfc7807/src/main/java/org/apache/juneau/bean/rfc7807/package-info.java b/juneau-bean/juneau-bean-rfc7807/src/main/java/org/apache/juneau/bean/rfc7807/package-info.java
index b24015b9d0..bddf296d50 100644
--- a/juneau-bean/juneau-bean-rfc7807/src/main/java/org/apache/juneau/bean/rfc7807/package-info.java
+++ b/juneau-bean/juneau-bean-rfc7807/src/main/java/org/apache/juneau/bean/rfc7807/package-info.java
@@ -16,7 +16,7 @@
*/
/**
- * Juneau {@link org.apache.juneau.Marshalled @Marshalled} beans for
+ * Juneau {@link org.apache.juneau.marshall.Marshalled @Marshalled} beans for
* <a class="doclink" href="https://www.rfc-editor.org/rfc/rfc7807">RFC 7807 — Problem Details for HTTP APIs</a>
* (media type {@code application/problem+json}).
*
diff --git a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Contact.java b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Contact.java
index 1883236d8e..462628cf86 100644
--- a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Contact.java
+++ b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Contact.java
@@ -20,7 +20,7 @@ import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.net.*;
import java.util.*;
diff --git a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/ExternalDocumentation.java b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/ExternalDocumentation.java
index 6d2e241782..a12580eeb9 100644
--- a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/ExternalDocumentation.java
+++ b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/ExternalDocumentation.java
@@ -20,13 +20,13 @@ import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.net.*;
import java.util.*;
-import org.apache.juneau.*;
import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.marshall.*;
/**
* Allows referencing an external resource for extended documentation.
diff --git a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/HeaderInfo.java b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/HeaderInfo.java
index 7f0d3a2fa4..7fc06f79a7 100644
--- a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/HeaderInfo.java
+++ b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/HeaderInfo.java
@@ -20,13 +20,13 @@ import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.util.*;
import org.apache.juneau.commons.bean.*;
import org.apache.juneau.commons.collections.*;
-import org.apache.juneau.marshaller.*;
+import org.apache.juneau.marshall.marshaller.*;
/**
* Describes a single HTTP header.
diff --git a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Info.java b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Info.java
index 2d6e0c3f9c..0a9323e8e4 100644
--- a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Info.java
+++ b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Info.java
@@ -19,7 +19,7 @@ package org.apache.juneau.bean.swagger;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.util.*;
diff --git a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Items.java b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Items.java
index 87ca89bb43..6e36c1acb2 100644
--- a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Items.java
+++ b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Items.java
@@ -20,13 +20,13 @@ import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.util.*;
import org.apache.juneau.commons.bean.*;
import org.apache.juneau.commons.collections.*;
-import org.apache.juneau.marshaller.*;
+import org.apache.juneau.marshall.marshaller.*;
/**
* A limited subset of JSON-Schema's items object.
diff --git a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/License.java b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/License.java
index caba47f9d9..5bff455ce3 100644
--- a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/License.java
+++ b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/License.java
@@ -20,13 +20,13 @@ import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.net.*;
import java.util.*;
-import org.apache.juneau.*;
import org.apache.juneau.commons.collections.*;
+import org.apache.juneau.marshall.*;
/**
* License information for the exposed API.
diff --git a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Operation.java b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Operation.java
index e7e8e943bc..65fe47b2b7 100644
--- a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Operation.java
+++ b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Operation.java
@@ -19,7 +19,7 @@ package org.apache.juneau.bean.swagger;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.util.*;
diff --git a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/ParameterInfo.java b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/ParameterInfo.java
index ba81e6015d..2044d6ee17 100644
--- a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/ParameterInfo.java
+++ b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/ParameterInfo.java
@@ -20,12 +20,12 @@ import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.util.*;
import org.apache.juneau.commons.collections.*;
-import org.apache.juneau.marshaller.*;
+import org.apache.juneau.marshall.marshaller.*;
/**
* Describes a single operation parameter.
diff --git a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/ResponseInfo.java b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/ResponseInfo.java
index 501727c44c..15650f5255 100644
--- a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/ResponseInfo.java
+++ b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/ResponseInfo.java
@@ -19,7 +19,7 @@ package org.apache.juneau.bean.swagger;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.util.*;
diff --git a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/SchemaInfo.java b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/SchemaInfo.java
index 26e67e2f33..5b17cf4a90 100644
--- a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/SchemaInfo.java
+++ b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/SchemaInfo.java
@@ -19,7 +19,7 @@ package org.apache.juneau.bean.swagger;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.util.*;
diff --git a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/SecurityScheme.java b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/SecurityScheme.java
index e3b266e41f..7bbc239181 100644
--- a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/SecurityScheme.java
+++ b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/SecurityScheme.java
@@ -20,12 +20,12 @@ import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.util.*;
import org.apache.juneau.commons.collections.*;
-import org.apache.juneau.marshaller.*;
+import org.apache.juneau.marshall.marshaller.*;
/**
* Allows the definition of a security scheme that can be used by the operations.
diff --git a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Swagger.java b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Swagger.java
index b8b2dc8e52..1939d39dbe 100644
--- a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Swagger.java
+++ b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Swagger.java
@@ -20,15 +20,15 @@ import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.util.*;
-import org.apache.juneau.collections.*;
import org.apache.juneau.commons.collections.*;
import org.apache.juneau.commons.http.*;
-import org.apache.juneau.json.*;
-import org.apache.juneau.objecttools.*;
+import org.apache.juneau.marshall.collections.*;
+import org.apache.juneau.marshall.json.*;
+import org.apache.juneau.marshall.objecttools.*;
/**
* This is the root document object for the Swagger 2.0 API specification.
diff --git a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/SwaggerBuilder.java b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/SwaggerBuilder.java
index 19cd2078ed..ad53b0bbd3 100644
--- a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/SwaggerBuilder.java
+++ b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/SwaggerBuilder.java
@@ -20,7 +20,7 @@ import static org.apache.juneau.commons.utils.StringUtils.*;
import java.net.*;
-import org.apache.juneau.*;
+import org.apache.juneau.marshall.*;
/**
* Various useful static methods for creating Swagger elements.
diff --git a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/SwaggerElement.java b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/SwaggerElement.java
index 6f3036d209..2c8435f036 100644
--- a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/SwaggerElement.java
+++ b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/SwaggerElement.java
@@ -20,13 +20,13 @@ import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.util.*;
-import org.apache.juneau.collections.*;
import org.apache.juneau.commons.bean.*;
-import org.apache.juneau.json.*;
+import org.apache.juneau.marshall.collections.*;
+import org.apache.juneau.marshall.json.*;
/**
* Root class for all Swagger beans.
diff --git a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Tag.java b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Tag.java
index 9f39c992fd..0ba6f59a36 100644
--- a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Tag.java
+++ b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Tag.java
@@ -19,7 +19,7 @@ package org.apache.juneau.bean.swagger;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.util.*;
diff --git a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Xml.java b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Xml.java
index f5f029046f..e656ebd64f 100644
--- a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Xml.java
+++ b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Xml.java
@@ -19,7 +19,7 @@ package org.apache.juneau.bean.swagger;
import static org.apache.juneau.commons.utils.AssertionUtils.*;
import static org.apache.juneau.commons.utils.CollectionUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
-import static org.apache.juneau.internal.ConverterUtils.*;
+import static org.apache.juneau.marshall.internal.ConverterUtils.*;
import java.util.*;
diff --git a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/ui/SwaggerUI.java b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/ui/SwaggerUI.java
index 22796a4d49..846b1a8a55 100644
--- a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/ui/SwaggerUI.java
+++ b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/ui/SwaggerUI.java
@@ -27,15 +27,15 @@ import static org.apache.juneau.commons.utils.Utils.*;
import java.util.*;
-import org.apache.juneau.*;
import org.apache.juneau.bean.html5.*;
import org.apache.juneau.bean.swagger.*;
-import org.apache.juneau.collections.*;
import org.apache.juneau.commons.http.*;
import org.apache.juneau.commons.inject.*;
import org.apache.juneau.commons.utils.*;
-import org.apache.juneau.cp.*;
-import org.apache.juneau.swap.*;
+import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshall.collections.*;
+import org.apache.juneau.marshall.cp.*;
+import org.apache.juneau.marshall.swap.*;
/**
* Generates a Swagger-UI interface from a Swagger document.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AnyAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AnyAssertion.java
index fb3d18aca7..b82fa8d63c 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AnyAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AnyAssertion.java
@@ -19,7 +19,7 @@ package org.apache.juneau.assertions;
import java.io.*;
import java.util.function.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for assertion calls against generic POJOs.
@@ -30,7 +30,7 @@ import org.apache.juneau.serializer.*;
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* List<MyBean> <jv>listOfBeans</jv> = ...;
* <jsm>assertList</jsm>(<jv>listOfBeans</jv>)
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ArrayAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ArrayAssertion.java
index 9e523df5f3..45e2735bf0 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ArrayAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ArrayAssertion.java
@@ -20,14 +20,14 @@ import java.io.*;
import java.util.*;
import java.util.function.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for assertion calls against arrays.
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* String[] <jv>array</jv> = {<js>"foo"</js>};
* <jsm>assertArray</jsm>(<jv>array</jv>).exists().isSize(1);
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertion.java
index 94f310ee33..28be739322 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertion.java
@@ -22,10 +22,10 @@ import static org.apache.juneau.commons.utils.Utils.*;
import java.io.*;
import java.lang.reflect.*;
-import org.apache.juneau.*;
import org.apache.juneau.commons.inject.*;
import org.apache.juneau.commons.reflect.*;
-import org.apache.juneau.cp.*;
+import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshall.cp.*;
/**
* Base class for all assertion objects.
@@ -114,7 +114,7 @@ public class Assertion {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* <jc>// Throws an assertion with a custom message instead of the default "Value was null."</jc>
* <jsm>assertString</jsm>(<jv>myString</jv>)
@@ -181,7 +181,7 @@ public class Assertion {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* <jc>// Throws a BadRequest instead of an AssertionError if the string is null.</jc>
* <jsm>assertString</jsm>(<jv>myString</jv>)
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
index 6c9408f4d4..adafa9e027 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
@@ -23,7 +23,7 @@ import java.text.*;
import java.util.function.*;
import org.apache.juneau.commons.utils.*;
-import org.apache.juneau.cp.*;
+import org.apache.juneau.marshall.cp.*;
/**
* Wrapper around a {@link Predicate} that allows for an error message for when the predicate fails.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java
index febd5e2838..345cfd3fc9 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java
@@ -27,7 +27,7 @@ import java.util.function.*;
import java.util.regex.*;
import org.apache.juneau.commons.utils.*;
-import org.apache.juneau.cp.*;
+import org.apache.juneau.marshall.cp.*;
/**
* Predefined {@link AssertionPredicate} objects.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertions.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertions.java
index d80ca8a405..4b6a48946b 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertions.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertions.java
@@ -34,7 +34,7 @@ import org.apache.juneau.commons.lang.*;
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* <jc>// Assert string is greater than 100 characters and contains "foo".</jc>
* <jsm>assertString</jsm>(<jv>myString</jv>)
@@ -47,7 +47,7 @@ import org.apache.juneau.commons.lang.*;
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* <jc>// Assert that calling doBadCall() causes a RuntimeException.</jc>
* <jsm>assertThrown</jsm>(() -> <jv>myPojo</jv>.doBadCall())
@@ -60,7 +60,7 @@ import org.apache.juneau.commons.lang.*;
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* <jk>public</jk> String getFoo(String <jv>bar</jv>) {
* <jsm>assertArgNotNull</jsm>(<js>"bar"</js>, <jv>bar</jv>);
@@ -88,7 +88,7 @@ public class Assertions {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* <jc>// Asserts that the property 'foo' of a bean is 'bar'.</jc>
* <jsm>assertAny</jsm>(<jv>myPojo</jv>) <jc>// Start with AnyAssertion.</jc>
@@ -116,7 +116,7 @@ public class Assertions {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* <jc>// Asserts that an Integer array contains [1,2,3].</jc>
* Integer[] <jv>array</jv> = {...};
@@ -144,7 +144,7 @@ public class Assertions {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* <jc>// Asserts that the 'foo' and 'bar' properties of a bean are 1 and 2 respectively.</jc>
* <jsm>assertBean</jsm>(<jv>myBean</jv>)
@@ -173,7 +173,7 @@ public class Assertions {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* <jc>// Asserts that a bean list has 3 entries with 'foo' property values of 'bar','baz','qux'.</jc>
* <jsm>assertBeanList</jsm>(<jv>myListOfBeans</jv>)
@@ -202,7 +202,7 @@ public class Assertions {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* <jc>// Asserts that a Boolean is not null and TRUE.</jc>
* <jsm>assertBoolean</jsm>(<jv>myBoolean</jv>)
@@ -228,7 +228,7 @@ public class Assertions {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* <jc>// Asserts that a Boolean array has size of 3 and all entries are TRUE.</jc>
* <jsm>assertBooleanArray</jsm>(<jv>myBooleanArray</jv>)
@@ -260,7 +260,7 @@ public class Assertions {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* <jc>// Asserts that a byte array has size of 3 and all bytes are larger than 10.</jc>
* <jsm>assertByteArray</jsm>(<jv>myByteArray</jv>)
@@ -292,7 +292,7 @@ public class Assertions {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* <jc>// Asserts that the byte array contains the string "foo".</jc>
* <jsm>assertBytes</jsm>(<jv>myBytes</jv>)
@@ -318,7 +318,7 @@ public class Assertions {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* <jc>// Asserts that the stream contains the string "foo".</jc>
* <jsm>assertBytes</jsm>(<jv>myStream</jv>)
@@ -346,7 +346,7 @@ public class Assertions {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* <jc>// Asserts that the char array contains the string "foo".</jc>
* <jsm>assertCharArray</jsm>(<jv>myCharArray</jv>)
@@ -372,7 +372,7 @@ public class Assertions {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* <jc>// Asserts that a collection of strings has only one entry of 'foo'.</jc>
* <jsm>assertCollection</jsm>(<jv>myCollectionOfStrings</jv>)
@@ -404,7 +404,7 @@ public class Assertions {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* <jc>// Asserts a comparable is less than another comparable.</jc>
* <jsm>assertComparable</jsm>(<jv>myComparable</jv>)
@@ -431,7 +431,7 @@ public class Assertions {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* <jc>// Asserts the specified date is after the current date.</jc>
* <jsm>assertDate</jsm>(<jv>myDate</jv>)
@@ -457,7 +457,7 @@ public class Assertions {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* <jc>// Asserts that a double array is at least size 100 and all values are greater than 1000.</jc>
* <jsm>assertDoubleArray</jsm>(<jv>myDoubleArray</jv>)
@@ -484,7 +484,7 @@ public class Assertions {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* <jc>// Asserts that a float array is at least size 100 and all values are greater than 1000.</jc>
* <jsm>assertFloatArray</jsm>(<jv>myFloatArray</jv>)
@@ -511,7 +511,7 @@ public class Assertions {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* <jc>// Asserts that a double array is at least size 100 and all values are greater than 1000.</jc>
* <jsm>assertIntArray</jsm>(<jv>myIntArray</jv>)
@@ -538,7 +538,7 @@ public class Assertions {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* <jc>// Assert that an HTTP response status code is 200 or 404.</jc>
* <jsm>assertInteger</jsm>(<jv>httpReponse</jv>)
@@ -564,7 +564,7 @@ public class Assertions {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* <jc>// Assert that the first entry in a list is "{foo:'bar'}" when serialized to simplified JSON.</jc>
* <jsm>assertList</jsm>(<jv>myList</jv>)
@@ -592,7 +592,7 @@ public class Assertions {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* <jc>// Assert that the first entry in a list is "{foo:'bar'}" when serialized to simplified JSON.</jc>
* <jsm>assertList</jsm>(<jv>myStream</jv>)
@@ -620,7 +620,7 @@ public class Assertions {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* <jc>// Throw a BadReqest if an HTTP response length is greater than 100k.</jc>
* <jsm>assertLong</jsm>(<jv>responseLength</jv>)
@@ -648,7 +648,7 @@ public class Assertions {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* <jc>// Asserts that a long array is at least size 100 and all values are greater than 1000.</jc>
* <jsm>assertLongArray</jsm>(<jv>myLongArray</jv>)
@@ -675,7 +675,7 @@ public class Assertions {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* <jc>// Assert the specified map is a HashMap and contains the key "foo".</jc>
* <jsm>assertMap</jsm>(<jv>myMap</jv>)
@@ -704,7 +704,7 @@ public class Assertions {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* <jc>// Asserts the specified POJO is of type MyBean and is "{foo:'bar'}" </jc>
* <jc>// when serialized to Simplified JSON.</jc>
@@ -733,7 +733,7 @@ public class Assertions {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* <jc>// Asserts the specified POJO is of type MyBean and is "{foo:'bar'}" </jc>
* <jc>// when serialized to Simplified JSON.</jc>
@@ -762,7 +762,7 @@ public class Assertions {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* <jc>// Asserts the contents of the Reader contains "foo".</jc>
* <jsm>assertReader</jsm>(<jv>myReader</jv>)
@@ -790,7 +790,7 @@ public class Assertions {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* <jc>// Asserts that a float array is at least size 10 and all values are greater than 100.</jc>
* <jsm>assertShortArray</jsm>(<jv>myShortArray</jv>)
@@ -817,7 +817,7 @@ public class Assertions {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* <jc>// Asserts a string is at least 100 characters long and contains "foo".</jc>
* <jsm>assertString</jsm>(<jv>myString</jv>)
@@ -846,7 +846,7 @@ public class Assertions {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* <jc>// Asserts a list of strings contain "foo,bar,baz" after trimming all and joining.</jc>
* <jsm>assertStringList</jsm>(<jv>myListOfStrings</jv>)
@@ -875,7 +875,7 @@ public class Assertions {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* <jc>// Asserts a throwable is a RuntimeException containing 'foobar' in the message.</jc>
* <jsm>assertThrowable</jsm>(<jv>throwable</jv>)
@@ -903,7 +903,7 @@ public class Assertions {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* <jc>// Asserts that the specified method throws a RuntimeException containing "foobar" in the message. </jc>
* <jsm>assertThrown</jsm>(()-><jv>foo</jv>.getBar())
@@ -931,7 +931,7 @@ public class Assertions {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* <jc>// Asserts the specified major version is at least 2.</jc>
* <jsm>assertVersion</jsm>(<jv>version</jv>)
@@ -957,7 +957,7 @@ public class Assertions {
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* <jc>// Asserts the specified date is after the current date.</jc>
* <jsm>assertZonedDateTime</jsm>(<jv>myZonedDateTime</jv>)
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BeanAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BeanAssertion.java
index 27535a1738..d314722305 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BeanAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BeanAssertion.java
@@ -19,7 +19,7 @@ package org.apache.juneau.assertions;
import java.io.*;
import java.util.function.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for assertion calls against Java beans.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BeanListAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BeanListAssertion.java
index 9027d7db31..6477469de9 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BeanListAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BeanListAssertion.java
@@ -20,7 +20,7 @@ import java.io.*;
import java.util.*;
import java.util.function.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for assertion calls against Java beans.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BooleanAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BooleanAssertion.java
index 58d1e61bfc..8f90b2775c 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BooleanAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BooleanAssertion.java
@@ -19,7 +19,7 @@ package org.apache.juneau.assertions;
import java.io.*;
import java.util.function.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for assertion calls against booleans.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ByteArrayAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ByteArrayAssertion.java
index 68ab1d06a2..e8273866fe 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ByteArrayAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ByteArrayAssertion.java
@@ -20,7 +20,7 @@ import java.io.*;
import java.nio.charset.*;
import java.util.function.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for assertion calls against byte arrays.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/CollectionAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/CollectionAssertion.java
index 034b76b7b9..f1f1c1a0f5 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/CollectionAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/CollectionAssertion.java
@@ -20,7 +20,7 @@ import java.io.*;
import java.util.*;
import java.util.function.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for assertion calls against collections objects.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ComparableAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ComparableAssertion.java
index 488f888551..ca2500bcb0 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ComparableAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ComparableAssertion.java
@@ -19,7 +19,7 @@ package org.apache.juneau.assertions;
import java.io.*;
import java.util.function.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for assertion calls against comparable objects.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/DateAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/DateAssertion.java
index ca56068269..8e060b5faa 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/DateAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/DateAssertion.java
@@ -21,7 +21,7 @@ import java.time.temporal.*;
import java.util.*;
import java.util.function.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for assertion calls against {@link Date} objects.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentAnyAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentAnyAssertion.java
index 2005439152..eb114e5b00 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentAnyAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentAnyAssertion.java
@@ -25,9 +25,9 @@ import java.time.*;
import java.util.*;
import java.util.function.*;
-import org.apache.juneau.*;
-import org.apache.juneau.cp.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshall.cp.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for assertion calls against generic POJOs.
@@ -38,7 +38,7 @@ import org.apache.juneau.serializer.*;
*
* <h5 class='section'>Example:</h5>
* <p class='bjava'>
- * <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
+ * <jk>import static</jk> org.apache.juneau.marshall.assertions.Assertions.*;
*
* List<MyBean> <jv>listOfBeans</jv> = ...;
* <jsm>assertList</jsm>(<jv>listOfBeans</jv>)
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
index 22924be922..e8b689a7cf 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
@@ -26,8 +26,8 @@ import java.util.*;
import java.util.function.*;
import org.apache.juneau.commons.utils.*;
-import org.apache.juneau.cp.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.cp.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for fluent assertion calls against array objects.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBeanAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBeanAssertion.java
index 07e99e5b98..35bf3d8836 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBeanAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBeanAssertion.java
@@ -23,7 +23,7 @@ import java.io.*;
import java.util.function.*;
import org.apache.juneau.commons.bean.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for fluent assertion calls against Java beans.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBeanListAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBeanListAssertion.java
index 5f0f338233..8fe234f7ff 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBeanListAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBeanListAssertion.java
@@ -23,7 +23,7 @@ import java.util.*;
import java.util.function.*;
import org.apache.juneau.commons.bean.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for fluent assertion calls against lists of beans.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBooleanAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBooleanAssertion.java
index 075e3f6aa4..d9bae6ca96 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBooleanAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBooleanAssertion.java
@@ -19,8 +19,8 @@ package org.apache.juneau.assertions;
import java.io.*;
import java.util.function.*;
-import org.apache.juneau.cp.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.cp.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for fluent assertion calls against booleans.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentByteArrayAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentByteArrayAssertion.java
index 846e2f6ae7..c32b0e463c 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentByteArrayAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentByteArrayAssertion.java
@@ -23,7 +23,7 @@ import java.io.*;
import java.nio.charset.*;
import java.util.function.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for fluent assertion calls against byte arrays.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
index 5022f634d5..0251818db0 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
@@ -23,8 +23,8 @@ import java.util.*;
import java.util.function.*;
import org.apache.juneau.commons.utils.*;
-import org.apache.juneau.cp.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.cp.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for fluent assertion calls against collections objects.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java
index cd9e10b406..b9dae5e005 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java
@@ -22,8 +22,8 @@ import static org.apache.juneau.commons.utils.Utils.*;
import java.io.*;
import java.util.function.*;
-import org.apache.juneau.cp.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.cp.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for fluent assertion calls against comparable objects.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
index e1f2d21b5c..93b8a4f792 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
@@ -24,8 +24,8 @@ import java.time.temporal.*;
import java.util.*;
import java.util.function.*;
-import org.apache.juneau.cp.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.cp.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for fluent assertion calls against dates.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentIntegerAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentIntegerAssertion.java
index 853e854cd5..09db423d4d 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentIntegerAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentIntegerAssertion.java
@@ -19,7 +19,7 @@ package org.apache.juneau.assertions;
import java.io.*;
import java.util.function.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for fluent assertion calls against integers.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentListAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentListAssertion.java
index 24ca9ff66d..47ac3e813b 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentListAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentListAssertion.java
@@ -24,8 +24,8 @@ import java.io.*;
import java.util.*;
import java.util.function.*;
-import org.apache.juneau.cp.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.cp.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for fluent assertion calls against lists.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentLongAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentLongAssertion.java
index a442bc090f..c23b68131b 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentLongAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentLongAssertion.java
@@ -19,7 +19,7 @@ package org.apache.juneau.assertions;
import java.io.*;
import java.util.function.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for fluent assertion calls against longs.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentMapAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentMapAssertion.java
index 269b6e4d5a..a647bb4ee7 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentMapAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentMapAssertion.java
@@ -25,8 +25,8 @@ import java.util.*;
import java.util.function.*;
import org.apache.juneau.commons.utils.*;
-import org.apache.juneau.cp.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.cp.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for fluent assertion calls against maps.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
index f06a3f4b42..5b6d87bc27 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
@@ -27,10 +27,10 @@ import java.util.*;
import java.util.function.*;
import org.apache.juneau.commons.utils.*;
-import org.apache.juneau.cp.*;
-import org.apache.juneau.json.*;
-import org.apache.juneau.json5.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.cp.*;
+import org.apache.juneau.marshall.json.*;
+import org.apache.juneau.marshall.json5.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for fluent assertion calls against POJOs.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
index a1bf86b46d..6241dd022d 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
@@ -25,9 +25,9 @@ import java.lang.reflect.*;
import java.util.*;
import java.util.function.*;
-import org.apache.juneau.*;
-import org.apache.juneau.cp.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshall.cp.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for fluent assertion calls against primitive array objects (e.g. <c><jk>int</jk>[]</c>).
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
index 32c7d7778d..a85d9e8ddf 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
@@ -28,8 +28,8 @@ import java.util.function.*;
import java.util.regex.*;
import org.apache.juneau.commons.utils.*;
-import org.apache.juneau.cp.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.cp.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for fluent assertion calls against strings.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringListAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringListAssertion.java
index 96a00e002a..4f6b002f5b 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringListAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringListAssertion.java
@@ -23,7 +23,7 @@ import java.util.*;
import java.util.function.*;
import org.apache.juneau.commons.utils.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for fluent assertion calls against lists of strings.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
index 7036bcba05..e109d83f09 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
@@ -28,8 +28,8 @@ import java.io.*;
import java.util.*;
import java.util.function.*;
-import org.apache.juneau.cp.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.cp.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for fluent assertion calls against throwables.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentVersionAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentVersionAssertion.java
index 26bb13a80a..868760c703 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentVersionAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentVersionAssertion.java
@@ -20,7 +20,7 @@ import java.io.*;
import java.util.function.*;
import org.apache.juneau.commons.lang.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for fluent assertion calls against {@link Version} objects.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentZonedDateTimeAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentZonedDateTimeAssertion.java
index 0dadd16195..45f546febc 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentZonedDateTimeAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentZonedDateTimeAssertion.java
@@ -24,8 +24,8 @@ import java.time.*;
import java.time.temporal.*;
import java.util.function.*;
-import org.apache.juneau.cp.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.cp.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for fluent assertion calls against {@link ZonedDateTime} objects.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/IntegerAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/IntegerAssertion.java
index b50a372e05..734731b6e1 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/IntegerAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/IntegerAssertion.java
@@ -19,7 +19,7 @@ package org.apache.juneau.assertions;
import java.io.*;
import java.util.function.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for assertion calls against integers.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ListAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ListAssertion.java
index d4fa3a4183..d180a6986a 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ListAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ListAssertion.java
@@ -21,7 +21,7 @@ import java.util.*;
import java.util.function.*;
import java.util.stream.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for assertion calls against lists.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/LongAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/LongAssertion.java
index 4f9a93153c..ef27e69db1 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/LongAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/LongAssertion.java
@@ -19,7 +19,7 @@ package org.apache.juneau.assertions;
import java.io.*;
import java.util.function.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for assertion calls against longs.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/MapAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/MapAssertion.java
index adde3567c9..8c0c5b4959 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/MapAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/MapAssertion.java
@@ -20,7 +20,7 @@ import java.io.*;
import java.util.*;
import java.util.function.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for assertion calls against lists.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ObjectAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ObjectAssertion.java
index 66effb39a9..6ddd469b8b 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ObjectAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ObjectAssertion.java
@@ -19,7 +19,7 @@ package org.apache.juneau.assertions;
import java.io.*;
import java.util.function.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for assertion calls against arbitrary POJOs.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/PrimitiveArrayAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/PrimitiveArrayAssertion.java
index 857d50acf8..9dce658957 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/PrimitiveArrayAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/PrimitiveArrayAssertion.java
@@ -19,7 +19,7 @@ package org.apache.juneau.assertions;
import java.io.*;
import java.util.function.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for assertion calls against arrays.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringAssertion.java
index 8414032cbb..df80ff0d91 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringAssertion.java
@@ -22,7 +22,7 @@ import java.io.*;
import java.util.function.*;
import java.util.regex.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for assertion calls against string objects.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringListAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringListAssertion.java
index 013a11bdf7..44f5278ce8 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringListAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringListAssertion.java
@@ -20,7 +20,7 @@ import java.io.*;
import java.util.*;
import java.util.function.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for assertion calls against lists of strings.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ThrowableAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ThrowableAssertion.java
index b46ad7df82..720d527928 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ThrowableAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ThrowableAssertion.java
@@ -19,7 +19,7 @@ package org.apache.juneau.assertions;
import java.io.*;
import java.util.function.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for assertion calls against throwable objects.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Verify.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Verify.java
index 80c45c7511..599f2ef8cd 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Verify.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Verify.java
@@ -20,7 +20,7 @@ import static org.apache.juneau.commons.utils.Utils.*;
import java.util.function.*;
-import org.apache.juneau.cp.*;
+import org.apache.juneau.marshall.cp.*;
/**
* Utility class for performing simple validations on objects.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/VersionAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/VersionAssertion.java
index 066e0cffee..c6119da8ae 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/VersionAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/VersionAssertion.java
@@ -20,7 +20,7 @@ import java.io.*;
import java.util.function.*;
import org.apache.juneau.commons.lang.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for assertion calls against {@link Version} objects.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ZonedDateTimeAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ZonedDateTimeAssertion.java
index 62c79a94a1..a7bffeb5fc 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ZonedDateTimeAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ZonedDateTimeAssertion.java
@@ -21,7 +21,7 @@ import java.time.*;
import java.time.temporal.*;
import java.util.function.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Used for assertion calls against {@link ZonedDateTime} objects.
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
index 2df5a839be..9148a0fc95 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
@@ -29,8 +29,6 @@ import java.io.*;
import java.lang.reflect.*;
import java.util.*;
-import org.apache.juneau.*;
-import org.apache.juneau.collections.*;
import org.apache.juneau.commons.collections.*;
import org.apache.juneau.commons.function.*;
import org.apache.juneau.commons.svl.*;
@@ -40,10 +38,12 @@ import org.apache.juneau.config.internal.*;
import org.apache.juneau.config.mod.*;
import org.apache.juneau.config.store.*;
import org.apache.juneau.config.vars.*;
-import org.apache.juneau.json.*;
-import org.apache.juneau.json5.*;
-import org.apache.juneau.parser.*;
-import org.apache.juneau.serializer.*;
+import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshall.collections.*;
+import org.apache.juneau.marshall.json.*;
+import org.apache.juneau.marshall.json5.*;
+import org.apache.juneau.marshall.parser.*;
+import org.apache.juneau.marshall.serializer.*;
/**
* Main configuration API class.
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Entry.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Entry.java
index cca1d4820f..95ba905789 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Entry.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Entry.java
@@ -16,21 +16,21 @@
*/
package org.apache.juneau.config;
-import static org.apache.juneau.BinaryFormat.*;
import static org.apache.juneau.commons.utils.StringUtils.*;
import static org.apache.juneau.commons.utils.ThrowableUtils.*;
import static org.apache.juneau.commons.utils.Utils.*;
+import static org.apache.juneau.marshall.BinaryFormat.*;
import java.lang.reflect.*;
import java.util.*;
import java.util.function.*;
-import org.apache.juneau.*;
-import org.apache.juneau.collections.*;
import org.apache.juneau.commons.utils.*;
import org.apache.juneau.config.internal.*;
-import org.apache.juneau.json.*;
-import org.apache.juneau.parser.*;
+import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshall.collections.*;
+import org.apache.juneau.marshall.json.*;
+import org.apache.juneau.marshall.parser.*;
/**
* A single entry in a {@link Config} file.
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Section.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Section.java
index 8f75a5a0ff..89192e9ea3 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Section.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Section.java
@@ -25,9 +25,9 @@ import java.beans.*;
import java.lang.reflect.*;
import java.util.*;
-import org.apache.juneau.collections.*;
import org.apache.juneau.config.internal.*;
-import org.apache.juneau.parser.*;
+import org.apache.juneau.marshall.collections.*;
+import org.apache.juneau.marshall.parser.*;
/**
* A single section in a config file.
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
index afa80758ed..eb3e018cca 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
@@ -29,13 +29,13 @@ import java.util.*;
import java.util.concurrent.*;
import java.util.stream.*;
-import org.apache.juneau.*;
-import org.apache.juneau.collections.*;
import org.apache.juneau.commons.concurrent.*;
import org.apache.juneau.commons.utils.*;
import org.apache.juneau.config.event.*;
import org.apache.juneau.config.format.*;
import org.apache.juneau.config.store.*;
+import org.apache.juneau.marshall.*;
+import org.apache.juneau.marshall.collections.*;
/**
* Represents the parsed contents of a configuration.
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/mod/XorEncodeMod.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/mod/XorEncodeMod.java
index e877445035..22735c2b66 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/mod/XorEncodeMod.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/mod/XorEncodeMod.java
@@ -35,7 +35,7 @@ public class XorEncodeMod extends Mod {
/** Reusable XOR-ConfigEncoder instance. */
public static final XorEncodeMod INSTANCE = new XorEncodeMod();
- private static final String KEY = env("org.apache.juneau.config.XorEncoder.key", "nuy7og796Vh6G9O6bG230SHK0cc8QYkH"); // The super-duper-secret key
+ private static final String KEY = env("org.apache.juneau.marshall.config.XorEncoder.key", "nuy7og796Vh6G9O6bG230SHK0cc8QYkH"); // The super-duper-secret key
/**
* Constructor.
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigStore.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigStore.java
index d54caf4daf..c526d8f339 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigStore.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigStore.java
@@ -24,9 +24,9 @@ import java.io.*;
import java.util.*;
import java.util.concurrent.*;
-import org.apache.juneau.*;
import org.apache.juneau.config.format.*;
import org.apache.juneau.config.internal.*;
+import org.apache.juneau.marshall.*;
/**
* Represents a storage location for configuration files.
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/Constants.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/Constants.java
deleted file mode 100644
index 72dacc0740..0000000000
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/Constants.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.juneau.jena;
-
-/**
- * Constants used by the {@link RdfSerializer} and {@link RdfParser} classes.
- *
- * <h5 class='section'>See Also:</h5><ul>
- * <li class='link'>{doc jmr.RdfDetails}
-
- * </ul>
- */
-@SuppressWarnings({
- "java:S115" // RDF language name constants mirror the official Jena API string identifiers (e.g. LANG_RDF_XML, LANG_N3) which use mixed conventions
-})
-public class Constants {
-
- private Constants() {}
-
- /** Jena language support: <js>"RDF/XML"</js>.*/
- public static final String LANG_RDF_XML = "RDF/XML";
-
- /** Jena language support: <js>"RDF/XML-ABBREV"</js>.*/
- public static final String LANG_RDF_XML_ABBREV = "RDF/XML-ABBREV";
-
- /** Jena language support: <js>"N-TRIPLE"</js>.*/
- public static final String LANG_NTRIPLE = "N-TRIPLE";
-
- /** Jena language support: <js>"TURTLE"</js>.*/
- public static final String LANG_TURTLE = "TURTLE";
-
- /** Jena language support: <js>"N3"</js>.*/
- public static final String LANG_N3 = "N3";
-
- /** Jena language support: <js>"JSON-LD"</js>.*/
- public static final String LANG_JSONLD = "JSON-LD";
-
- /** Jena language support: <js>"N-QUADS"</js>.*/
- public static final String LANG_NQUADS = "N-QUADS";
-
- /** Jena language support: <js>"TRIG"</js>.*/
- public static final String LANG_TRIG = "TRIG";
-
- /** Jena language support: <js>"TRIX"</js>.*/
- public static final String LANG_TRIX = "TRIX";
-
- /** Jena language support: <js>"RDF/JSON"</js>.*/
- public static final String LANG_RDFJSON = "RDF/JSON";
-
- /** Jena language support: <js>"RDF/THRIFT"</js> (binary).*/
- public static final String LANG_RDFTHRIFT = "RDF/THRIFT";
-
- /** Jena language support: <js>"RDF/PROTO"</js> (binary).*/
- public static final String LANG_RDFPROTO = "RDF/PROTO";
-
- /**
- * RDF property identifier <js>"items"</js>.
- *
- * <p>
- * For resources that are collections, this property identifies the RDF Sequence container for the items in the
- * collection.
- */
- public static final String RDF_juneauNs_ITEMS = "items";
-
- /**
- * RDF property identifier <js>"root"</js>.
- *
- * <p>
- * Property added to root nodes to help identify them as root elements during parsing.
- *
- * <p>
- * Added if {@link RdfSerializer.Builder#addRootProperty()} setting is enabled.
- */
- public static final String RDF_juneauNs_ROOT = "root";
-
- /**
- * RDF property identifier <js>"class"</js>.
- *
- * <p>
- * Property added to bean resources to identify the class type.
- *
- * <p>
- * Added if {@link org.apache.juneau.serializer.Serializer.Builder#addBeanTypes()} setting is enabled.
- */
- public static final String RDF_juneauNs_TYPE = "_type";
-
- /**
- * RDF property identifier <js>"value"</js>.
- *
- * <p>
- * Property added to nodes to identify a simple value.
- */
- public static final String RDF_juneauNs_VALUE = "value";
-
- /**
- * RDF resource that identifies a <jk>null</jk> value.
- */
- public static final String RDF_NIL = "http://www.w3.org/1999/02/22-rdf-syntax-ns#nil";
-
- /**
- * RDF resource that identifies a <c>Seq</c> value.
- */
- public static final String RDF_SEQ = "http://www.w3.org/1999/02/22-rdf-syntax-ns#Seq";
-
- /**
- * RDF resource that identifies a <c>Bag</c> value.
- */
- public static final String RDF_BAG = "http://www.w3.org/1999/02/22-rdf-syntax-ns#Bag";
-}
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/JsonLdParser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/JsonLdParser.java
deleted file mode 100644
index 0ce01bdd17..0000000000
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/JsonLdParser.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.juneau.jena;
-
-/**
- * Subclass of {@link RdfParser} for parsing JSON-LD into POJOs.
- *
- * <p>
- * Accepts RDF in W3C JSON-LD format and converts it to Java beans, maps, collections, and primitive
- * types. Date/time literals are parsed via ISO 8601.
- *
- * <h5 class='figure'>Examples:</h5>
- * <p class='bjava'>
- * <jc>// Parse JSON-LD string into a bean.</jc>
- * String <jv>jsonLd</jv> = ...; <jc>// JSON-LD content</jc>
- * Person <jv>person</jv> = JsonLdParser.<jsf>DEFAULT</jsf>.parse(<jv>jsonLd</jv>, Person.<jk>class</jk>);
- * </p>
- * <p class='bjava'>
- * <jc>// Or use the JsonLd marshaller for convenience.</jc>
- * Person <jv>person</jv> = JsonLd.<jsf>DEFAULT</jsf>.read(<jv>jsonLd</jv>, Person.<jk>class</jk>);
- * </p>
- * <p class='bjava'>
- * <jc>// Parse into a list of beans.</jc>
- * List<Person> <jv>people</jv> = JsonLdParser.<jsf>DEFAULT</jsf>.parse(<jv>jsonLd</jv>, List.<jk>class</jk>, Person.<jk>class</jk>);
- * </p>
- * <p class='bjava'>
- * <jc>// Custom parser with swaps.</jc>
- * JsonLdParser <jv>p</jv> = JsonLdParser.create().swaps(DateSwap.<jk>class</jk>).build();
- * MyBean <jv>bean</jv> = <jv>p</jv>.parse(<jv>jsonLd</jv>, MyBean.<jk>class</jk>);
- * </p>
- *
- * <h5 class='figure'>Example input (bean with name/age):</h5>
- * <p class='bjson'>
- * { <js>"@context"</js>: {...}, <js>"@id"</js>: <js>"..."</js>,
- * <js>"@type"</js>: <js>"Person"</js>, <js>"name"</js>: <js>"Alice"</js>, <js>"age"</js>: 30 }
- * </p>
- *
- * <h5 class='figure'>Complex (nested address + array):</h5>
- * <p class='bjson'>
- * { <js>"@context"</js>: {...}, <js>"@id"</js>: <js>"..."</js>, <js>"@type"</js>: <js>"Person"</js>,
- * <js>"name"</js>: <js>"Alice"</js>, <js>"age"</js>: 30,
- * <js>"address"</js>: { <js>"@id"</js>: <js>".../address"</js>, <js>"street"</js>: <js>"123 Main St"</js>,
- * <js>"city"</js>: <js>"Boston"</js>, <js>"state"</js>: <js>"MA"</js> },
- * <js>"tags"</js>: [<js>"a"</js>,<js>"b"</js>,<js>"c"</js>] }
- * </p>
- *
- * <h5 class='section'>Notes:</h5><ul>
- * <li class='note'>This class is thread safe and reusable.
- * </ul>
- *
- * <h5 class='section'>See Also:</h5><ul>
- * <li class='link'>{doc jmr.RdfDetails}
- * </ul>
- */
-@SuppressWarnings({
- "java:S110" // Deep inheritance inherent to the RDF parser hierarchy.
-})
-public class JsonLdParser extends RdfParser {
-
- /** Default JSON-LD parser, all default settings.*/
- public static final JsonLdParser DEFAULT = new JsonLdParser(create());
-
- /**
- * Creates a new builder for this object.
- *
- * @return A new builder.
- */
- @SuppressWarnings({
- "java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
- })
- public static RdfParser.Builder<?> create() {
- return RdfParser.create().jsonLd();
- }
-
- /**
- * Constructor.
- *
- * @param builder The builder for this object.
- */
- public JsonLdParser(RdfParser.Builder<?> builder) {
- super(builder.jsonLd().consumes("application/ld+json"));
- }
-}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/JsonLdSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/JsonLdSerializer.java
deleted file mode 100644
index 7d65df5265..0000000000
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/JsonLdSerializer.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.juneau.jena;
-
-/**
- * Subclass of {@link RdfSerializer} for serializing POJOs to JSON-LD format.
- *
- * <p>
- * Produces RDF in W3C JSON-LD syntax, a JSON-based format for linked data. JSON-LD is widely used
- * for web APIs and integrates well with JSON tooling.
- *
- * <h5 class='figure'>Examples:</h5>
- * <p class='bjava'>
- * <jc>// Serialize a bean to JSON-LD string.</jc>
- * Person <jv>person</jv> = <jk>new</jk> Person(<js>"Alice"</js>, 30);
- * String <jv>jsonLd</jv> = JsonLdSerializer.<jsf>DEFAULT</jsf>.serialize(<jv>person</jv>);
- * </p>
- * <p class='bjava'>
- * <jc>// Or use the JsonLd marshaller for convenience.</jc>
- * String <jv>jsonLd</jv> = JsonLd.<jsf>DEFAULT</jsf>.write(<jv>person</jv>);
- * </p>
- * <p class='bjava'>
- * <jc>// Custom serializer with swaps.</jc>
- * JsonLdSerializer <jv>s</jv> = JsonLdSerializer.create().swaps(DateSwap.<jk>class</jk>).build();
- * String <jv>jsonLd</jv> = <jv>s</jv>.serialize(<jv>bean</jv>);
- * </p>
- *
- * <h5 class='figure'>Example output (bean with name/age):</h5>
- * <p class='bjson'>
- * { <js>"@context"</js>: {...}, <js>"@id"</js>: <js>"..."</js>,
- * <js>"@type"</js>: <js>"Person"</js>, <js>"name"</js>: <js>"Alice"</js>, <js>"age"</js>: 30 }
- * </p>
- *
- * <h5 class='figure'>Complex (nested address + array):</h5>
- * <p class='bjson'>
- * { <js>"@context"</js>: {...}, <js>"@id"</js>: <js>"..."</js>, <js>"@type"</js>: <js>"Person"</js>,
- * <js>"name"</js>: <js>"Alice"</js>, <js>"age"</js>: 30,
- * <js>"address"</js>: { <js>"@id"</js>: <js>".../address"</js>, <js>"street"</js>: <js>"123 Main St"</js>,
- * <js>"city"</js>: <js>"Boston"</js>, <js>"state"</js>: <js>"MA"</js> },
- * <js>"tags"</js>: [<js>"a"</js>,<js>"b"</js>,<js>"c"</js>] }
- * </p>
- *
- * <h5 class='section'>Notes:</h5><ul>
- * <li class='note'>This class is thread safe and reusable.
- * </ul>
- *
- * <h5 class='section'>See Also:</h5><ul>
- * <li class='link'>{doc jmr.RdfDetails}
- * </ul>
- */
-@SuppressWarnings({
- "java:S110" // Deep inheritance inherent to the RDF serializer hierarchy.
-})
-public class JsonLdSerializer extends RdfSerializer {
-
- /** Default JSON-LD serializer, all default settings.*/
- public static final JsonLdSerializer DEFAULT = new JsonLdSerializer(create());
-
- /**
- * Creates a new builder for this object.
- *
- * @return A new builder.
- */
- @SuppressWarnings({
- "java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
- })
- public static RdfSerializer.Builder<?> create() {
- return RdfSerializer.create().jsonLd();
- }
-
- /**
- * Constructor.
- *
- * @param builder The builder for this object.
- */
- public JsonLdSerializer(RdfSerializer.Builder<?> builder) {
- super(builder.jsonLd());
- }
-}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Parser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Parser.java
deleted file mode 100644
index c832701b60..0000000000
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Parser.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.juneau.jena;
-
-/**
- * Subclass of {@link RdfParser} for parsing N3 (Notation3) into POJOs.
- *
- * <p>
- * Accepts RDF in Notation3 format and converts it to Java beans, maps, collections, and primitive
- * types. Date/time literals are parsed via ISO 8601.
- *
- * <h5 class='figure'>Examples:</h5>
- * <p class='bjava'>
- * <jc>// Parse N3 string into a bean.</jc>
- * String <jv>n3</jv> = ...; <jc>// N3 content</jc>
- * Person <jv>person</jv> = N3Parser.<jsf>DEFAULT</jsf>.parse(<jv>n3</jv>, Person.<jk>class</jk>);
- * </p>
- * <p class='bjava'>
- * <jc>// Or use the N3 marshaller for convenience.</jc>
- * Person <jv>person</jv> = N3.<jsf>DEFAULT</jsf>.read(<jv>n3</jv>, Person.<jk>class</jk>);
- * </p>
- * <p class='bjava'>
- * <jc>// Custom parser with swaps.</jc>
- * N3Parser <jv>p</jv> = N3Parser.create().swaps(DateSwap.<jk>class</jk>).build();
- * MyBean <jv>bean</jv> = <jv>p</jv>.parse(<jv>n3</jv>, MyBean.<jk>class</jk>);
- * </p>
- *
- * <h5 class='figure'>Example input (bean with name/age):</h5>
- * <p class='bcode'>
- * @prefix j: <...> .
- * <...> a j:Person ; j:name "Alice" ; j:age 30 .
- * </p>
- *
- * <h5 class='figure'>Complex (nested address + array):</h5>
- * <p class='bcode'>
- * @prefix j: <...> .
- * <...> a j:Person ; j:name "Alice" ; j:age 30 ;
- * j:address <.../address> ; j:tags <.../tags> .
- * <.../address> a j:Address ; j:street "123 Main St" ;
- * j:city "Boston" ; j:state "MA" .
- * </p>
- *
- * <h5 class='section'>Notes:</h5><ul>
- * <li class='note'>This class is thread safe and reusable.
- * </ul>
- *
- * <h5 class='section'>See Also:</h5><ul>
- * <li class='link'>{doc jmr.RdfDetails}
- * </ul>
- */
-@SuppressWarnings({
- "java:S110" // Deep inheritance inherent to the RDF parser hierarchy.
-})
-public class N3Parser extends RdfParser {
-
- /** Default N3 parser, all default settings.*/
- public static final N3Parser DEFAULT = new N3Parser(create());
-
- /**
- * Creates a new builder for this object.
- *
- * @return A new builder.
- */
- @SuppressWarnings({
- "java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
- })
- public static RdfParser.Builder<?> create() {
- return RdfParser.create().n3();
- }
-
- /**
- * Constructor.
- *
- * @param builder The builder for this object.
- */
- public N3Parser(RdfParser.Builder<?> builder) {
- super(builder.n3().consumes("text/n3"));
- }
-}
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Serializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Serializer.java
deleted file mode 100644
index 620bb7bf22..0000000000
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Serializer.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.juneau.jena;
-
-/**
- * Subclass of {@link RdfSerializer} for serializing POJOs to N3 (Notation3) format.
- *
- * <p>
- * Produces RDF in Notation3 syntax, a compact, readable format that extends Turtle with additional
- * features such as formulas and variables.
- *
- * <h5 class='figure'>Examples:</h5>
- * <p class='bjava'>
- * <jc>// Serialize a bean to N3 string.</jc>
- * Person <jv>person</jv> = <jk>new</jk> Person(<js>"Alice"</js>, 30);
- * String <jv>n3</jv> = N3Serializer.<jsf>DEFAULT</jsf>.serialize(<jv>person</jv>);
- * </p>
- * <p class='bjava'>
- * <jc>// Or use the N3 marshaller for convenience.</jc>
- * String <jv>n3</jv> = N3.<jsf>DEFAULT</jsf>.write(<jv>person</jv>);
- * </p>
- * <p class='bjava'>
- * <jc>// Custom serializer with swaps.</jc>
- * N3Serializer <jv>s</jv> = N3Serializer.create().swaps(DateSwap.<jk>class</jk>).build();
- * String <jv>n3</jv> = <jv>s</jv>.serialize(<jv>bean</jv>);
- * </p>
- *
- * <h5 class='figure'>Example output (bean with name/age):</h5>
- * <p class='bcode'>
- * @prefix j: <...> .
- * <...> a j:Person ; j:name "Alice" ; j:age 30 .
- * </p>
- *
- * <h5 class='figure'>Complex (nested address + array):</h5>
- * <p class='bcode'>
- * @prefix j: <...> .
- * <...> a j:Person ; j:name "Alice" ; j:age 30 ;
- * j:address <.../address> ; j:tags <.../tags> .
- * <.../address> a j:Address ; j:street "123 Main St" ;
- * j:city "Boston" ; j:state "MA" .
- * </p>
- *
- * <h5 class='section'>Notes:</h5><ul>
- * <li class='note'>This class is thread safe and reusable.
- * </ul>
- *
- * <h5 class='section'>See Also:</h5><ul>
- * <li class='link'>{doc jmr.RdfDetails}
- * </ul>
- */
-@SuppressWarnings({
- "java:S110" // Deep inheritance inherent to the RDF serializer hierarchy.
-})
-public class N3Serializer extends RdfSerializer {
-
- /** Default N3 serializer, all default settings.*/
- public static final N3Serializer DEFAULT = new N3Serializer(create());
-
- /**
- * Creates a new builder for this object.
- *
- * @return A new builder.
- */
- @SuppressWarnings({
- "java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
- })
- public static RdfSerializer.Builder<?> create() {
- return RdfSerializer.create().n3();
- }
-
- /**
- * Constructor.
- *
- * @param builder The builder for this object.
- */
- public N3Serializer(RdfSerializer.Builder<?> builder) {
- super(builder.n3());
- }
-}
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NQuadsParser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NQuadsParser.java
deleted file mode 100644
index b44a8d3ca5..0000000000
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NQuadsParser.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.juneau.jena;
-
-/**
- * Subclass of {@link RdfParser} for parsing N-Quads into POJOs.
- *
- * <p>
- * Accepts RDF in N-Quads format (quads with optional graph component) and converts it to Java beans,
- * maps, collections, and primitive types. Date/time literals are parsed via ISO 8601.
- *
- * <h5 class='figure'>Examples:</h5>
- * <p class='bjava'>
- * <jc>// Parse N-Quads string into a bean.</jc>
- * String <jv>nQuads</jv> = ...; <jc>// N-Quads content</jc>
- * Person <jv>person</jv> = NQuadsParser.<jsf>DEFAULT</jsf>.parse(<jv>nQuads</jv>, Person.<jk>class</jk>);
- * </p>
- * <p class='bjava'>
- * <jc>// Or use the NQuads marshaller for convenience.</jc>
- * Person <jv>person</jv> = NQuads.to(<jv>nQuads</jv>, Person.<jk>class</jk>);
- * </p>
- * <p class='bjava'>
- * <jc>// Custom parser with swaps.</jc>
- * NQuadsParser <jv>p</jv> = NQuadsParser.create().swaps(DateSwap.<jk>class</jk>).build();
- * MyBean <jv>bean</jv> = <jv>p</jv>.parse(<jv>nQuads</jv>, MyBean.<jk>class</jk>);
- * </p>
- *
- * <h5 class='figure'>Example input (bean with name/age):</h5>
- * <p class='bcode'>
- * <...> <.../name> "Alice" <...> .
- * <...> <.../age> "30"^^<http://www.w3.org/2001/XMLSchema#int> <...> .
- * </p>
- *
- * <h5 class='figure'>Complex (nested address + array):</h5>
- * <p class='bcode'>
- * <...> <.../name> "Alice" <graph> .
- * <...> <.../address> <.../address> <graph> .
- * <.../address> <.../street> "123 Main St" <graph> .
- * <.../address> <.../city> "Boston" <graph> .
- * <.../address> <.../state> "MA" <graph> .
- * </p>
- *
- * <h5 class='section'>Notes:</h5><ul>
- * <li class='note'>This class is thread safe and reusable.
- * </ul>
- *
- * <h5 class='section'>See Also:</h5><ul>
- * <li class='link'>{doc jmr.RdfDetails}
- * </ul>
- */
-@SuppressWarnings({
- "java:S110" // Deep inheritance inherent to the RDF parser hierarchy.
-})
-public class NQuadsParser extends RdfParser {
-
- /** Default N-Quads parser, all default settings.*/
- public static final NQuadsParser DEFAULT = new NQuadsParser(create());
-
- /**
- * Creates a new builder for this object.
- *
- * @return A new builder.
- */
- @SuppressWarnings({
- "java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
- })
- public static RdfParser.Builder<?> create() {
- return RdfParser.create().nQuads();
- }
-
- /**
- * Constructor.
- *
- * @param builder The builder for this object.
- */
- public NQuadsParser(RdfParser.Builder<?> builder) {
- super(builder.nQuads().consumes("application/n-quads"));
- }
-}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NQuadsSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NQuadsSerializer.java
deleted file mode 100644
index 2ad55c6fe6..0000000000
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NQuadsSerializer.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.juneau.jena;
-
-/**
- * Subclass of {@link RdfSerializer} for serializing POJOs to N-Quads format.
- *
- * <p>
- * Produces RDF quads (subject, predicate, object, graph) in N-Quads notation. Like N-Triples but
- * with an optional fourth element for the named graph. Useful for RDF datasets.
- *
- * <h5 class='figure'>Examples:</h5>
- * <p class='bjava'>
- * <jc>// Serialize a bean to N-Quads string.</jc>
- * Person <jv>person</jv> = <jk>new</jk> Person(<js>"Alice"</js>, 30);
- * String <jv>nQuads</jv> = NQuadsSerializer.<jsf>DEFAULT</jsf>.serialize(<jv>person</jv>);
- * </p>
- * <p class='bjava'>
- * <jc>// Or use the NQuads marshaller for convenience.</jc>
- * String <jv>nQuads</jv> = NQuads.of(<jv>person</jv>);
- * </p>
- * <p class='bjava'>
- * <jc>// Custom serializer with swaps.</jc>
- * NQuadsSerializer <jv>s</jv> = NQuadsSerializer.create().swaps(DateSwap.<jk>class</jk>).build();
- * String <jv>nQuads</jv> = <jv>s</jv>.serialize(<jv>bean</jv>);
- * </p>
- *
- * <h5 class='figure'>Example output (bean with name/age):</h5>
- * <p class='bcode'>
- * <...> <.../name> "Alice" <...> .
- * <...> <.../age> "30"^^<http://www.w3.org/2001/XMLSchema#int> <...> .
- * </p>
- *
- * <h5 class='figure'>Complex (nested address + array):</h5>
- * <p class='bcode'>
- * <...> <.../name> "Alice" <graph> .
- * <...> <.../address> <.../address> <graph> .
- * <.../address> <.../street> "123 Main St" <graph> .
- * <.../address> <.../city> "Boston" <graph> .
- * <.../address> <.../state> "MA" <graph> .
- * </p>
- *
- * <h5 class='section'>Notes:</h5><ul>
- * <li class='note'>This class is thread safe and reusable.
- * </ul>
- *
- * <h5 class='section'>See Also:</h5><ul>
- * <li class='link'>{doc jmr.RdfDetails}
- * </ul>
- */
-@SuppressWarnings({
- "java:S110" // Deep inheritance inherent to the RDF serializer hierarchy.
-})
-public class NQuadsSerializer extends RdfSerializer {
-
- /** Default N-Quads serializer, all default settings.*/
- public static final NQuadsSerializer DEFAULT = new NQuadsSerializer(create());
-
- /**
- * Creates a new builder for this object.
- *
- * @return A new builder.
- */
- @SuppressWarnings({
- "java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
- })
- public static RdfSerializer.Builder<?> create() {
- return RdfSerializer.create().nQuads();
- }
-
- /**
- * Constructor.
- *
- * @param builder The builder for this object.
- */
- public NQuadsSerializer(RdfSerializer.Builder<?> builder) {
- super(builder.nQuads());
- }
-}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleParser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleParser.java
deleted file mode 100644
index 7978f2f224..0000000000
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleParser.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.juneau.jena;
-
-/**
- * Subclass of {@link RdfParser} for parsing N-Triples into POJOs.
- *
- * <p>
- * Accepts RDF in W3C N-Triples format (one triple per line) and converts it to Java beans, maps,
- * collections, and primitive types. Date/time literals are parsed via ISO 8601.
- *
- * <h5 class='figure'>Examples:</h5>
- * <p class='bjava'>
- * <jc>// Parse N-Triples string into a bean.</jc>
- * String <jv>nTriples</jv> = ...; <jc>// N-Triples content</jc>
- * Person <jv>person</jv> = NTripleParser.<jsf>DEFAULT</jsf>.parse(<jv>nTriples</jv>, Person.<jk>class</jk>);
- * </p>
- * <p class='bjava'>
- * <jc>// Or use the NTriple marshaller for convenience.</jc>
- * Person <jv>person</jv> = NTriple.<jsf>DEFAULT</jsf>.read(<jv>nTriples</jv>, Person.<jk>class</jk>);
- * </p>
- * <p class='bjava'>
- * <jc>// Parse into a map.</jc>
- * Map<String, String> <jv>map</jv> = NTripleParser.<jsf>DEFAULT</jsf>.parse(<jv>nTriples</jv>, Map.<jk>class</jk>, String.<jk>class</jk>, String.<jk>class</jk>);
- * </p>
- * <p class='bjava'>
- * <jc>// Custom parser with swaps.</jc>
- * NTripleParser <jv>p</jv> = NTripleParser.create().swaps(DateSwap.<jk>class</jk>).build();
- * MyBean <jv>bean</jv> = <jv>p</jv>.parse(<jv>nTriples</jv>, MyBean.<jk>class</jk>);
- * </p>
- *
- * <h5 class='figure'>Example input (bean with name/age):</h5>
- * <p class='bcode'>
- * <...> <.../name> "Alice" .
- * <...> <.../age> "30"^^<http://www.w3.org/2001/XMLSchema#int> .
- * </p>
- *
- * <h5 class='figure'>Complex (nested address + array):</h5>
- * <p class='bcode'>
- * <...> <.../name> "Alice" .
- * <...> <.../address> <.../address> .
- * <.../address> <.../street> "123 Main St" .
- * <.../address> <.../city> "Boston" .
- * <.../address> <.../state> "MA" .
- * </p>
- *
- * <h5 class='section'>Notes:</h5><ul>
- * <li class='note'>This class is thread safe and reusable.
- * </ul>
- *
- * <h5 class='section'>See Also:</h5><ul>
- * <li class='link'>{doc jmr.RdfDetails}
- * </ul>
- */
-@SuppressWarnings({
- "java:S110" // Deep inheritance inherent to the RDF parser hierarchy.
-})
-public class NTripleParser extends RdfParser {
-
- /** Default N-Triple parser, all default settings.*/
- public static final NTripleParser DEFAULT = new NTripleParser(create());
-
- /**
- * Creates a new builder for this object.
- *
- * @return A new builder.
- */
- @SuppressWarnings({
- "java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
- })
- public static RdfParser.Builder<?> create() {
- return RdfParser.create().ntriple();
- }
-
- /**
- * Constructor.
- *
- * @param builder The builder for this object.
- */
- public NTripleParser(RdfParser.Builder<?> builder) {
- super(builder.ntriple().consumes("text/n-triple"));
- }
-}
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleSerializer.java
deleted file mode 100644
index 373b2a42dc..0000000000
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleSerializer.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.juneau.jena;
-
-/**
- * Subclass of {@link RdfSerializer} for serializing POJOs to N-Triples notation.
- *
- * <p>
- * Produces one RDF triple per line in W3C N-Triples format. Simple, line-oriented, and easy to parse.
- *
- * <h5 class='figure'>Examples:</h5>
- * <p class='bjava'>
- * <jc>// Serialize a bean to N-Triples string.</jc>
- * Person <jv>person</jv> = <jk>new</jk> Person(<js>"Alice"</js>, 30);
- * String <jv>nTriples</jv> = NTripleSerializer.<jsf>DEFAULT</jsf>.serialize(<jv>person</jv>);
- * </p>
- * <p class='bjava'>
- * <jc>// Or use the NTriple marshaller for convenience.</jc>
- * String <jv>nTriples</jv> = NTriple.<jsf>DEFAULT</jsf>.write(<jv>person</jv>);
- * </p>
- * <p class='bjava'>
- * <jc>// Custom serializer with swaps.</jc>
- * NTripleSerializer <jv>s</jv> = NTripleSerializer.create().swaps(DateSwap.<jk>class</jk>).build();
- * String <jv>nTriples</jv> = <jv>s</jv>.serialize(<jv>person</jv>);
- * </p>
- *
- * <h5 class='figure'>Example output (bean with name/age):</h5>
- * <p class='bcode'>
- * <...> <.../name> "Alice" .
- * <...> <.../age> "30"^^<http://www.w3.org/2001/XMLSchema#int> .
- * </p>
- *
- * <h5 class='figure'>Complex (nested address + array):</h5>
- * <p class='bcode'>
- * <...> <.../name> "Alice" .
- * <...> <.../age> "30"^^... .
- * <...> <.../address> <.../address> .
- * <.../address> <.../street> "123 Main St" .
- * <.../address> <.../city> "Boston" .
- * <.../address> <.../state> "MA" .
- * </p>
- *
- * <h5 class='section'>Notes:</h5><ul>
- * <li class='note'>This class is thread safe and reusable.
- * </ul>
- *
- * <h5 class='section'>See Also:</h5><ul>
- * <li class='link'>{doc jmr.RdfDetails}
- * </ul>
- */
-@SuppressWarnings({
- "java:S110" // Deep inheritance inherent to the RDF serializer hierarchy.
-})
-public class NTripleSerializer extends RdfSerializer {
-
- /** Default N-Triple serializer, all default settings.*/
- public static final NTripleSerializer DEFAULT = new NTripleSerializer(create());
-
- /**
- * Creates a new builder for this object.
- *
- * @return A new builder.
- */
- @SuppressWarnings({
- "java:S1452" // Builder<?> wildcard return intentional; callers chain via fluent API without needing the concrete type
- })
- public static RdfSerializer.Builder<?> create() {
- return RdfSerializer.create().ntriple();
- }
-
- /**
- * Constructor.
- *
- * @param builder The builder for this object.
- */
- public NTripleSerializer(RdfSerializer.Builder<?> builder) {
- super(builder.ntriple());
- }
-}
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/Rdf.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/Rdf.java
deleted file mode 100644
index 4fc41826ec..0000000000
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/Rdf.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.juneau.jena;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
-
-import java.lang.annotation.*;
-
-/**
- * Annotation for specifying options for RDF serializers.
- *
- * <p>
- * Can be used in the following locations:
- * <ul>
- * <li>Marshalled classes/methods/fields/packages.
- * </ul>
- *
- * <p>
- * Can be used for the following:
- * <ul>
- * <li>Override the default behavior of how collections and arrays are serialized.
- * </ul>
- *
- * <h5 class='section'>See Also:</h5><ul>
- * <li class='link'>{doc jmr.RdfDetails}
-
- * </ul>
- */
-@Documented
-@Target({ PACKAGE, TYPE, FIELD, METHOD })
-@Retention(RUNTIME)
-@Inherited
-public @interface Rdf {
-
- /**
- * Marks a bean property as a resource URI identifier for the bean.
- *
- * <p>
- * Has the following effects on the following serializers:
- * <ul class='spaced-list'>
- * <li>
- * {@link RdfSerializer} - Will be rendered as the value of the <js>"rdf:about"</js> attribute
- * for the bean.
- * </ul>
- *
- * @return The annotation value.
- */
- boolean beanUri() default false;
-
- /**
- * The format for how collections (lists and arrays for example) are serialized in RDF.
- *
- * @see RdfCollectionFormat
- * @return The annotation value.
- */
- RdfCollectionFormat collectionFormat() default RdfCollectionFormat.DEFAULT;
-
- /**
- * Sets the namespace URI of this property or class.
- *
- * <p>
- * Must be matched with a {@link #prefix() @Rdf(prefix)} annotation on this object, a parent object, or a {@link RdfNs @RdfNs} with the
- * same name through the {@link RdfSchema#rdfNs() @RdfSchema(rdfNs)} annotation on the package.
- *
- * @return The annotation value.
- */
- String namespace() default "";
-
- /**
- * Sets the XML prefix of this property or class.
- *
- * <p>
- * Must either be matched to a {@link #namespace() @Rdf(namespace)} annotation on the same object, parent object, or a {@link RdfNs @RdfNs}
- * with the same name through the {@link RdfSchema#rdfNs() @RdfSchema(rdfNs)} annotation on the package.
- *
- * @return The annotation value.
- */
- String prefix() default "";
-}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfAnnotation.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfAnnotation.java
deleted file mode 100644
index 2f114969c6..0000000000
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfAnnotation.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.juneau.jena;
-
-import java.lang.annotation.*;
-
-import org.apache.juneau.commons.*;
-
-/**
- * Utility classes and methods for the {@link Rdf @Rdf} annotation.
- *
- * <h5 class='section'>See Also:</h5><ul>
- * <li class='link'>{doc jmr.RdfDetails}
- * </ul>
- */
-public class RdfAnnotation {
-
- private RdfAnnotation() {}
-
- /**
- * Builder class.
- *
- * <h5 class='section'>See Also:</h5><ul>
- * <li class='jm'>{@link org.apache.juneau.MarshallingContext.Builder#annotations(Annotation...)}
- * </ul>
- */
- public static class Builder extends AnnotationObject.Builder {
-
- private String namespace = "";
- private String prefix = "";
- private boolean beanUri;
- private RdfCollectionFormat collectionFormat = RdfCollectionFormat.DEFAULT;
-
- /**
- * Constructor.
- */
- protected Builder() {
- super(Rdf.class);
- }
-
- /**
- * Sets the {@link Rdf#beanUri} property on this annotation.
- *
- * @param value The new value for this property.
- * @return This object.
- */
- public Builder beanUri(boolean value) {
- beanUri = value;
- return this;
- }
-
- /**
- * Instantiates a new {@link Rdf @Rdf} object initialized with this builder.
- *
- * @return A new {@link Rdf @Rdf} object.
- */
- public Rdf build() {
- return new Object(this);
- }
-
- /**
- * Sets the {@link Rdf#collectionFormat} property on this annotation.
- *
- * @param value The new value for this property.
- * @return This object.
- */
- public Builder collectionFormat(RdfCollectionFormat value) {
- collectionFormat = value;
- return this;
- }
-
- /**
- * Sets the {@link Rdf#namespace} property on this annotation.
- *
- * @param value The new value for this property.
- * @return This object.
- */
- public Builder namespace(String value) {
- namespace = value;
- return this;
- }
-
- /**
- * Sets the {@link Rdf#prefix} property on this annotation.
- *
- * @param value The new value for this property.
- * @return This object.
- */
- public Builder prefix(String value) {
- prefix = value;
- return this;
- }
- }
-
- @SuppressWarnings({
- "java:S2160" // equals() inherited from AnnotationObject compares all annotation interface methods; subclass fields are accessed via those methods
- })
- private static class Object extends AnnotationObject implements Rdf {
-
- private final boolean beanUri;
- private final RdfCollectionFormat collectionFormat;
- private final String namespace;
- private final String prefix;
-
- Object(RdfAnnotation.Builder b) {
- super(b);
- beanUri = b.beanUri;
- collectionFormat = b.collectionFormat;
- namespace = b.namespace;
- prefix = b.prefix;
- }
-
- @Override /* Overridden from Rdf */
- public boolean beanUri() {
- return beanUri;
- }
-
- @Override /* Overridden from Rdf */
- public RdfCollectionFormat collectionFormat() {
- return collectionFormat;
- }
-
- @Override /* Overridden from Rdf */
- public String namespace() {
- return namespace;
- }
-
- @Override /* Overridden from Rdf */
- public String prefix() {
- return prefix;
- }
- }
-
- /** Default value */
- public static final Rdf DEFAULT = create().build();
-
- /**
- * Instantiates a new builder for this class.
- *
- * @return A new builder object.
- */
- public static Builder create() {
- return new Builder();
- }
-}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfApply.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfApply.java
deleted file mode 100644
index ad0e763ff9..0000000000
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfApply.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.juneau.jena;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
-
-import java.lang.annotation.*;
-
-import org.apache.juneau.*;
-
-/**
- * Dynamically applies a {@link Rdf @Rdf} annotation to specified classes, methods, or fields.
- *
- * <p>
- * This annotation separates the <b>targeting</b> concern ({@link #on()}/{@link #onClass()}) from the
- * <b>content</b> concern ({@link #value()}), enabling {@link Rdf @Rdf} to be a pure data annotation
- * without marshall-specific application machinery.
- *
- * <h5 class='section'>See Also:</h5><ul>
- * <li class='link'><a class="doclink" href="https://juneau.apache.org/docs/topics/DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
- * </ul>
- */
-@Documented
-@Target({ TYPE, METHOD })
-@Retention(RUNTIME)
-@Repeatable(RdfApply.Array.class)
-@ContextApply(RdfApplyAnnotation.Applier.class)
-public @interface RdfApply {
-
- /**
- * The {@link Rdf @Rdf} annotation to apply.
- *
- * @return The annotation value.
- */
- Rdf value();
-
- /**
- * Dynamically apply this annotation to the specified classes/methods/fields.
- *
- * <h5 class='section'>See Also:</h5><ul>
- * <li class='link'><a class="doclink" href="https://juneau.apache.org/docs/topics/DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
- * </ul>
- *
- * @return The annotation value.
- */
- String[] on() default {};
-
- /**
- * Dynamically apply this annotation to the specified classes.
- *
- * <h5 class='section'>See Also:</h5><ul>
- * <li class='link'><a class="doclink" href="https://juneau.apache.org/docs/topics/DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
- * </ul>
- *
- * @return The annotation value.
- */
- Class<?>[] onClass() default {};
-
- /**
- * A collection of {@link RdfApply @RdfApply annotations}.
- */
- @Documented
- @Target({ TYPE, METHOD })
- @Retention(RUNTIME)
- public @interface Array {
-
- /**
- * The child annotations.
- *
- * @return The annotation value.
- */
- RdfApply[] value();
- }
-}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfApplyAnnotation.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfApplyAnnotation.java
deleted file mode 100644
index 9030174e9e..0000000000
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfApplyAnnotation.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.juneau.jena;
-
-import static org.apache.juneau.commons.utils.CollectionUtils.*;
-
-import java.lang.annotation.*;
-import java.lang.reflect.*;
-
-import org.apache.juneau.*;
-import org.apache.juneau.commons.*;
-import org.apache.juneau.commons.reflect.*;
-import org.apache.juneau.commons.svl.*;
-
-/**
- * Utility classes and methods for the {@link RdfApply @RdfApply} annotation.
- *
- */
-public class RdfApplyAnnotation {
-
- /**
- * Prevents instantiation.
- */
- private RdfApplyAnnotation() {}
-
- /**
- * Applies targeted {@link RdfApply} annotations to a {@link org.apache.juneau.Context.Builder}.
- */
- @SuppressWarnings({
- "rawtypes" // Raw types required for reflective annotation application.
- })
- public static class Applier extends AnnotationApplier<RdfApply,Context.Builder> {
-
- /**
- * Constructor.
- *
- * @param vr The resolver for resolving values in annotations.
- */
- public Applier(VarResolverSession vr) {
- super(RdfApply.class, Context.Builder.class, vr);
- }
-
- @Override
- public void apply(AnnotationInfo<RdfApply> ai, Context.Builder b) {
- RdfApply a = ai.inner();
- if (isEmptyArray(a.on()) && isEmptyArray(a.onClass()))
- return;
- b.annotations(a);
- }
- }
-
- /**
- * Builder class.
- *
- * <h5 class='section'>See Also:</h5><ul>
- * <li class='jm'>{@link org.apache.juneau.MarshallingContext.Builder#annotations(Annotation...)}
- * </ul>
- */
- public static class Builder extends AppliedAnnotationObject.BuilderTMF {
-
- Rdf value = RdfAnnotation.DEFAULT;
-
- /**
- * Constructor.
- */
- protected Builder() {
- super(RdfApply.class);
- }
-
- /**
- * Sets the {@link RdfApply#value()} property on this annotation.
- *
- * @param value The new value for this property.
- * @return This object.
- */
- public Builder value(Rdf value) {
- this.value = value;
- return this;
- }
-
- @Override /* Overridden from AppliedAnnotationObject.Builder */
- public Builder on(String...value) {
- super.on(value);
- return this;
- }
-
- @Override /* Overridden from AppliedAnnotationObject.BuilderT */
- public Builder on(Class<?>...value) {
- super.on(value);
- return this;
- }
-
- @Override /* Overridden from AppliedOnClassAnnotationObject.Builder */
- public Builder onClass(Class<?>...value) {
- super.onClass(value);
- return this;
- }
-
- @Override /* Overridden from AppliedAnnotationObject.BuilderM */
- public Builder on(Method...value) {
- super.on(value);
- return this;
- }
-
- @Override /* Overridden from AppliedAnnotationObject.BuilderMF */
- public Builder on(Field...value) {
- super.on(value);
- return this;
- }
-
- @Override /* Overridden from AppliedAnnotationObject.BuilderT */
- public Builder on(ClassInfo...value) {
- super.on(value);
- return this;
- }
-
- @Override /* Overridden from AppliedAnnotationObject.BuilderT */
- public Builder onClass(ClassInfo...value) {
- super.onClass(value);
- return this;
- }
-
- @Override /* Overridden from AppliedAnnotationObject.BuilderTMF */
- public Builder on(FieldInfo...value) {
- super.on(value);
- return this;
- }
-
- @Override /* Overridden from AppliedAnnotationObject.BuilderTMF */
- public Builder on(MethodInfo...value) {
- super.on(value);
- return this;
- }
-
- /**
- * Instantiates a new {@link RdfApply @RdfApply} object initialized with this builder.
- *
- * @return A new {@link RdfApply} object.
- */
- public RdfApply build() {
- return new Object(this);
- }
- }
-
- @SuppressWarnings({
- "java:S2160" // equals() inherited from AnnotationObject compares all annotation interface methods; subclass fields are accessed via those methods
- })
- private static class Object extends AppliedOnClassAnnotationObject implements RdfApply {
-
- private final Rdf value;
-
- Object(RdfApplyAnnotation.Builder b) {
- super(b);
- value = b.value;
- }
-
- @Override /* Overridden from RdfApply */
- public Rdf value() {
- return value;
- }
- }
-
- /** Default value */
- public static final RdfApply DEFAULT = create().build();
-
- /**
- * Instantiates a new builder for this class.
- *
- * @return A new builder object.
- */
- public static Builder create() {
- return new Builder();
- }
-
- /**
- * Instantiates a new builder for this class.
- *
- * @param on The targets this annotation applies to.
- * @return A new builder object.
- */
- public static Builder create(Class<?>...on) {
- return create().on(on);
- }
-
- /**
- * Instantiates a new builder for this class.
- *
- * @param on The targets this annotation applies to.
- * @return A new builder object.
- */
- public static Builder create(String...on) {
- return create().on(on);
- }
-
- /**
- * Returns <jk>true</jk> if the specified annotation contains all default values.
- *
- * @param a The annotation to check.
- * @return <jk>true</jk> if the specified annotation contains all default values.
- */
- public static boolean empty(RdfApply a) {
- return a == null || DEFAULT.equals(a);
- }
-}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfBeanMeta.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfBeanMeta.java
deleted file mode 100644
index 4ca914c830..0000000000
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfBeanMeta.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.juneau.jena;
-
-import static org.apache.juneau.commons.utils.Utils.*;
-
-import org.apache.juneau.*;
-import org.apache.juneau.commons.bean.*;
-
-/**
- * Metadata on beans specific to the RDF serializers and parsers pulled from the {@link Rdf @Rdf} annotation on the
- * class.
- *
- * <h5 class='section'>See Also:</h5><ul>
- * <li class='link'>{doc jmr.RdfDetails}
-
- * </ul>
- */
-public class RdfBeanMeta extends ExtendedBeanMeta {
-
- // RDF related fields
- private final BeanPropertyMeta beanUriProperty; // Bean property that identifies the URI of the bean.
-
- /**
- * Constructor.
- *
- * @param beanMeta The metadata on the bean that this metadata applies to.
- * @param mp RDF metadata provider (for finding information about other artifacts).
- */
- public RdfBeanMeta(BeanMeta<?> beanMeta, RdfMetaProvider mp) {
- super(beanMeta);
- this.beanUriProperty = beanMeta.getProperties().values().stream().filter(x -> mp.getRdfBeanPropertyMeta(x).isBeanUri()).findFirst().orElse(null);
- }
-
- /**
- * Returns the bean property marked as the URI for the bean (annotated with {@link Rdf#beanUri() @Rdf(beanUri)} as <jk>true</jk>).
- *
- * @return The URI property, or <jk>null</jk> if no URI property exists on this bean.
- */
- public BeanPropertyMeta getBeanUriProperty() { return beanUriProperty; }
-
- /**
- * Returns <jk>true</jk> if one of the properties on this bean is annotated with {@link Rdf#beanUri() @Rdf(beanUri)} as
- * <jk>true</jk>
- *
- * @return <jk>true</jk> if there is a URI property associated with this bean.
- */
- public boolean hasBeanUri() {
- return nn(beanUriProperty);
- }
-}
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfBeanPropertyMeta.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfBeanPropertyMeta.java
deleted file mode 100644
index cd317e1f9b..0000000000
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfBeanPropertyMeta.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.juneau.jena;
-
-import static org.apache.juneau.commons.utils.CollectionUtils.*;
-
-import org.apache.juneau.*;
-import org.apache.juneau.commons.bean.*;
-import org.apache.juneau.commons.collections.*;
-import org.apache.juneau.commons.reflect.*;
-import org.apache.juneau.xml.*;
-
-/**
- * Metadata on bean properties specific to the RDF serializers and parsers pulled from the {@link Rdf @Rdf} annotation
- * on the bean property.
- *
- * <h5 class='section'>See Also:</h5><ul>
- * <li class='link'>{doc jmr.RdfDetails}
-
- * </ul>
- */
-public class RdfBeanPropertyMeta extends ExtendedBeanPropertyMeta {
-
- /**
- * Default instance.
- */
- public static final RdfBeanPropertyMeta DEFAULT = new RdfBeanPropertyMeta();
-
- private RdfCollectionFormat collectionFormat = RdfCollectionFormat.DEFAULT;
- private Namespace namespace;
- private boolean isBeanUri;
-
- /**
- * Constructor.
- *
- * @param bpm The metadata of the bean property of this additional metadata.
- * @param mp RDF metadata provider (for finding information about other artifacts).
- */
- public RdfBeanPropertyMeta(BeanPropertyMeta bpm, RdfMetaProvider mp) {
- super(bpm);
-
- var bpmcm = (ClassMeta<?>) bpm.getBeanInfo();
- var bmcm = (ClassMeta<?>) bpm.getBeanMeta().getBeanInfo();
- var ap = bpmcm.getMarshallingContext().getAnnotationProvider();
- var rdfs = new MultiList<>(
- rstream(ap.find(Rdf.class, bmcm)).map(AnnotationInfo::inner).toList(),
- reverse(bpm.getAnnotations(Rdf.class).map(AnnotationInfo::inner).toList())
- );
- var schemas = new MultiList<>(
- rstream(ap.find(RdfSchema.class, bmcm)).map(AnnotationInfo::inner).toList(),
- reverse(bpm.getAnnotations(RdfSchema.class).map(AnnotationInfo::inner).toList())
- );
-
- rdfs.forEach(x -> {
- if (x.collectionFormat() != RdfCollectionFormat.DEFAULT)
- collectionFormat = x.collectionFormat();
- if (x.beanUri())
- isBeanUri = true;
- });
-
- namespace = RdfUtils.findNamespace(rdfs, schemas);
- }
-
- private RdfBeanPropertyMeta() {
- super(null);
- }
-
- /**
- * Returns the RDF namespace associated with this bean property.
- *
- * <p>
- * Namespace is determined in the following order of {@link Rdf#prefix() @Rdf(prefix)} annotations:
- * <ol>
- * <li>Bean property field.
- * <li>Bean getter.
- * <li>Bean setter.
- * <li>Bean class.
- * <li>Bean package.
- * <li>Bean superclasses.
- * <li>Bean superclass packages.
- * <li>Bean interfaces.
- * <li>Bean interface packages.
- * </ol>
- *
- * @return The namespace associated with this bean property, or <jk>null</jk> if no namespace is associated with it.
- */
- public Namespace getNamespace() { return namespace; }
-
- /**
- * Returns <jk>true</jk> if this bean property is marked with {@link Rdf#beanUri() @Rdf(beanUri)} as <jk>true</jk>.
- *
- * @return <jk>true</jk> if this bean property annotation is <jk>true</jk>.
- */
- public boolean isBeanUri() { return isBeanUri; }
-
- /**
- * Returns the RDF collection format of this property from the {@link Rdf#collectionFormat} annotation on this bean
- * property.
- *
- * @return The RDF collection format, or {@link RdfCollectionFormat#DEFAULT} if annotation not specified.
- */
- protected RdfCollectionFormat getCollectionFormat() { return collectionFormat; }
-}
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfClassMeta.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfClassMeta.java
deleted file mode 100644
index 17275584da..0000000000
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfClassMeta.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.juneau.jena;
-
-import static org.apache.juneau.commons.utils.CollectionUtils.*;
-
-import java.util.*;
-
-import org.apache.juneau.*;
-import org.apache.juneau.xml.*;
-
-/**
- * Metadata on classes specific to the RDF serializers and parsers pulled from the {@link Rdf @Rdf} annotation on the
- * class.
- *
- * <h5 class='section'>See Also:</h5><ul>
- * <li class='link'>{doc jmr.RdfDetails}
-
- * </ul>
- */
-@SuppressWarnings({
- "java:S1612" // Lambdas used instead of method references; annotation attribute access requires explicit lambda form
-})
-public class RdfClassMeta extends ExtendedClassMeta {
-
- private final RdfCollectionFormat collectionFormat;
- private final Namespace namespace;
-
- /**
- * Constructor.
- *
- * @param cm The class that this annotation is defined on.
- * @param mp RDF metadata provider (for finding information about other artifacts).
- */
- public RdfClassMeta(ClassMeta<?> cm, RdfMetaProvider mp) {
- super(cm);
- List<Rdf> rdfs = list();
- List<RdfSchema> schemas = list();
- cm.forEachAnnotation(Rdf.class, x -> true, x -> rdfs.add(x));
- cm.forEachAnnotation(RdfSchema.class, x -> true, x -> schemas.add(x)); // HTT - @RdfSchema targets PACKAGE only; cannot annotate classes with it in tests
-
- this.collectionFormat = rdfs.stream().map(x -> x.collectionFormat()).filter(x -> x != RdfCollectionFormat.DEFAULT).findFirst().orElse(RdfCollectionFormat.DEFAULT);
- this.namespace = RdfUtils.findNamespace(rdfs, schemas);
- }
-
- /**
- * Returns the {@link Rdf#collectionFormat() @Rdf(collectionFormat)} annotation defined on the class.
- *
- * @return The value of the annotation, or <jk>null</jk> if annotation is not
- * specified.
- */
- protected RdfCollectionFormat getCollectionFormat() { return collectionFormat; }
-
- /**
- * Returns the RDF namespace associated with this class.
- *
- * <p>
- * Namespace is determined in the following order of {@link Rdf#prefix() @Rdf(prefix)} annotation:
- * <ol>
- * <li>Class.
- * <li>Package.
- * <li>Superclasses.
- * <li>Superclass packages.
- * <li>Interfaces.
- * <li>Interface packages.
- * </ol>
- *
- * @return The namespace associated with this class, or <jk>null</jk> if no namespace is associated with it.
- */
- protected Namespace getNamespace() { return namespace; }
-}
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfCollectionFormat.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfCollectionFormat.java
deleted file mode 100644
index 88bb72707a..0000000000
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfCollectionFormat.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.juneau.jena;
-
-/**
- * Used in conjunction with the {@link Rdf#collectionFormat() @Rdf(collectionFormat)} annotation to fine-tune how
- * classes, beans, and bean properties are serialized, particularly collections.
- *
- * <h5 class='section'>See Also:</h5><ul>
- * <li class='link'>{doc jmr.RdfDetails}
-
- * </ul>
- */
-public enum RdfCollectionFormat {
-
- /**
- * Default formatting (default).
- *
- * <p>
- * Inherit formatting from parent class or parent package.
- * If no formatting specified at any level, default is {@link #SEQ}.
- */
- DEFAULT,
-
- /**
- * Causes collections and arrays to be rendered as RDF sequences.
- */
- SEQ,
-
- /**
- * Causes collections and arrays to be rendered as RDF bags.
- */
- BAG,
-
- /**
- * Causes collections and arrays to be rendered as RDF lists.
- */
- LIST,
-
- /**
- * Causes collections and arrays to be rendered as multi-valued RDF properties instead of sequences.
- *
- * <p>
- * Note that enabling this setting will cause order of elements in the collection to be lost.
- */
- MULTI_VALUED;
-}
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfConfig.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfConfig.java
deleted file mode 100644
... 530852 lines suppressed ...