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 2022/02/08 14:51:18 UTC
[juneau] branch master updated: Javadocs
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 df51c8f Javadocs
df51c8f is described below
commit df51c8f2235cc38172c8c6c59c43e668928648a9
Author: JamesBognar <ja...@salesforce.com>
AuthorDate: Tue Feb 8 09:50:47 2022 -0500
Javadocs
---
eclipse-preferences/user-dictionary.txt | 12 +
.../main/java/org/apache/juneau/config/Entry.java | 28 +-
.../java/org/apache/juneau/config/Section.java | 88 +-
.../org/apache/juneau/config/vars/ConfigVar.java | 8 +-
.../java/org/apache/juneau/dto/LinkString.java | 2 +-
.../org/apache/juneau/dto/atom/AtomBuilder.java | 4 +-
.../java/org/apache/juneau/dto/atom/Category.java | 2 +-
.../java/org/apache/juneau/dto/atom/Common.java | 2 +-
.../java/org/apache/juneau/dto/atom/Content.java | 2 +-
.../java/org/apache/juneau/dto/atom/Entry.java | 2 +-
.../main/java/org/apache/juneau/dto/atom/Feed.java | 2 +-
.../java/org/apache/juneau/dto/atom/Generator.java | 2 +-
.../main/java/org/apache/juneau/dto/atom/Icon.java | 2 +-
.../main/java/org/apache/juneau/dto/atom/Id.java | 2 +-
.../main/java/org/apache/juneau/dto/atom/Link.java | 2 +-
.../main/java/org/apache/juneau/dto/atom/Logo.java | 2 +-
.../java/org/apache/juneau/dto/atom/Person.java | 2 +-
.../java/org/apache/juneau/dto/atom/Source.java | 2 +-
.../main/java/org/apache/juneau/dto/atom/Text.java | 2 +-
.../java/org/apache/juneau/dto/atom/package.html | 246 +--
.../java/org/apache/juneau/dto/html5/HtmlText.java | 4 +-
.../java/org/apache/juneau/dto/html5/package.html | 40 +-
.../jsonschema/JsonSchemaPropertySimpleArray.java | 6 +-
.../juneau/dto/jsonschema/JsonSchemaRef.java | 4 +-
.../org/apache/juneau/dto/jsonschema/JsonType.java | 4 +-
.../org/apache/juneau/dto/jsonschema/package.html | 414 ++---
.../org/apache/juneau/dto/swagger/Contact.java | 4 +-
.../juneau/dto/swagger/ExternalDocumentation.java | 4 +-
.../org/apache/juneau/dto/swagger/HeaderInfo.java | 11 +-
.../java/org/apache/juneau/dto/swagger/Info.java | 8 +-
.../java/org/apache/juneau/dto/swagger/Items.java | 6 +-
.../org/apache/juneau/dto/swagger/License.java | 5 +-
.../org/apache/juneau/dto/swagger/Operation.java | 10 +-
.../apache/juneau/dto/swagger/ParameterInfo.java | 8 +-
.../apache/juneau/dto/swagger/ResponseInfo.java | 10 +-
.../org/apache/juneau/dto/swagger/SchemaInfo.java | 10 +-
.../apache/juneau/dto/swagger/SecurityScheme.java | 2 +-
.../org/apache/juneau/dto/swagger/Swagger.java | 4 +-
.../java/org/apache/juneau/dto/swagger/Tag.java | 6 +-
.../java/org/apache/juneau/dto/swagger/Xml.java | 6 +-
.../java/org/apache/juneau/jena/RdfParser.java | 16 +-
.../java/org/apache/juneau/jena/RdfSerializer.java | 28 +-
.../apache/juneau/jena/annotation/RdfSchema.java | 4 +-
.../main/java/org/apache/juneau/marshall/N3.java | 14 +-
.../java/org/apache/juneau/marshall/NTriple.java | 14 +-
.../java/org/apache/juneau/marshall/RdfXml.java | 14 +-
.../org/apache/juneau/marshall/RdfXmlAbbrev.java | 14 +-
.../java/org/apache/juneau/marshall/Turtle.java | 14 +-
.../java/org/apache/juneau/AnnotationApplier.java | 2 +-
.../java/org/apache/juneau/BasicPropertyNamer.java | 8 +-
.../main/java/org/apache/juneau/BeanContext.java | 296 ++--
.../java/org/apache/juneau/BeanContextable.java | 300 ++--
.../java/org/apache/juneau/BeanDictionaryList.java | 4 +-
.../java/org/apache/juneau/BeanDictionaryMap.java | 4 +-
.../main/java/org/apache/juneau/BeanFilter.java | 78 +-
.../src/main/java/org/apache/juneau/BeanMap.java | 26 +-
.../main/java/org/apache/juneau/BeanMapEntry.java | 12 +-
.../src/main/java/org/apache/juneau/BeanMeta.java | 18 +-
.../java/org/apache/juneau/BeanMetaFiltered.java | 2 +-
.../java/org/apache/juneau/BeanPropertyMeta.java | 2 +-
.../main/java/org/apache/juneau/BeanSession.java | 22 +-
.../org/apache/juneau/BeanTraverseContext.java | 30 +-
.../main/java/org/apache/juneau/BinaryFormat.java | 4 +-
.../src/main/java/org/apache/juneau/Context.java | 32 +-
.../java/org/apache/juneau/PropertyNamerDLC.java | 6 +-
.../java/org/apache/juneau/PropertyNamerDUCS.java | 6 +-
.../java/org/apache/juneau/PropertyNamerULC.java | 6 +-
.../main/java/org/apache/juneau/UriContext.java | 2 +-
.../main/java/org/apache/juneau/UriResolver.java | 4 +-
.../src/main/java/org/apache/juneau/Version.java | 10 +-
.../main/java/org/apache/juneau/Visibility.java | 2 +-
.../java/org/apache/juneau/annotation/Bean.java | 30 +-
.../org/apache/juneau/annotation/BeanConfig.java | 2 +-
.../java/org/apache/juneau/annotation/Beanc.java | 22 +-
.../java/org/apache/juneau/annotation/Beanp.java | 42 +-
.../java/org/apache/juneau/annotation/Builder.java | 8 +-
.../java/org/apache/juneau/annotation/Example.java | 2 +-
.../org/apache/juneau/annotation/Marshalled.java | 6 +-
.../java/org/apache/juneau/annotation/Name.java | 4 +-
.../java/org/apache/juneau/annotation/Swap.java | 14 +-
.../org/apache/juneau/assertions/AnyAssertion.java | 2 +-
.../apache/juneau/assertions/ArrayAssertion.java | 2 +-
.../org/apache/juneau/assertions/Assertion.java | 4 +-
.../juneau/assertions/AssertionPredicate.java | 12 +-
.../juneau/assertions/AssertionPredicates.java | 2 +-
.../org/apache/juneau/assertions/Assertions.java | 92 +-
.../apache/juneau/assertions/BeanAssertion.java | 6 +-
.../juneau/assertions/BeanListAssertion.java | 2 +-
.../juneau/assertions/ByteArrayAssertion.java | 2 +-
.../juneau/assertions/CollectionAssertion.java | 2 +-
.../apache/juneau/assertions/DateAssertion.java | 2 +-
.../juneau/assertions/FluentAnyAssertion.java | 3 +-
.../juneau/assertions/FluentArrayAssertion.java | 4 +-
.../apache/juneau/assertions/FluentAssertion.java | 12 +-
.../assertions/FluentByteArrayAssertion.java | 20 +-
.../juneau/assertions/FluentDateAssertion.java | 2 +-
.../juneau/assertions/FluentIntegerAssertion.java | 2 +-
.../juneau/assertions/FluentLongAssertion.java | 2 +-
.../juneau/assertions/FluentObjectAssertion.java | 32 +-
.../juneau/assertions/FluentStringAssertion.java | 18 +-
.../assertions/FluentThrowableAssertion.java | 44 +-
.../juneau/assertions/FluentVersionAssertion.java | 2 +-
.../assertions/FluentZonedDateTimeAssertion.java | 2 +-
.../apache/juneau/assertions/IntegerAssertion.java | 2 +-
.../apache/juneau/assertions/ListAssertion.java | 2 +-
.../apache/juneau/assertions/LongAssertion.java | 2 +-
.../org/apache/juneau/assertions/MapAssertion.java | 4 +-
.../apache/juneau/assertions/ObjectAssertion.java | 2 +-
.../juneau/assertions/PrimitiveArrayAssertion.java | 2 +-
.../apache/juneau/assertions/StringAssertion.java | 2 +-
.../juneau/assertions/ThrowableAssertion.java | 2 +-
.../java/org/apache/juneau/assertions/Verify.java | 8 +-
.../apache/juneau/assertions/VersionAssertion.java | 2 +-
.../juneau/assertions/ZonedDateTimeAssertion.java | 2 +-
.../java/org/apache/juneau/collections/AList.java | 14 +-
.../java/org/apache/juneau/collections/AMap.java | 12 +-
.../java/org/apache/juneau/collections/ASet.java | 14 +-
.../org/apache/juneau/collections/ASortedMap.java | 12 +-
.../org/apache/juneau/collections/ASortedSet.java | 14 +-
.../java/org/apache/juneau/collections/Args.java | 68 +-
.../java/org/apache/juneau/collections/OList.java | 136 +-
.../java/org/apache/juneau/collections/OMap.java | 136 +-
.../java/org/apache/juneau/cp/BasicFileFinder.java | 2 +-
.../apache/juneau/cp/BeanCreateMethodFinder.java | 8 +-
.../java/org/apache/juneau/cp/BeanCreator.java | 19 +-
.../main/java/org/apache/juneau/cp/FileFinder.java | 8 +-
.../main/java/org/apache/juneau/cp/Messages.java | 8 +-
.../org/apache/juneau/encoders/EncoderSet.java | 2 +-
.../org/apache/juneau/html/HtmlDocSerializer.java | 30 +-
.../org/apache/juneau/html/HtmlDocTemplate.java | 2 +-
.../juneau/html/HtmlSchemaDocSerializer.java | 2 +-
.../apache/juneau/html/HtmlSchemaSerializer.java | 2 +-
.../org/apache/juneau/html/HtmlSerializer.java | 50 +-
.../org/apache/juneau/html/SimpleHtmlWriter.java | 4 +-
.../org/apache/juneau/html/annotation/Html.java | 4 +-
.../juneau/html/annotation/HtmlDocConfig.java | 24 +-
.../java/org/apache/juneau/http/HttpEntities.java | 24 +-
.../java/org/apache/juneau/http/HttpParts.java | 4 +-
.../java/org/apache/juneau/http/HttpResources.java | 80 +-
.../org/apache/juneau/http/annotation/Body.java | 14 +-
.../org/apache/juneau/http/annotation/Contact.java | 2 +-
.../juneau/http/annotation/ExternalDocs.java | 2 +-
.../apache/juneau/http/annotation/FormData.java | 22 +-
.../apache/juneau/http/annotation/HasFormData.java | 14 +-
.../apache/juneau/http/annotation/HasQuery.java | 14 +-
.../org/apache/juneau/http/annotation/Header.java | 18 +-
.../org/apache/juneau/http/annotation/Items.java | 4 +-
.../org/apache/juneau/http/annotation/License.java | 2 +-
.../org/apache/juneau/http/annotation/Path.java | 14 +-
.../org/apache/juneau/http/annotation/Query.java | 22 +-
.../org/apache/juneau/http/annotation/Request.java | 6 +-
.../apache/juneau/http/annotation/Response.java | 2 +-
.../org/apache/juneau/http/annotation/Schema.java | 26 +-
.../apache/juneau/http/annotation/StatusCode.java | 6 +-
.../org/apache/juneau/http/annotation/Tag.java | 2 +-
.../java/org/apache/juneau/http/header/Accept.java | 14 +-
.../apache/juneau/http/header/AcceptCharset.java | 6 +-
.../apache/juneau/http/header/AcceptEncoding.java | 6 +-
.../apache/juneau/http/header/AcceptLanguage.java | 6 +-
.../apache/juneau/http/header/AcceptRanges.java | 8 +-
.../java/org/apache/juneau/http/header/Age.java | 4 +-
.../java/org/apache/juneau/http/header/Allow.java | 6 +-
.../apache/juneau/http/header/Authorization.java | 4 +-
.../juneau/http/header/BasicBooleanHeader.java | 6 +-
.../juneau/http/header/BasicCsvArrayHeader.java | 11 +-
.../apache/juneau/http/header/BasicDateHeader.java | 8 +-
.../http/header/BasicEntityTagArrayHeader.java | 2 +-
.../juneau/http/header/BasicEntityTagHeader.java | 2 +-
.../juneau/http/header/BasicIntegerHeader.java | 6 +-
.../apache/juneau/http/header/BasicLongHeader.java | 8 +-
.../http/header/BasicMediaRangeArrayHeader.java | 2 +-
.../juneau/http/header/BasicMediaTypeHeader.java | 8 +-
.../juneau/http/header/BasicStringHeader.java | 8 +-
.../http/header/BasicStringRangeArrayHeader.java | 2 +-
.../apache/juneau/http/header/BasicUriHeader.java | 2 +-
.../apache/juneau/http/header/CacheControl.java | 4 +-
.../apache/juneau/http/header/ClientVersion.java | 6 +-
.../org/apache/juneau/http/header/Connection.java | 6 +-
.../juneau/http/header/ContentDisposition.java | 4 +-
.../apache/juneau/http/header/ContentEncoding.java | 6 +-
.../apache/juneau/http/header/ContentLanguage.java | 8 +-
.../apache/juneau/http/header/ContentLength.java | 6 +-
.../apache/juneau/http/header/ContentLocation.java | 4 +-
.../apache/juneau/http/header/ContentRange.java | 8 +-
.../org/apache/juneau/http/header/ContentType.java | 6 +-
.../java/org/apache/juneau/http/header/Date.java | 6 +-
.../java/org/apache/juneau/http/header/Debug.java | 2 +-
.../java/org/apache/juneau/http/header/ETag.java | 6 +-
.../org/apache/juneau/http/header/EntityTag.java | 2 +-
.../java/org/apache/juneau/http/header/Expect.java | 4 +-
.../org/apache/juneau/http/header/Expires.java | 6 +-
.../java/org/apache/juneau/http/header/From.java | 6 +-
.../apache/juneau/http/header/HeaderBeanMeta.java | 2 +-
.../org/apache/juneau/http/header/HeaderList.java | 28 +-
.../java/org/apache/juneau/http/header/Host.java | 6 +-
.../org/apache/juneau/http/header/IfMatch.java | 6 +-
.../apache/juneau/http/header/IfModifiedSince.java | 6 +-
.../org/apache/juneau/http/header/IfNoneMatch.java | 6 +-
.../org/apache/juneau/http/header/IfRange.java | 4 +-
.../juneau/http/header/IfUnmodifiedSince.java | 6 +-
.../apache/juneau/http/header/LastModified.java | 6 +-
.../org/apache/juneau/http/header/Location.java | 6 +-
.../org/apache/juneau/http/header/MaxForwards.java | 4 +-
.../org/apache/juneau/http/header/MediaRanges.java | 2 +-
.../java/org/apache/juneau/http/header/Pragma.java | 4 +-
.../juneau/http/header/ProxyAuthenticate.java | 4 +-
.../juneau/http/header/ProxyAuthorization.java | 4 +-
.../java/org/apache/juneau/http/header/Range.java | 10 +-
.../org/apache/juneau/http/header/Referer.java | 6 +-
.../org/apache/juneau/http/header/RetryAfter.java | 6 +-
.../juneau/http/header/SerializedHeader.java | 8 +-
.../java/org/apache/juneau/http/header/Server.java | 6 +-
.../apache/juneau/http/header/StringRanges.java | 4 +-
.../java/org/apache/juneau/http/header/TE.java | 6 +-
.../java/org/apache/juneau/http/header/Thrown.java | 6 +-
.../org/apache/juneau/http/header/Trailer.java | 4 +-
.../juneau/http/header/TransferEncoding.java | 6 +-
.../org/apache/juneau/http/header/Upgrade.java | 6 +-
.../org/apache/juneau/http/header/UserAgent.java | 6 +-
.../java/org/apache/juneau/http/header/Vary.java | 4 +-
.../java/org/apache/juneau/http/header/Via.java | 12 +-
.../org/apache/juneau/http/header/Warning.java | 4 +-
.../apache/juneau/http/header/WwwAuthenticate.java | 4 +-
.../org/apache/juneau/http/part/PartBeanMeta.java | 2 +-
.../java/org/apache/juneau/http/part/PartList.java | 32 +-
.../apache/juneau/http/part/SerializedPart.java | 8 +-
.../java/org/apache/juneau/http/remote/Remote.java | 2 +-
.../apache/juneau/http/remote/RemoteDelete.java | 4 +-
.../org/apache/juneau/http/remote/RemoteGet.java | 4 +-
.../org/apache/juneau/http/remote/RemoteOp.java | 6 +-
.../org/apache/juneau/http/remote/RemotePost.java | 4 +-
.../org/apache/juneau/http/remote/RemotePut.java | 4 +-
.../apache/juneau/http/resource/HttpResource.java | 4 +-
.../java/org/apache/juneau/internal/DateUtils.java | 16 +-
.../java/org/apache/juneau/internal/HashCode.java | 4 +-
.../org/apache/juneau/internal/StringUtils.java | 6 +-
.../java/org/apache/juneau/json/JsonParser.java | 2 +-
.../apache/juneau/json/JsonSchemaSerializer.java | 2 +-
.../org/apache/juneau/json/JsonSerializer.java | 26 +-
.../org/apache/juneau/json/annotation/Json.java | 8 +-
.../apache/juneau/json/annotation/JsonConfig.java | 2 +-
.../juneau/jsonschema/JsonSchemaGenerator.java | 4 +-
.../jsonschema/annotation/JsonSchemaConfig.java | 6 +-
.../main/java/org/apache/juneau/marshall/Html.java | 14 +-
.../main/java/org/apache/juneau/marshall/Json.java | 14 +-
.../java/org/apache/juneau/marshall/Marshall.java | 68 +-
.../java/org/apache/juneau/marshall/MsgPack.java | 14 +-
.../java/org/apache/juneau/marshall/OpenApi.java | 14 +-
.../java/org/apache/juneau/marshall/PlainText.java | 14 +-
.../org/apache/juneau/marshall/SimpleJson.java | 14 +-
.../main/java/org/apache/juneau/marshall/Uon.java | 14 +-
.../org/apache/juneau/marshall/UrlEncoding.java | 14 +-
.../main/java/org/apache/juneau/marshall/Xml.java | 14 +-
.../java/org/apache/juneau/oapi/OpenApiParser.java | 20 +-
.../org/apache/juneau/oapi/OpenApiSerializer.java | 24 +-
.../apache/juneau/parser/InputStreamParser.java | 4 +-
.../main/java/org/apache/juneau/parser/Parser.java | 54 +-
.../org/apache/juneau/parser/ParserReader.java | 2 +-
.../org/apache/juneau/parser/ParserSession.java | 42 +-
.../java/org/apache/juneau/parser/ParserSet.java | 10 +-
.../org/apache/juneau/parser/ReaderParser.java | 4 +-
.../org/apache/juneau/reflect/AnnotationInfo.java | 1 +
.../org/apache/juneau/reflect/AnnotationList.java | 1 +
.../java/org/apache/juneau/reflect/ClassInfo.java | 11 +-
.../org/apache/juneau/reflect/ConstructorInfo.java | 1 +
.../org/apache/juneau/reflect/ExecutableInfo.java | 1 +
.../java/org/apache/juneau/reflect/FieldInfo.java | 1 +
.../java/org/apache/juneau/reflect/MethodInfo.java | 11 +-
.../java/org/apache/juneau/reflect/Mutater.java | 1 +
.../java/org/apache/juneau/reflect/Mutaters.java | 1 +
.../java/org/apache/juneau/reflect/ParamInfo.java | 1 +
.../org/apache/juneau/reflect/ReflectFlags.java | 1 +
.../juneau/serializer/OutputStreamSerializer.java | 2 +-
.../org/apache/juneau/serializer/Serializer.java | 33 +-
.../apache/juneau/serializer/SerializerSet.java | 14 +-
.../apache/juneau/serializer/SerializerWriter.java | 4 +-
.../apache/juneau/serializer/WriterSerializer.java | 14 +-
.../serializer/annotation/SerializerConfig.java | 4 +-
.../java/org/apache/juneau/svl/MultipartVar.java | 2 +-
.../java/org/apache/juneau/svl/VarResolver.java | 10 +-
.../java/org/apache/juneau/svl/vars/ArgsVar.java | 10 +-
.../apache/juneau/svl/vars/EnvVariablesVar.java | 6 +-
.../java/org/apache/juneau/svl/vars/IfVar.java | 6 +-
.../java/org/apache/juneau/svl/vars/LenVar.java | 6 +-
.../apache/juneau/svl/vars/ManifestFileVar.java | 10 +-
.../apache/juneau/svl/vars/PatternExtractVar.java | 6 +-
.../apache/juneau/svl/vars/PatternMatchVar.java | 6 +-
.../apache/juneau/svl/vars/PatternReplaceVar.java | 6 +-
.../org/apache/juneau/svl/vars/SubstringVar.java | 6 +-
.../java/org/apache/juneau/svl/vars/SwitchVar.java | 6 +-
.../juneau/svl/vars/SystemPropertiesVar.java | 6 +-
.../org/apache/juneau/swap/BeanInterceptor.java | 39 +-
.../org/apache/juneau/swap/FunctionalSwap.java | 4 +-
.../main/java/org/apache/juneau/swap/MapSwap.java | 14 +-
.../java/org/apache/juneau/swap/StringSwap.java | 14 +-
.../java/org/apache/juneau/swap/Surrogate.java | 22 +-
.../main/java/org/apache/juneau/uon/UonParser.java | 6 +-
.../main/java/org/apache/juneau/uon/UonReader.java | 4 +-
.../java/org/apache/juneau/uon/UonSerializer.java | 40 +-
.../juneau/urlencoding/UrlEncodingParser.java | 6 +-
.../juneau/urlencoding/UrlEncodingSerializer.java | 20 +-
.../java/org/apache/juneau/utils/BeanDiff.java | 14 +-
.../main/java/org/apache/juneau/utils/Mutable.java | 9 +-
.../org/apache/juneau/utils/PojoIntrospector.java | 6 +-
.../java/org/apache/juneau/utils/PojoMerge.java | 28 +-
.../java/org/apache/juneau/utils/PojoQuery.java | 8 +-
.../java/org/apache/juneau/utils/PojoRest.java | 56 +-
.../java/org/apache/juneau/utils/SearchArgs.java | 12 +-
.../org/apache/juneau/utils/Tuple2Function.java | 2 +-
.../org/apache/juneau/utils/Tuple3Function.java | 2 +-
.../org/apache/juneau/utils/Tuple4Function.java | 2 +-
.../org/apache/juneau/utils/Tuple5Function.java | 2 +-
.../main/java/org/apache/juneau/xml/XmlParser.java | 6 +-
.../java/org/apache/juneau/xml/XmlSerializer.java | 6 +-
.../java/org/apache/juneau/xml/annotation/Xml.java | 14 +-
.../apache/juneau/xml/annotation/XmlSchema.java | 4 +-
juneau-doc/docs/ReleaseNotes/5.0.0.00.html | 4 +-
juneau-doc/docs/ReleaseNotes/5.0.0.34.html | 2 +-
juneau-doc/docs/ReleaseNotes/5.1.0.17.html | 4 +-
juneau-doc/docs/ReleaseNotes/6.0.0.html | 2 +-
juneau-doc/docs/ReleaseNotes/6.1.0.html | 6 +-
juneau-doc/docs/ReleaseNotes/6.2.0.html | 8 +-
juneau-doc/docs/ReleaseNotes/6.3.0.html | 10 +-
juneau-doc/docs/ReleaseNotes/6.3.1.html | 10 +-
juneau-doc/docs/ReleaseNotes/6.4.0.html | 14 +-
juneau-doc/docs/ReleaseNotes/7.0.0.html | 2 +-
juneau-doc/docs/ReleaseNotes/7.0.1.html | 6 +-
juneau-doc/docs/ReleaseNotes/7.1.0.html | 2 +-
juneau-doc/docs/ReleaseNotes/7.2.0.html | 32 +-
juneau-doc/docs/ReleaseNotes/8.1.0.html | 4 +-
juneau-doc/docs/ReleaseNotes/8.1.1.html | 4 +-
juneau-doc/docs/ReleaseNotes/8.1.3.html | 16 +-
juneau-doc/docs/ReleaseNotes/8.2.0.html | 26 +-
juneau-doc/docs/ReleaseNotes/9.0.0.html | 6 +-
juneau-doc/docs/Topics/01.Overview.html | 4 +-
juneau-doc/docs/Topics/01.Overview/01.o.Core.html | 46 +-
juneau-doc/docs/Topics/01.Overview/02.o.Dto.html | 8 +-
.../docs/Topics/01.Overview/03.o.Config.html | 4 +-
juneau-doc/docs/Topics/01.Overview/04.o.Rest.html | 8 +-
.../docs/Topics/01.Overview/05.o.RestServer.html | 20 +-
.../docs/Topics/01.Overview/06.o.RestClient.html | 4 +-
.../Topics/01.Overview/07.o.GeneralDesign.html | 8 +-
juneau-doc/docs/Topics/02.juneau-marshall.html | 2 +-
.../02.juneau-marshall/01.jm.BeanContexts.html | 2 +-
.../02.jm.SerializersAndParsers.html | 56 +-
.../Topics/02.juneau-marshall/03.jm.Marshalls.html | 4 +-
.../02.juneau-marshall/04.jm.JavaBeansSupport.html | 6 +-
.../01.jm.BeanAnnotation.html | 18 +-
.../02.jm.BeanpAnnotation.html | 20 +-
.../03.jm.BeancAnnotation.html | 12 +-
.../04.jm.BeanIgnoreAnnotation.html | 4 +-
.../05.jm.NamePropertyAnnotation.html | 4 +-
.../06.jm.ParentPropertyAnnotation.html | 2 +-
.../04.jm.JavaBeansSupport/07.jm.PojoBuilders.html | 18 +-
.../08.jm.BypassSerialization.html | 8 +-
.../05.jm.HttpPartSerializersParsers.html | 4 +-
.../02.juneau-marshall/06.jm.ContextSettings.html | 6 +-
.../07.jm.ContextAnnotations.html | 12 +-
.../docs/Topics/02.juneau-marshall/08.jm.OMap.html | 6 +-
.../02.juneau-marshall/09.jm.ComplexDataTypes.html | 6 +-
.../10.jm.SerializerSetsParserSets.html | 8 +-
.../Topics/02.juneau-marshall/11.jm.Swaps.html | 16 +-
.../11.jm.Swaps/02.jm.AutoSwaps.html | 4 +-
.../11.jm.Swaps/03.jm.PerMediaTypeSwaps.html | 8 +-
.../11.jm.Swaps/04.jm.OneWaySwaps.html | 4 +-
.../11.jm.Swaps/05.jm.SwapAnnotation.html | 10 +-
.../11.jm.Swaps/06.jm.TemplatedSwaps.html | 4 +-
.../11.jm.Swaps/07.jm.SurrogateClasses.html | 8 +-
.../12.jm.DynamicallyAppliedAnnotations.html | 6 +-
.../02.juneau-marshall/13.jm.BeanDictionaries.html | 10 +-
.../13.jm.BeanDictionaries/01.jm.BeanSubTypes.html | 16 +-
.../02.juneau-marshall/14.jm.VirtualBeans.html | 4 +-
.../Topics/02.juneau-marshall/15.jm.Recursion.html | 6 +-
.../16.jm.ParsingIntoGenericModels.html | 24 +-
.../17.jm.ReadingContinuousStreams.html | 4 +-
.../02.juneau-marshall/18.jm.MarshallingUris.html | 6 +-
.../02.juneau-marshall/21.jm.FluentAssertions.html | 12 +-
.../22.jm.SimpleVariableLanguage.html | 8 +-
.../01.jm.SvlVariables.html | 2 +-
.../02.jm.VarResolvers.html | 5 +-
.../02.juneau-marshall/26.jm.JsonDetails.html | 8 +-
.../26.jm.JsonDetails/03.jm.SimplifiedJson.html | 8 +-
.../26.jm.JsonDetails/05.jm.JsonAnnotation.html | 2 +-
.../27.jm.JsonSchemaDetails.html | 6 +-
.../02.juneau-marshall/28.jm.XmlDetails.html | 6 +-
.../28.jm.XmlDetails/07.jm.XmlNamespaces.html | 16 +-
.../29.jm.HtmlDetails/04.jm.HtmlAnnotation.html | 10 +-
.../05.jm.HtmlRenderAnnotation.html | 8 +-
.../29.jm.HtmlDetails/06.jm.HtmlDocSerializer.html | 2 +-
.../07.jm.BasicHtmlDocTemplate.html | 2 +-
.../02.juneau-marshall/30.jm.HtmlSchema.html | 4 +-
.../02.juneau-marshall/31.jm.UonDetails.html | 6 +-
.../32.jm.UrlEncodingDetails.html | 6 +-
.../01.jm.OpenApiMethodology.html | 8 +-
.../02.jm.OpenApiSerializers.html | 26 +-
.../34.jm.OpenApiDetails/03.jm.OpenApiParsers.html | 18 +-
juneau-doc/docs/Topics/03.juneau-marshall-rdf.html | 2 +-
.../03.juneau-marshall-rdf/01.jmr.RdfDetails.html | 2 +-
.../01.jmr.RdfDetails/04.jmr.Namespaces.html | 8 +-
.../01.jmr.RdfDetails/05.jmr.UriProperties.html | 10 +-
.../01.jmr.RdfDetails/06.jmr.RootProperty.html | 4 +-
.../01.jmr.RdfDetails/07.jmr.TypedLiterals.html | 56 +-
juneau-doc/docs/Topics/04.juneau-dto.html | 2 +-
.../docs/Topics/04.juneau-dto/02.jd.Atom.html | 6 +-
.../docs/Topics/04.juneau-dto/03.jd.Swagger.html | 10 +-
.../docs/Topics/04.juneau-dto/04.jd.SwaggerUi.html | 8 +-
juneau-doc/docs/Topics/05.juneau-config.html | 2 +-
.../Topics/05.juneau-config/01.jc.Overview.html | 6 +-
.../01.jc.Overview/01.jc.SyntaxRules.html | 18 +-
.../05.juneau-config/02.jc.ReadingEntries.html | 10 +-
.../02.jc.ReadingEntries/01.jc.Pojos.html | 12 +-
.../02.jc.ReadingEntries/02.jc.Arrays.html | 24 +-
.../02.jc.ReadingEntries/03.jc.JCFObjects.html | 12 +-
.../02.jc.ReadingEntries/04.jc.BinaryData.html | 8 +-
.../Topics/05.juneau-config/03.jc.Variables.html | 12 +-
.../03.jc.Variables/01.jc.LogicVariables.html | 8 +-
.../05.juneau-config/04.jc.ModdedEntries.html | 2 +-
.../Topics/05.juneau-config/05.jc.Sections.html | 24 +-
.../05.juneau-config/06.jc.SettingValues.html | 10 +-
.../02.jc.CustomEntrySerialization.html | 8 +-
.../Topics/05.juneau-config/07.jc.Listeners.html | 2 +-
.../05.juneau-config/09.jc.ConfigImports.html | 24 +-
.../05.juneau-config/10.jc.ConfigStores.html | 8 +-
.../10.jc.ConfigStores/01.jc.MemoryStore.html | 2 +-
.../10.jc.ConfigStores/02.jc.FileStore.html | 2 +-
.../10.jc.ConfigStores/03.jc.CustomStores.html | 2 +-
.../05.juneau-config/11.jc.ReadOnlyConfigs.html | 2 +-
.../05.juneau-config/12.jc.ClosingConfigs.html | 2 +-
.../13.jc.SystemDefaultConfig.html | 2 +-
juneau-doc/docs/Topics/06.juneau-rest-server.html | 2 +-
.../01.jrs.HelloWorldExample.html | 6 +-
.../01.jrs.PredefinedClasses.html | 8 +-
.../02.jrs.ChildResources.html | 4 +-
.../03.jrs.PathVariables.html | 2 +-
.../02.jrs.AnnotatedClasses/04.jrs.Deployment.html | 2 +-
.../05.jrs.LifecycleHooks.html | 4 +-
.../03.jrs.RestOpAnnotatedMethods.html | 4 +-
.../01.jrs.InferredHttpMethodsAndPaths.html | 12 +-
.../02.jrs.JavaMethodParameters.html | 2 +-
.../03.jrs.JavaMethodReturnTypes.html | 6 +-
.../04.jrs.JavaMethodThrowableTypes.html | 2 +-
.../05.jrs.PathPatterns.html | 6 +-
.../06.jrs.Matchers.html | 4 +-
.../07.jrs.OverloadingHttpMethods.html | 4 +-
.../06.juneau-rest-server/04.jrs.HttpParts.html | 2 +-
.../04.jrs.HttpParts/01.jrs.PartMarshallers.html | 4 +-
.../02.jrs.HttpPartAnnotations.html | 34 +-
.../04.jrs.HttpParts/03.jrs.DefaultParts.html | 2 +-
.../04.jrs.HttpParts/04.jrs.RequestBeans.html | 8 +-
.../04.jrs.HttpParts/05.jrs.ResponseBeans.html | 10 +-
.../04.jrs.HttpParts/06.jrs.HttpPartApis.html | 4 +-
.../06.juneau-rest-server/05.jrs.Marshalling.html | 8 +-
.../06.jrs.HandlingFormPosts.html | 20 +-
.../06.juneau-rest-server/07.jrs.Guards.html | 12 +-
.../06.juneau-rest-server/08.jrs.Converters.html | 2 +-
.../09.jrs.LocalizedMessages.html | 16 +-
.../06.juneau-rest-server/10.jrs.Encoders.html | 2 +-
.../11.jrs.ConfigurationFiles.html | 32 +-
.../06.juneau-rest-server/12.jrs.SvlVariables.html | 4 +-
.../06.juneau-rest-server/13.jrs.StaticFiles.html | 4 +-
.../14.jrs.ClientVersioning.html | 2 +-
.../01.jrs.BasicRestServletSwagger.html | 2 +-
.../15.jrs.Swagger/02.jrs.BasicSwaggerInfo.html | 12 +-
.../15.jrs.Swagger/03.jrs.SwaggerTags.html | 6 +-
.../15.jrs.Swagger/04.jrs.SwaggerOperations.html | 4 +-
.../15.jrs.Swagger/05.jrs.SwaggerParameters.html | 8 +-
.../15.jrs.Swagger/06.jrs.SwaggerResponses.html | 4 +-
.../15.jrs.Swagger/07.jrs.SwaggerModels.html | 4 +-
.../16.jrs.ExecutionStatistics.html | 2 +-
.../17.jrs.HtmlDocAnnotation.html | 8 +-
.../02.jrs.HtmlWidgets.html | 8 +-
.../03.jrs.HtmlPredefinedWidgets.html | 12 +-
.../04.jrs.HtmlUiCustomization.html | 8 +-
.../05.jrs.HtmlStylesheets.html | 28 +-
.../18.jrs.LoggingAndDebugging.html | 12 +-
.../21.jrs.UsingWithOsgi.html | 6 +-
.../06.juneau-rest-server/22.jrs.Injection.html | 10 +-
.../06.juneau-rest-server/24.jrs.RestContext.html | 2 +-
.../06.juneau-rest-server/25.jrs.RestRpc.html | 30 +-
.../26.jrs.CustomRestContextsAndBuilders.html | 4 +-
.../31.jrs.SerializingUris.html | 4 +-
.../01.jrs.Log4j.html | 2 +-
.../docs/Topics/07.juneau-rest-server-rdf.html | 2 +-
.../docs/Topics/08.juneau-rest-server-jaxrs.html | 2 +-
.../Topics/09.juneau-rest-server-springboot.html | 2 +-
.../01.jrss.Overview.html | 4 +-
.../02.jrss.ChildResources.html | 8 +-
juneau-doc/docs/Topics/10.juneau-rest-client.html | 12 +-
.../01.jrc.PojoMarshalling.html | 10 +-
.../02.jrc.RequestHeaders.html | 12 +-
.../03.jrc.RequestQueryParameters.html | 6 +-
.../04.jrc.RequestFormData.html | 6 +-
.../10.juneau-rest-client/05.jrc.RequestBody.html | 2 +-
.../06.jrc.ResponseStatus.html | 8 +-
.../07.jrc.ResponseHeaders.html | 6 +-
.../10.juneau-rest-client/08.jrc.ResponseBody.html | 20 +-
.../09.jrc.CustomCallHandlers.html | 2 +-
.../10.juneau-rest-client/10.jrc.Interceptors.html | 2 +-
.../10.juneau-rest-client/11.jrc.Proxies.html | 8 +-
.../11.jrc.Proxies/01.jrc.Remote.html | 22 +-
.../11.jrc.Proxies/02.jrc.RemoteMethod.html | 10 +-
.../11.jrc.Proxies/03.jrc.Body.html | 8 +-
.../11.jrc.Proxies/04.jrc.FormData.html | 2 +-
.../11.jrc.Proxies/05.jrc.Query.html | 2 +-
.../11.jrc.Proxies/06.jrc.Header.html | 2 +-
.../11.jrc.Proxies/07.jrc.Path.html | 2 +-
.../11.jrc.Proxies/08.jrc.Request.html | 10 +-
.../11.jrc.Proxies/09.jrc.Response.html | 6 +-
.../10.jrc.DualPurposeInterfaces.html | 12 +-
.../12.jrc.LoggingAndDebugging.html | 6 +-
.../13.jrc.CustomizingHttpClient.html | 2 +-
.../14.jrc.ExtendingRestClient.html | 2 +-
.../01.jrc.AuthenticationBASIC.html | 10 +-
.../02.jrc.AuthenticationForm.html | 2 +-
.../03.jrc.AuthenticationOIDC.html | 2 +-
juneau-doc/docs/Topics/11.juneau-rest-mock.html | 2 +-
.../11.juneau-rest-mock/01.jrm.MockRestClient.html | 14 +-
.../docs/Topics/12.juneau-microservice-core.html | 2 +-
.../01.jmc.Overview.html | 6 +-
.../02.jmc.LifecycleMethods.html | 12 +-
.../12.juneau-microservice-core/03.jmc.Args.html | 48 +-
.../04.jmc.Manifest.html | 18 +-
.../12.juneau-microservice-core/05.jmc.Config.html | 28 +-
.../06.jmc.SystemProperties.html | 2 +-
.../07.jmc.VarResolver.html | 6 +-
.../08.jmc.ConsoleCommands.html | 10 +-
.../09.jmc.Logging.html | 12 +-
.../10.jmc.Listeners.html | 14 +-
.../docs/Topics/13.juneau-microservice-jetty.html | 2 +-
.../01.jmj.Overview.html | 6 +-
.../02.jmj.LifecycleMethods.html | 12 +-
.../03.jmj.ResourceClasses.html | 20 +-
.../05.jmj.Config.html | 72 +-
.../06.jmj.JettyXml.html | 12 +-
.../07.jmj.UiCustomization.html | 58 +-
.../08.jmj.Extending.html | 26 +-
.../01.mjm.Installing.html | 410 ++---
.../14.my-jetty-microservice/02.mjm.Running.html | 4 +-
.../14.my-jetty-microservice/03.mjm.Building.html | 6 +-
.../01.msm.Installing.html | 6 +-
.../02.msm.Running.html | 4 +-
.../03.msm.Building.html | 6 +-
.../docs/Topics/17.juneau-examples-rest.html | 2 +-
.../01.jer.RootResources.html | 6 +-
.../02.jer.HelloWorldResource.html | 6 +-
.../03.jer.DtoExamples.html | 14 +-
.../04.jer.ConfigResource.html | 12 +-
.../05.jer.LogsResource.html | 2 +-
.../01.jerj.Installing.html | 26 +-
.../02.jerj.Running.html | 6 +-
.../03.jerj.Building.html | 8 +-
.../01.jers.Installing.html | 6 +-
.../02.jers.Running.html | 4 +-
.../03.jers.Building.html | 6 +-
.../04.jers.DeployingToHeroku.html | 16 +-
.../docs/Topics/22.Security/01.s.Marshall.html | 12 +-
juneau-doc/docs/Topics/22.Security/02.s.Svl.html | 6 +-
juneau-doc/pom.xml | 18 +-
juneau-doc/src/main/javadoc/overview.html | 1623 ++++++++++----------
juneau-doc/src/main/javadoc/resources/docs.txt | 2 +-
.../src/main/javadoc/resources/fragments/toc.html | 2 +-
.../src/main/javadoc/resources/juneau-code.css | 38 +-
.../juneau/examples/rest/RootResourcesTest.java | 16 +-
.../apache/juneau/microservice/Microservice.java | 42 +-
.../microservice/console/ConsoleCommand.java | 24 +-
.../org/apache/juneau/rest/test/ConfigTest.java | 2 +-
.../juneau/microservice/jetty/JettyLogger.java | 2 +-
.../microservice/jetty/JettyMicroservice.java | 2 +-
.../apache/juneau/rest/client/ResponseBody.java | 94 +-
.../apache/juneau/rest/client/ResponseHeader.java | 14 +-
.../juneau/rest/client/ResponseStatusLine.java | 2 +-
.../apache/juneau/rest/client/RestCallHandler.java | 2 +-
.../juneau/rest/client/RestCallInterceptor.java | 2 +-
.../org/apache/juneau/rest/client/RestClient.java | 386 +++--
.../org/apache/juneau/rest/client/RestRequest.java | 128 +-
.../apache/juneau/rest/client/RestResponse.java | 26 +-
.../assertion/FluentResponseBodyAssertion.java | 36 +-
.../FluentResponseStatusLineAssertion.java | 2 +-
.../org/apache/juneau/rest/mock/MockConsole.java | 6 +-
.../org/apache/juneau/rest/mock/MockLogger.java | 12 +-
.../apache/juneau/rest/mock/MockRestClient.java | 32 +-
.../rest/config/BasicUniversalJenaConfig.java | 4 +-
.../java/org/apache/juneau/rest/RestChild.java | 8 +-
.../java/org/apache/juneau/rest/RestContext.java | 326 ++--
.../java/org/apache/juneau/rest/RestOpContext.java | 74 +-
.../java/org/apache/juneau/rest/RestRequest.java | 58 +-
.../java/org/apache/juneau/rest/RestResponse.java | 6 +-
.../org/apache/juneau/rest/annotation/Attr.java | 10 +-
.../apache/juneau/rest/annotation/HookEvent.java | 38 +-
.../org/apache/juneau/rest/annotation/Inherit.java | 2 +-
.../org/apache/juneau/rest/annotation/Method.java | 4 +-
.../org/apache/juneau/rest/annotation/None.java | 2 +-
.../apache/juneau/rest/annotation/OpSwagger.java | 24 +-
.../org/apache/juneau/rest/annotation/Rest.java | 75 +-
.../apache/juneau/rest/annotation/RestDelete.java | 33 +-
.../org/apache/juneau/rest/annotation/RestGet.java | 39 +-
.../apache/juneau/rest/annotation/RestHook.java | 10 +-
.../org/apache/juneau/rest/annotation/RestOp.java | 60 +-
.../apache/juneau/rest/annotation/RestPost.java | 52 +-
.../org/apache/juneau/rest/annotation/RestPut.java | 52 +-
.../org/apache/juneau/rest/annotation/Swagger.java | 28 +-
.../org/apache/juneau/rest/arg/AttributeArg.java | 2 +-
.../java/org/apache/juneau/rest/arg/BodyArg.java | 2 +-
.../org/apache/juneau/rest/arg/DefaultArg.java | 2 +-
.../org/apache/juneau/rest/arg/FormDataArg.java | 2 +-
.../org/apache/juneau/rest/arg/HasFormDataArg.java | 2 +-
.../org/apache/juneau/rest/arg/HasQueryArg.java | 2 +-
.../java/org/apache/juneau/rest/arg/HeaderArg.java | 2 +-
.../juneau/rest/arg/InputStreamParserArg.java | 2 +-
.../java/org/apache/juneau/rest/arg/MethodArg.java | 2 +-
.../java/org/apache/juneau/rest/arg/ParserArg.java | 2 +-
.../java/org/apache/juneau/rest/arg/PathArg.java | 2 +-
.../java/org/apache/juneau/rest/arg/QueryArg.java | 2 +-
.../apache/juneau/rest/arg/ReaderParserArg.java | 2 +-
.../org/apache/juneau/rest/arg/RequestBeanArg.java | 2 +-
.../apache/juneau/rest/arg/ResponseBeanArg.java | 2 +-
.../apache/juneau/rest/arg/ResponseHeaderArg.java | 2 +-
.../java/org/apache/juneau/rest/arg/RestOpArg.java | 2 +-
.../assertions/FluentRequestBodyAssertion.java | 12 +-
.../org/apache/juneau/rest/beans/Hyperlink.java | 2 +-
.../juneau/rest/beans/ResourceDescription.java | 2 +-
.../apache/juneau/rest/config/BasicJsonConfig.java | 4 +-
.../juneau/rest/config/BasicJsonHtmlConfig.java | 4 +-
.../juneau/rest/config/BasicOpenApiConfig.java | 4 +-
.../juneau/rest/config/BasicSimpleJsonConfig.java | 4 +-
.../juneau/rest/config/BasicUniversalConfig.java | 4 +-
.../apache/juneau/rest/converter/Queryable.java | 6 +-
.../juneau/rest/converter/RestConverter.java | 2 +-
.../apache/juneau/rest/converter/Traversable.java | 2 +-
.../org/apache/juneau/rest/guard/RestGuard.java | 8 +-
.../juneau/rest/httppart/RequestAttributes.java | 4 +-
.../apache/juneau/rest/httppart/RequestBody.java | 30 +-
.../juneau/rest/httppart/RequestFormParam.java | 12 +-
.../juneau/rest/httppart/RequestFormParams.java | 4 +-
.../apache/juneau/rest/httppart/RequestHeader.java | 12 +-
.../juneau/rest/httppart/RequestHeaders.java | 4 +-
.../juneau/rest/httppart/RequestHttpPart.java | 20 +-
.../juneau/rest/httppart/RequestPathParam.java | 12 +-
.../juneau/rest/httppart/RequestPathParams.java | 6 +-
.../juneau/rest/httppart/RequestQueryParam.java | 12 +-
.../juneau/rest/httppart/RequestQueryParams.java | 4 +-
.../juneau/rest/logging/BasicRestLogger.java | 6 +-
.../rest/logging/BasicTestCaptureRestLogger.java | 2 +-
.../juneau/rest/logging/BasicTestRestLogger.java | 4 +-
.../apache/juneau/rest/logging/RestLoggerRule.java | 30 +-
.../apache/juneau/rest/matcher/RestMatcher.java | 2 +-
.../juneau/rest/processor/ResponseProcessor.java | 2 +-
.../juneau/rest/servlet/BasicGroupOperations.java | 2 +-
.../juneau/rest/servlet/BasicRestOperations.java | 2 +-
.../org/apache/juneau/rest/servlet/RestObject.java | 14 +-
.../apache/juneau/rest/servlet/RestServlet.java | 10 +-
.../java/org/apache/juneau/rest/util/UrlPath.java | 2 +-
.../java/org/apache/juneau/rest/vars/FileVar.java | 2 +-
.../juneau/rest/vars/RequestAttributeVar.java | 2 +-
.../juneau/rest/vars/RequestFormDataVar.java | 2 +-
.../apache/juneau/rest/vars/RequestHeaderVar.java | 2 +-
.../apache/juneau/rest/vars/RequestPathVar.java | 2 +-
.../apache/juneau/rest/vars/RequestQueryVar.java | 2 +-
.../apache/juneau/rest/vars/RequestSwaggerVar.java | 2 +-
.../org/apache/juneau/rest/vars/RequestVar.java | 2 +-
.../juneau/rest/widget/ContentTypeMenuItem.java | 2 +-
.../apache/juneau/rest/widget/MenuItemWidget.java | 8 +-
.../apache/juneau/rest/widget/PoweredByApache.java | 2 +-
.../juneau/rest/client/RestCallException_Test.java | 2 +-
.../juneau/rest/client/RestClient_Body_Test.java | 4 +-
.../client/RestClient_Config_BeanContext_Test.java | 106 +-
.../client/RestClient_Config_Context_Test.java | 16 +-
.../rest/client/RestClient_Config_Parser_Test.java | 4 +-
.../client/RestClient_Config_RestClient_Test.java | 36 +-
.../rest/client/RestClient_Marshalls_Test.java | 100 +-
.../rest/client/RestClient_Response_Body_Test.java | 24 +-
.../rest/client/RestClient_Response_Test.java | 4 +-
672 files changed, 5575 insertions(+), 5767 deletions(-)
diff --git a/eclipse-preferences/user-dictionary.txt b/eclipse-preferences/user-dictionary.txt
index d72721d..7fdd673 100644
--- a/eclipse-preferences/user-dictionary.txt
+++ b/eclipse-preferences/user-dictionary.txt
@@ -209,6 +209,9 @@ jena
jetty
jf
jk
+jm
+jma
+jmp
jp
jpeg
js
@@ -223,6 +226,7 @@ jun
juneau
juneaubp
juno
+jv
kbd
keygen
l
@@ -363,6 +367,7 @@ samp
scratchpad
scratchpads
se
+seealso
seemlessly
seg
sept
@@ -502,3 +507,10 @@ timezones
beanp
irs
 
+bjava
+bconsole
+bxml
+bini
+buon
+bcode
+burlenc
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 8840db8..93216ae 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
@@ -138,25 +138,25 @@ public class Entry {
* The type can be a simple type (e.g. beans, strings, numbers) or parameterized type (collections/maps).
*
* <h5 class='section'>Examples:</h5>
- * <p class='bcode w800'>
- * Config cf = Config.<jsm>create</jsm>().name(<js>"MyConfig.cfg"</js>).build();
+ * <p class='bjava'>
+ * Config <jv>config</jv> = Config.<jsm>create</jsm>().name(<js>"MyConfig.cfg"</js>).build();
*
* <jc>// Parse into a linked-list of strings.</jc>
- * List l = cf.get(<js>"MySection/myListOfStrings"</js>).to(LinkedList.<jk>class</jk>, String.<jk>class</jk>);
+ * List <jv>list</jv> = <jv>config</jv>.get(<js>"MySection/myListOfStrings"</js>).to(LinkedList.<jk>class</jk>, String.<jk>class</jk>);
*
* <jc>// Parse into a linked-list of beans.</jc>
- * List l = cf.get(<js>"MySection/myListOfBeans"</js>).to(LinkedList.<jk>class</jk>, MyBean.<jk>class</jk>);
+ * List <jv>list</jv> = <jv>config</jv>.get(<js>"MySection/myListOfBeans"</js>).to(LinkedList.<jk>class</jk>, MyBean.<jk>class</jk>);
*
* <jc>// Parse into a linked-list of linked-lists of strings.</jc>
- * List l = cf.get(<js>"MySection/my2dListOfStrings"</js>).to(LinkedList.<jk>class</jk>,
+ * List <jv>list</jv> = <jv>config</jv>.get(<js>"MySection/my2dListOfStrings"</js>).to(LinkedList.<jk>class</jk>,
* LinkedList.<jk>class</jk>, String.<jk>class</jk>);
*
* <jc>// Parse into a map of string keys/values.</jc>
- * Map m = cf.get(<js>"MySection/myMap"</js>).to(TreeMap.<jk>class</jk>, String.<jk>class</jk>,
+ * Map <jv>map</jv> = <jv>config</jv>.get(<js>"MySection/myMap"</js>).to(TreeMap.<jk>class</jk>, String.<jk>class</jk>,
* String.<jk>class</jk>);
*
* <jc>// Parse into a map containing string keys and values of lists containing beans.</jc>
- * Map m = cf.get(<js>"MySection/myMapOfListsOfBeans"</js>).to(TreeMap.<jk>class</jk>, String.<jk>class</jk>,
+ * Map <jv>map</jv> = <jv>config</jv>.get(<js>"MySection/myMapOfListsOfBeans"</js>).to(TreeMap.<jk>class</jk>, String.<jk>class</jk>,
* List.<jk>class</jk>, MyBean.<jk>class</jk>);
* </p>
*
@@ -195,25 +195,25 @@ public class Entry {
* The type can be a simple type (e.g. beans, strings, numbers) or parameterized type (collections/maps).
*
* <h5 class='section'>Examples:</h5>
- * <p class='bcode w800'>
- * Config cf = Config.<jsm>create</jsm>().name(<js>"MyConfig.cfg"</js>).build();
+ * <p class='bjava'>
+ * Config <jv>config</jv> = Config.<jsm>create</jsm>().name(<js>"MyConfig.cfg"</js>).build();
*
* <jc>// Parse into a linked-list of strings.</jc>
- * List l = cf.get(<js>"MySection/myListOfStrings"</js>).to(LinkedList.<jk>class</jk>, String.<jk>class</jk>);
+ * List <jv>list</jv> = <jv>config</jv>.get(<js>"MySection/myListOfStrings"</js>).to(LinkedList.<jk>class</jk>, String.<jk>class</jk>);
*
* <jc>// Parse into a linked-list of beans.</jc>
- * List l = cf.get(<js>"MySection/myListOfBeans"</js>).to(LinkedList.<jk>class</jk>, MyBean.<jk>class</jk>);
+ * List <jv>list</jv> = <jv>config</jv>.get(<js>"MySection/myListOfBeans"</js>).to(LinkedList.<jk>class</jk>, MyBean.<jk>class</jk>);
*
* <jc>// Parse into a linked-list of linked-lists of strings.</jc>
- * List l = cf.get(<js>"MySection/my2dListOfStrings"</js>).to(LinkedList.<jk>class</jk>,
+ * List <jv>list</jv> = <jv>config</jv>.get(<js>"MySection/my2dListOfStrings"</js>).to(LinkedList.<jk>class</jk>,
* LinkedList.<jk>class</jk>, String.<jk>class</jk>);
*
* <jc>// Parse into a map of string keys/values.</jc>
- * Map m = cf.get(<js>"MySection/myMap"</js>).to(TreeMap.<jk>class</jk>, String.<jk>class</jk>,
+ * Map <jv>map</jv> = <jv>config</jv>.get(<js>"MySection/myMap"</js>).to(TreeMap.<jk>class</jk>, String.<jk>class</jk>,
* String.<jk>class</jk>);
*
* <jc>// Parse into a map containing string keys and values of lists containing beans.</jc>
- * Map m = cf.get(<js>"MySection/myMapOfListsOfBeans"</js>).to(TreeMap.<jk>class</jk>, String.<jk>class</jk>,
+ * Map <jv>map</jv> = <jv>config</jv>.get(<js>"MySection/myMapOfListsOfBeans"</js>).to(TreeMap.<jk>class</jk>, String.<jk>class</jk>,
* List.<jk>class</jk>, MyBean.<jk>class</jk>);
* </p>
*
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 9233415..aecbd05 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
@@ -85,7 +85,7 @@ public class Section {
* Key/value pairs in the config file section get copied as bean property values to the specified bean class.
*
* <h5 class='figure'>Example config file</h5>
- * <p class='bcode w800'>
+ * <p class='bini'>
* <cs>[MyAddress]</cs>
* <ck>name</ck> = <cv>John Smith</cv>
* <ck>street</ck> = <cv>123 Main Street</cv>
@@ -95,18 +95,18 @@ public class Section {
* </p>
*
* <h5 class='figure'>Example bean</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>public class</jk> Address {
- * public String name, street, city;
- * public StateEnum state;
- * public int zip;
+ * <jk>public</jk> String <jf>name</jf>, <jf>street</jf>, <jf>city</jf>;
+ * <jk>public</jk> StateEnum <jf>state</jf>;
+ * <jk>public int</jk> <jf>zip</jf>;
* }
* </p>
*
* <h5 class='figure'>Example usage</h5>
- * <p class='bcode w800'>
- * Config cf = Config.<jsm>create</jsm>().name(<js>"MyConfig.cfg"</js>).build();
- * Address myAddress = cf.getSection(<js>"MySection"</js>).toBean(Address.<jk>class</jk>);
+ * <p class='bjava'>
+ * Config <jv>config</jv> = Config.<jsm>create</jsm>().name(<js>"MyConfig.cfg"</js>).build();
+ * Address <jv>address</jv> = <jv>config</jv>.getSection(<js>"MySection"</js>).toBean(Address.<jk>class</jk>);
* </p>
*
* @param c The bean class to create.
@@ -143,7 +143,7 @@ public class Section {
* Key/value pairs in the config file section get copied as bean property values to the specified bean class.
*
* <h5 class='figure'>Example config file</h5>
- * <p class='bcode w800'>
+ * <p class='bini'>
* <cs>[MyAddress]</cs>
* <ck>name</ck> = <cv>John Smith</cv>
* <ck>street</ck> = <cv>123 Main Street</cv>
@@ -153,18 +153,18 @@ public class Section {
* </p>
*
* <h5 class='figure'>Example bean</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>public class</jk> Address {
- * public String name, street, city;
- * public StateEnum state;
- * public int zip;
+ * <jk>public</jk> String <jf>name</jf>, <jf>street</jf>, <jf>city</jf>;
+ * <jk>public</jk> StateEnum <jf>state</jf>;
+ * <jk>public int</jk> <jf>zip</jf>;
* }
* </p>
*
* <h5 class='figure'>Example usage</h5>
- * <p class='bcode w800'>
- * Config cf = Config.<jsm>create</jsm>().name(<js>"MyConfig.cfg"</js>).build();
- * Address myAddress = cf.getSection(<js>"MySection"</js>).asBean(Address.<jk>class</jk>).orElse(<jk>null</jk>);
+ * <p class='bjava'>
+ * Config <jv>config</jv> = Config.<jsm>create</jsm>().name(<js>"MyConfig.cfg"</js>).build();
+ * Address <jv>address</jv> = <jv>config</jv>.getSection(<js>"MySection"</js>).asBean(Address.<jk>class</jk>).orElse(<jk>null</jk>);
* </p>
*
* @param c The bean class to create.
@@ -208,7 +208,7 @@ public class Section {
* write using getters and setters.
*
* <h5 class='figure'>Example config file</h5>
- * <p class='bcode w800'>
+ * <p class='bini'>
* <cs>[MySection]</cs>
* <ck>string</ck> = <cv>foo</cv>
* <ck>int</ck> = <cv>123</cv>
@@ -219,40 +219,40 @@ public class Section {
* </p>
*
* <h5 class='figure'>Example interface</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>public interface</jk> MyConfigInterface {
*
* String getString();
- * <jk>void</jk> setString(String x);
+ * <jk>void</jk> setString(String <jv>value</jv>);
*
* <jk>int</jk> getInt();
- * <jk>void</jk> setInt(<jk>int</jk> x);
+ * <jk>void</jk> setInt(<jk>int</jk> <jv>value</jv>);
*
* MyEnum getEnum();
- * <jk>void</jk> setEnum(MyEnum x);
+ * <jk>void</jk> setEnum(MyEnum <jv>value</jv>);
*
* MyBean getBean();
- * <jk>void</jk> setBean(MyBean x);
+ * <jk>void</jk> setBean(MyBean <jv>value</jv>);
*
* <jk>int</jk>[][][] getInt3dArray();
- * <jk>void</jk> setInt3dArray(<jk>int</jk>[][][] x);
+ * <jk>void</jk> setInt3dArray(<jk>int</jk>[][][] <jv>value</jv>);
*
* Map<String,List<MyBean[][][]>> getBean1d3dListMap();
- * <jk>void</jk> setBean1d3dListMap(Map<String,List<MyBean[][][]>> x);
+ * <jk>void</jk> setBean1d3dListMap(Map<String,List<MyBean[][][]>> <jv>value</jv>);
* }
* </p>
*
* <h5 class='figure'>Example usage</h5>
- * <p class='bcode w800'>
- * Config cf = Config.<jsm>create</jsm>().name(<js>"MyConfig.cfg"</js>).build();
+ * <p class='bjava'>
+ * Config <jv>config</jv> = Config.<jsm>create</jsm>().name(<js>"MyConfig.cfg"</js>).build();
*
- * MyConfigInterface ci = cf.get(<js>"MySection"</js>).toInterface(MyConfigInterface.<jk>class</jk>);
+ * MyConfigInterface <jv>ci</jv> = <jv>config</jv>.get(<js>"MySection"</js>).toInterface(MyConfigInterface.<jk>class</jk>);
*
- * <jk>int</jk> myInt = ci.getInt();
+ * <jk>int</jk> <jv>myInt</jv> = <jv>ci</jv>.getInt();
*
- * ci.setBean(<jk>new</jk> MyBean());
+ * <jv>ci</jv>.setBean(<jk>new</jk> MyBean());
*
- * cf.save();
+ * <jv>ci</jv>.save();
* </p>
*
* <ul class='notes'>
@@ -293,7 +293,7 @@ public class Section {
* write using getters and setters.
*
* <h5 class='figure'>Example config file</h5>
- * <p class='bcode w800'>
+ * <p class='bini'>
* <cs>[MySection]</cs>
* <ck>string</ck> = <cv>foo</cv>
* <ck>int</ck> = <cv>123</cv>
@@ -304,40 +304,40 @@ public class Section {
* </p>
*
* <h5 class='figure'>Example interface</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>public interface</jk> MyConfigInterface {
*
* String getString();
- * <jk>void</jk> setString(String x);
+ * <jk>void</jk> setString(String <jv>value</jv>);
*
* <jk>int</jk> getInt();
- * <jk>void</jk> setInt(<jk>int</jk> x);
+ * <jk>void</jk> setInt(<jk>int</jk> <jv>value</jv>);
*
* MyEnum getEnum();
- * <jk>void</jk> setEnum(MyEnum x);
+ * <jk>void</jk> setEnum(MyEnum <jv>value</jv>);
*
* MyBean getBean();
- * <jk>void</jk> setBean(MyBean x);
+ * <jk>void</jk> setBean(MyBean <jv>value</jv>);
*
* <jk>int</jk>[][][] getInt3dArray();
- * <jk>void</jk> setInt3dArray(<jk>int</jk>[][][] x);
+ * <jk>void</jk> setInt3dArray(<jk>int</jk>[][][] <jv>value</jv>);
*
* Map<String,List<MyBean[][][]>> getBean1d3dListMap();
- * <jk>void</jk> setBean1d3dListMap(Map<String,List<MyBean[][][]>> x);
+ * <jk>void</jk> setBean1d3dListMap(Map<String,List<MyBean[][][]>> <jv>value</jv>);
* }
* </p>
*
* <h5 class='figure'>Example usage</h5>
- * <p class='bcode w800'>
- * Config cf = Config.<jsm>create</jsm>().name(<js>"MyConfig.cfg"</js>).build();
+ * <p class='bjava'>
+ * Config <jv>config</jv> = Config.<jsm>create</jsm>().name(<js>"MyConfig.cfg"</js>).build();
*
- * MyConfigInterface ci = cf.get(<js>"MySection"</js>).asInterface(MyConfigInterface.<jk>class</jk>).orElse(<jk>null</jk>);
+ * MyConfigInterface <jv>ci</jv> = <jv>config</jv>.get(<js>"MySection"</js>).asInterface(MyConfigInterface.<jk>class</jk>).orElse(<jk>null</jk>);
*
- * <jk>int</jk> myInt = ci.getInt();
+ * <jk>int</jk> <jv>myInt</jv> = <jv>ci</jv>.getInt();
*
- * ci.setBean(<jk>new</jk> MyBean());
+ * <jv>ci</jv>.setBean(<jk>new</jk> MyBean());
*
- * cf.save();
+ * <jv>ci</jv>.save();
* </p>
*
* <ul class='notes'>
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/vars/ConfigVar.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/vars/ConfigVar.java
index 1595003..7944357 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/vars/ConfigVar.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/vars/ConfigVar.java
@@ -25,20 +25,20 @@ import org.apache.juneau.svl.*;
* <p>
* This variable resolver requires that a {@link Config} bean be available in the resolver session bean factory.
*
- * <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <h5 class='figure'>Example:</h5>
+ * <p class='bjava'>
* <jc>// Create a config object.</jc>
* Config <jv>config</jv> = Config.<jsm>create</jsm>().name(<js>"MyConfig.cfg"</js>).build();
*
* <jc>// Create a variable resolver that resolves config file entries (e.g. "$C{MySection/myKey}")</jc>
- * VarResolver <jv>resolver<jv> = VarResolver
+ * VarResolver <jv>resolver</jv> = VarResolver
* .<jsm>create</jsm>()
* .vars(ConfigVar.<jk>class</jk>)
* .bean(Config.<jk>class</jk>, <jv>config</jv>)
* .build();
*
* <jc>// Use it!</jc>
- * System.<jsf>out</jsf>.println(<jv>resolver<jv>.resolve(<js>"Value for myKey in section MySection is $C{MySection/myKey}"</js>));
+ * System.<jsf>out</jsf>.println(<jv>resolver</jv>.resolve(<js>"Value for myKey in section MySection is $C{MySection/myKey}"</js>));
* </p>
*
* <p>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/LinkString.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/LinkString.java
index 18ff32c..54c809b 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/LinkString.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/LinkString.java
@@ -32,7 +32,7 @@ import org.apache.juneau.utils.*;
*
* <p>
* The name and url properties correspond to the following parts of a hyperlink in an HTML document...
- * <p class='bcode w800'>
+ * <p class='bxml'>
* <xt><a</xt> <xa>href</xa>=<xs>'href'</xs><xt>></xt>name<xt></a></xt>
* </p>
*
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/AtomBuilder.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/AtomBuilder.java
index c16e952..0735b04 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/AtomBuilder.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/AtomBuilder.java
@@ -22,10 +22,10 @@ import org.apache.juneau.*;
*
* <p>
* Typically, you'll want to do a static import on this class and then call the methods like so...
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.dto.atom.AtomBuilder.*;
*
- * Feed feed =
+ * Feed <jv>feed</jv> =
* <jsm>feed</jsm>(<js>"tag:juneau.sample.com,2013:1"</js>, <js>"Juneau ATOM specification"</js>,
* <js>"2013-05-08T12:29:29Z"</js>)
* .subtitle(<jsm>text</jsm>(<js>"html"</js>)
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Category.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Category.java
index 7889966..3200df2 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Category.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Category.java
@@ -26,7 +26,7 @@ import org.apache.juneau.xml.annotation.*;
* Represents an <c>atomCategory</c> construct in the RFC4287 specification.
*
* <h5 class='figure'>Schema</h5>
- * <p class='bcode w800'>
+ * <p class='bschema'>
* atomCategory =
* element atom:category {
* atomCommonAttributes,
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Common.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Common.java
index bfc5abc..df0d3d1 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Common.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Common.java
@@ -26,7 +26,7 @@ import org.apache.juneau.xml.annotation.*;
* Represents an <c>atomCommonAttributes</c> construct in the RFC4287 specification.
*
* <h5 class='figure'>Schema</h5>
- * <p class='bcode w800'>
+ * <p class='bschema'>
* atomCommonAttributes =
* attribute xml:base { atomUri }?,
* attribute xml:lang { atomLanguageTag }?,
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Content.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Content.java
index 8d9d7ee..c6c1d92 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Content.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Content.java
@@ -25,7 +25,7 @@ import org.apache.juneau.xml.annotation.*;
* Represents an <c>atomContent</c> construct in the RFC4287 specification.
*
* <h5 class='figure'>Schema</h5>
- * <p class='bcode w800'>
+ * <p class='bschema'>
* atomContent = atomInlineTextContent
* | atomInlineXHTMLContent
* | atomInlineOtherContent
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Entry.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Entry.java
index 34b5c8f..9b82390 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Entry.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Entry.java
@@ -22,7 +22,7 @@ import org.apache.juneau.annotation.*;
* Represents an <c>atomEntry</c> construct in the RFC4287 specification.
*
* <h5 class='figure'>Schema</h5>
- * <p class='bcode w800'>
+ * <p class='bschema'>
* atomEntry =
* element atom:entry {
* atomCommonAttributes,
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Feed.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Feed.java
index cd70204..2931671 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Feed.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Feed.java
@@ -26,7 +26,7 @@ import org.apache.juneau.xml.annotation.*;
* Represents an <c>atomFeed</c> construct in the RFC4287 specification.
*
* <h5 class='figure'>Schema</h5>
- * <p class='bcode w800'>
+ * <p class='bschema'>
* atomFeed =
* element atom:feed {
* atomCommonAttributes,
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Generator.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Generator.java
index d87d6a3..621d8f5 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Generator.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Generator.java
@@ -26,7 +26,7 @@ import org.apache.juneau.xml.annotation.*;
* Represents an <c>atomGenerator</c> construct in the RFC4287 specification.
*
* <h5 class='figure'>Schema</h5>
- * <p class='bcode w800'>
+ * <p class='bschema'>
* atomGenerator = element atom:generator {
* atomCommonAttributes,
* attribute uri { atomUri }?,
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Icon.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Icon.java
index 4a8c4a6..433bda4 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Icon.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Icon.java
@@ -27,7 +27,7 @@ import org.apache.juneau.xml.annotation.*;
* Represents an <c>atomIcon</c> construct in the RFC4287 specification.
*
* <h5 class='figure'>Schema</h5>
- * <p class='bcode w800'>
+ * <p class='bschema'>
* atomIcon = element atom:icon {
* atomCommonAttributes,
* (atomUri)
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Id.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Id.java
index 5b1c75f..09e7959 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Id.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Id.java
@@ -23,7 +23,7 @@ import org.apache.juneau.xml.annotation.*;
* Represents an <c>atomId</c> construct in the RFC4287 specification.
*
* <h5 class='figure'>Schema</h5>
- * <p class='bcode w800'>
+ * <p class='bschema'>
* atomId = element atom:id {
* atomCommonAttributes,
* (atomUri)
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Link.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Link.java
index bae5a6a..b91de86 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Link.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Link.java
@@ -23,7 +23,7 @@ import org.apache.juneau.xml.annotation.*;
* Represents an <c>atomLink</c> construct in the RFC4287 specification.
*
* <h5 class='figure'>Schema</h5>
- * <p class='bcode w800'>
+ * <p class='bschema'>
* atomLink =
* element atom:link {
* atomCommonAttributes,
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Logo.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Logo.java
index d0a4082..424c1ec 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Logo.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Logo.java
@@ -27,7 +27,7 @@ import org.apache.juneau.xml.annotation.*;
* Represents an <c>atomLogo</c> construct in the RFC4287 specification.
*
* <h5 class='figure'>Schema</h5>
- * <p class='bcode w800'>
+ * <p class='bschema'>
* atomLogo = element atom:logo {
* atomCommonAttributes,
* (atomUri)
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Person.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Person.java
index 51f8d2c..809f904 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Person.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Person.java
@@ -24,7 +24,7 @@ import org.apache.juneau.*;
* Represents an <c>atomPersonConstruct</c> construct in the RFC4287 specification.
*
* <h5 class='figure'>Schema</h5>
- * <p class='bcode w800'>
+ * <p class='bschema'>
* atomPersonConstruct =
* atomCommonAttributes,
* (element atom:name { text }
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Source.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Source.java
index ff8a2ae..aae93f4 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Source.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Source.java
@@ -18,7 +18,7 @@ import java.util.*;
* Represents an <c>atomSource</c> construct in the RFC4287 specification.
*
* <h5 class='figure'>Schema</h5>
- * <p class='bcode w800'>
+ * <p class='bschema'>
* atomSource =
* element atom:source {
* atomCommonAttributes,
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Text.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Text.java
index ee1e08e..c6edb6b 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Text.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Text.java
@@ -22,7 +22,7 @@ import org.apache.juneau.xml.annotation.*;
* Represents an <c>atomTextConstruct</c> construct in the RFC4287 specification.
*
* <h5 class='figure'>Schema</h5>
- * <p class='bcode w800'>
+ * <p class='bschema'>
* atomTextConstruct = atomPlainTextConstruct | atomXHTMLTextConstruct
*
* atomPlainTextConstruct =
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/package.html b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/package.html
index 47bb4e1..6feb582 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/package.html
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/package.html
@@ -92,11 +92,11 @@
<br>The following code shows a feed being created programmatically using the
{@link org.apache.juneau.dto.atom.AtomBuilder} class.
</p>
- <p class='bcode w800'>
+ <p class='bjava'>
<jk>import static</jk> org.apache.juneau.dto.atom.AtomBuilder.*;
- Feed feed =
+ 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>)
.subtitle(<jsm>text</jsm>(<js>"html"</js>).text(<js>"Describes <em>stuff</em> about Juneau"</js>))
.links(
@@ -132,16 +132,16 @@
</p>
<h5 class='figure'>Example with no namespaces</h5>
- <p class='bcode w800'>
+ <p class='bjava'>
<jc>// Create a serializer with readable output, no namespaces yet.</jc>
- XmlSerializer s = XmlSerializer.<jsm>create</jsm>().sq().ws().build();
+ XmlSerializer <jv>serializer</jv> = XmlSerializer.<jsm>create</jsm>().sq().ws().build();
<jc>// Serialize to ATOM/XML</jc>
- String atomXml = s.serialize(feed);
+ String <jv>atomXml</jv> = <jv>serializer</jv>.serialize(<jv>feed</jv>);
</p>
<h5 class='figure'>Results</h5>
- <p class='bcode w800'>
+ <p class='bxml'>
<xt><feed></xt>
<xt><id></xt>
tag:juneau.apache.org
@@ -189,16 +189,16 @@
</p>
<h5 class='figure'>Example with namespaces</h5>
- <p class='bcode w800'>
+ <p class='bjava'>
<jc>// Create a serializer with readable output with namespaces.</jc>
- XmlSerializer s = XmlSerializer.<jsm>create</jsm>().sq().ws().build();
+ XmlSerializer <jv>serializer</jv> = XmlSerializer.<jsm>create</jsm>().sq().ws().build();
<jc>// Serialize to ATOM/XML</jc>
- String atomXml = s.serialize(feed);
+ String <jv>atomXml</jv> = <jv>serializer</jv>.serialize(<jv>feed</jv>);
</p>
<h5 class='figure'>Results</h5>
- <p class='bcode w800'>
+ <p class='bxml'>
<xt><atom:feed</xt>
<xa>xmlns</xa>=<xs>'http://www.apache.org/2013/Juneau'</xs>
<xa>xmlns:atom</xa>=<xs>'http://www.w3.org/2005/Atom/'</xs>
@@ -250,16 +250,16 @@
</p>
<h5 class='figure'>Example with namespaces with ATOM as the default namespace</h5>
- <p class='bcode w800'>
+ <p class='bjava'>
<jc>// Create a serializer with readable output with namespaces.</jc>
- XmlSerializer s = XmlSerializer.<jsm>create</jsm>().sq().ws().defaultNamespaceUri(<js>"atom"</js>).build();
+ XmlSerializer <jv>serializer</jv> = XmlSerializer.<jsm>create</jsm>().sq().ws().defaultNamespaceUri(<js>"atom"</js>).build();
<jc>// Serialize to ATOM/XML</jc>
- String atomXml = s.serialize(feed);
+ String <jv>atomXml</jv> = <jv>serializer</jv>.serialize(<jv>feed</jv>);
</p>
<h5 class='figure'>Results</h5>
- <p class='bcode w800'>
+ <p class='bxml'>
<xt><feed</xt>
<xa>xmlns</xa>=<xs>'http://www.w3.org/2005/Atom/'</xs>
<xa>xmlns:xml</xa>=<xs>'http://www.w3.org/XML/1998/namespace'</xs>
@@ -315,16 +315,16 @@
</p>
<h5 class='figure'>ATOM/JSON example</h5>
- <p class='bcode w800'>
+ <p class='bjava'>
<jc>// Get JSON serializer with readable output.</jc>
- JsonSerializer s = SimpleJsonSerializer.<jsf>DEFAULT_READABLE</jsf>;
+ JsonSerializer <jv>serializer</jv> = SimpleJsonSerializer.<jsf>DEFAULT_READABLE</jsf>;
<jc>// Serialize to ATOM/JSON</jc>
- String atomJson = s.serialize(feed);
+ String <jv>atomXml</jv> = <jv>serializer</jv>.serialize(<jv>feed</jv>);
</p>
<h5 class='figure'>Results</h5>
- <p class='bcode w800'>
+ <p class='bjson'>
{
id: {
text: <js>'tag:juneau.apache.org'</js>
@@ -414,112 +414,112 @@
</p>
<h5 class='figure'>ATOM/RDF/XML example</h5>
- <p class='bcode w800'>
+ <p class='bjava'>
<jc>// Get RDF/XML serializer with readable output.</jc>
- RdfSerializer s = RdfSerializer.<jsm>create</jsm>()
+ RdfSerializer <jv>serializer</jv> = RdfSerializer.<jsm>create</jsm>()
.xmlabbrev()
.ws()
.sq()
- .set(RdfProperties.<jsf>RDF_rdfxml_tab</jsf>, 3)
+ .rdfxml_tab(3)
.build();
<jc>// Serialize to ATOM/RDF/XML</jc>
- String atomRdfXml = s.serialize(feed);
+ String <jv>atomRdfXml</jv> = <jv>serializer</jv>.serialize(<jv>feed</jv>);
</p>
<h5 class='figure'>Results</h5>
- <p class='bcode w800'>
+ <p class='bxml'>
<xt><rdf:RDF</xt>
- <xa>xmlns:rdf</xa>=<xs>'http://www.w3.org/1999/02/22-rdf-syntax-ns#'</xs>
- <xa>xmlns:j</xa>=<xs>'http://www.apache.org/juneau/'</xs>
- <xa>xmlns:jp</xa>=<xs>'http://www.apache.org/juneaubp/'</xs>
- <xa>xmlns:atom</xa>=<xs>'http://www.w3.org/2005/Atom/'</xs>
- <xa>xmlns:j.0</xa>=<xs>'http://www.w3.org/XML/1998/'</xs><xt>></xt>
- <xt><rdf:Description></xt>
- <xt><atom:id</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>></xt>
- <xt><atom:text></xt>tag:juneau.apache.org<xt></atom:text></xt>
- <xt></atom:id></xt>
- <xt><atom:links></xt>
- <xt><rdf:Seq></xt>
- <xt><rdf:li</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>></xt>
- <xt><atom:href></xt>http://juneau.apache.org/<xt></atom:href></xt>
- <xt><atom:rel></xt>alternate<xt></atom:rel></xt>
- <xt><atom:type></xt>text/html<xt></atom:type></xt>
- <xt><atom:hreflang></xt>en<xt></atom:hreflang></xt>
- <xt></rdf:li></xt>
- <xt><rdf:li</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>></xt>
- <xt><atom:href></xt>http://juneau.apache.org/feed.atom<xt></atom:href></xt>
- <xt><atom:rel></xt>self<xt></atom:rel></xt>
- <xt><atom:type></xt>application/atom+xml<xt></atom:type></xt>
- <xt></rdf:li></xt>
- <xt></rdf:Seq></xt>
- <xt></atom:links></xt>
- <xt><atom:title</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>></xt>
- <xt><atom:type></xt>text<xt></atom:type></xt>
- <xt><atom:text></xt>Juneau ATOM specification<xt></atom:text></xt>
- <xt></atom:title></xt>
- <xt><atom:updated></xt>2016-01-02T03:04:05Z<xt></atom:updated></xt>
- <xt><atom:generator</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>></xt>
- <xt><atom:uri</xt> <xa>rdf:resource</xa>=<xs>'http://juneau.apache.org/'</xs><xt>/></xt>
- <xt><atom:version></xt>1.0<xt></atom:version></xt>
- <xt><atom:text></xt>Juneau<xt></atom:text></xt>
- <xt></atom:generator></xt>
- <xt><atom:subtitle</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>></xt>
- <xt><atom:type></xt>html<xt></atom:type></xt>
- <xt><atom:text></xt>A &lt;em&gt;lot&lt;/em&gt; of effort went into making this effortless<xt></atom:text></xt>
- <xt></atom:subtitle></xt>
- <xt><atom:entries></xt>
- <xt><rdf:Seq></xt>
- <xt><rdf:li</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>></xt>
- <xt><atom:authors></xt>
- <xt><rdf:Seq></xt>
- <xt><rdf:li</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>></xt>
- <xt><atom:name></xt>James Bognar<xt></atom:name></xt>
- <xt><atom:uri</xt> <xa>rdf:resource</xa>=<xs>'http://juneau.apache.org/'</xs><xt>/></xt>
- <xt><atom:email></xt>james.bognar@salesforce.com<xt></atom:email></xt>
- <xt></rdf:li></xt>
- <xt></rdf:Seq></xt>
- <xt></atom:authors></xt>
- <xt><atom:contributors></xt>
- <xt><rdf:Seq></xt>
- <xt><rdf:li</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>></xt>
- <xt><atom:name></xt>Barry M. Caceres<xt></atom:name></xt>
- <xt></rdf:li></xt>
- <xt></rdf:Seq></xt>
- <xt></atom:contributors></xt>
- <xt><atom:id</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>></xt>
- <xt><atom:text></xt>tag:juneau.apache.org<xt></atom:text></xt>
- <xt></atom:id></xt>
- <xt><atom:links></xt>
- <xt><rdf:Seq></xt>
- <xt><rdf:li</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>></xt>
- <xt><atom:href></xt>http://juneau.apache.org/juneau.atom<xt></atom:href></xt>
- <xt><atom:rel></xt>alternate<xt></atom:rel></xt>
- <xt><atom:type></xt>text/html<xt></atom:type></xt>
- <xt></rdf:li></xt>
- <xt><rdf:li</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>></xt>
- <xt><atom:href></xt>http://juneau.apache.org/audio/juneau_podcast.mp3<xt></atom:href></xt>
- <xt><atom:rel></xt>enclosure<xt></atom:rel></xt>
- <xt><atom:type></xt>audio/mpeg<xt></atom:type></xt>
- <xt><atom:length></xt>12345<xt></atom:length></xt>
- <xt></rdf:li></xt>
- <xt></rdf:Seq></xt>
- <xt></atom:links></xt>
- <xt><atom:title</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>></xt>
- <xt><atom:text></xt>Juneau ATOM specification snapshot<xt></atom:text></xt>
- <xt></atom:title></xt>
- <xt><atom:updated></xt>2016-01-02T03:04:05Z<xt></atom:updated></xt>
- <xt><atom:content</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>></xt>
- <xt><j.0:namespacebase</xt> <xa>rdf:resource</xa>=<xs>'http://www.apache.org/'</xs><xt>/></xt>
- <xt><j.0:namespacelang></xt>en<xt></j.0:namespacelang></xt>
- <xt><atom:type></xt>xhtml<xt></atom:type></xt>
- <xt><atom:text></xt>&lt;div xmlns="http://www.w3.org/1999/xhtml"&gt;&lt;p&gt;&lt;i&gt;[Update: Juneau supports ATOM.]&lt;/i&gt;&lt;/p&gt;&lt;/div&gt;<xt></atom:text></xt>
- <xt></atom:content></xt>
- <xt><atom:published></xt>2016-01-02T03:04:05Z<xt></atom:published></xt>
- <xt></rdf:li></xt>
- <xt></rdf:Seq></xt>
- <xt></atom:entries></xt>
- <xt></rdf:Description></xt>
+ <xa>xmlns:rdf</xa>=<xs>'http://www.w3.org/1999/02/22-rdf-syntax-ns#'</xs>
+ <xa>xmlns:j</xa>=<xs>'http://www.apache.org/juneau/'</xs>
+ <xa>xmlns:jp</xa>=<xs>'http://www.apache.org/juneaubp/'</xs>
+ <xa>xmlns:atom</xa>=<xs>'http://www.w3.org/2005/Atom/'</xs>
+ <xa>xmlns:j.0</xa>=<xs>'http://www.w3.org/XML/1998/'</xs><xt>></xt>
+ <xt><rdf:Description></xt>
+ <xt><atom:id</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>></xt>
+ <xt><atom:text></xt>tag:juneau.apache.org<xt></atom:text></xt>
+ <xt></atom:id></xt>
+ <xt><atom:links></xt>
+ <xt><rdf:Seq></xt>
+ <xt><rdf:li</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>></xt>
+ <xt><atom:href></xt>http://juneau.apache.org/<xt></atom:href></xt>
+ <xt><atom:rel></xt>alternate<xt></atom:rel></xt>
+ <xt><atom:type></xt>text/html<xt></atom:type></xt>
+ <xt><atom:hreflang></xt>en<xt></atom:hreflang></xt>
+ <xt></rdf:li></xt>
+ <xt><rdf:li</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>></xt>
+ <xt><atom:href></xt>http://juneau.apache.org/feed.atom<xt></atom:href></xt>
+ <xt><atom:rel></xt>self<xt></atom:rel></xt>
+ <xt><atom:type></xt>application/atom+xml<xt></atom:type></xt>
+ <xt></rdf:li></xt>
+ <xt></rdf:Seq></xt>
+ <xt></atom:links></xt>
+ <xt><atom:title</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>></xt>
+ <xt><atom:type></xt>text<xt></atom:type></xt>
+ <xt><atom:text></xt>Juneau ATOM specification<xt></atom:text></xt>
+ <xt></atom:title></xt>
+ <xt><atom:updated></xt>2016-01-02T03:04:05Z<xt></atom:updated></xt>
+ <xt><atom:generator</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>></xt>
+ <xt><atom:uri</xt> <xa>rdf:resource</xa>=<xs>'http://juneau.apache.org/'</xs><xt>/></xt>
+ <xt><atom:version></xt>1.0<xt></atom:version></xt>
+ <xt><atom:text></xt>Juneau<xt></atom:text></xt>
+ <xt></atom:generator></xt>
+ <xt><atom:subtitle</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>></xt>
+ <xt><atom:type></xt>html<xt></atom:type></xt>
+ <xt><atom:text></xt>A &lt;em&gt;lot&lt;/em&gt; of effort went into making this effortless<xt></atom:text></xt>
+ <xt></atom:subtitle></xt>
+ <xt><atom:entries></xt>
+ <xt><rdf:Seq></xt>
+ <xt><rdf:li</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>></xt>
+ <xt><atom:authors></xt>
+ <xt><rdf:Seq></xt>
+ <xt><rdf:li</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>></xt>
+ <xt><atom:name></xt>James Bognar<xt></atom:name></xt>
+ <xt><atom:uri</xt> <xa>rdf:resource</xa>=<xs>'http://juneau.apache.org/'</xs><xt>/></xt>
+ <xt><atom:email></xt>james.bognar@salesforce.com<xt></atom:email></xt>
+ <xt></rdf:li></xt>
+ <xt></rdf:Seq></xt>
+ <xt></atom:authors></xt>
+ <xt><atom:contributors></xt>
+ <xt><rdf:Seq></xt>
+ <xt><rdf:li</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>></xt>
+ <xt><atom:name></xt>Barry M. Caceres<xt></atom:name></xt>
+ <xt></rdf:li></xt>
+ <xt></rdf:Seq></xt>
+ <xt></atom:contributors></xt>
+ <xt><atom:id</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>></xt>
+ <xt><atom:text></xt>tag:juneau.apache.org<xt></atom:text></xt>
+ <xt></atom:id></xt>
+ <xt><atom:links></xt>
+ <xt><rdf:Seq></xt>
+ <xt><rdf:li</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>></xt>
+ <xt><atom:href></xt>http://juneau.apache.org/juneau.atom<xt></atom:href></xt>
+ <xt><atom:rel></xt>alternate<xt></atom:rel></xt>
+ <xt><atom:type></xt>text/html<xt></atom:type></xt>
+ <xt></rdf:li></xt>
+ <xt><rdf:li</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>></xt>
+ <xt><atom:href></xt>http://juneau.apache.org/audio/juneau_podcast.mp3<xt></atom:href></xt>
+ <xt><atom:rel></xt>enclosure<xt></atom:rel></xt>
+ <xt><atom:type></xt>audio/mpeg<xt></atom:type></xt>
+ <xt><atom:length></xt>12345<xt></atom:length></xt>
+ <xt></rdf:li></xt>
+ <xt></rdf:Seq></xt>
+ <xt></atom:links></xt>
+ <xt><atom:title</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>></xt>
+ <xt><atom:text></xt>Juneau ATOM specification snapshot<xt></atom:text></xt>
+ <xt></atom:title></xt>
+ <xt><atom:updated></xt>2016-01-02T03:04:05Z<xt></atom:updated></xt>
+ <xt><atom:content</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>></xt>
+ <xt><j.0:namespacebase</xt> <xa>rdf:resource</xa>=<xs>'http://www.apache.org/'</xs><xt>/></xt>
+ <xt><j.0:namespacelang></xt>en<xt></j.0:namespacelang></xt>
+ <xt><atom:type></xt>xhtml<xt></atom:type></xt>
+ <xt><atom:text></xt>&lt;div xmlns="http://www.w3.org/1999/xhtml"&gt;&lt;p&gt;&lt;i&gt;[Update: Juneau supports ATOM.]&lt;/i&gt;&lt;/p&gt;&lt;/div&gt;<xt></atom:text></xt>
+ <xt></atom:content></xt>
+ <xt><atom:published></xt>2016-01-02T03:04:05Z<xt></atom:published></xt>
+ <xt></rdf:li></xt>
+ <xt></rdf:Seq></xt>
+ <xt></atom:entries></xt>
+ <xt></rdf:Description></xt>
<xt></rdf:RDF></xt>
</p>
</div>
@@ -549,18 +549,18 @@
<p>
Use the {@link org.apache.juneau.xml.XmlParser} to convert ATOM/XML feeds back into their original POJOs:
</p>
- <p class='bcode w800'>
- <jc>// Create a serializer with readable output with namespaces</jc>
- XmlSerializer s = XmlSerializer.<jsf>DEFAULT_SQ_READABLE</jsf>;
+ <p class='bjava'>
+ <jc>// Create a serializer with readable output with namespaces</jc>
+ XmlSerializer <jv>serializer</jv> = XmlSerializer.<jsf>DEFAULT_SQ_READABLE</jsf>;
- <jc>// Serialize to ATOM/XML</jc>
- String atomXml = s.serialize(feed);
+ <jc>// Serialize to ATOM/XML</jc>
+ String <jv>atomXml</jv> = <jv>serializer</jv>.serialize(<jv>feed</jv>);
- <jc>// Get an XML parser to convert it back into a POJO</jc>
- XmlParser p = XmlParser.<jsf>DEFAULT</jsf>;
-
- <jc>// Convert the XML back into a POJO</jc>
- Feed feed2 = p.parse(atomXml, Feed.<jk>class</jk>);
+ <jc>// Get an XML parser to convert it back into a POJO</jc>
+ XmlParser <jv>parser</jv> = XmlParser.<jsf>DEFAULT</jsf>;
+
+ <jc>// Convert the XML back into a POJO</jc>
+ Feed <jv>feed2</jv> = <jv>parser</jv>.parse(<jv>atomXml</jv>, Feed.<jk>class</jk>);
</p>
<p>
ATOM Feed objects can also be constructed from the other media types using the appropriate parsers.
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlText.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlText.java
index 54ff057..19ccc3a 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlText.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlText.java
@@ -24,8 +24,8 @@ import org.apache.juneau.xml.annotation.*;
* For example:
*
* <h5 class='figure'>Example:</h5>
- * <p class='bcode w800'>
- * HtmlText t = <jk>new</jk> HtmlText(<js>"<span>&#2753;</span>"</js>);
+ * <p class='bjava'>
+ * HtmlText <jv>htmlText</jv> = <jk>new</jk> HtmlText(<js>"<span>&#2753;</span>"</js>);
* </p>
*
* <ul class='seealso'>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/package.html b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/package.html
index 7bd63bc..7b93eb6 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/package.html
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/package.html
@@ -224,12 +224,12 @@
<p>
Use the {@link org.apache.juneau.html.HtmlParser} to convert HTML5 documents back into their original POJOs:
</p>
- <p class='bcode w800'>
+ <p class='bjava'>
<jc>// Get an HTML parser to convert our generated HTML5 documents back into POJOs.</jc>
- HtmlParser p = HtmlParser.<jsf>DEFAULT</jsf>;
+ HtmlParser <jv>parser</jv> = HtmlParser.<jsf>DEFAULT</jsf>;
<jc>// Convert an HTML table back into a Table object.</jc>
- Table table = p.parse(tableHtml, Table.<jk>class</jk>);
+ Table <jv>table</jv> = <jv>parser</jv>.parse(<jv>tableHtml</jv>, Table.<jk>class</jk>);
</p>
<p>
HTML5 objects can also be constructed from the other media types using the appropriate parsers.
@@ -257,7 +257,7 @@
In this case, we are defining a template for a reusable HTML form with two simple fields.
This gets serialized as an HTML form.
</p>
- <p class='bcode w800'>
+ <p class='bjava'>
<jk>import static</jk> org.apache.juneau.dto.html5.HtmlBuilder.*;
<jd>/**
@@ -270,15 +270,15 @@
<jk>private boolean</jk> <jf>value2</jf>;
<jc>// Some constructor that initializes our fields. </jc>
- <jk>public</jk> FormTemplate(String action, <jk>int</jk> value1, <jk>boolean</jk> value2) {
- <jk>this</jk>.<jf>action</jf> = action;
- <jk>this</jk>.<jf>value1</jf> = value1;
- <jk>this</jk>.<jf>value2</jf> = value2;
+ <jk>public</jk> FormTemplate(String <jv>action</jv>, <jk>int</jk> <jv>value1</jv>, <jk>boolean</jk> <jv>value2</jv>) {
+ <jk>this</jk>.<jf>action</jf> = <jv>action</jv>;
+ <jk>this</jk>.<jf>value1</jf> = <jv>value1</jv>;
+ <jk>this</jk>.<jf>value2</jf> = <jv>value2</jv>;
}
<jc>// Special swap method that converts this template to a serializable bean,
// in this case an HTML5 Form bean. </jc>
- <jk>public</jk> Form swap(BeanSession session) {
+ <jk>public</jk> Form swap(BeanSession <jv>session</jv>) {
<jk>return</jk> <jsm>form</jsm>(<jf>action</jf>,
<jsm>input</jsm>(<js>"text"</js>).name(<js>"v1"</js>).value(<jf>value1</jf>),
<jsm>input</jsm>(<js>"text"</js>).name(<js>"v2"</js>).value(<jf>value2</jf>)
@@ -289,7 +289,7 @@
<p>
When serialized using the HTML or XML serializer, it produces the following:
</p>
- <p class='bcode w800'><xt>
+ <p class='bxml'><xt>
<form <xa>action</xa>='myaction'>
<input <xa>type</xa>=<xs>'text'</xs> <xa>name</xa>=<xs>'v1'</xs> <xa>value</xa>=<xs>'123'</xs>/>
<input <xa>type</xa>=<xs>'text'</xs> <xa>name</xa>=<xs>'v2'</xs> <xa>value</xa>=<xs>'true'</xs>/>
@@ -299,7 +299,7 @@
Support for parsing back into the template class can be accomplished by adding an unswap method or
constructor.
</p>
- <p class='bcode w800'>
+ <p class='bjava'>
<jk>import static</jk> org.apache.juneau.dto.html5.HtmlBuilder.*;
<jd>/**
@@ -314,21 +314,21 @@
<jk>private boolean</jk> <jf>value2</jf>;
<jc>// Our 'unswap' constructor</jc>
- <jk>public</jk> FormTemplate(Form f) {
- <jk>this</jk>.<jf>action</jf> = f.getAttr(<js>"action"</js>);
- <jk>this</jk>.<jf>value1</jf> = f.getChild(Input.<jk>class</jk>, 0)
+ <jk>public</jk> FormTemplate(Form <jv>form</jv>) {
+ <jk>this</jk>.<jf>action</jf> = <jv>form</jv>.getAttr(<js>"action"</js>);
+ <jk>this</jk>.<jf>value1</jf> = <jv>form</jv>.getChild(Input.<jk>class</jk>, 0)
.getAttr(<jk>int</jk>.<jk>class</jk>, <js>"value"</js>);
- <jk>this</jk>.<jf>value2</jf> = f.getChild(Input.<jk>class</jk>, 1)
+ <jk>this</jk>.<jf>value2</jf> = <jv>form</jv>.getChild(Input.<jk>class</jk>, 1)
.getAttr(<jk>boolean</jk>.<jk>class</jk>, <js>"value"</js>);
}
- <jk>public</jk> FormTemplate(String action, <jk>int</jk> value1, <jk>boolean</jk> value2) {
- <jk>this</jk>.<jf>action</jf> = action;
- <jk>this</jk>.<jf>value1</jf> = value1;
- <jk>this</jk>.<jf>value2</jf> = value2;
+ <jk>public</jk> FormTemplate(String <jv>action</jv>, <jk>int</jk> <jv>value1</jv>, <jk>boolean</jk> <jv>value2</jv>) {
+ <jk>this</jk>.<jf>action</jf> = <jv>action</jv>;
+ <jk>this</jk>.<jf>value1</jf> = <jv>value1</jv>;
+ <jk>this</jk>.<jf>value2</jf> = <jv>value2</jv>;
}
- <jk>public</jk> Form swap(BeanSession session) {
+ <jk>public</jk> Form swap(BeanSession <jv>session</jv>) {
<jk>return</jk> <jsm>form</jsm>(<jf>action</jf>,
<jsm>input</jsm>(<js>"text"</js>).name(<js>"v1"</js>).value(<jf>value1</jf>),
<jsm>input</jsm>(<js>"text"</js>).name(<js>"v2"</js>).value(<jf>value2</jf>)
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaPropertySimpleArray.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaPropertySimpleArray.java
index 2fa4fee..1d23278 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaPropertySimpleArray.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaPropertySimpleArray.java
@@ -18,11 +18,11 @@ package org.apache.juneau.dto.jsonschema;
* <p>
* An instance of this object is equivalent to calling...
*
- * <p class='bcode w800'>
- * JsonSchemaProperty p = <jk>new</jk> JsonSchemaProperty(name)
+ * <p class='bjava'>
+ * JsonSchemaProperty <jv>property</jv> = <jk>new</jk> JsonSchemaProperty(<jv>name</jv>)
* .setType(JsonType.<jsf>ARRAY</jsf>)
* .setItems(
- * <jk>new</jk> JsonSchema().setType(elementType)
+ * <jk>new</jk> JsonSchema().setType(<jv>elementType</jv>)
* );
* </p>
*
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaRef.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaRef.java
index 71abc14..3c52a82 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaRef.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaRef.java
@@ -22,8 +22,8 @@ import org.apache.juneau.*;
* <p>
* An instance of this object is equivalent to calling...
*
- * <p class='bcode w800'>
- * JsonSchema s = <jk>new</jk> JsonSchema().setRef(uri);
+ * <p class='bjava'>
+ * JsonSchema <jv>schema</jv> = <jk>new</jk> JsonSchema().setRef(<jv>uri</jv>);
* </p>
*
* <ul class='seealso'>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonType.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonType.java
index acb430f..1714861 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonType.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonType.java
@@ -21,9 +21,9 @@ package org.apache.juneau.dto.jsonschema;
* specification).
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Produces 'number', not 'NUMBER'.</jc>
- * String json = JsonSerializer.<jsf>DEFAULT</jsf>.serialize(JsonType.<jsf>NUMBER</jsf>);
+ * String <jv>json</jv> = JsonSerializer.<jsf>DEFAULT</jsf>.serialize(JsonType.<jsf>NUMBER</jsf>);
* </p>
*
* <ul class='seealso'>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/package.html b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/package.html
index 988d5bd..97b72b3 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/package.html
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/package.html
@@ -88,158 +88,158 @@
<p>
The draft JSON-Schema specification that the JSON-Schema beans are modeled after is as follows:
</p>
- <p class='bcode w800'>
+ <p class='bjson'>
{
- <js>"id"</js>: <js>"http://json-schema.org/draft-04/schema#"</js>,
- <js>"$schema"</js>: <js>"http://json-schema.org/draft-04/schema#"</js>,
- <js>"description"</js>: <js>"Core schema meta-schema"</js>,
- <js>"definitions"</js>: {
- <js>"schemaArray"</js>: {
- <js>"type"</js>: <js>"array"</js>,
- <js>"minItems"</js>: 1,
- <js>"items"</js>: { <js>"$ref"</js>: <js>"#"</js> }
- },
- <js>"positiveInteger"</js>: {
- <js>"type"</js>: <js>"integer"</js>,
- <js>"minimum"</js>: 0
- },
- <js>"positiveIntegerDefault0"</js>: {
- <js>"allOf"</js>: [ { <js>"$ref"</js>: <js>"#/definitions/positiveInteger"</js> },
- { <js>"default"</js>: 0 } ]
- },
- <js>"simpleTypes"</js>: {
- <js>"enum"</js>: [ <js>"array"</js>, <js>"boolean"</js>, <js>"integer"</js>, <js>"null"</js>,
- <js>"number"</js>, <js>"object"</js>, <js>"string"</js> ]
- },
- <js>"stringArray"</js>: {
- <js>"type"</js>: <js>"array"</js>,
- <js>"items"</js>: { <js>"type"</js>: <js>"string"</js> },
- <js>"minItems"</js>: 1,
- <js>"uniqueItems"</js>: <jk>true</jk>
- }
- },
- <js>"type"</js>: <js>"object"</js>,
- <js>"properties"</js>: {
- <js>"id"</js>: {
- <js>"type"</js>: <js>"string"</js>,
- <js>"format"</js>: <js>"uri"</js>
- },
- <js>"$schema"</js>: {
- <js>"type"</js>: <js>"string"</js>,
- <js>"format"</js>: <js>"uri"</js>
- },
- <js>"title"</js>: {
- <js>"type"</js>: <js>"string"</js>
- },
- <js>"description"</js>: {
- <js>"type"</js>: <js>"string"</js>
- },
- <js>"default"</js>: {},
- <js>"multipleOf"</js>: {
- <js>"type"</js>: <js>"number"</js>,
- <js>"minimum"</js>: 0,
- <js>"exclusiveMinimum"</js>: <jk>true</jk>
- },
- <js>"maximum"</js>: {
- <js>"type"</js>: <js>"number"</js>
- },
- <js>"exclusiveMaximum"</js>: {
- <js>"type"</js>: <js>"boolean"</js>,
- <js>"default"</js>: <jk>false</jk>
- },
- <js>"minimum"</js>: {
- <js>"type"</js>: <js>"number"</js>
- },
- <js>"exclusiveMinimum"</js>: {
- <js>"type"</js>: <js>"boolean"</js>,
- <js>"default"</js>: <jk>false</jk>
- },
- <js>"maxLength"</js>: { <js>"$ref"</js>: <js>"#/definitions/positiveInteger"</js> },
- <js>"minLength"</js>: { <js>"$ref"</js>: <js>"#/definitions/positiveIntegerDefault0"</js> },
- <js>"pattern"</js>: {
- <js>"type"</js>: <js>"string"</js>,
- <js>"format"</js>: <js>"regex"</js>
- },
- <js>"additionalItems"</js>: {
- <js>"anyOf"</js>: [
- { <js>"type"</js>: <js>"boolean"</js> },
- { <js>"$ref"</js>: <js>"#"</js> }
- ],
- <js>"default"</js>: {}
- },
- <js>"items"</js>: {
- <js>"anyOf"</js>: [
- { <js>"$ref"</js>: <js>"#"</js> },
- { <js>"$ref"</js>: <js>"#/definitions/schemaArray"</js> }
- ],
- <js>"default"</js>: {}
- },
- <js>"maxItems"</js>: { <js>"$ref"</js>: <js>"#/definitions/positiveInteger"</js> },
- <js>"minItems"</js>: { <js>"$ref"</js>: <js>"#/definitions/positiveIntegerDefault0"</js> },
- <js>"uniqueItems"</js>: {
- <js>"type"</js>: <js>"boolean"</js>,
- <js>"default"</js>: <jk>false</jk>
- },
- <js>"maxProperties"</js>: { <js>"$ref"</js>: <js>"#/definitions/positiveInteger"</js> },
- <js>"minProperties"</js>: { <js>"$ref"</js>: <js>"#/definitions/positiveIntegerDefault0"</js> },
- <js>"required"</js>: { <js>"$ref"</js>: <js>"#/definitions/stringArray"</js> },
- <js>"additionalProperties"</js>: {
- <js>"anyOf"</js>: [
- { <js>"type"</js>: <js>"boolean"</js> },
- { <js>"$ref"</js>: <js>"#"</js> }
- ],
- <js>"default"</js>: {}
- },
- <js>"definitions"</js>: {
- <js>"type"</js>: <js>"object"</js>,
- <js>"additionalProperties"</js>: { <js>"$ref"</js>: <js>"#"</js> },
- <js>"default"</js>: {}
- },
- <js>"properties"</js>: {
- <js>"type"</js>: <js>"object"</js>,
- <js>"additionalProperties"</js>: { <js>"$ref"</js>: <js>"#"</js> },
- <js>"default"</js>: {}
- },
- <js>"patternProperties"</js>: {
- <js>"type"</js>: <js>"object"</js>,
- <js>"additionalProperties"</js>: { <js>"$ref"</js>: <js>"#"</js> },
- <js>"default"</js>: {}
- },
- <js>"dependencies"</js>: {
- <js>"type"</js>: <js>"object"</js>,
- <js>"additionalProperties"</js>: {
- <js>"anyOf"</js>: [
- { <js>"$ref"</js>: <js>"#"</js> },
- { <js>"$ref"</js>: <js>"#/definitions/stringArray"</js> }
- ]
- }
- },
- <js>"enum"</js>: {
- <js>"type"</js>: <js>"array"</js>,
- <js>"minItems"</js>: 1,
- <js>"uniqueItems"</js>: <jk>true</jk>
- },
- <js>"type"</js>: {
- <js>"anyOf"</js>: [
- { <js>"$ref"</js>: <js>"#/definitions/simpleTypes"</js> },
- {
- <js>"type"</js>: <js>"array"</js>,
- <js>"items"</js>: { <js>"$ref"</js>: <js>"#/definitions/simpleTypes"</js> },
- <js>"minItems"</js>: 1,
- <js>"uniqueItems"</js>: <jk>true</jk>
- }
- ]
- },
- <js>"allOf"</js>: { <js>"$ref"</js>: <js>"#/definitions/schemaArray"</js> },
- <js>"anyOf"</js>: { <js>"$ref"</js>: <js>"#/definitions/schemaArray"</js> },
- <js>"oneOf"</js>: { <js>"$ref"</js>: <js>"#/definitions/schemaArray"</js> },
- <js>"not"</js>: { <js>"$ref"</js>: <js>"#"</js> }
- },
- <js>"dependencies"</js>: {
- <js>"exclusiveMaximum"</js>: [ <js>"maximum"</js> ],
- <js>"exclusiveMinimum"</js>: [ <js>"minimum"</js> ]
- },
- <js>"default"</js>: {}
+ <js>"id"</js>: <js>"http://json-schema.org/draft-04/schema#"</js>,
+ <js>"$schema"</js>: <js>"http://json-schema.org/draft-04/schema#"</js>,
+ <js>"description"</js>: <js>"Core schema meta-schema"</js>,
+ <js>"definitions"</js>: {
+ <js>"schemaArray"</js>: {
+ <js>"type"</js>: <js>"array"</js>,
+ <js>"minItems"</js>: 1,
+ <js>"items"</js>: { <js>"$ref"</js>: <js>"#"</js> }
+ },
+ <js>"positiveInteger"</js>: {
+ <js>"type"</js>: <js>"integer"</js>,
+ <js>"minimum"</js>: 0
+ },
+ <js>"positiveIntegerDefault0"</js>: {
+ <js>"allOf"</js>: [ { <js>"$ref"</js>: <js>"#/definitions/positiveInteger"</js> },
+ { <js>"default"</js>: 0 } ]
+ },
+ <js>"simpleTypes"</js>: {
+ <js>"enum"</js>: [ <js>"array"</js>, <js>"boolean"</js>, <js>"integer"</js>, <js>"null"</js>,
+ <js>"number"</js>, <js>"object"</js>, <js>"string"</js> ]
+ },
+ <js>"stringArray"</js>: {
+ <js>"type"</js>: <js>"array"</js>,
+ <js>"items"</js>: { <js>"type"</js>: <js>"string"</js> },
+ <js>"minItems"</js>: 1,
+ <js>"uniqueItems"</js>: <jk>true</jk>
+ }
+ },
+ <js>"type"</js>: <js>"object"</js>,
+ <js>"properties"</js>: {
+ <js>"id"</js>: {
+ <js>"type"</js>: <js>"string"</js>,
+ <js>"format"</js>: <js>"uri"</js>
+ },
+ <js>"$schema"</js>: {
+ <js>"type"</js>: <js>"string"</js>,
+ <js>"format"</js>: <js>"uri"</js>
+ },
+ <js>"title"</js>: {
+ <js>"type"</js>: <js>"string"</js>
+ },
+ <js>"description"</js>: {
+ <js>"type"</js>: <js>"string"</js>
+ },
+ <js>"default"</js>: {},
+ <js>"multipleOf"</js>: {
+ <js>"type"</js>: <js>"number"</js>,
+ <js>"minimum"</js>: 0,
+ <js>"exclusiveMinimum"</js>: <jk>true</jk>
+ },
+ <js>"maximum"</js>: {
+ <js>"type"</js>: <js>"number"</js>
+ },
+ <js>"exclusiveMaximum"</js>: {
+ <js>"type"</js>: <js>"boolean"</js>,
+ <js>"default"</js>: <jk>false</jk>
+ },
+ <js>"minimum"</js>: {
+ <js>"type"</js>: <js>"number"</js>
+ },
+ <js>"exclusiveMinimum"</js>: {
+ <js>"type"</js>: <js>"boolean"</js>,
+ <js>"default"</js>: <jk>false</jk>
+ },
+ <js>"maxLength"</js>: { <js>"$ref"</js>: <js>"#/definitions/positiveInteger"</js> },
+ <js>"minLength"</js>: { <js>"$ref"</js>: <js>"#/definitions/positiveIntegerDefault0"</js> },
+ <js>"pattern"</js>: {
+ <js>"type"</js>: <js>"string"</js>,
+ <js>"format"</js>: <js>"regex"</js>
+ },
+ <js>"additionalItems"</js>: {
+ <js>"anyOf"</js>: [
+ { <js>"type"</js>: <js>"boolean"</js> },
+ { <js>"$ref"</js>: <js>"#"</js> }
+ ],
+ <js>"default"</js>: {}
+ },
+ <js>"items"</js>: {
+ <js>"anyOf"</js>: [
+ { <js>"$ref"</js>: <js>"#"</js> },
+ { <js>"$ref"</js>: <js>"#/definitions/schemaArray"</js> }
+ ],
+ <js>"default"</js>: {}
+ },
+ <js>"maxItems"</js>: { <js>"$ref"</js>: <js>"#/definitions/positiveInteger"</js> },
+ <js>"minItems"</js>: { <js>"$ref"</js>: <js>"#/definitions/positiveIntegerDefault0"</js> },
+ <js>"uniqueItems"</js>: {
+ <js>"type"</js>: <js>"boolean"</js>,
+ <js>"default"</js>: <jk>false</jk>
+ },
+ <js>"maxProperties"</js>: { <js>"$ref"</js>: <js>"#/definitions/positiveInteger"</js> },
+ <js>"minProperties"</js>: { <js>"$ref"</js>: <js>"#/definitions/positiveIntegerDefault0"</js> },
+ <js>"required"</js>: { <js>"$ref"</js>: <js>"#/definitions/stringArray"</js> },
+ <js>"additionalProperties"</js>: {
+ <js>"anyOf"</js>: [
+ { <js>"type"</js>: <js>"boolean"</js> },
+ { <js>"$ref"</js>: <js>"#"</js> }
+ ],
+ <js>"default"</js>: {}
+ },
+ <js>"definitions"</js>: {
+ <js>"type"</js>: <js>"object"</js>,
+ <js>"additionalProperties"</js>: { <js>"$ref"</js>: <js>"#"</js> },
+ <js>"default"</js>: {}
+ },
+ <js>"properties"</js>: {
+ <js>"type"</js>: <js>"object"</js>,
+ <js>"additionalProperties"</js>: { <js>"$ref"</js>: <js>"#"</js> },
+ <js>"default"</js>: {}
+ },
+ <js>"patternProperties"</js>: {
+ <js>"type"</js>: <js>"object"</js>,
+ <js>"additionalProperties"</js>: { <js>"$ref"</js>: <js>"#"</js> },
+ <js>"default"</js>: {}
+ },
+ <js>"dependencies"</js>: {
+ <js>"type"</js>: <js>"object"</js>,
+ <js>"additionalProperties"</js>: {
+ <js>"anyOf"</js>: [
+ { <js>"$ref"</js>: <js>"#"</js> },
+ { <js>"$ref"</js>: <js>"#/definitions/stringArray"</js> }
+ ]
+ }
+ },
+ <js>"enum"</js>: {
+ <js>"type"</js>: <js>"array"</js>,
+ <js>"minItems"</js>: 1,
+ <js>"uniqueItems"</js>: <jk>true</jk>
+ },
+ <js>"type"</js>: {
+ <js>"anyOf"</js>: [
+ { <js>"$ref"</js>: <js>"#/definitions/simpleTypes"</js> },
+ {
+ <js>"type"</js>: <js>"array"</js>,
+ <js>"items"</js>: { <js>"$ref"</js>: <js>"#/definitions/simpleTypes"</js> },
+ <js>"minItems"</js>: 1,
+ <js>"uniqueItems"</js>: <jk>true</jk>
+ }
+ ]
+ },
+ <js>"allOf"</js>: { <js>"$ref"</js>: <js>"#/definitions/schemaArray"</js> },
+ <js>"anyOf"</js>: { <js>"$ref"</js>: <js>"#/definitions/schemaArray"</js> },
+ <js>"oneOf"</js>: { <js>"$ref"</js>: <js>"#/definitions/schemaArray"</js> },
+ <js>"not"</js>: { <js>"$ref"</js>: <js>"#"</js> }
+ },
+ <js>"dependencies"</js>: {
+ <js>"exclusiveMaximum"</js>: [ <js>"maximum"</js> ],
+ <js>"exclusiveMinimum"</js>: [ <js>"minimum"</js> ]
+ },
+ <js>"default"</js>: {}
}
</p>
<p>
@@ -277,7 +277,7 @@
<p>
The following is an example JSON-Schema document:
</p>
- <p class='bcode w800'>
+ <p class='bjson'>
{
<js>"title"</js>: <js>"Example Schema"</js>,
<js>"type"</js>: <js>"object"</js>,
@@ -300,9 +300,9 @@
<p>
This document can be constructing using the following code:
</p>
- <p class='bcode w800'>
+ <p class='bjava'>
<jc>// Create the document object model</jc>
- JsonSchema s = <jk>new</jk> JsonSchema()
+ JsonSchema <jv>schema</jv> = <jk>new</jk> JsonSchema()
.setTitle(<js>"Example Schema"</js>)
.setType(JsonType.<jsf>OBJECT</jsf>)
.addProperties(
@@ -315,52 +315,52 @@
.addRequired(<js>"firstName"</js>, <js>"lastName"</js>);
<jc>// Serialize to JSON</jc>
- String json = JsonSerializer.<jsf>DEFAULT_READABLE</jsf>.serialize(s);
+ String <jv>json</jv> = JsonSerializer.<jsf>DEFAULT_READABLE</jsf>.serialize(<jv>schema</jv>);
</p>
<p>
The following is a more-complex example showing various kinds of constraints.
</p>
- <p class='bcode w800'>
+ <p class='bjson'>
{
- <js>"id"</js>: <js>"http://some.site.somewhere/entry-schema#"</js>,
- <js>"$schema"</js>: <js>"http://json-schema.org/draft-04/schema#"</js>,
- <js>"description"</js>: <js>"schema for an fstab entry"</js>,
- <js>"type"</js>: <js>"object"</js>,
- <js>"required"</js>: [ <js>"storage"</js> ],
- <js>"properties"</js>: {
- <js>"storage"</js>: {
- <js>"type"</js>: <js>"object"</js>,
- <js>"oneOf"</js>: [
- { <js>"$ref"</js>: <js>"#/definitions/diskDevice"</js> },
- { <js>"$ref"</js>: <js>"#/definitions/diskUUID"</js> },
- { <js>"$ref"</js>: <js>"#/definitions/nfs"</js> },
- { <js>"$ref"</js>: <js>"#/definitions/tmpfs"</js> }
- ]
- },
- <js>"fstype"</js>: {
- <js>"enum"</js>: [ <js>"ext3"</js>, <js>"ext4"</js>, <js>"btrfs"</js> ]
- },
- <js>"options"</js>: {
- <js>"type"</js>: <js>"array"</js>,
- <js>"minItems"</js>: 1,
- <js>"items"</js>: { <js>"type"</js>: <js>"string"</js> },
- <js>"uniqueItems"</js>: <jk>true</jk>
- },
- <js>"readonly"</js>: { <js>"type"</js>: <js>"boolean"</js> }
- },
- <js>"definitions"</js>: {
- <js>"diskDevice"</js>: {},
- <js>"diskUUID"</js>: {},
- <js>"nfs"</js>: {},
- <js>"tmpfs"</js>: {}
- }
+ <js>"id"</js>: <js>"http://some.site.somewhere/entry-schema#"</js>,
+ <js>"$schema"</js>: <js>"http://json-schema.org/draft-04/schema#"</js>,
+ <js>"description"</js>: <js>"schema for an fstab entry"</js>,
+ <js>"type"</js>: <js>"object"</js>,
+ <js>"required"</js>: [ <js>"storage"</js> ],
+ <js>"properties"</js>: {
+ <js>"storage"</js>: {
+ <js>"type"</js>: <js>"object"</js>,
+ <js>"oneOf"</js>: [
+ { <js>"$ref"</js>: <js>"#/definitions/diskDevice"</js> },
+ { <js>"$ref"</js>: <js>"#/definitions/diskUUID"</js> },
+ { <js>"$ref"</js>: <js>"#/definitions/nfs"</js> },
+ { <js>"$ref"</js>: <js>"#/definitions/tmpfs"</js> }
+ ]
+ },
+ <js>"fstype"</js>: {
+ <js>"enum"</js>: [ <js>"ext3"</js>, <js>"ext4"</js>, <js>"btrfs"</js> ]
+ },
+ <js>"options"</js>: {
+ <js>"type"</js>: <js>"array"</js>,
+ <js>"minItems"</js>: 1,
+ <js>"items"</js>: { <js>"type"</js>: <js>"string"</js> },
+ <js>"uniqueItems"</js>: <jk>true</jk>
+ },
+ <js>"readonly"</js>: { <js>"type"</js>: <js>"boolean"</js> }
+ },
+ <js>"definitions"</js>: {
+ <js>"diskDevice"</js>: {},
+ <js>"diskUUID"</js>: {},
+ <js>"nfs"</js>: {},
+ <js>"tmpfs"</js>: {}
+ }
}
</p>
<p>
This document can be constructing using the following code:
</p>
- <p class='bcode w800'>
- JsonSchema s = <jk>new</jk> JsonSchema()
+ <p class='bjava'>
+ JsonSchema <jv>schema</jv> = <jk>new</jk> JsonSchema()
.setId(<js>"http://some.site.somewhere/entry-schema#"</js>)
.setSchemaVersionId(<js>"http://json-schema.org/draft-04/schema#"</js>)
.setDescription(<js>"schema for an fstab entry"</js>)
@@ -397,7 +397,7 @@
);
<jc>// Serialize to JSON</jc>
- String json = JsonSerializer.<jsf>DEFAULT_READABLE</jsf>.serialize(s);
+ String <jv>json</jv> = JsonSerializer.<jsf>DEFAULT_READABLE</jsf>.serialize(<jv>schema</jv>);
</p>
@@ -414,23 +414,23 @@
The sample web application includes a REST resource that generates a JSON-Schema document.
We'll use this resource to show what the JSON-Schema document looks like in other languages.
</p>
- <p class='bcode w800'>
+ <p class='bjava'>
<jd>/**
* Sample resource that shows how to serialize JSON-Schema documents.
*/</jd>
<ja>@Rest</ja>(
path=<js>"/jsonSchema"</js>,
messages=<js>"nls/JsonSchemaResource"</js>,
- title=<js>"Sample JSON-Schema document"</js>,
- htmldoc=<ja>@HtmlDoc</ja>(
- navlinks={
- <js>"options: ?method=OPTIONS"</js>
- }
- )
+ title=<js>"Sample JSON-Schema document"</js>
+ )
+ <ja>@HtmlDocConfig</ja>(
+ navlinks={
+ <js>"options: ?method=OPTIONS"</js>
+ }
)
<jk>public class</jk> JsonSchemaResource <jk>extends</jk> BasicRestServlet {
- <jk>private</jk> JsonSchema <jf>schema</jf>; <jc>// The schema document</jc>
+ <jk>private</jk> JsonSchema <jf>schema</jf>; <jc>// The schema document</jc>
<jd>/** Servlet initialization */</jd>
<ja>@Override</ja>
@@ -450,8 +450,8 @@
.setMinimum(0)
)
.addRequired(<js>"firstName"</js>, <js>"lastName"</js>);
- } <jk>catch</jk> (Exception e) {
- <jk>throw new</jk> RuntimeException(e);
+ } <jk>catch</jk> (Exception <jv>e</jv>) {
+ <jk>throw new</jk> RuntimeException(<jv>e</jv>);
}
}
@@ -466,15 +466,15 @@
* Replaces the schema document with the specified content, and then mirrors it as the response.
*/</jd>
<ja>@RestPut</ja>(<js>"/"</js>)
- <jk>public</jk> JsonSchema setSchema(<ja>@Body</ja> JsonSchema schema) <jk>throws</jk> Exception {
- <jk>this</jk>.<jf>schema</jf> = schema;
+ <jk>public</jk> JsonSchema setSchema(<ja>@Body</ja> JsonSchema <jv>schema</jv>) <jk>throws</jk> Exception {
+ <jk>this</jk>.<jf>schema</jf> = <jv>schema</jv>;
<jk>return</jk> <jk>this</jk>.<jf>schema</jf>;
}
<jd>/** OPTIONS request handler */</jd>
<ja>@RestOp</ja>(method=<jsf>OPTIONS</jsf>, path=<js>"/*"</js>)
- <jk>public</jk> ResourceOptions doOptions(RestRequest req) {
- <jk>return new</jk> ResourceOptions(<jk>this</jk>, req);
+ <jk>public</jk> ResourceOptions doOptions(RestRequest <jv>req</jv>) {
+ <jk>return new</jk> ResourceOptions(<jk>this</jk>, <jv>req</jv>);
}
}
</p>
@@ -524,9 +524,9 @@
<p>
Use the {@link org.apache.juneau.json.JsonParser} to parse JSON-Schema documents into DTOs:
</p>
- <p class='bcode w800'>
+ <p class='bjava'>
<jc>// Use parser to load JSON-Schema document into JSON-Schema DTOs</jc>
- Schema schema = JsonParser.<jsf>DEFAULT</jsf>.parse(json, JsonSchema.<jk>class</jk>);
+ Schema <jv>schema</jv> = JsonParser.<jsf>DEFAULT</jsf>.parse(<jv>json</jv>, JsonSchema.<jk>class</jk>);
</p>
<p>
Schema objects can also be constructed from the other media types using the appropriate parsers.
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Contact.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Contact.java
index b53e28d..448aa27 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Contact.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Contact.java
@@ -27,7 +27,7 @@ import org.apache.juneau.internal.*;
* Contact information for the exposed API.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Construct using SwaggerBuilder.</jc>
* Contact <jv>contact</jv> = <jsm>contact</jsm>(<js>"API Support"</js>, <js>"http://www.swagger.io/support"</js>, <js>"support@swagger.io"</js>);
*
@@ -37,7 +37,7 @@ import org.apache.juneau.internal.*;
* <jc>// Or just use toString() which does the same as above.</jc>
* <jv>json</jv> = <jv>contact</jv>.toString();
* </p>
- * <p class='bcode w800'>
+ * <p class='bjson'>
* <jc>// Output</jc>
* {
* <js>"name"</js>: <js>"API Support"</js>,
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ExternalDocumentation.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ExternalDocumentation.java
index 440c7e5..6d4dfbb 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ExternalDocumentation.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ExternalDocumentation.java
@@ -28,7 +28,7 @@ import org.apache.juneau.internal.*;
* Allows referencing an external resource for extended documentation.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Construct using SwaggerBuilder.</jc>
* ExternalDocumentation <jv>extDoc</jv> = <jsm>externalDocumentation</jsm>(<js>"https://swagger.io"</js>, <js>"Find more info here"</js>);
*
@@ -38,7 +38,7 @@ import org.apache.juneau.internal.*;
* <jc>// Or just use toString() which does the same as above.</jc>
* <jv>json</jv> = <jv>extDoc</jv>.toString();
* </p>
- * <p class='bcode w800'>
+ * <p class='bjson'>
* <jc>// Output</jc>
* {
* <js>"description"</js>: <js>"Find more info here"</js>,
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/HeaderInfo.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/HeaderInfo.java
index c659de4..116301a 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/HeaderInfo.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/HeaderInfo.java
@@ -27,7 +27,7 @@ import org.apache.juneau.internal.*;
* Describes a single HTTP header.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Construct using SwaggerBuilder.</jc>
* HeaderInfo <jv>headerInfo</jv> = <jsm>headerInfo</jsm>(<js>"integer"</js>).description(<js>"The number of allowed requests in the current period"</js>);
*
@@ -37,7 +37,7 @@ import org.apache.juneau.internal.*;
* <jc>// Or just use toString() which does the same as above.</jc>
* <jv>json</jv> = <jv>headerInfo</jv>.toString();
* </p>
- * <p class='bcode w800'>
+ * <p class='bjson'>
* <jc>// Output</jc>
* {
* <js>"description"</js>: <js>"The number of allowed requests in the current period"</js>,
@@ -411,11 +411,6 @@ public class HeaderInfo extends SwaggerElement {
/**
* Bean property fluent setter: <property>enum</property>.
*
- * <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
- * _enumJson(<js>"['foo','bar']"</js>);
- * </p>
- *
* @param value
* The new value for this property.
* <br>Strings can be JSON arrays.
@@ -715,7 +710,7 @@ public class HeaderInfo extends SwaggerElement {
* Describes the type of items in the array as raw JSON.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjson'>
* items(<js>"{type:'type',format:'format',...}"</js>);
* </p>
*
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Info.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Info.java
index a216825..a712b63 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Info.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Info.java
@@ -29,7 +29,7 @@ import org.apache.juneau.internal.*;
* in the Swagger-UI for convenience.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Construct using SwaggerBuilder.</jc>
* Info <jv>info</jv> = <jsm>info</jsm>(<js>"Swagger Sample App"</js>, <js>"1.0.1"</js>)
* .description(<js>"This is a sample server Petstore server."</js>)
@@ -47,7 +47,7 @@ import org.apache.juneau.internal.*;
* <jc>// Or just use toString() which does the same as above.</jc>
* <jv>json</jv> = <jv>info</jv>.toString();
* </p>
- * <p class='bcode w800'>
+ * <p class='bjson'>
* <jc>// Output</jc>
* {
* <js>"title"</js>: <js>"Swagger Sample App"</js>,
@@ -179,7 +179,7 @@ public class Info extends SwaggerElement {
* The contact information for the exposed API as raw JSON.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* contact(<js>"{name:'name',url:'url',...}"</js>);
* </p>
*
@@ -318,7 +318,7 @@ public class Info extends SwaggerElement {
* The license information for the exposed API as raw JSON.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* license(<js>"{name:'name',url:'url',...}"</js>);
* </p>
*
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Items.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Items.java
index 03eafbc..17a657a 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Items.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Items.java
@@ -30,7 +30,7 @@ import org.apache.juneau.internal.*;
* It is used by parameter definitions that are not located in "body".
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Construct using SwaggerBuilder.</jc>
* Items <jv>items</jv> = <jsm>items</jsm>(<js>"string"</js>).minLength(2);
*
@@ -40,7 +40,7 @@ import org.apache.juneau.internal.*;
* <jc>// Or just use toString() which does the same as above.</jc>
* <jv>json</jv> = <jv>items</jv>.toString();
* </p>
- * <p class='bcode w800'>
+ * <p class='bjson'>
* <jc>// Output</jc>
* {
* <js>"type"</js>: <js>"string"</js>,
@@ -606,7 +606,7 @@ public class Items extends SwaggerElement {
* Describes the type of items in the array in raw JSON.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* items(<js>"{type:'type',format:'format',...}"</js>);
* </p>
*
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/License.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/License.java
index 1270083..a27cdf8 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/License.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/License.java
@@ -28,16 +28,17 @@ import org.apache.juneau.internal.*;
* License information for the exposed API.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Construct using SwaggerBuilder.</jc>
* License <jv>license</jv> = <jsm>license</jsm>(<js>"Apache 2.0"</js>, <js>"http://www.apache.org/licenses/LICENSE-2.0.html"</js>);
*
* <jc>// Serialize using JsonSerializer.</jc>
+ * String <jv>json</jv> = JsonSerializer.<jsf>DEFAULT</jsf>.toString(<jv>license</jv>);
*
* <jc>// Or just use toString() which does the same as above.</jc>
* <jv>json</jv> = <jv>license</jv>.toString();
* </p>
- * <p class='bcode w800'>
+ * <p class='bjson'>
* <jc>// Output</jc>
* {
* <js>"name"</js>: <js>"Apache 2.0"</js>,
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Operation.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Operation.java
index 044bb93..db97926 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Operation.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Operation.java
@@ -27,7 +27,7 @@ import org.apache.juneau.internal.*;
* Describes a single API operation on a path.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Construct using SwaggerBuilder.</jc>
* Operation <jv>operation</jv> = <jsm>operation</jsm>()
* .tags(<js>"pet"</js>)
@@ -66,7 +66,7 @@ import org.apache.juneau.internal.*;
* <jc>// Or just use toString() which does the same as above.</jc>
* <jv>json</jv> = <jv>operation</jv>.toString();
* </p>
- * <p class='bcode w800'>
+ * <p class='bjson'>
* <jc>// Output</jc>
* {
* <js>"tags"</js>: [
@@ -522,7 +522,7 @@ public class Operation extends SwaggerElement {
* Additional external documentation for this operation as raw JSON.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* externalDocs(<js>"{description:'description',url:'url'}"</js>);
* </p>
*
@@ -969,7 +969,7 @@ public class Operation extends SwaggerElement {
* The list of possible responses as they are returned from executing this operation as raw JSON.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* responses(<js>"{'404':{description:'description',...}}"</js>);
* </p>
*
@@ -1176,7 +1176,7 @@ public class Operation extends SwaggerElement {
* <br>To remove a top-level <c>security</c> declaration, an empty array can be used.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* security(<js>"[{key:['val1','val2']}]"</js>);
* </p>
*
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java
index 1e319bc..eb4c748 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java
@@ -69,7 +69,7 @@ import org.apache.juneau.internal.*;
* </ul>
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Construct using SwaggerBuilder.</jc>
* ParameterInfo <jv>info</jv> = <jsm>parameterInfo</jsm>(<js>"query"</js>, <js>"foo"</js>);
*
@@ -79,7 +79,7 @@ import org.apache.juneau.internal.*;
* <jc>// Or just use toString() which does the same as above.</jc>
* <jv>json</jv> = <jv>info</jv>.toString();
* </p>
- * <p class='bcode w800'>
+ * <p class='bjson'>
* <jc>// Output</jc>
* {
* <js>"in"</js>: <js>"query"</js>,
@@ -932,7 +932,7 @@ public class ParameterInfo extends SwaggerElement {
* Describes the type of items in the array as raw JSON.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* items(<js>"{type:'type',format:'format',...}"</js>);
* </p>
*
@@ -1609,7 +1609,7 @@ public class ParameterInfo extends SwaggerElement {
* The schema defining the type used for the body parameter as raw JSON.
*
* <h5 class='section'>Example:,/h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* schema(<js>"{type:'type',description:'description',...}"</js>);
* </p>
*
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ResponseInfo.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ResponseInfo.java
index 6fb43f4..e4c369f 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ResponseInfo.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ResponseInfo.java
@@ -26,7 +26,7 @@ import org.apache.juneau.internal.*;
* Describes a single response from an API Operation.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Construct using SwaggerBuilder.</jc>
* ResponseInfo <jv>info</jv> = <jsm>responseInfo</jsm>(<js>"A complex object array response"</js>)
* .schema(
@@ -44,7 +44,7 @@ import org.apache.juneau.internal.*;
* <jc>// Or just use toString() which does the same as above.</jc>
* <jv>json</jv> = <jv>info</jv>.toString();
* </p>
- * <p class='bcode w800'>
+ * <p class='bjson'>
* <jc>// Output</jc>
* {
* <js>"description"</js>: <js>"A complex object array response"</js>,
@@ -274,7 +274,7 @@ public class ResponseInfo extends SwaggerElement {
* Bean property fluent setter: <property>examples</property>.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* examples(<js>"{'text/json':{foo:'bar'}}"</js>);
* </p>
*
@@ -376,7 +376,7 @@ public class ResponseInfo extends SwaggerElement {
* A list of headers that are sent with the response as raw JSON.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* headers(<js>"{headerName:{description:'description',...}}"</js>);
* </p>
*
@@ -475,7 +475,7 @@ public class ResponseInfo extends SwaggerElement {
* A definition of the response structure as raw JSON.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* schema(<js>"{type:'type',description:'description',...}"</js>);
* </p>
*
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SchemaInfo.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SchemaInfo.java
index 5851db5..f0d758e 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SchemaInfo.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SchemaInfo.java
@@ -35,7 +35,7 @@ import org.apache.juneau.internal.*;
* Unless stated otherwise, the property definitions follow the JSON Schema specification as referenced here.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Construct using SwaggerBuilder.</jc>
* SchemaInfo <jv>info</jv> = <jsm>schemaInfo</jsm>()
* .type(<js>"string"</js>)
@@ -47,7 +47,7 @@ import org.apache.juneau.internal.*;
* <jc>// Or just use toString() which does the same as above.</jc>
* <jv>json</jv> = <jv>info</jv>.toString();
* </p>
- * <p class='bcode w800'>
+ * <p class='bjson'>
* <jc>// Output</jc>
* {
* <js>"type"</js>: <js>"string"</js>,
@@ -729,7 +729,7 @@ public class SchemaInfo extends SwaggerElement {
* Bean property fluent setter: <property>externalDocs</property>.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* externalDocs(<js>"{description:'description',url:'url'}"</js>);
* </p>
*
@@ -863,7 +863,7 @@ public class SchemaInfo extends SwaggerElement {
* Bean property fluent setter: <property>items</property>.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* items(<js>"{type:'type',format:'format',...}"</js>);
* </p>
*
@@ -1984,7 +1984,7 @@ public class SchemaInfo extends SwaggerElement {
* Bean property fluent setter: <property>xml</property>.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* xml(<js>"{name:'name',namespace:'namespace',...}"</js>);
* </p>
*
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SecurityScheme.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SecurityScheme.java
index 60da262..54c90a1 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SecurityScheme.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SecurityScheme.java
@@ -32,7 +32,7 @@ import org.apache.juneau.internal.*;
* common flows (implicit, password, application and access code).
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjson'>
* <jc>// Basic authentication sample</jc>
* {
* <js>"type"</js>: <js>"basic"</js>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Swagger.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Swagger.java
index f86f10a..8b98865 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Swagger.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Swagger.java
@@ -501,7 +501,7 @@ public class Swagger extends SwaggerElement {
* Additional external documentation as raw JSON.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* externalDocs(<js>"{description:'description',url:'url'}"</js>);
* </p>
*
@@ -645,7 +645,7 @@ public class Swagger extends SwaggerElement {
* Provides metadata about the API as raw JSON.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* info(<js>"{title:'title',description:'description',...}"</js>);
* </p>
*
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Tag.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Tag.java
index 284b2fd..6619799 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Tag.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Tag.java
@@ -28,7 +28,7 @@ import org.apache.juneau.internal.*;
* It is not mandatory to have a Tag Object per tag used there.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Construct using SwaggerBuilder.</jc>
* Tag <jv>tag</jv> = <jsm>tag</jsm>()
* .name(<js>"pet"</js>)
@@ -40,7 +40,7 @@ import org.apache.juneau.internal.*;
* <jc>// Or just use toString() which does the same as above.</jc>
* <jv>json</jv> = <jv>tag</jv>.toString();
* </p>
- * <p class='bcode w800'>
+ * <p class='bjson'>
* <jc>// Output</jc>
* {
* <js>"name"</js>: <js>"pet"</js>,
@@ -209,7 +209,7 @@ public class Tag extends SwaggerElement {
* Additional external documentation for this tag as raw JSON.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* externalDocs(<js>"{description:'description',url:'url'}"</js>);
* </p>
*
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Xml.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Xml.java
index 5a1ce6c..e11e6a0 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Xml.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Xml.java
@@ -29,19 +29,19 @@ import org.apache.juneau.internal.*;
* used to add that information.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Construct using SwaggerBuilder.</jc>
* Xml <jv>xml</jv> = <jsm>xml</jsm>()
* .name(<js>"foo"</js>)
* .namespace(<js>"http://foo"</js>)
*
* <jc>// Serialize using JsonSerializer.</jc>
- * String <jv>json</jv> = JsonSerializer.<jsf>DEFAULT</jsf>.toString(<jv>xml</jv>x);
+ * String <jv>json</jv> = JsonSerializer.<jsf>DEFAULT</jsf>.toString(<jv>xml</jv>);
*
* <jc>// Or just use toString() which does the same as above.</jc>
* <jv>json</jv> = <jv>xml</jv>.toString();
* </p>
- * <p class='bcode w800'>
+ * <p class='bjson'>
* <jc>// Output</jc>
* {
* <js>"name"</js>: <js>"foo"</js>,
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
index 0c84089..f2b532a 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
@@ -834,7 +834,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
* annotated with {@link Rdf#beanUri @Rdf(beanUri=true)}.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* WriterSerializer <jv>serializer</jv> = RdfSerializer
* .<jsm>create</jsm>()
* .xmlabbrev()
@@ -847,21 +847,21 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
* .looseCollections()
* .build();
*
- * List<MyBean> <jv>myList</jv> = createListOfMyBeans();
+ * List<MyBean> <jv>list</jv> = <jsm>createListOfMyBeans</jsm>();
*
* <jc>// Serialize to RDF/XML as loose resources</jc>
- * String <jv>rdfXml</jv> = <jv>serializer</jv>.serialize(<jv>myList</jv>);
+ * String <jv>rdfXml</jv> = <jv>serializer</jv>.serialize(<jv>list</jv>);
*
* <jc>// Parse back into a Java collection</jc>
- * <jv>myList</jv> = <jv>parser</jv>.parse(<jv>rdfXml</jv>, LinkedList.<jk>class</jk>, MyBean.<jk>class</jk>);
+ * <jv>list</jv> = <jv>parser</jv>.parse(<jv>rdfXml</jv>, LinkedList.<jk>class</jk>, MyBean.<jk>class</jk>);
*
- * MyBean[] <jv>myBeans</jv> = createArrayOfMyBeans();
+ * MyBean[] <jv>bean</jv> = <jsm>createArrayOfMyBeans</jsm>();
*
* <jc>// Serialize to RDF/XML as loose resources</jc>
- * <jv>rdfXml</jv> = <jv>serializer</jv>.serialize(<jv>myBeans</jv>);
+ * <jv>rdfXml</jv> = <jv>serializer</jv>.serialize(<jv>beans</jv>);
*
* <jc>// Parse back into a bean array</jc>
- * <jv>myBeans</jv> = <jv>parser</jv>.parse(<jv>rdfXml</jv>, MyBean[].<jk>class</jk>);
+ * <jv>beans</jv> = <jv>parser</jv>.parse(<jv>rdfXml</jv>, MyBean[].<jk>class</jk>);
* </p>
*
* @return This object.
@@ -916,7 +916,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
* When enabled, whitespace in text elements will be automatically trimmed.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Create an RDF parser that trims whitespace.</jc>
* ReaderParser <jv>parser</jv> = RdfParser
* .<jsm>create</jsm>()
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
index 805554c..dd47485 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
@@ -994,7 +994,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* annotated with {@link Rdf#beanUri @Rdf(beanUri=true)}.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* WriterSerializer <jv>serializer</jv> = RdfSerializer
* .<jsm>create</jsm>()
* .xmlabbrev()
@@ -1007,21 +1007,21 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* .looseCollections()
* .build();
*
- * List<MyBean> <jv>myList</jv> = createListOfMyBeans();
+ * List<MyBean> <jv>list</jv> = <jsm>createListOfMyBeans</jsm>();
*
* <jc>// Serialize to RDF/XML as loose resources</jc>
- * String <jv>rdfXml</jv> = <jv>serializer</jv>.serialize(<jv>myList</jv>);
+ * String <jv>rdfXml</jv> = <jv>serializer</jv>.serialize(<jv>list</jv>);
*
* <jc>// Parse back into a Java collection</jc>
- * <jv>myList</jv> = <jv>parser</jv>.parse(<jv>rdfXml</jv>, LinkedList.<jk>class</jk>, MyBean.<jk>class</jk>);
+ * <jv>list</jv> = <jv>parser</jv>.parse(<jv>rdfXml</jv>, LinkedList.<jk>class</jk>, MyBean.<jk>class</jk>);
*
- * MyBean[] <jv>myBeans</jv> = createArrayOfMyBeans();
+ * MyBean[] <jv>beans</jv> = <jsm>createArrayOfMyBeans</jsm>();
*
* <jc>// Serialize to RDF/XML as loose resources</jc>
- * <jv>rdfXml</jv> = <jv>serializer</jv>.serialize(<jv>myBeans</jv>);
+ * <jv>rdfXml</jv> = <jv>serializer</jv>.serialize(<jv>beans</jv>);
*
* <jc>// Parse back into a bean array</jc>
- * <jv>myBeans</jv> = <jv>parser</jv>.parse(<jv>rdfXml</jv>, MyBean[].<jk>class</jk>);
+ * <jv>beans</jv> = <jv>parser</jv>.parse(<jv>rdfXml</jv>, MyBean[].<jk>class</jk>);
* </p>
*
* @return This object.
@@ -1048,7 +1048,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* annotated with {@link Rdf#beanUri @Rdf(beanUri=true)}.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* WriterSerializer <jv>serializer</jv> = RdfSerializer
* .<jsm>create</jsm>()
* .xmlabbrev()
@@ -1061,21 +1061,21 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
* .looseCollections()
* .build();
*
- * List<MyBean> <jv>myList</jv> = createListOfMyBeans();
+ * List<MyBean> <jv>list</jv> = <jsm>createListOfMyBeans</jsm>();
*
* <jc>// Serialize to RDF/XML as loose resources</jc>
- * String <jv>rdfXml</jv> = <jv>serializer</jv>.serialize(<jv>myList</jv>);
+ * String <jv>rdfXml</jv> = <jv>serializer</jv>.serialize(<jv>list</jv>);
*
* <jc>// Parse back into a Java collection</jc>
- * <jv>myList</jv> = <jv>parser</jv>.parse(<jv>rdfXml</jv>, LinkedList.<jk>class</jk>, MyBean.<jk>class</jk>);
+ * <jv>list</jv> = <jv>parser</jv>.parse(<jv>rdfXml</jv>, LinkedList.<jk>class</jk>, MyBean.<jk>class</jk>);
*
- * MyBean[] <jv>myBeans</jv> = createArrayOfMyBeans();
+ * MyBean[] <jv>beans</jv> = <jsm>createArrayOfMyBeans</jsm>();
*
* <jc>// Serialize to RDF/XML as loose resources</jc>
- * <jv>rdfXml</jv> = <jv>serializer</jv>.serialize(<jv>myBeans</jv>);
+ * <jv>rdfXml</jv> = <jv>serializer</jv>.serialize(<jv>beans</jv>);
*
* <jc>// Parse back into a bean array</jc>
- * <jv>myBeans</jv> = <jv>parser</jv>.parse(<jv>rdfXml</jv>, MyBean[].<jk>class</jk>);
+ * <jv>beans</jv> = <jv>parser</jv>.parse(<jv>rdfXml</jv>, MyBean[].<jk>class</jk>);
* </p>
*
* @param value
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfSchema.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfSchema.java
index 19c4b44..7c843a3 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfSchema.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfSchema.java
@@ -62,7 +62,7 @@ public @interface RdfSchema {
* <h5 class='section'>Example:</h5>
*
* Contents of <c>package-info.java</c>...
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// XML namespaces used within this package.</jc>
* <ja>@RdfSchema</ja>(prefix=<js>"ab"</js>,
* namespaces={
@@ -78,7 +78,7 @@ public @interface RdfSchema {
*
* <p>
* Class in package using defined namespaces...
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>package</jk> org.apache.juneau.examples.addressbook;
*
* <jc>// Bean class, override "ab" namespace on package.</jc>
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshall/N3.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshall/N3.java
index 6f76f46..e97f417 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshall/N3.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshall/N3.java
@@ -21,16 +21,16 @@ import org.apache.juneau.jena.*;
* The general idea is to combine a single serializer and parser inside a simplified API for reading and writing POJOs.
*
* <h5 class='figure'>Examples:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Using instance.</jc>
- * N3 n3 = <jk>new</jk> N3();
- * MyPojo myPojo = n3.read(string, MyPojo.<jk>class</jk>);
- * String string = n3.write(myPojo);
+ * N3 <jv>n3</jv> = <jk>new</jk> N3();
+ * MyPojo <jv>myPojo</jv> = <jv>n3</jv>.read(<jv>string</jv>, MyPojo.<jk>class</jk>);
+ * String <jv>string</jv> = <jv>n3</jv>.write(<jv>myPojo</jv>);
* </p>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Using DEFAULT instance.</jc>
- * MyPojo myPojo = N3.<jsf>DEFAULT</jsf>.read(string, MyPojo.<jk>class</jk>);
- * String string = N3.<jsf>DEFAULT</jsf>.write(myPojo);
+ * MyPojo <jv>myPojo</jv> = N3.<jsf>DEFAULT</jsf>.read(<jv>string</jv>, MyPojo.<jk>class</jk>);
+ * String <jv>string</jv> = N3.<jsf>DEFAULT</jsf>.write(<jv>myPojo</jv>);
* </p>
*
* <ul class='seealso'>
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshall/NTriple.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshall/NTriple.java
index eae6934..502dd15 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshall/NTriple.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshall/NTriple.java
@@ -21,16 +21,16 @@ import org.apache.juneau.jena.*;
* The general idea is to combine a single serializer and parser inside a simplified API for reading and writing POJOs.
*
* <h5 class='figure'>Examples:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Using instance.</jc>
- * NTriple nTriple = <jk>new</jk> NTriple();
- * MyPojo myPojo = nTriple.read(string, MyPojo.<jk>class</jk>);
- * String string = nTriple.write(myPojo);
+ * NTriple <jv>nTriple</jv> = <jk>new</jk> NTriple();
+ * MyPojo <jv>myPojo</jv> = <jv>nTriple</jv>.read(<jv>string</jv>, MyPojo.<jk>class</jk>);
+ * String <jv>string</jv> = <jv>nTriple</jv>.write(<jv>myPojo</jv>);
* </p>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Using DEFAULT instance.</jc>
- * MyPojo myPojo = NTriple.<jsf>DEFAULT</jsf>.read(string, MyPojo.<jk>class</jk>);
- * String string = NTriple.<jsf>DEFAULT</jsf>.write(myPojo);
+ * MyPojo <jv>myPojo</jv> = NTriple.<jsf>DEFAULT</jsf>.read(<jv>string</jv>, MyPojo.<jk>class</jk>);
+ * String stri<jv>string</jv>ng = NTriple.<jsf>DEFAULT</jsf>.write(<jv>myPojo</jv>);
* </p>
*
* <ul class='seealso'>
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshall/RdfXml.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshall/RdfXml.java
index 3bdf959..634bfdd 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshall/RdfXml.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshall/RdfXml.java
@@ -21,16 +21,16 @@ import org.apache.juneau.jena.*;
* The general idea is to combine a single serializer and parser inside a simplified API for reading and writing POJOs.
*
* <h5 class='figure'>Examples:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Using instance.</jc>
- * RdfXml rdfXml = <jk>new</jk> RdfXml();
- * MyPojo myPojo = rdfXml.read(string, MyPojo.<jk>class</jk>);
- * String string = rdfXml.write(myPojo);
+ * RdfXml <jv>rdfXml</jv> = <jk>new</jk> RdfXml();
+ * MyPojo <jv>myPojo</jv> = <jv>rdfXml</jv>.read(<jv>string</jv>, MyPojo.<jk>class</jk>);
+ * String <jv>string</jv> = <jv>rdfXml</jv>.write(<jv>myPojo</jv>);
* </p>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Using DEFAULT instance.</jc>
- * MyPojo myPojo = RdfXml.<jsf>DEFAULT</jsf>.read(string, MyPojo.<jk>class</jk>);
- * String string = RdfXml.<jsf>DEFAULT</jsf>.write(myPojo);
+ * MyPojo <jv>myPojo</jv> = RdfXml.<jsf>DEFAULT</jsf>.read(<jv>string</jv>, MyPojo.<jk>class</jk>);
+ * String <jv>string</jv> = RdfXml.<jsf>DEFAULT</jsf>.write(<jv>myPojo</jv>);
* </p>
*
* <ul class='seealso'>
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshall/RdfXmlAbbrev.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshall/RdfXmlAbbrev.java
index 53a1faa..c343884 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshall/RdfXmlAbbrev.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshall/RdfXmlAbbrev.java
@@ -21,16 +21,16 @@ import org.apache.juneau.jena.*;
* The general idea is to combine a single serializer and parser inside a simplified API for reading and writing POJOs.
*
* <h5 class='figure'>Examples:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Using instance.</jc>
- * RdfXmlAbbrev rdfXmlAbbrev = <jk>new</jk> RdfXmlAbbrev();
- * MyPojo myPojo = rdfXmlAbbrev.read(string, MyPojo.<jk>class</jk>);
- * String string = rdfXmlAbbrev.write(myPojo);
+ * RdfXmlAbbrev <jv>rdfXmlAbbrev</jv> = <jk>new</jk> RdfXmlAbbrev();
+ * MyPojo <jv>myPojo</jv> = <jv>rdfXmlAbbrev</jv>.read(<jv>string</jv>, MyPojo.<jk>class</jk>);
+ * String <jv>string</jv> = <jv>rdfXmlAbbrev</jv>.write(<jv>myPojo</jv>);
* </p>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Using DEFAULT instance.</jc>
- * MyPojo myPojo = RdfXmlAbbrev.<jsf>DEFAULT</jsf>.read(string, MyPojo.<jk>class</jk>);
- * String string = RdfXmlAbbrev.<jsf>DEFAULT</jsf>.write(myPojo);
+ * MyPojo <jv>myPojo</jv> = RdfXmlAbbrev.<jsf>DEFAULT</jsf>.read(<jv>string</jv>, MyPojo.<jk>class</jk>);
+ * String <jv>string</jv> = RdfXmlAbbrev.<jsf>DEFAULT</jsf>.write(<jv>myPojo</jv>);
* </p>
*
* <ul class='seealso'>
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshall/Turtle.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshall/Turtle.java
index c6da323..25720a5 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshall/Turtle.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshall/Turtle.java
@@ -21,16 +21,16 @@ import org.apache.juneau.jena.*;
* The general idea is to combine a single serializer and parser inside a simplified API for reading and writing POJOs.
*
* <h5 class='figure'>Examples:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Using instance.</jc>
- * Turtle turtle = <jk>new</jk> Turtle();
- * MyPojo myPojo = turtle.read(string, MyPojo.<jk>class</jk>);
- * String string = turtle.write(myPojo);
+ * Turtle <jv>turtle</jv> = <jk>new</jk> Turtle();
+ * MyPojo <jv>myPojo</jv> = <jv>turtle</jv>.read(<jv>string</jv>, MyPojo.<jk>class</jk>);
+ * String <jv>string</jv> = <jv>turtle</jv>.write(<jv>myPojo</jv>);
* </p>
- * <p class='bcode w800'>
+ * <p class='bcode'>
* <jc>// Using DEFAULT instance.</jc>
- * MyPojo myPojo = Turtle.<jsf>DEFAULT</jsf>.read(string, MyPojo.<jk>class</jk>);
- * String string = Turtle.<jsf>DEFAULT</jsf>.write(myPojo);
+ * MyPojo <jv>myPojo</jv> = Turtle.<jsf>DEFAULT</jsf>.read(<jv>string</jv>, MyPojo.<jk>class</jk>);
+ * String <jv>string</jv> = Turtle.<jsf>DEFAULT</jsf>.write(<jv>myPojo</jv>);
* </p>
*
* <ul class='seealso'>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationApplier.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationApplier.java
index 5ddd579..8c7f3a1 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationApplier.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationApplier.java
@@ -35,7 +35,7 @@ import org.apache.juneau.svl.*;
* <p>
* The following code shows the general design pattern.
*
- * <p class 'bcode w800'>
+ * <p class 'bjava'>
* <jc>// The annotation applied to classes and methods.</jc>
* <ja>@Target</ja>({METHOD,TYPE})
* <ja>@Retention</ja>(<jsf>RUNTIME</jsf>)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BasicPropertyNamer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BasicPropertyNamer.java
index 60cf43a..da38df8 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BasicPropertyNamer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BasicPropertyNamer.java
@@ -19,10 +19,10 @@ import java.beans.*;
*
* <h5 class='section'>Example:</h5>
* <ul>
- * <li><js>"fooBar"</js> -> <js>"fooBar"</js>
- * <li><js>"fooBarURL"</js> -> <js>"fooBarURL"</js>
- * <li><js>"FooBarURL"</js> -> <js>"fooBarURL"</js>
- * <li><js>"URL"</js> -> <js>"URL"</js>
+ * <li><js>"fooBar"</js> -> <js>"fooBar"</js>
+ * <li><js>"fooBarURL"</js> -> <js>"fooBarURL"</js>
+ * <li><js>"FooBarURL"</js> -> <js>"fooBarURL"</js>
+ * <li><js>"URL"</js> -> <js>"URL"</js>
* </ul>
*
* <p>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
index c725b24..cc83c07 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
@@ -99,7 +99,7 @@ import org.apache.juneau.utils.*;
*
* <h5 class='section'>Example:</h5>
*
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Construct a context from scratch.</jc>
* BeanContext <jv>beanContext</jv> = BeanContext
* .<jsm>create</jsm>()
@@ -125,7 +125,7 @@ import org.apache.juneau.utils.*;
*
* <h5 class='section'>Example:</h5>
*
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A sample bean class</jc>
* <jk>public class</jk> Person {
* <jk>public</jk> String getName();
@@ -138,15 +138,15 @@ import org.apache.juneau.utils.*;
* BeanSession <jv>session</jv> = BeanContext.<jsf>DEFAULT</jsf>.createSession();
*
* <jc>// Wrap an existing bean in a new bean map</jc>
- * BeanMap<Person> <jv>m1</jv> = <jv>session</jv>.toBeanMap(<jk>new</jk> Person());
- * <jv>m1</jv>.put(<js>"name"</js>, <js>"John Smith"</js>);
- * <jv>m1</jv>.put(<js>"age"</js>, 45);
+ * BeanMap<Person> <jv>map1</jv> = <jv>session</jv>.toBeanMap(<jk>new</jk> Person());
+ * <jv>map1</jv>.put(<js>"name"</js>, <js>"John Smith"</js>);
+ * <jv>map1</jv>.put(<js>"age"</js>, 45);
*
* <jc>// Create a new bean instance wrapped in a new bean map</jc>
- * BeanMap<Person> <jv>m2</jv> = <jv>session</jv>.newBeanMap(Person.<jk>class</jk>);
- * <jv>m2</jv>.put(<js>"name"</js>, <js>"John Smith"</js>);
- * <jv>m2</jv>.put(<js>"age"</js>, 45);
- * Person <jv>p</jv> = <jv>m2</jv>.getBean(); <jc>// Get the bean instance that was created.</jc>
+ * BeanMap<Person> <jv>map2</jv> = <jv>session</jv>.newBeanMap(Person.<jk>class</jk>);
+ * <jv>map2</jv>.put(<js>"name"</js>, <js>"John Smith"</js>);
+ * <jv>map2</jv>.put(<js>"age"</js>, 45);
+ * Person <jv>person</jv> = <jv>map2</jv>.getBean(); <jc>// Get the bean instance that was created.</jc>
* </p>
*
* <ul class='spaced-list'>
@@ -423,7 +423,7 @@ public class BeanContext extends Context {
* Use this setting to reduce the visibility requirement.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with a protected class and one field.</jc>
* <jk>protected class</jk> MyBean {
* <jk>public</jk> String <jf>foo</jf> = <js>"bar"</js>;
@@ -470,7 +470,7 @@ public class BeanContext extends Context {
* constructors are used. Use this setting if you want to reduce the visibility requirement.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with a protected constructor and one field.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String <jf>foo</jf>;
@@ -519,7 +519,7 @@ public class BeanContext extends Context {
* Use this setting if you want to reduce the visibility requirement.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with a protected field.</jc>
* <jk>public class</jk> MyBean {
* <jk>protected</jk> String <jf>foo</jf> = <js>"bar"</js>;
@@ -538,7 +538,7 @@ public class BeanContext extends Context {
* <p>
* Bean fields can be ignored as properties entirely by setting the value to {@link Visibility#NONE}
*
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Disable using fields as properties entirely.</jc>
* WriterSerializer <jv>serializer</jv> = JsonSerializer
* .<jsm>create</jsm>()
@@ -573,7 +573,7 @@ public class BeanContext extends Context {
* Bean interceptors can be used to intercept calls to getters and setters and alter their values in transit.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Interceptor that strips out sensitive information.</jc>
* <jk>public class</jk> AddressInterceptor <jk>extends</jk> BeanInterceptor<Address> {
*
@@ -632,7 +632,7 @@ public class BeanContext extends Context {
* Disabled by default because it introduces a slight performance penalty during serialization.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Create a context that creates BeanMaps with normal put() behavior.</jc>
* BeanContext <jv>context</jv> = BeanContext
* .<jsm>create</jsm>()
@@ -678,7 +678,7 @@ public class BeanContext extends Context {
* Use this setting if you want to reduce the visibility requirement.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with a protected getter.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String getFoo() { <jk>return</jk> <js>"foo"</js>; }
@@ -723,7 +723,7 @@ public class BeanContext extends Context {
* Otherwise, the bean will be serialized as a string using the {@link Object#toString()} method.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean without a no-arg constructor.</jc>
* <jk>public class</jk> MyBean {
*
@@ -787,7 +787,7 @@ public class BeanContext extends Context {
* Otherwise, the bean will be serialized as a string using the {@link Object#toString()} method.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean without a Serializable interface.</jc>
* <jk>public class</jk> MyBean {
*
@@ -845,7 +845,7 @@ public class BeanContext extends Context {
* When enabled, ignore read-only properties (properties with getters but not setters).
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean without a Serializable interface.</jc>
* <jk>public class</jk> MyBean {
*
@@ -902,7 +902,7 @@ public class BeanContext extends Context {
* The {@link Bean @Bean} annotation can be used on a class to override this setting when <jk>true</jk>.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with no properties.</jc>
* <jk>public class</jk> MyBean {
* }
@@ -967,7 +967,7 @@ public class BeanContext extends Context {
* Setting applies to specified class and all subclasses.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with 3 properties.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String
@@ -988,12 +988,12 @@ public class BeanContext extends Context {
*
* <p>
* This method is functionally equivalent to the following code:
- * <p class='bcode w800'>
- * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>beanClass</jv>).properties(<jv>properties</jv>));
+ * <p class='bjava'>
+ * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>beanClass</jv>).properties(<jv>properties</jv>).build());
* </p>
*
* <ul class='seealso'>
- * <li class='jm'>{@link Bean#properties()}/{@link Bean#p()} - On an annotation on the bean class itself.
+ * <li class='jma'>{@link Bean#properties()}/{@link Bean#p()} - On an annotation on the bean class itself.
* </ul>
*
* @param beanClass The bean class.
@@ -1027,7 +1027,7 @@ public class BeanContext extends Context {
* Setting applies to specified class and all subclasses.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with 3 properties.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String
@@ -1048,12 +1048,12 @@ public class BeanContext extends Context {
*
* <p>
* This method is functionally equivalent to the following code for each entry:
- * <p class='bcode w800'>
- * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>key</jv>).properties(<jv>value</jv>.toString()));
+ * <p class='bjava'>
+ * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>key</jv>).properties(<jv>value</jv>.toString()).build());
* </p>
*
* <ul class='seealso'>
- * <li class='jm'>{@link Bean#properties()} / {@link Bean#p()}- On an annotation on the bean class itself.
+ * <li class='jma'>{@link Bean#properties()} / {@link Bean#p()}- On an annotation on the bean class itself.
* </ul>
*
* @param values
@@ -1091,7 +1091,7 @@ public class BeanContext extends Context {
* Setting applies to specified class and all subclasses.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with 3 properties.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String
@@ -1112,12 +1112,12 @@ public class BeanContext extends Context {
*
* <p>
* This method is functionally equivalent to the following code:
- * <p class='bcode w800'>
- * <jv>builider</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>beanClassName</jv>).properties(<jv>properties</jv>));
+ * <p class='bjava'>
+ * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>beanClassName</jv>).properties(<jv>properties</jv>).build());
* </p>
*
* <ul class='seealso'>
- * <li class='jm'>{@link Bean#properties()} / {@link Bean#p()} - On an annotation on the bean class itself.
+ * <li class='jma'>{@link Bean#properties()} / {@link Bean#p()} - On an annotation on the bean class itself.
* </ul>
*
* @param beanClassName
@@ -1145,7 +1145,7 @@ public class BeanContext extends Context {
* Setting applies to specified class and all subclasses.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with 3 properties.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String
@@ -1166,12 +1166,12 @@ public class BeanContext extends Context {
*
* <p>
* This method is functionally equivalent to the following code:
- * <p class='bcode w800'>
- * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>beanClass</jv>).excludeProperties(<jv>properties</jv>));
+ * <p class='bjava'>
+ * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>beanClass</jv>).excludeProperties(<jv>properties</jv>).build());
* </p>
*
* <ul class='seealso'>
- * <li class='jm'>{@link Bean#excludeProperties()} / {@link Bean#xp()}
+ * <li class='jma'>{@link Bean#excludeProperties()} / {@link Bean#xp()}
* </ul>
*
* @param beanClass The bean class.
@@ -1197,7 +1197,7 @@ public class BeanContext extends Context {
* Setting applies to specified class and all subclasses.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with 3 properties.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String
@@ -1218,12 +1218,12 @@ public class BeanContext extends Context {
*
* <p>
* This method is functionally equivalent to the following code for each entry:
- * <p class='bcode w800'>
- * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>key</jv>).excludeProperties(<jv>value</jv>.toString()));
+ * <p class='bjava'>
+ * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>key</jv>).excludeProperties(<jv>value</jv>.toString()).build());
* </p>
*
* <ul class='seealso'>
- * <li class='jm'>{@link Bean#excludeProperties()} / {@link Bean#xp()}
+ * <li class='jma'>{@link Bean#excludeProperties()} / {@link Bean#xp()}
* </ul>
*
* @param values
@@ -1253,7 +1253,7 @@ public class BeanContext extends Context {
* Setting applies to specified class and all subclasses.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with 3 properties.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String
@@ -1274,12 +1274,12 @@ public class BeanContext extends Context {
*
* <p>
* This method is functionally equivalent to the following code:
- * <p class='bcode w800'>
- * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>beanClassName</jv>).excludeProperties(<jv>properties</jv>));
+ * <p class='bjava'>
+ * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>beanClassName</jv>).excludeProperties(<jv>properties</jv>).build());
* </p>
*
* <ul class='seealso'>
- * <li class='jm'>{@link Bean#excludeProperties()} / {@link Bean#xp()}
+ * <li class='jma'>{@link Bean#excludeProperties()} / {@link Bean#xp()}
* </ul>
*
* @param beanClassName
@@ -1303,7 +1303,7 @@ public class BeanContext extends Context {
* for both serializers and parsers.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with 3 properties.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String <jf>foo</jf>, <jf>bar</jf>, <jf>baz</jf>;
@@ -1331,12 +1331,12 @@ public class BeanContext extends Context {
*
* <p>
* This method is functionally equivalent to the following code:
- * <p class='bcode w800'>
- * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>beanClass</jv>).readOnlyProperties(<jv>properties</jv>));
+ * <p class='bjava'>
+ * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>beanClass</jv>).readOnlyProperties(<jv>properties</jv>).build());
* </p>
*
* <ul class='seealso'>
- * <li class='jm'>{@link Bean#readOnlyProperties()} / {@link Bean#ro()}
+ * <li class='jma'>{@link Bean#readOnlyProperties()} / {@link Bean#ro()}
* </ul>
*
* @param beanClass The bean class.
@@ -1358,7 +1358,7 @@ public class BeanContext extends Context {
* for both serializers and parsers.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with 3 properties.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String <jf>foo</jf>, <jf>bar</jf>, <jf>baz</jf>;
@@ -1386,12 +1386,12 @@ public class BeanContext extends Context {
*
* <p>
* This method is functionally equivalent to the following code for each entry:
- * <p class='bcode w800'>
- * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>key</jv>).readOnlyProperties(<jv>value</jv>.toString()));
+ * <p class='bjava'>
+ * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>key</jv>).readOnlyProperties(<jv>value</jv>.toString()).build());
* </p>
*
* <ul class='seealso'>
- * <li class='jm'>{@link Bean#readOnlyProperties()} / {@link Bean#ro()}
+ * <li class='jma'>{@link Bean#readOnlyProperties()} / {@link Bean#ro()}
* </ul>
*
* @param values
@@ -1417,7 +1417,7 @@ public class BeanContext extends Context {
* for both serializers and parsers.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with 3 properties.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String <jf>foo</jf>, <jf>bar</jf>, <jf>baz</jf>;
@@ -1445,12 +1445,12 @@ public class BeanContext extends Context {
*
* <p>
* This method is functionally equivalent to the following code:
- * <p class='bcode w800'>
- * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>beanClassName</jv>).readOnlyProperties(<jv>properties</jv>));
+ * <p class='bjava'>
+ * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>beanClassName</jv>).readOnlyProperties(<jv>properties</jv>).build());
* </p>
*
* <ul class='seealso'>
- * <li class='jm'>{@link Bean#readOnlyProperties()} / {@link Bean#ro()}
+ * <li class='jma'>{@link Bean#readOnlyProperties()} / {@link Bean#ro()}
* </ul>
*
* @param beanClassName
@@ -1474,7 +1474,7 @@ public class BeanContext extends Context {
* for both serializers and parsers.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with 3 properties.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String <jf>foo</jf>, <jf>bar</jf>, <jf>baz</jf>;
@@ -1501,12 +1501,12 @@ public class BeanContext extends Context {
*
* <p>
* This method is functionally equivalent to the following code:
- * <p class='bcode w800'>
- * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>beanClass</jv>).writeOnlyProperties(<jv>properties</jv>));
+ * <p class='bjava'>
+ * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>beanClass</jv>).writeOnlyProperties(<jv>properties</jv>).build());
* </p>
*
* <ul class='seealso'>
- * <li class='jm'>{@link Bean#writeOnlyProperties()} / {@link Bean#wo()}
+ * <li class='jma'>{@link Bean#writeOnlyProperties()} / {@link Bean#wo()}
* </ul>
*
* @param beanClass The bean class.
@@ -1528,7 +1528,7 @@ public class BeanContext extends Context {
* for both serializers and parsers.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with 3 properties.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String <jf>foo</jf>, <jf>bar</jf>, <jf>baz</jf>;
@@ -1555,12 +1555,12 @@ public class BeanContext extends Context {
*
* <p>
* This method is functionally equivalent to the following code for each entry:
- * <p class='bcode w800'>
- * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>key</jv>).writeOnlyProperties(<jv>value</jv>.toString()));
+ * <p class='bjava'>
+ * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>key</jv>).writeOnlyProperties(<jv>value</jv>.toString()).build());
* </p>
*
* <ul class='seealso'>
- * <li class='jm'>{@link Bean#writeOnlyProperties()} / {@link Bean#wo()}
+ * <li class='jma'>{@link Bean#writeOnlyProperties()} / {@link Bean#wo()}
* </ul>
*
* @param values
@@ -1586,7 +1586,7 @@ public class BeanContext extends Context {
* for both serializers and parsers.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with 3 properties.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String <jf>foo</jf>, <jf>bar</jf>, <jf>baz</jf>;
@@ -1613,12 +1613,12 @@ public class BeanContext extends Context {
*
* <p>
* This method is functionally equivalent to the following code:
- * <p class='bcode w800'>
- * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>beanClassName</jv>).writeOnlyProperties(<jv>properties</jv>));
+ * <p class='bjava'>
+ * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>beanClassName</jv>).writeOnlyProperties(<jv>properties</jv>).build());
* </p>
*
* <ul class='seealso'>
- * <li class='jm'>{@link Bean#writeOnlyProperties()} / {@link Bean#wo()}
+ * <li class='jma'>{@link Bean#writeOnlyProperties()} / {@link Bean#wo()}
* </ul>
*
* @param beanClassName
@@ -1661,7 +1661,7 @@ public class BeanContext extends Context {
* </ul>
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// POJOs with @Bean(name) annotations.</jc>
* <ja>@Bean</ja>(typeName=<js>"foo"</js>)
* <jk>public class</jk> Foo {...}
@@ -1687,7 +1687,7 @@ public class BeanContext extends Context {
* <p>
* Another option is to use the {@link Bean#dictionary()} annotation on the POJO class itself:
*
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Instead of by parser, define a bean dictionary on a class through an annotation.</jc>
* <jc>// This applies to all properties on this class and all subclasses.</jc>
* <ja>@Bean</ja>(dictionary={Foo.<jk>class</jk>,Bar.<jk>class</jk>})
@@ -1699,7 +1699,7 @@ public class BeanContext extends Context {
*
* <p>
* A typical usage is to allow for HTML documents to be parsed back into HTML beans:
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Use the predefined HTML5 bean dictionary which is a BeanDictionaryList.</jc>
* ReaderParser <jv>parser</jv> = HtmlParser
* .<jsm>create</jsm>()
@@ -1764,7 +1764,7 @@ public class BeanContext extends Context {
* a single class as opposed to globally.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// POJOs with @Bean(name) annotations.</jc>
* <ja>@Bean</ja>(typeName=<js>"foo"</js>)
* <jk>public class</jk> Foo {...}
@@ -1790,7 +1790,7 @@ public class BeanContext extends Context {
* This is functionally equivalent to the {@link Bean#dictionary()} annotation.
*
* <ul class='seealso'>
- * <li class='ja'>{@link Bean#dictionary()}
+ * <li class='jma'>{@link Bean#dictionary()}
* <li class='jm'>{@link #beanDictionary(Class...)}
* </ul>
*
@@ -1814,7 +1814,7 @@ public class BeanContext extends Context {
* Examples are used in cases such as POJO examples in Swagger documents.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Create a serializer that excludes the 'foo' and 'bar' properties on the MyBean class.</jc>
* WriterSerializer <jv>serializer</jv> = JsonSerializer
* .<jsm>create</jsm>()
@@ -1824,8 +1824,8 @@ public class BeanContext extends Context {
*
* <p>
* This is a shorthand method for the following code:
- * <p class='bcode w800'>
- * <jv>builder</jv>.annotations(MarshalledAnnotation.<jsm>create</jsm>(<jv>pojoClass</jv>).example(SimpleJson.<jsf>DEFAULT</jsf>.toString(<jv>o</jv>)))
+ * <p class='bjava'>
+ * <jv>builder</jv>.annotations(MarshalledAnnotation.<jsm>create</jsm>(<jv>pojoClass</jv>).example(SimpleJson.<jsf>DEFAULT</jsf>.toString(<jv>object</jv>)).build())
* </p>
*
* <ul class='notes'>
@@ -1865,7 +1865,7 @@ public class BeanContext extends Context {
* Setting applies to specified class and all subclasses.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Create a serializer that excludes the 'foo' and 'bar' properties on the MyBean class.</jc>
* WriterSerializer <jv>serializer</jv> = JsonSerializer
* .<jsm>create</jsm>()
@@ -1875,8 +1875,8 @@ public class BeanContext extends Context {
*
* <p>
* This is a shorthand method for the following code:
- * <p class='bcode w800'>
- * <jv>builder</jv>.annotations(MarshalledAnnotation.<jsm>create</jsm>(<jv>pojoClass</jv>).example(<jv>json</jv>))
+ * <p class='bjava'>
+ * <jv>builder</jv>.annotations(MarshalledAnnotation.<jsm>create</jsm>(<jv>pojoClass</jv>).example(<jv>json</jv>).build())
* </p>
*
* <p>
@@ -1917,7 +1917,7 @@ public class BeanContext extends Context {
* </ul>
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with a fluent setter.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> MyBean foo(String <jv>value</jv>) {...}
@@ -1969,7 +1969,7 @@ public class BeanContext extends Context {
* Identical to {@link #findFluentSetters()} but enables it on a specific class only.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with a fluent setter.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> MyBean foo(String <jv>value</jv>) {...}
@@ -2010,7 +2010,7 @@ public class BeanContext extends Context {
* Otherwise, a {@code BeanRuntimeException} is thrown.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with a property that throws an exception.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String getFoo() {
@@ -2059,7 +2059,7 @@ public class BeanContext extends Context {
* Otherwise, a {@code BeanRuntimeException} is thrown.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with a property that throws an exception.</jc>
* <jk>public class</jk> MyBean {
* <jk>public void</jk> setFoo(String <jv>foo</jv>) {
@@ -2108,7 +2108,7 @@ public class BeanContext extends Context {
* Otherwise, it will be silently ignored.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with a property with a getter but not a setter.</jc>
* <jk>public class</jk> MyBean {
* <jk>public void</jk> getFoo() {
@@ -2160,7 +2160,7 @@ public class BeanContext extends Context {
* When enabled, methods and fields marked as <jk>transient</jk> will not be ignored as bean properties.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with a transient field.</jc>
* <jk>public class</jk> MyBean {
* <jk>public transient</jk> String <jf>foo</jf> = <js>"foo"</js>;
@@ -2211,7 +2211,7 @@ public class BeanContext extends Context {
* Otherwise, a {@code BeanRuntimeException} is thrown.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with a single property.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String <jf>foo</jf>;
@@ -2258,7 +2258,7 @@ public class BeanContext extends Context {
* Otherwise it will be silently ignored.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with a single property.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String <jf>foo</jf>;
@@ -2306,7 +2306,7 @@ public class BeanContext extends Context {
* parse).
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean interface.</jc>
* <jk>public interface</jk> MyBean {
* ...
@@ -2345,7 +2345,7 @@ public class BeanContext extends Context {
* parse).
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with a single property.</jc>
* <jk>public interface</jk> MyBean {
* ...
@@ -2384,7 +2384,7 @@ public class BeanContext extends Context {
* When specified, only the list of properties defined on the interface class will be used during serialization.
* Additional properties on subclasses will be ignored.
*
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Parent class or interface</jc>
* <jk>public abstract class</jk> A {
* <jk>public</jk> String <jf>foo</jf> = <js>"foo"</js>;
@@ -2430,7 +2430,7 @@ public class BeanContext extends Context {
* When specified, only the list of properties defined on the interface class will be used during serialization
* of implementation classes. Additional properties on subclasses will be ignored.
*
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Parent class or interface</jc>
* <jk>public abstract class</jk> A {
* <jk>public</jk> String <jf>foo</jf> = <js>"foo"</js>;
@@ -2480,14 +2480,14 @@ public class BeanContext extends Context {
* {@link ObjectSwap#unswap(BeanSession, Object, ClassMeta, String)} methods.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Define a POJO swap that skips serializing beans if we're in the UK.</jc>
* <jk>public class</jk> MyBeanSwap <jk>extends</jk> StringSwap<MyBean> {
* <ja>@Override</ja>
- * public String swap(BeanSession <jv>session</jv>, MyBean <jv>o</jv>) throws Exception {
+ * <jk>public</jk> String swap(BeanSession <jv>session</jv>, MyBean <jv>bean/jv>) <jk>throws</jk> Exception {
* <jk>if</jk> (<jv>session</jv>.getLocale().equals(Locale.<jsf>UK</jsf>))
* <jk>return null</jk>;
- * <jk>return</jk> <jv>o</jv>.toString();
+ * <jk>return</jk> <jv>bean</jv>.toString();
* }
* }
*
@@ -2497,14 +2497,6 @@ public class BeanContext extends Context {
* .locale(Locale.<jsf>UK</jsf>)
* .swaps(MyBeanSwap.<jk>class</jk>)
* .build();
- *
- * <jc>// Define on session-args instead.</jc>
- * SerializerSessionArgs <jv>sessionArgs</jv> = <jk>new</jk> SerializerSessionArgs().locale(Locale.<jsf>UK</jsf>);
- * <jk>try</jk> (WriterSerializerSession <jv>session</jv> = <jv>serializer</jv>.createSession(<jv>sessionArgs</jv>)) {
- *
- * <jc>// Produces "null" if in the UK.</jc>
- * String <jv>json</jv> = <jv>session</jv>.serialize(<jk>new</jk> MyBean());
- * }
* </p>
*
* <ul class='seealso'>
@@ -2532,14 +2524,14 @@ public class BeanContext extends Context {
* serializer or parser.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Define a POJO swap that skips serializing beans if the media type is application/json.</jc>
* <jk>public class</jk> MyBeanSwap <jk>extends</jk> StringSwap<MyBean> {
* <ja>@Override</ja>
- * <jk>public</jk> String swap(BeanSession <jv>session</jv>, MyBean <jv>o</jv>) throws Exception {
+ * <jk>public</jk> String swap(BeanSession <jv>session</jv>, MyBean <jv>bean</jv>) <jk>throws</jk> Exception {
* <jk>if</jk> (<jv>session</jv>.getMediaType().equals(<js>"application/json"</js>))
* <jk>return null</jk>;
- * <jk>return</jk> <jv>o</jv>.toString();
+ * <jk>return</jk> <jv>bean</jv>.toString();
* }
* }
*
@@ -2548,14 +2540,6 @@ public class BeanContext extends Context {
* .<jsm>create</jsm>()
* .mediaType(MediaType.<jsf>JSON</jsf>)
* .build();
- *
- * <jc>// Define on session-args instead.</jc>
- * SerializerSessionArgs <jv>sessionArgs</jv> = <jk>new</jk> SerializerSessionArgs().mediaType(MediaType.<jsf>JSON</jsf>);
- * <jk>try</jk> (WriterSerializerSession <jv>session</jv> = <jv>serializer</jv>.createSession(<jv>sessionArgs</jv>)) {
- *
- * <jc>// Produces "null" since it's JSON.</jc>
- * String <jv>json</jv> = <jv>session</jv>.serialize(<jk>new</jk> MyBean());
- * }
* </p>
*
* <ul class='seealso'>
@@ -2587,7 +2571,7 @@ public class BeanContext extends Context {
* </ul>
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with a single property.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String <jf>foo</jf> = <js>"bar"</js>;
@@ -2677,7 +2661,7 @@ public class BeanContext extends Context {
* </ul>
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Create a serializer that ignores beans in the specified packages.</jc>
* WriterSerializer <jv>serializer</jv> = JsonSerializer
* .<jsm>create</jsm>()
@@ -2744,7 +2728,7 @@ public class BeanContext extends Context {
* </ul>
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with a single property.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String <jf>fooBarBaz</jf> = <js>"fooBarBaz"</js>;
@@ -2779,7 +2763,7 @@ public class BeanContext extends Context {
* Same as {@link #propertyNamer(Class)} but allows you to specify a namer for a specific class.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with a single property.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String <jf>fooBarBaz</jf> = <js>"fooBarBaz"</js>;
@@ -2827,7 +2811,7 @@ public class BeanContext extends Context {
* in the Java file.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with 3 properties.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String <jf>c</jf> = <js>"1"</js>;
@@ -2876,7 +2860,7 @@ public class BeanContext extends Context {
* Same as {@link #sortProperties()} but allows you to specify individual bean classes instead of globally.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with 3 properties.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String <jf>c</jf> = <js>"1"</js>;
@@ -2921,7 +2905,7 @@ public class BeanContext extends Context {
* but not <c>p1</c> or <c>p2</c>.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>public class</jk> C1 {
* <jk>public int</jk> getP1();
* }
@@ -2979,20 +2963,20 @@ public class BeanContext extends Context {
* </ul>
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Sample swap for converting Dates to ISO8601 strings.</jc>
* <jk>public class</jk> MyDateSwap <jk>extends</jk> StringSwap<Date> {
* <jc>// ISO8601 formatter.</jc>
* <jk>private</jk> DateFormat <jf>format</jf> = <jk>new</jk> SimpleDateFormat(<js>"yyyy-MM-dd'T'HH:mm:ssZ"</js>);
*
* <ja>@Override</ja>
- * <jk>public</jk> String swap(BeanSession <jv>session</jv>, Date <jv>o</jv>) {
- * <jk>return</jk> <jf>format</jf>.format(<jv>o</jv>);
+ * <jk>public</jk> String swap(BeanSession <jv>session</jv>, Date <jv>date</jv>) {
+ * <jk>return</jk> <jf>format</jf>.format(<jv>date</jv>);
* }
*
* <ja>@Override</ja>
- * <jk>public</jk> Date unswap(BeanSession <jv>session</jv>, String <jv>o</jv>, ClassMeta <jv>hint</jv>) <jk>throws</jk> Exception {
- * <jk>return</jk> <jf>format</jf>.parse(<jv>o</jv>);
+ * <jk>public</jk> Date unswap(BeanSession <jv>session</jv>, String <jv>string</jv>, ClassMeta <jv>hint</jv>) <jk>throws</jk> Exception {
+ * <jk>return</jk> <jf>format</jf>.parse(<jv>string</jv>);
* }
* }
*
@@ -3017,7 +3001,7 @@ public class BeanContext extends Context {
* .build();
*
* <jc>// Use our parser to parse a bean.</jc>
- * MyBean <jv>myBean</jv> = <jv>parser</jv>.parse(json, MyBean.<jk>class</jk>);
+ * MyBean <jv>bean</jv> = <jv>parser</jv>.parse(<jv>json</jv>, MyBean.<jk>class</jk>);
* </p>
*
* <ul class='notes'>
@@ -3058,11 +3042,11 @@ public class BeanContext extends Context {
* A shortcut for defining a {@link FunctionalSwap}.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Create a serializer that performs a custom format for DAte objects.</jc>
* WriterSerializer <jv>serializer</jv> = JsonSerializer
* .<jsm>create</jsm>()
- * .swap(Date.<jk>class</jk>, String.<jk>class</jk>, <jv>x</jv> -> <jsm>format</jsm>(<jv>x</jv>))
+ * .swap(Date.<jk>class</jk>, String.<jk>class</jk>, <jv>x</jv> -> <jsm>format</jsm>(<jv>x</jv>))
* .build();
* </p>
*
@@ -3080,11 +3064,11 @@ public class BeanContext extends Context {
* A shortcut for defining a {@link FunctionalSwap}.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Create a serializer that performs a custom format for DAte objects.</jc>
* WriterSerializer <jv>serializer</jv> = JsonSerializer
* .<jsm>create</jsm>()
- * .swap(Date.<jk>class</jk>, String.<jk>class</jk>, <jv>x</jv> -> <jsm>format</jsm>(<jv>x</jv>), <jv>x</jv> -> <jsm>parse</jsm>(<jv>x</jv>))
+ * .swap(Date.<jk>class</jk>, String.<jk>class</jk>, <jv>x</jv> -> <jsm>format</jsm>(<jv>x</jv>), <jv>x</jv> -> <jsm>parse</jsm>(<jv>x</jv>))
* .build();
* </p>
*
@@ -3125,14 +3109,14 @@ public class BeanContext extends Context {
* {@link ObjectSwap#unswap(BeanSession, Object, ClassMeta, String)} methods.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Define a POJO swap that skips serializing beans if the time zone is GMT.</jc>
* <jk>public class</jk> MyBeanSwap <jk>extends</jk> StringSwap<MyBean> {
* <ja>@Override</ja>
- * <jk>public</jk> String swap(BeanSession <jv>session</jv>, MyBean <jv>o</jv>) throws Exception {
+ * <jk>public</jk> String swap(BeanSession <jv>session</jv>, MyBean <jv>bean</jv>) <jk>throws</jk> Exception {
* <jk>if</jk> (<jv>session</jv>.getTimeZone().equals(TimeZone.<jsf>GMT</jsf>))
* <jk>return null</jk>;
- * <jk>return</jk> <jv>o</jv>.toString();
+ * <jk>return</jk> <jv>bean</jv>.toString();
* }
* }
*
@@ -3141,14 +3125,6 @@ public class BeanContext extends Context {
* .<jsm>create</jsm>()
* .timeZone(TimeZone.<jsf>GMT</jsf>)
* .build();
- *
- * <jc>// Define on session-args instead.</jc>
- * SerializerSessionArgs <jv>sessionArgs</jv> = <jk>new</jk> SerializerSessionArgs().timeZone(TimeZone.<jsf>GMT</jsf>);
- * <jk>try</jk> (WriterSerializerSession <jv>session</jv> = JsonSerializer.<jsf>DEFAULT</jsf>.createSession(<jv>sessionArgs</jv>)) {
- *
- * <jc>// Produces "null" since the time zone is GMT.</jc>
- * String <jv>json</jv> = <jv>session</jv>.serialize(<jk>new</jk> MyBean());
- * }
* </p>
*
* <ul class='seealso'>
@@ -3177,7 +3153,7 @@ public class BeanContext extends Context {
* It is also used to specify element names in XML.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Use _type='mybean' to identify this bean.</jc>
* <jk>public class</jk> MyBean {...}
*
@@ -3219,7 +3195,7 @@ public class BeanContext extends Context {
* parser knows the data type to reconstruct.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// POJOs with @Bean(name) annotations.</jc>
* <ja>@Bean</ja>(typeName=<js>"foo"</js>)
* <jk>public class</jk> Foo {...}
@@ -3249,7 +3225,7 @@ public class BeanContext extends Context {
* String <jv>json</jv> = <jv>serializer</jv>.serialize(<jk>new</jk> MyBean());
*
* <jc>// Parse bean.</jc>
- * MyBean <jv>myBean</jv> = <jv>parser</jv>.parse(<jv>json</jv>, MyBean.<jk>class</jk>);
+ * MyBean <jv>bean</jv> = <jv>parser</jv>.parse(<jv>json</jv>, MyBean.<jk>class</jk>);
* </p>
*
* <ul class='seealso'>
@@ -3275,7 +3251,7 @@ public class BeanContext extends Context {
* Same as {@link #typePropertyName(String)} except targets a specific bean class instead of globally.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// POJOs with @Bean(name) annotations.</jc>
* <ja>@Bean</ja>(typeName=<js>"foo"</js>)
* <jk>public class</jk> Foo {...}
@@ -3320,7 +3296,7 @@ public class BeanContext extends Context {
* When enabled, enums are always serialized by name, not using {@link Object#toString()}.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Create a serializer with debug enabled.</jc>
* WriterSerializer <jv>serializer</jv> = JsonSerializer
* .<jsm>create</jsm>()
@@ -3334,15 +3310,15 @@ public class BeanContext extends Context {
* <jsf>TWO</jsf>(2),
* <jsf>THREE</jsf>(3);
*
- * <jk>private int</jk> <jf>i</jf>;
+ * <jk>private int</jk> <jf>value</jf>;
*
- * Option(<jk>int</jk> i) {
- * <jk>this</jk>.<jf>i</jf> = i;
+ * Option(<jk>int</jk> <jv>value</jv>) {
+ * <jk>this</jk>.<jf>value</jf> = <jv>value</jv>;
* }
*
* <ja>@Override</ja>
* <jk>public</jk> String toString() {
- * <jk>return</jk> String.<jsm>valueOf</jsm>(<jf>i</jf>);
+ * <jk>return</jk> String.<jsm>valueOf</jsm>(<jf>value</jf>);
* }
* }
* </p>
@@ -3405,7 +3381,7 @@ public class BeanContext extends Context {
* <br>Most {@link Bean @Bean} annotations will be ignored.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Create a serializer that only uses the built-in java bean introspector for finding properties.</jc>
* WriterSerializer <jv>serializer</jv> = JsonSerializer
* .<jsm>create</jsm>()
@@ -3660,21 +3636,21 @@ public class BeanContext extends Context {
* Wraps an object inside a {@link BeanMap} object (a modifiable {@link Map}).
*
* <p>
- * This is a shortcut for the following code: <c>createSession().build().toBeanMap(<jv>c</jv>);</c>
+ * This is a shortcut for the following code: <c>createSession().build().toBeanMap(<jv>object</jv>);</c>
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Construct a bean map around a bean instance</jc>
- * BeanMap<Person> bm = BeanContext.<jsf>DEFAULT</jsf>.forBean(<jk>new</jk> Person());
+ * BeanMap<Person> <jv>beanMap</jv> = BeanContext.<jsf>DEFAULT</jsf>.toBeanMap(<jk>new</jk> Person());
* </p>
*
* @param <T> The class of the object being wrapped.
- * @param o The object to wrap in a map interface. Must not be null.
+ * @param object The object to wrap in a map interface. Must not be null.
* @return The wrapped object.
* @see BeanSession#toBeanMap(Object)
*/
- public <T> BeanMap<T> toBeanMap(T o) {
- return defaultSession.toBeanMap(o);
+ public <T> BeanMap<T> toBeanMap(T object) {
+ return defaultSession.toBeanMap(object);
}
/**
@@ -3682,12 +3658,12 @@ public class BeanContext extends Context {
* property values.
*
* <p>
- * This is a shortcut for the following code: <c>createSession().build().newBeanMap(<jv>c</jv>);</c>
+ * This is a shortcut for the following code: <c>createSession().build().newBeanMap(<jv>_class</jv>);</c>
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Construct a new bean map wrapped around a new Person object</jc>
- * BeanMap<Person> bm = BeanContext.<jsf>DEFAULT</jsf>.newBeanMap(Person.<jk>class</jk>);
+ * BeanMap<Person> <jv>beanMap</jv> = BeanContext.<jsf>DEFAULT</jsf>.newBeanMap(Person.<jk>class</jk>);
* </p>
*
* @param <T> The class of the object being wrapped.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextable.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextable.java
index b9a88cc..d207f03 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextable.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextable.java
@@ -173,7 +173,7 @@ public abstract class BeanContextable extends Context {
* Use this setting to reduce the visibility requirement.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with a protected class and one field.</jc>
* <jk>protected class</jk> MyBean {
* <jk>public</jk> String <jf>foo</jf> = <js>"bar"</js>;
@@ -220,7 +220,7 @@ public abstract class BeanContextable extends Context {
* constructors are used. Use this setting if you want to reduce the visibility requirement.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with a protected constructor and one field.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String <jf>foo</jf>;
@@ -235,7 +235,7 @@ public abstract class BeanContextable extends Context {
* .build();
*
* <jc>// Use it.</jc>
- * MyBean <jv>myBean</jv> = <jv>parser</jv>.parse(<js>"{foo:'bar'}"</js>, MyBean.<jk>class</jk>);
+ * MyBean <jv>bean</jv> = <jv>parser</jv>.parse(<js>"{foo:'bar'}"</js>, MyBean.<jk>class</jk>);
* </p>
*
* <ul class='notes'>
@@ -269,7 +269,7 @@ public abstract class BeanContextable extends Context {
* Use this setting if you want to reduce the visibility requirement.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with a protected field.</jc>
* <jk>public class</jk> MyBean {
* <jk>protected</jk> String <jf>foo</jf> = <js>"bar"</js>;
@@ -288,7 +288,7 @@ public abstract class BeanContextable extends Context {
* <p>
* Bean fields can be ignored as properties entirely by setting the value to {@link Visibility#NONE}
*
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Disable using fields as properties entirely.</jc>
* WriterSerializer <jv>serializer</jv> = JsonSerializer
* .<jsm>create</jsm>()
@@ -323,7 +323,7 @@ public abstract class BeanContextable extends Context {
* Bean interceptors can be used to intercept calls to getters and setters and alter their values in transit.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Interceptor that strips out sensitive information.</jc>
* <jk>public class</jk> AddressInterceptor <jk>extends</jk> BeanInterceptor<Address> {
*
@@ -383,16 +383,16 @@ public abstract class BeanContextable extends Context {
* Disabled by default because it introduces a slight performance penalty during serialization.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Create a context that creates BeanMaps with normal put() behavior.</jc>
* BeanContext <jv>context</jv> = BeanContext
* .<jsm>create</jsm>()
* .beanMapPutReturnsOldValue()
* .build();
*
- * BeanMap<MyBean> <jv>myBeanMap</jv> = <jv>context</jv>.createSession().toBeanMap(<jk>new</jk> MyBean());
- * <jv>myBeanMap</jv>.put(<js>"foo"</js>, <js>"bar"</js>);
- * Object <jv>oldValue</jv> = <jv>myBeanMap</jv>.put(<js>"foo"</js>, <js>"baz"</js>); <jc>// oldValue == "bar"</jc>
+ * BeanMap<MyBean> <jv>beanMap</jv> = <jv>context</jv>.createSession().toBeanMap(<jk>new</jk> MyBean());
+ * <jv>beanMap</jv>.put(<js>"foo"</js>, <js>"bar"</js>);
+ * Object <jv>oldValue</jv> = <jv>beanMap</jv>.put(<js>"foo"</js>, <js>"baz"</js>); <jc>// oldValue == "bar"</jc>
* </p>
*
* <ul class='seealso'>
@@ -419,7 +419,7 @@ public abstract class BeanContextable extends Context {
* Use this setting if you want to reduce the visibility requirement.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with a protected getter.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String getFoo() { <jk>return</jk> <js>"foo"</js>; }
@@ -464,7 +464,7 @@ public abstract class BeanContextable extends Context {
* Otherwise, the bean will be serialized as a string using the {@link Object#toString()} method.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean without a no-arg constructor.</jc>
* <jk>public class</jk> MyBean {
*
@@ -518,7 +518,7 @@ public abstract class BeanContextable extends Context {
* Otherwise, the bean will be serialized as a string using the {@link Object#toString()} method.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean without a Serializable interface.</jc>
* <jk>public class</jk> MyBean {
*
@@ -566,7 +566,7 @@ public abstract class BeanContextable extends Context {
* When enabled, ignore read-only properties (properties with getters but not setters).
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean without a Serializable interface.</jc>
* <jk>public class</jk> MyBean {
*
@@ -617,7 +617,7 @@ public abstract class BeanContextable extends Context {
* The {@link Bean @Bean} annotation can be used on a class to override this setting when <jk>true</jk>.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with no properties.</jc>
* <jk>public class</jk> MyBean {
* }
@@ -672,7 +672,7 @@ public abstract class BeanContextable extends Context {
* Setting applies to specified class and all subclasses.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with 3 properties.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String
@@ -693,8 +693,8 @@ public abstract class BeanContextable extends Context {
*
* <p>
* This method is functionally equivalent to the following code:
- * <p class='bcode w800'>
- * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>beanClass</jv>).properties(<jv>properties</jv>));
+ * <p class='bjava'>
+ * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>beanClass</jv>).properties(<jv>properties</jv>).build());
* </p>
*
* <ul class='seealso'>
@@ -733,7 +733,7 @@ public abstract class BeanContextable extends Context {
* Setting applies to specified class and all subclasses.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with 3 properties.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String
@@ -754,12 +754,12 @@ public abstract class BeanContextable extends Context {
*
* <p>
* This method is functionally equivalent to the following code for each entry:
- * <p class='bcode w800'>
- * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>key</jv>).properties(<jv>value</jv>.toString()));
+ * <p class='bjava'>
+ * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>key</jv>).properties(<jv>value</jv>.toString()).build());
* </p>
*
* <ul class='seealso'>
- * <li class='jm'>{@link Bean#properties()} / {@link Bean#p()}- On an annotation on the bean class itself.
+ * <li class='jma'>{@link Bean#properties()} / {@link Bean#p()}- On an annotation on the bean class itself.
* </ul>
*
* @param values
@@ -796,7 +796,7 @@ public abstract class BeanContextable extends Context {
* Setting applies to specified class and all subclasses.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with 3 properties.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String
@@ -817,12 +817,12 @@ public abstract class BeanContextable extends Context {
*
* <p>
* This method is functionally equivalent to the following code:
- * <p class='bcode w800'>
- * <jv>builider</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>beanClassName</jv>).properties(<jv>properties</jv>));
+ * <p class='bjava'>
+ * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>beanClassName</jv>).properties(<jv>properties</jv>).build());
* </p>
*
* <ul class='seealso'>
- * <li class='jm'>{@link Bean#properties()} / {@link Bean#p()} - On an annotation on the bean class itself.
+ * <li class='jma'>{@link Bean#properties()} / {@link Bean#p()} - On an annotation on the bean class itself.
* </ul>
*
* @param beanClassName
@@ -851,7 +851,7 @@ public abstract class BeanContextable extends Context {
* Setting applies to specified class and all subclasses.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with 3 properties.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String
@@ -872,12 +872,12 @@ public abstract class BeanContextable extends Context {
*
* <p>
* This method is functionally equivalent to the following code:
- * <p class='bcode w800'>
- * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>beanClass</jv>).excludeProperties(<jv>properties</jv>));
+ * <p class='bjava'>
+ * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>beanClass</jv>).excludeProperties(<jv>properties</jv>).build());
* </p>
*
* <ul class='seealso'>
- * <li class='jm'>{@link Bean#excludeProperties()} / {@link Bean#xp()}
+ * <li class='jma'>{@link Bean#excludeProperties()} / {@link Bean#xp()}
* </ul>
*
* @param beanClass The bean class.
@@ -904,7 +904,7 @@ public abstract class BeanContextable extends Context {
* Setting applies to specified class and all subclasses.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with 3 properties.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String
@@ -925,12 +925,12 @@ public abstract class BeanContextable extends Context {
*
* <p>
* This method is functionally equivalent to the following code for each entry:
- * <p class='bcode w800'>
- * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>key</jv>).excludeProperties(<jv>value</jv>.toString()));
+ * <p class='bjava'>
+ * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>key</jv>).excludeProperties(<jv>value</jv>.toString()).build());
* </p>
*
* <ul class='seealso'>
- * <li class='jm'>{@link Bean#excludeProperties()} / {@link Bean#xp()}
+ * <li class='jma'>{@link Bean#excludeProperties()} / {@link Bean#xp()}
* </ul>
*
* @param values
@@ -959,7 +959,7 @@ public abstract class BeanContextable extends Context {
* Setting applies to specified class and all subclasses.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with 3 properties.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String
@@ -980,12 +980,12 @@ public abstract class BeanContextable extends Context {
*
* <p>
* This method is functionally equivalent to the following code:
- * <p class='bcode w800'>
- * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>beanClassName</jv>).excludeProperties(<jv>properties</jv>));
+ * <p class='bjava'>
+ * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>beanClassName</jv>).excludeProperties(<jv>properties</jv>).build());
* </p>
*
* <ul class='seealso'>
- * <li class='jm'>{@link Bean#excludeProperties()} / {@link Bean#xp()}
+ * <li class='jma'>{@link Bean#excludeProperties()} / {@link Bean#xp()}
* </ul>
*
* @param beanClassName
@@ -1010,7 +1010,7 @@ public abstract class BeanContextable extends Context {
* for both serializers and parsers.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with 3 properties.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String <jf>foo</jf>, <jf>bar</jf>, <jf>baz</jf>;
@@ -1033,17 +1033,17 @@ public abstract class BeanContextable extends Context {
* .build();
*
* <jc>// Parser ignores bar and baz properties.</jc>
- * MyBean <jv>myBean</jv> = <jv>parser</jv>.parse(<js>"{foo:'foo',bar:'bar',baz:'baz'}"</js>, MyBean.<jk>class</jk>);
+ * MyBean <jv>bean</jv> = <jv>parser</jv>.parse(<js>"{foo:'foo',bar:'bar',baz:'baz'}"</js>, MyBean.<jk>class</jk>);
* </p>
*
* <p>
* This method is functionally equivalent to the following code:
- * <p class='bcode w800'>
- * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>beanClass</jv>).readOnlyProperties(<jv>properties</jv>));
+ * <p class='bjava'>
+ * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>beanClass</jv>).readOnlyProperties(<jv>properties</jv>).build());
* </p>
*
* <ul class='seealso'>
- * <li class='jm'>{@link Bean#readOnlyProperties()} / {@link Bean#ro()}
+ * <li class='jma'>{@link Bean#readOnlyProperties()} / {@link Bean#ro()}
* </ul>
*
* @param beanClass The bean class.
@@ -1066,7 +1066,7 @@ public abstract class BeanContextable extends Context {
* for both serializers and parsers.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with 3 properties.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String <jf>foo</jf>, <jf>bar</jf>, <jf>baz</jf>;
@@ -1089,17 +1089,17 @@ public abstract class BeanContextable extends Context {
* .build();
*
* <jc>// Parser ignores bar and baz properties.</jc>
- * MyBean <jv>myBean</jv> = <jv>parser</jv>.parse(<js>"{foo:'foo',bar:'bar',baz:'baz'}"</js>, MyBean.<jk>class</jk>);
+ * MyBean <jv>bean</jv> = <jv>parser</jv>.parse(<js>"{foo:'foo',bar:'bar',baz:'baz'}"</js>, MyBean.<jk>class</jk>);
* </p>
*
* <p>
* This method is functionally equivalent to the following code for each entry:
- * <p class='bcode w800'>
- * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>key</jv>).readOnlyProperties(<jv>value</jv>.toString()));
+ * <p class='bjava'>
+ * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>key</jv>).readOnlyProperties(<jv>value</jv>.toString()).build());
* </p>
*
* <ul class='seealso'>
- * <li class='jm'>{@link Bean#readOnlyProperties()} / {@link Bean#ro()}
+ * <li class='jma'>{@link Bean#readOnlyProperties()} / {@link Bean#ro()}
* </ul>
*
* @param values
@@ -1124,7 +1124,7 @@ public abstract class BeanContextable extends Context {
* for both serializers and parsers.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with 3 properties.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String <jf>foo</jf>, <jf>bar</jf>, <jf>baz</jf>;
@@ -1147,17 +1147,17 @@ public abstract class BeanContextable extends Context {
* .build();
*
* <jc>// Parser ignores bar and baz properties.</jc>
- * MyBean <jv>myBean</jv> = <jv>parser</jv>.parse(<js>"{foo:'foo',bar:'bar',baz:'baz'}"</js>, MyBean.<jk>class</jk>);
+ * MyBean <jv>bean</jv> = <jv>parser</jv>.parse(<js>"{foo:'foo',bar:'bar',baz:'baz'}"</js>, MyBean.<jk>class</jk>);
* </p>
*
* <p>
* This method is functionally equivalent to the following code:
- * <p class='bcode w800'>
- * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>beanClassName</jv>).readOnlyProperties(<jv>properties</jv>));
+ * <p class='bjava'>
+ * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>beanClassName</jv>).readOnlyProperties(<jv>properties</jv>).build());
* </p>
*
* <ul class='seealso'>
- * <li class='jm'>{@link Bean#readOnlyProperties()} / {@link Bean#ro()}
+ * <li class='jma'>{@link Bean#readOnlyProperties()} / {@link Bean#ro()}
* </ul>
*
* @param beanClassName
@@ -1182,7 +1182,7 @@ public abstract class BeanContextable extends Context {
* for both serializers and parsers.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with 3 properties.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String <jf>foo</jf>, <jf>bar</jf>, <jf>baz</jf>;
@@ -1204,17 +1204,17 @@ public abstract class BeanContextable extends Context {
* .build();
*
* <jc>// Parser parses all 3 properties.</jc>
- * MyBean <jv>myBean</jv> = <jv>parser</jv>.parse(<js>"{foo:'foo',bar:'bar',baz:'baz'}"</js>, MyBean.<jk>class</jk>);
+ * MyBean <jv>bean</jv> = <jv>parser</jv>.parse(<js>"{foo:'foo',bar:'bar',baz:'baz'}"</js>, MyBean.<jk>class</jk>);
* </p>
*
* <p>
* This method is functionally equivalent to the following code:
- * <p class='bcode w800'>
- * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>beanClass</jv>).writeOnlyProperties(<jv>properties</jv>));
+ * <p class='bjava'>
+ * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>beanClass</jv>).writeOnlyProperties(<jv>properties</jv>).build());
* </p>
*
* <ul class='seealso'>
- * <li class='jm'>{@link Bean#writeOnlyProperties()} / {@link Bean#wo()}
+ * <li class='jma'>{@link Bean#writeOnlyProperties()} / {@link Bean#wo()}
* </ul>
*
* @param beanClass The bean class.
@@ -1237,7 +1237,7 @@ public abstract class BeanContextable extends Context {
* for both serializers and parsers.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with 3 properties.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String <jf>foo</jf>, <jf>bar</jf>, <jf>baz</jf>;
@@ -1259,17 +1259,17 @@ public abstract class BeanContextable extends Context {
* .build();
*
* <jc>// Parser parses all 3 properties.</jc>
- * MyBean <jv>myBean</jv> = <jv>parser</jv>.parse(<js>"{foo:'foo',bar:'bar',baz:'baz'}"</js>, MyBean.<jk>class</jk>);
+ * MyBean <jv>bean</jv> = <jv>parser</jv>.parse(<js>"{foo:'foo',bar:'bar',baz:'baz'}"</js>, MyBean.<jk>class</jk>);
* </p>
*
* <p>
* This method is functionally equivalent to the following code for each entry:
- * <p class='bcode w800'>
- * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>key</jv>).writeOnlyProperties(<jv>value</jv>.toString()));
+ * <p class='bjava'>
+ * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>key</jv>).writeOnlyProperties(<jv>value</jv>.toString()).build());
* </p>
*
* <ul class='seealso'>
- * <li class='jm'>{@link Bean#writeOnlyProperties()} / {@link Bean#wo()}
+ * <li class='jma'>{@link Bean#writeOnlyProperties()} / {@link Bean#wo()}
* </ul>
*
* @param values
@@ -1294,7 +1294,7 @@ public abstract class BeanContextable extends Context {
* for both serializers and parsers.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with 3 properties.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String <jf>foo</jf>, <jf>bar</jf>, <jf>baz</jf>;
@@ -1316,17 +1316,17 @@ public abstract class BeanContextable extends Context {
* .build();
*
* <jc>// Parser parses all 3 properties.</jc>
- * MyBean <jv>myBean</jv> = <jv>parser</jv>.parse(<js>"{foo:'foo',bar:'bar',baz:'baz'}"</js>, MyBean.<jk>class</jk>);
+ * MyBean <jv>bean</jv> = <jv>parser</jv>.parse(<js>"{foo:'foo',bar:'bar',baz:'baz'}"</js>, MyBean.<jk>class</jk>);
* </p>
*
* <p>
* This method is functionally equivalent to the following code:
- * <p class='bcode w800'>
- * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>beanClassName</jv>).writeOnlyProperties(<jv>properties</jv>));
+ * <p class='bjava'>
+ * <jv>builder</jv>.annotations(BeanAnnotation.<jsm>create</jsm>(<jv>beanClassName</jv>).writeOnlyProperties(<jv>properties</jv>).build());
* </p>
*
* <ul class='seealso'>
- * <li class='jm'>{@link Bean#writeOnlyProperties()} / {@link Bean#wo()}
+ * <li class='jma'>{@link Bean#writeOnlyProperties()} / {@link Bean#wo()}
* </ul>
*
* @param beanClassName
@@ -1370,7 +1370,7 @@ public abstract class BeanContextable extends Context {
* </ul>
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// POJOs with @Bean(name) annotations.</jc>
* <ja>@Bean</ja>(typeName=<js>"foo"</js>)
* <jk>public class</jk> Foo {...}
@@ -1390,13 +1390,13 @@ public abstract class BeanContextable extends Context {
* }
*
* <jc>// Parse bean.</jc>
- * MyBean <jv>myBean</jv> = <jv>parser</jv>.parse(<js>"{mySimpleField:{_type:'foo',...}}"</js>, MyBean.<jk>class</jk>);
+ * MyBean <jv>bean</jv> = <jv>parser</jv>.parse(<js>"{mySimpleField:{_type:'foo',...}}"</js>, MyBean.<jk>class</jk>);
* </p>
*
* <p>
* Another option is to use the {@link Bean#dictionary()} annotation on the POJO class itself:
*
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Instead of by parser, define a bean dictionary on a class through an annotation.</jc>
* <jc>// This applies to all properties on this class and all subclasses.</jc>
* <ja>@Bean</ja>(dictionary={Foo.<jk>class</jk>,Bar.<jk>class</jk>})
@@ -1408,7 +1408,7 @@ public abstract class BeanContextable extends Context {
*
* <p>
* A typical usage is to allow for HTML documents to be parsed back into HTML beans:
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Use the predefined HTML5 bean dictionary which is a BeanDictionaryList.</jc>
* ReaderParser <jv>parser</jv> = HtmlParser
* .<jsm>create</jsm>()
@@ -1444,7 +1444,7 @@ public abstract class BeanContextable extends Context {
* a single class as opposed to globally.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// POJOs with @Bean(name) annotations.</jc>
* <ja>@Bean</ja>(typeName=<js>"foo"</js>)
* <jk>public class</jk> Foo {...}
@@ -1463,7 +1463,7 @@ public abstract class BeanContextable extends Context {
* .build();
*
* <jc>// Parse bean.</jc>
- * MyBean <jv>myBean</jv> = <jv>parser</jv>.parse(<js>"{mySimpleField:{_type:'foo',...}}"</js>, MyBean.<jk>class</jk>);
+ * MyBean <jv>bean</jv> = <jv>parser</jv>.parse(<js>"{mySimpleField:{_type:'foo',...}}"</js>, MyBean.<jk>class</jk>);
* </p>
*
* <p>
@@ -1495,7 +1495,7 @@ public abstract class BeanContextable extends Context {
* Examples are used in cases such as POJO examples in Swagger documents.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Create a serializer that excludes the 'foo' and 'bar' properties on the MyBean class.</jc>
* WriterSerializer <jv>serializer</jv> = JsonSerializer
* .<jsm>create</jsm>()
@@ -1505,8 +1505,8 @@ public abstract class BeanContextable extends Context {
*
* <p>
* This is a shorthand method for the following code:
- * <p class='bcode w800'>
- * <jv>builder</jv>.annotations(MarshalledAnnotation.<jsm>create</jsm>(<jv>pojoClass</jv>).example(SimpleJson.<jsf>DEFAULT</jsf>.toString(<jv>o</jv>)))
+ * <p class='bjava'>
+ * <jv>builder</jv>.annotations(MarshalledAnnotation.<jsm>create</jsm>(<jv>pojoClass</jv>).example(SimpleJson.<jsf>DEFAULT</jsf>.toString(<jv>object</jv>)).build())
* </p>
*
* <ul class='notes'>
@@ -1547,7 +1547,7 @@ public abstract class BeanContextable extends Context {
* Setting applies to specified class and all subclasses.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Create a serializer that excludes the 'foo' and 'bar' properties on the MyBean class.</jc>
* WriterSerializer <jv>serializer</jv> = JsonSerializer
* .<jsm>create</jsm>()
@@ -1557,8 +1557,8 @@ public abstract class BeanContextable extends Context {
*
* <p>
* This is a shorthand method for the following code:
- * <p class='bcode w800'>
- * <jv>builder</jv>.annotations(MarshalledAnnotation.<jsm>create</jsm>(<jv>pojoClass</jv>).example(<jv>json</jv>))
+ * <p class='bjava'>
+ * <jv>builder</jv>.annotations(MarshalledAnnotation.<jsm>create</jsm>(<jv>pojoClass</jv>).example(<jv>json</jv>).build())
* </p>
*
* <p>
@@ -1600,7 +1600,7 @@ public abstract class BeanContextable extends Context {
* </ul>
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with a fluent setter.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> MyBean foo(String <jv>value</jv>) {...}
@@ -1613,7 +1613,7 @@ public abstract class BeanContextable extends Context {
* .build();
*
* <jc>// Parse into bean using fluent setter.</jc>
- * MyBean <jv>myBean</jv> = <jv>parser</jv>.parse(<js>"{foo:'bar'}"</js>);
+ * MyBean <jv>bean</jv> = <jv>parser</jv>.parse(<js>"{foo:'bar'}"</js>, MyBean.<jk>class</jk>);
* </p>
*
* <ul class='notes'>
@@ -1642,7 +1642,7 @@ public abstract class BeanContextable extends Context {
* Identical to {@link #findFluentSetters()} but enables it on a specific class only.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with a fluent setter.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> MyBean foo(String <jv>value</jv>) {...}
@@ -1655,7 +1655,7 @@ public abstract class BeanContextable extends Context {
* .build();
*
* <jc>// Parse into bean using fluent setter.</jc>
- * MyBean <jv>myBean</jv> = <jv>parser</jv>.parse(<js>"{foo:'bar'}"</js>);
+ * MyBean <jv>bean</jv> = <jv>parser</jv>.parse(<js>"{foo:'bar'}"</js>, MyBean.<jk>class</jk>);
* </p>
*
* <ul class='notes'>
@@ -1684,7 +1684,7 @@ public abstract class BeanContextable extends Context {
* Otherwise, a {@code BeanRuntimeException} is thrown.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with a property that throws an exception.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String getFoo() {
@@ -1723,7 +1723,7 @@ public abstract class BeanContextable extends Context {
* Otherwise, a {@code BeanRuntimeException} is thrown.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with a property that throws an exception.</jc>
* <jk>public class</jk> MyBean {
* <jk>public void</jk> setFoo(String <jv>foo</jv>) {
@@ -1738,7 +1738,7 @@ public abstract class BeanContextable extends Context {
* .build();
*
* <jc>// Exception is ignored.</jc>
- * MyBean <jv>myBean</jv> = <jv>parser</jv>.parse(<js>"{foo:'bar'}"</js>, MyBean.<jk>class</jk>);
+ * MyBean <jv>bean</jv> = <jv>parser</jv>.parse(<js>"{foo:'bar'}"</js>, MyBean.<jk>class</jk>);
* </p>
*
* <ul class='seealso'>
@@ -1762,7 +1762,7 @@ public abstract class BeanContextable extends Context {
* Otherwise, it will be silently ignored.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with a property with a getter but not a setter.</jc>
* <jk>public class</jk> MyBean {
* <jk>public void</jk> getFoo() {
@@ -1777,7 +1777,7 @@ public abstract class BeanContextable extends Context {
* .build();
*
* <jc>// Throws a ParseException.</jc>
- * MyBean <jv>myBean</jv> = <jv>parser</jv>.parse(<js>"{foo:'bar'}"</js>, MyBean.<jk>class</jk>);
+ * MyBean <jv>bean</jv> = <jv>parser</jv>.parse(<js>"{foo:'bar'}"</js>, MyBean.<jk>class</jk>);
* </p>
*
* <ul class='notes'>
@@ -1804,7 +1804,7 @@ public abstract class BeanContextable extends Context {
* When enabled, methods and fields marked as <jk>transient</jk> will not be ignored as bean properties.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with a transient field.</jc>
* <jk>public class</jk> MyBean {
* <jk>public transient</jk> String <jf>foo</jf> = <js>"foo"</js>;
@@ -1845,7 +1845,7 @@ public abstract class BeanContextable extends Context {
* Otherwise, a {@code BeanRuntimeException} is thrown.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with a single property.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String <jf>foo</jf>;
@@ -1858,7 +1858,7 @@ public abstract class BeanContextable extends Context {
* .build();
*
* <jc>// Doesn't throw an exception on unknown 'bar' property.</jc>
- * MyBean <jv>myBean</jv> = <jv>parser</jv>.parse(<js>"{foo:'foo',bar:'bar'}"</js>, MyBean.<jk>class</jk>);
+ * MyBean <jv>bean</jv> = <jv>parser</jv>.parse(<js>"{foo:'foo',bar:'bar'}"</js>, MyBean.<jk>class</jk>);
* </p>
*
* <ul class='seealso'>
@@ -1882,7 +1882,7 @@ public abstract class BeanContextable extends Context {
* Otherwise it will be silently ignored.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with a single property.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String <jf>foo</jf>;
@@ -1895,7 +1895,7 @@ public abstract class BeanContextable extends Context {
* .build();
*
* <jc>// Throws a BeanRuntimeException wrapped in a ParseException on the unknown 'bar' property.</jc>
- * MyBean <jv>myBean</jv> = <jv>parser</jv>.parse(<js>"{foo:'foo',bar:null}"</js>, MyBean.<jk>class</jk>);
+ * MyBean <jv>bean</jv> = <jv>parser</jv>.parse(<js>"{foo:'foo',bar:null}"</js>, MyBean.<jk>class</jk>);
* </p>
*
* <ul class='seealso'>
@@ -1920,7 +1920,7 @@ public abstract class BeanContextable extends Context {
* parse).
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean interface.</jc>
* <jk>public interface</jk> MyBean {
* ...
@@ -1938,7 +1938,7 @@ public abstract class BeanContextable extends Context {
* .build();
*
* <jc>// Instantiates a MyBeanImpl,</jc>
- * MyBean <jv>myBean</jv> = <jv>parser</jv>.parse(<js>"..."</js>, MyBean.<jk>class</jk>);
+ * MyBean <jv>bean</jv> = <jv>parser</jv>.parse(<js>"..."</js>, MyBean.<jk>class</jk>);
* </p>
*
* @param interfaceClass The interface class.
@@ -1960,7 +1960,7 @@ public abstract class BeanContextable extends Context {
* parse).
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with a single property.</jc>
* <jk>public interface</jk> MyBean {
* ...
@@ -1978,7 +1978,7 @@ public abstract class BeanContextable extends Context {
* .build();
*
* <jc>// Instantiates a MyBeanImpl,</jc>
- * MyBean <jv>myBean</jv> = <jv>parser</jv>.parse(<js>"..."</js>, MyBean.<jk>class</jk>);
+ * MyBean <jv>bean</jv> = <jv>parser</jv>.parse(<js>"..."</js>, MyBean.<jk>class</jk>);
* </p>
*
* @param values
@@ -1998,7 +1998,7 @@ public abstract class BeanContextable extends Context {
* When specified, only the list of properties defined on the interface class will be used during serialization.
* Additional properties on subclasses will be ignored.
*
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Parent class or interface</jc>
* <jk>public abstract class</jk> A {
* <jk>public</jk> String <jf>foo</jf> = <js>"foo"</js>;
@@ -2045,7 +2045,7 @@ public abstract class BeanContextable extends Context {
* When specified, only the list of properties defined on the interface class will be used during serialization
* of implementation classes. Additional properties on subclasses will be ignored.
*
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Parent class or interface</jc>
* <jk>public abstract class</jk> A {
* <jk>public</jk> String <jf>foo</jf> = <js>"foo"</js>;
@@ -2094,14 +2094,14 @@ public abstract class BeanContextable extends Context {
* {@link ObjectSwap#unswap(BeanSession, Object, ClassMeta, String)} methods.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Define a POJO swap that skips serializing beans if we're in the UK.</jc>
* <jk>public class</jk> MyBeanSwap <jk>extends</jk> StringSwap<MyBean> {
* <ja>@Override</ja>
- * public String swap(BeanSession <jv>session</jv>, MyBean <jv>o</jv>) throws Exception {
+ * <jk>public</jk> String swap(BeanSession <jv>session</jv>, MyBean <jv>bean</jv>) <jk>throws</jk> Exception {
* <jk>if</jk> (<jv>session</jv>.getLocale().equals(Locale.<jsf>UK</jsf>))
* <jk>return null</jk>;
- * <jk>return</jk> <jv>o</jv>.toString();
+ * <jk>return</jk> <jv>bean</jv>.toString();
* }
* }
*
@@ -2111,14 +2111,6 @@ public abstract class BeanContextable extends Context {
* .locale(Locale.<jsf>UK</jsf>)
* .swaps(MyBeanSwap.<jk>class</jk>)
* .build();
- *
- * <jc>// Define on session-args instead.</jc>
- * SerializerSessionArgs <jv>sessionArgs</jv> = <jk>new</jk> SerializerSessionArgs().locale(Locale.<jsf>UK</jsf>);
- * <jk>try</jk> (WriterSerializerSession <jv>session</jv> = <jv>serializer</jv>.createSession(<jv>sessionArgs</jv>)) {
- *
- * <jc>// Produces "null" if in the UK.</jc>
- * String <jv>json</jv> = <jv>session</jv>.serialize(<jk>new</jk> MyBean());
- * }
* </p>
*
* <ul class='seealso'>
@@ -2147,14 +2139,14 @@ public abstract class BeanContextable extends Context {
* serializer or parser.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Define a POJO swap that skips serializing beans if the media type is application/json.</jc>
* <jk>public class</jk> MyBeanSwap <jk>extends</jk> StringSwap<MyBean> {
* <ja>@Override</ja>
- * <jk>public</jk> String swap(BeanSession <jv>session</jv>, MyBean <jv>o</jv>) throws Exception {
+ * <jk>public</jk> String swap(BeanSession <jv>session</jv>, MyBean <jv>bean</jv>) <jk>throws</jk> Exception {
* <jk>if</jk> (<jv>session</jv>.getMediaType().equals(<js>"application/json"</js>))
* <jk>return null</jk>;
- * <jk>return</jk> <jv>o</jv>.toString();
+ * <jk>return</jk> <jv>bean</jv>.toString();
* }
* }
*
@@ -2163,14 +2155,6 @@ public abstract class BeanContextable extends Context {
* .<jsm>create</jsm>()
* .mediaType(MediaType.<jsf>JSON</jsf>)
* .build();
- *
- * <jc>// Define on session-args instead.</jc>
- * SerializerSessionArgs <jv>sessionArgs</jv> = <jk>new</jk> SerializerSessionArgs().mediaType(MediaType.<jsf>JSON</jsf>);
- * <jk>try</jk> (WriterSerializerSession <jv>session</jv> = <jv>serializer</jv>.createSession(<jv>sessionArgs</jv>)) {
- *
- * <jc>// Produces "null" since it's JSON.</jc>
- * String <jv>json</jv> = <jv>session</jv>.serialize(<jk>new</jk> MyBean());
- * }
* </p>
*
* <ul class='seealso'>
@@ -2203,7 +2187,7 @@ public abstract class BeanContextable extends Context {
* </ul>
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with a single property.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String <jf>foo</jf> = <js>"bar"</js>;
@@ -2266,7 +2250,7 @@ public abstract class BeanContextable extends Context {
* </ul>
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Create a serializer that ignores beans in the specified packages.</jc>
* WriterSerializer <jv>serializer</jv> = JsonSerializer
* .<jsm>create</jsm>()
@@ -2309,7 +2293,7 @@ public abstract class BeanContextable extends Context {
* </ul>
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with a single property.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String <jf>fooBarBaz</jf> = <js>"fooBarBaz"</js>;
@@ -2348,7 +2332,7 @@ public abstract class BeanContextable extends Context {
* Same as {@link #propertyNamer(Class)} but allows you to specify a namer for a specific class.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with a single property.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String <jf>fooBarBaz</jf> = <js>"fooBarBaz"</js>;
@@ -2397,7 +2381,7 @@ public abstract class BeanContextable extends Context {
* in the Java file.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with 3 properties.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String <jf>c</jf> = <js>"1"</js>;
@@ -2438,7 +2422,7 @@ public abstract class BeanContextable extends Context {
* Same as {@link #sortProperties()} but allows you to specify individual bean classes instead of globally.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean with 3 properties.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String <jf>c</jf> = <js>"1"</js>;
@@ -2482,7 +2466,7 @@ public abstract class BeanContextable extends Context {
* but not <c>p1</c> or <c>p2</c>.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>public class</jk> C1 {
* <jk>public int</jk> getP1();
* }
@@ -2541,20 +2525,20 @@ public abstract class BeanContextable extends Context {
* </ul>
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Sample swap for converting Dates to ISO8601 strings.</jc>
* <jk>public class</jk> MyDateSwap <jk>extends</jk> StringSwap<Date> {
* <jc>// ISO8601 formatter.</jc>
* <jk>private</jk> DateFormat <jf>format</jf> = <jk>new</jk> SimpleDateFormat(<js>"yyyy-MM-dd'T'HH:mm:ssZ"</js>);
*
* <ja>@Override</ja>
- * <jk>public</jk> String swap(BeanSession <jv>session</jv>, Date <jv>o</jv>) {
- * <jk>return</jk> <jf>format</jf>.format(<jv>o</jv>);
+ * <jk>public</jk> String swap(BeanSession <jv>session</jv>, Date <jv>date</jv>) {
+ * <jk>return</jk> <jf>format</jf>.format(<jv>date</jv>);
* }
*
* <ja>@Override</ja>
- * <jk>public</jk> Date unswap(BeanSession <jv>session</jv>, String <jv>o</jv>, ClassMeta <jv>hint</jv>) <jk>throws</jk> Exception {
- * <jk>return</jk> <jf>format</jf>.parse(<jv>o</jv>);
+ * <jk>public</jk> Date unswap(BeanSession <jv>session</jv>, String <jv>string</jv>, ClassMeta <jv>hint</jv>) <jk>throws</jk> Exception {
+ * <jk>return</jk> <jf>format</jf>.parse(<jv>string</jv>);
* }
* }
*
@@ -2579,7 +2563,7 @@ public abstract class BeanContextable extends Context {
* .build();
*
* <jc>// Use our parser to parse a bean.</jc>
- * MyBean <jv>myBean</jv> = <jv>parser</jv>.parse(json, MyBean.<jk>class</jk>);
+ * MyBean <jv>bean</jv> = <jv>parser</jv>.parse(<jv>json</jv>, MyBean.<jk>class</jk>);
* </p>
*
* <ul class='notes'>
@@ -2611,11 +2595,11 @@ public abstract class BeanContextable extends Context {
* A shortcut for defining a {@link FunctionalSwap}.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
- * <jc>// Create a serializer that performs a custom format for DAte objects.</jc>
+ * <p class='bjava'>
+ * <jc>// Create a serializer that performs a custom format for Date objects.</jc>
* WriterSerializer <jv>serializer</jv> = JsonSerializer
* .<jsm>create</jsm>()
- * .swap(Date.<jk>class</jk>, String.<jk>class</jk>, <jv>x</jv> -> <jsm>format</jsm>(<jv>x</jv>))
+ * .swap(Date.<jk>class</jk>, String.<jk>class</jk>, <jv>x</jv> -> <jsm>format</jsm>(<jv>x</jv>))
* .build();
* </p>
*
@@ -2634,11 +2618,11 @@ public abstract class BeanContextable extends Context {
* A shortcut for defining a {@link FunctionalSwap}.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
- * <jc>// Create a serializer that performs a custom format for DAte objects.</jc>
+ * <p class='bjava'>
+ * <jc>// Create a serializer that performs a custom format for Date objects.</jc>
* WriterSerializer <jv>serializer</jv> = JsonSerializer
* .<jsm>create</jsm>()
- * .swap(Date.<jk>class</jk>, String.<jk>class</jk>, <jv>x</jv> -> <jsm>format</jsm>(<jv>x</jv>), <jv>x</jv> -> <jsm>parse</jsm>(<jv>x</jv>))
+ * .swap(Date.<jk>class</jk>, String.<jk>class</jk>, <jv>x</jv> -> <jsm>format</jsm>(<jv>x</jv>), <jv>x</jv> -> <jsm>parse</jsm>(<jv>x</jv>))
* .build();
* </p>
*
@@ -2664,14 +2648,14 @@ public abstract class BeanContextable extends Context {
* {@link ObjectSwap#unswap(BeanSession, Object, ClassMeta, String)} methods.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Define a POJO swap that skips serializing beans if the time zone is GMT.</jc>
* <jk>public class</jk> MyBeanSwap <jk>extends</jk> StringSwap<MyBean> {
* <ja>@Override</ja>
- * <jk>public</jk> String swap(BeanSession <jv>session</jv>, MyBean <jv>o</jv>) throws Exception {
+ * <jk>public</jk> String swap(BeanSession <jv>session</jv>, MyBean <jv>bean</jv>) <jk>throws</jk> Exception {
* <jk>if</jk> (<jv>session</jv>.getTimeZone().equals(TimeZone.<jsf>GMT</jsf>))
* <jk>return null</jk>;
- * <jk>return</jk> <jv>o</jv>.toString();
+ * <jk>return</jk> <jv>bean</jv>.toString();
* }
* }
*
@@ -2680,14 +2664,6 @@ public abstract class BeanContextable extends Context {
* .<jsm>create</jsm>()
* .timeZone(TimeZone.<jsf>GMT</jsf>)
* .build();
- *
- * <jc>// Define on session-args instead.</jc>
- * SerializerSessionArgs <jv>sessionArgs</jv> = <jk>new</jk> SerializerSessionArgs().timeZone(TimeZone.<jsf>GMT</jsf>);
- * <jk>try</jk> (WriterSerializerSession <jv>session</jv> = JsonSerializer.<jsf>DEFAULT</jsf>.createSession(<jv>sessionArgs</jv>)) {
- *
- * <jc>// Produces "null" since the time zone is GMT.</jc>
- * String <jv>json</jv> = <jv>session</jv>.serialize(<jk>new</jk> MyBean());
- * }
* </p>
*
* <ul class='seealso'>
@@ -2717,7 +2693,7 @@ public abstract class BeanContextable extends Context {
* It is also used to specify element names in XML.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Use _type='mybean' to identify this bean.</jc>
* <jk>public class</jk> MyBean {...}
*
@@ -2760,7 +2736,7 @@ public abstract class BeanContextable extends Context {
* parser knows the data type to reconstruct.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// POJOs with @Bean(name) annotations.</jc>
* <ja>@Bean</ja>(typeName=<js>"foo"</js>)
* <jk>public class</jk> Foo {...}
@@ -2790,7 +2766,7 @@ public abstract class BeanContextable extends Context {
* String <jv>json</jv> = <jv>serializer</jv>.serialize(<jk>new</jk> MyBean());
*
* <jc>// Parse bean.</jc>
- * MyBean <jv>myBean</jv> = <jv>parser</jv>.parse(<jv>json</jv>, MyBean.<jk>class</jk>);
+ * MyBean <jv>bean</jv> = <jv>parser</jv>.parse(<jv>json</jv>, MyBean.<jk>class</jk>);
* </p>
*
* <ul class='seealso'>
@@ -2817,7 +2793,7 @@ public abstract class BeanContextable extends Context {
* Same as {@link #typePropertyName(String)} except targets a specific bean class instead of globally.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// POJOs with @Bean(name) annotations.</jc>
* <ja>@Bean</ja>(typeName=<js>"foo"</js>)
* <jk>public class</jk> Foo {...}
@@ -2864,7 +2840,7 @@ public abstract class BeanContextable extends Context {
* When enabled, enums are always serialized by name, not using {@link Object#toString()}.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Create a serializer with debug enabled.</jc>
* WriterSerializer <jv>serializer</jv> = JsonSerializer
* .<jsm>create</jsm>()
@@ -2878,15 +2854,15 @@ public abstract class BeanContextable extends Context {
* <jsf>TWO</jsf>(2),
* <jsf>THREE</jsf>(3);
*
- * <jk>private int</jk> <jf>i</jf>;
+ * <jk>private int</jk> <jf>value</jf>;
*
- * Option(<jk>int</jk> i) {
- * <jk>this</jk>.<jf>i</jf> = i;
+ * Option(<jk>int</jk> <jv>value</jv>) {
+ * <jk>this</jk>.<jf>value</jf> = <jv>value</jv>;
* }
*
* <ja>@Override</ja>
* <jk>public</jk> String toString() {
- * <jk>return</jk> String.<jsm>valueOf</jsm>(<jf>i</jf>);
+ * <jk>return</jk> String.<jsm>valueOf</jsm>(<jf>value</jf>);
* }
* }
* </p>
@@ -2932,7 +2908,7 @@ public abstract class BeanContextable extends Context {
* <br>Most {@link Bean @Bean} annotations will be ignored.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Create a serializer that only uses the built-in java bean introspector for finding properties.</jc>
* WriterSerializer <jv>serializer</jv> = JsonSerializer
* .<jsm>create</jsm>()
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanDictionaryList.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanDictionaryList.java
index 9c27358..2174f52 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanDictionaryList.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanDictionaryList.java
@@ -28,7 +28,7 @@ import org.apache.juneau.annotation.*;
* </ul>
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean dictionary list consisting of classes with @Bean(typeName) annotations.</jc>
* <jk>public class</jk> MyBeanDictionaryList <jk>extends</jk> BeanDictionaryList {
*
@@ -39,7 +39,7 @@ import org.apache.juneau.annotation.*;
* }
*
* <jc>// Use it in a parser.</jc>
- * ReaderParser p = JsonParser
+ * ReaderParser <jv>parser</jv> = JsonParser
* .<jsm>create</jsm>()
* .dictionary(MyBeanDictionaryList.<jk>class</jk>)
* .build();
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanDictionaryMap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanDictionaryMap.java
index e032c10..f84ba22 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanDictionaryMap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanDictionaryMap.java
@@ -25,7 +25,7 @@ import org.apache.juneau.annotation.*;
* {@link Bean#typeName() @Bean(typeName)} annotation.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A bean dictionary map consisting of classes without @Bean(typeName) annotations</jc>
* <jc>// that require type names to be explicitly specified.</jc>
* <jk>public class</jk> MyBeanDictionaryMap <jk>extends</jk> BeanDictionaryMap {
@@ -47,7 +47,7 @@ import org.apache.juneau.annotation.*;
* }
*
* <jc>// Use it in a parser.</jc>
- * ReaderParser p = JsonParser
+ * ReaderParser <jv>parser</jv> = JsonParser
* .<jsm>create</jsm>()
* .dictionary(MyBeanDictionaryMap.<jk>class</jk>)
* .build();
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanFilter.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanFilter.java
index 0ebda71..c078c3e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanFilter.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanFilter.java
@@ -147,7 +147,7 @@ public final class BeanFilter {
* Specifies the dictionary type name for this bean.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Define our filter.</jc>
* <jk>public class</jk> MyFilter <jk>extends</jk> Builder<MyBean> {
* <jk>public</jk> MyFilter() {
@@ -156,13 +156,13 @@ public final class BeanFilter {
* }
*
* <jc>// Register it with a serializer or parser.</jc>
- * WriterSerializer s = JsonSerializer
+ * WriterSerializer <jv>serializer<jv> = JsonSerializer
* .<jsm>create</jsm>()
* .beanFilters(MyFilter.<jk>class</jk>)
* .build();
*
* <jc>// Produces: "{_type:'mybean', ...}"</jc>
- * String json = s.serialize(<jk>new</jk> MyBean());
+ * String <jv>json</jv> = <jv>serializer</jv>.serialize(<jk>new</jk> MyBean());
* </p>
*
* <ul class='seealso'>
@@ -197,7 +197,7 @@ public final class BeanFilter {
* When specified, only the list of properties defined on the interface class will be used during serialization.
* <br>Additional properties on subclasses will be ignored.
*
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Parent class</jc>
* <jk>public abstract class</jk> A {
* <jk>public</jk> String <jf>f0</jf> = <js>"f0"</js>;
@@ -216,15 +216,15 @@ public final class BeanFilter {
* }
*
* <jc>// Register it with a serializer.</jc>
- * WriterSerializer s = JsonSerializer
+ * WriterSerializer <jv>serializer</jv> = JsonSerializer
* .<jsm>create</jsm>()
* .beanFilters(AFilter.<jk>class</jk>)
* .build();
*
* <jc>// Use it.</jc>
- * A1 a1 = <jk>new</jk> A1();
- * String r = s.serialize(a1);
- * <jsm>assertEquals</jsm>(<js>"{f0:'f0'}"</js>, r); <jc>// Note f1 is not serialized</jc>
+ * A1 <jv>a1</jv> = <jk>new</jk> A1();
+ * String <jv>json</jv> = <jv>serializer</jv>.serialize(<jv>a1</jv>);
+ * <jsm>assertEquals</jsm>(<js>"{f0:'f0'}"</js>, <jv>json</jv>); <jc>// Note f1 is not serialized</jc>
* </p>
*
* <p>
@@ -258,7 +258,7 @@ public final class BeanFilter {
* but not <c>p1</c> or <c>p2</c>.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>public class</jk> C1 {
* <jk>public int</jk> getP1();
* }
@@ -279,13 +279,13 @@ public final class BeanFilter {
* }
*
* <jc>// Register it with a serializer.</jc>
- * WriterSerializer s = JsonSerializer
+ * WriterSerializer <jv>serializer</jv> = JsonSerializer
* .<jsm>create</jsm>()
* .beanFilters(C3Filter.<jk>class</jk>)
* .build();
*
* <jc>// Serializes property 'p3', but NOT 'p1' or 'p2'.</jc>
- * String json = s.serialize(<jk>new</jk> C3());
+ * String <jv>json</jv> = <jv>serializer</jv>.serialize(<jk>new</jk> C3());
* </p>
*
* <ul class='seealso'>
@@ -308,7 +308,7 @@ public final class BeanFilter {
* <br>Otherwise, the natural order of the bean properties is used which is dependent on the JVM vendor.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Define our filter.</jc>
* <jk>public class</jk> MyFilter <jk>extends</jk> Builder<MyBean> {
* <jk>public</jk> MyFilter() {
@@ -317,13 +317,13 @@ public final class BeanFilter {
* }
*
* <jc>// Register it with a serializer.</jc>
- * WriterSerializer s = JsonSerializer
+ * WriterSerializer <jv>serializer</jv> = JsonSerializer
* .<jsm>create</jsm>()
* .beanFilters(MyFilter.<jk>class</jk>)
* .build();
*
* <jc>// Properties will be sorted alphabetically.</jc>
- * String json = s.serialize(<jk>new</jk> MyBean());
+ * String <jv>json</jv> = <jv>serializer</jv>.serialize(<jk>new</jk> MyBean());
* </p>
*
* <ul class='seealso'>
@@ -375,7 +375,7 @@ public final class BeanFilter {
* </ul>
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Define our filter.</jc>
* <jk>public class</jk> MyFilter <jk>extends</jk> Builder<MyBean> {
* <jk>public</jk> MyFilter() {
@@ -403,7 +403,7 @@ public final class BeanFilter {
* The class to use for calculating bean property names.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Define our filter.</jc>
* <jk>public class</jk> MyFilter <jk>extends</jk> Builder<MyBean> {
* <jk>public</jk> MyFilter() {
@@ -414,13 +414,13 @@ public final class BeanFilter {
* }
*
* <jc>// Register it with a serializer or parser.</jc>
- * WriterSerializer s = JsonSerializer
+ * WriterSerializer <jv>serializer</jv> = JsonSerializer
* .<jsm>create</jsm>()
* .beanFilters(MyFilter.<jk>class</jk>)
* .build();
*
* <jc>// Properties names will be Dashed-Lower-Case.</jc>
- * String json = s.serialize(<jk>new</jk> MyBean());
+ * String <jv>json</jv> = <jv>serializer</jv>.serialize(<jk>new</jk> MyBean());
* </p>
*
* <ul class='seealso'>
@@ -446,22 +446,22 @@ public final class BeanFilter {
* Specifies the set and order of names of properties associated with the bean class.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Define our filter.</jc>
* <jk>public class</jk> MyFilter <jk>extends</jk> Builder<MyBean> {
* <jk>public</jk> MyFilter() {
- * bpi(<js>"foo,bar,baz"</js>);
+ * properties(<js>"foo,bar,baz"</js>);
* }
* }
*
* <jc>// Register it with a serializer.</jc>
- * WriterSerializer s = JsonSerializer
+ * WriterSerializer <jv>serializer</jv> = JsonSerializer
* .<jsm>create</jsm>()
* .beanFilters(MyFilter.<jk>class</jk>)
* .build();
*
* <jc>// Only serializes the properties 'foo', 'bar', and 'baz'.</jc>
- * String json = s.serialize(<jk>new</jk> MyBean());
+ * String <jv>json</jv> = <jv>serializer</jv>.serialize(<jk>new</jk> MyBean());
* </p>
*
* <ul class='seealso'>
@@ -491,22 +491,22 @@ public final class BeanFilter {
* Specifies properties to exclude from the bean class.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Define our filter.</jc>
* <jk>public class</jk> MyFilter <jk>extends</jk> Builder<MyBean> {
* <jk>public</jk> MyFilter() {
- * bpx(<js>"foo,bar"</js>);
+ * excludeProperties(<js>"foo,bar"</js>);
* }
* }
*
* <jc>// Register it with a serializer.</jc>
- * WriterSerializer s = JsonSerializer
+ * WriterSerializer <jv>serializer</jv> = JsonSerializer
* .<jsm>create</jsm>()
* .beanFilters(MyFilter.<jk>class</jk>)
* .build();
*
* <jc>// Serializes all properties except for 'foo' and 'bar'.</jc>
- * String json = s.serialize(<jk>new</jk> MyBean());
+ * String <jv>json</jv> = <jv>serializer</jv>.serialize(<jk>new</jk> MyBean());
* </p>
*
* <ul class='seealso'>
@@ -537,22 +537,22 @@ public final class BeanFilter {
* Serializers will serialize such properties as usual, but parsers will silently ignore them.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Define our filter.</jc>
* <jk>public class</jk> MyFilter <jk>extends</jk> Builder<MyBean> {
* <jk>public</jk> MyFilter() {
- * bpro(<js>"foo,bar"</js>);
+ * readOnlyProperties(<js>"foo,bar"</js>);
* }
* }
*
* <jc>// Register it with a parser.</jc>
- * ReaderParser p = JsonParser
+ * ReaderParser <jv>parser</jv> = JsonParser
* .<jsm>create</jsm>()
* .beanFilters(MyFilter.<jk>class</jk>)
* .build();
*
* <jc>// Parsers all properties except for 'foo' and 'bar'.</jc>
- * MyBean b = p.parse(<js>"..."</js>, MyBean.<jk>class</jk>);
+ * MyBean <jv>bean</jv> = <jv>parser</jv>.parse(<js>"..."</js>, MyBean.<jk>class</jk>);
* </p>
*
* <ul class='seealso'>
@@ -584,22 +584,22 @@ public final class BeanFilter {
* Parsers will parse such properties as usual, but serializers will silently ignore them.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Define our filter.</jc>
* <jk>public class</jk> MyFilter <jk>extends</jk> Builder<MyBean> {
* <jk>public</jk> MyFilter() {
- * bpwo(<js>"foo,bar"</js>);
+ * writeOnlyProperties(<js>"foo,bar"</js>);
* }
* }
*
* <jc>// Register it with a serializer.</jc>
- * WriterSerializer s = JsonSerializer
+ * WriterSerializer <jv>serializer</jv> = JsonSerializer
* .<jsm>create</jsm>()
* .beanFilters(MyFilter.<jk>class</jk>)
* .build();
*
* <jc>// Serializes all properties except for 'foo' and 'bar'.</jc>
- * String json = s.serialize(<jk>new</jk> MyBean());
+ * String <jv>json</jv> = <jv>serializer</jv>.serialize(<jk>new</jk> MyBean());
* </p>
*
* <ul class='seealso'>
@@ -630,7 +630,7 @@ public final class BeanFilter {
* Adds to the list of classes that make up the bean dictionary for this bean.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Define our filter.</jc>
* <jk>public class</jk> MyFilter <jk>extends</jk> Builder<MyBean> {
* <jk>public</jk> MyFilter() {
@@ -640,13 +640,13 @@ public final class BeanFilter {
* }
*
* <jc>// Register it with a parser.</jc>
- * ReaderParser p = JsonParser
+ * ReaderParser <jv>parser</jv> = JsonParser
* .<jsm>create</jsm>()
* .beanFilters(MyFilter.<jk>class</jk>)
* .build();
*
* <jc>// Instantiate our bean.</jc>
- * MyBean myBean = p.parse(json);
+ * MyBean <jv>bean</jv> = <jv>parser</jv>.parse(<jv>json</jv>);
* </p>
*
* <ul class='seealso'>
@@ -685,7 +685,7 @@ public final class BeanFilter {
* The interceptor to use for intercepting and altering getter and setter calls.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Define our filter.</jc>
* <jk>public class</jk> MyFilter <jk>extends</jk> Builder<MyBean> {
* <jk>public</jk> MyFilter() {
@@ -695,7 +695,7 @@ public final class BeanFilter {
* }
*
* <jc>// Register it with a serializer or parser.</jc>
- * WriterSerializer s = JsonSerializer
+ * WriterSerializer <jv>serializer</jv> = JsonSerializer
* .<jsm>create</jsm>()
* .beanFilters(MyFilter.<jk>class</jk>)
* .build();
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java
index fdccb01..631ddf4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java
@@ -216,18 +216,18 @@ public class BeanMap<T> extends AbstractMap<String,Object> implements Delegate<T
* a String containing an ISO8601 date-time string value.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Construct a bean with a 'birthDate' Date field</jc>
- * Person p = <jk>new</jk> Person();
+ * Person <jv>person</jv> = <jk>new</jk> Person();
*
* <jc>// Create a bean context and add the ISO8601 date-time swap</jc>
- * BeanContext beanContext = <jk>new</jk> BeanContext().swaps(DateSwap.ISO8601DT.<jk>class</jk>);
+ * BeanContext <jv>beanContext</jv> = BeanContext.<jsm>create</jsm>().swaps(DateSwap.ISO8601DT.<jk>class</jk>).build();
*
* <jc>// Wrap our bean in a bean map</jc>
- * BeanMap<Person> b = beanContext.forBean(p);
+ * BeanMap<Person> <jv>beanMap</jv> = <jv>beanContext</jv>.toBeanMap(<jv>person</jv>);
*
* <jc>// Set the field</jc>
- * myBeanMap.put(<js>"birthDate"</js>, <js>"'1901-03-03T04:05:06-5000'"</js>);
+ * <jv>beanMap</jv>.put(<js>"birthDate"</js>, <js>"'1901-03-03T04:05:06-5000'"</js>);
* </p>
*
* @param property The name of the property to set.
@@ -300,19 +300,19 @@ public class BeanMap<T> extends AbstractMap<String,Object> implements Delegate<T
* ISO8601 date-time string value.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Construct a bean with a 'birthDate' Date field</jc>
- * Person p = <jk>new</jk> Person();
- * p.setBirthDate(<jk>new</jk> Date(1, 2, 3, 4, 5, 6));
+ * Person <jv>person</jv> = <jk>new</jk> Person();
+ * <jv>person</jv>.setBirthDate(<jk>new</jk> Date(1, 2, 3, 4, 5, 6));
*
* <jc>// Create a bean context and add the ISO8601 date-time swap</jc>
- * BeanContext beanContext = <jk>new</jk> BeanContext().swaps(DateSwap.ISO8601DT.<jk>class</jk>);
+ * BeanContext <jv>beanContext</jv> = BeanContext.<jsm>create</jsm>().swaps(DateSwap.ISO8601DT.<jk>class</jk>).build();
*
* <jc>// Wrap our bean in a bean map</jc>
- * BeanMap<Person> b = beanContext.forBean(p);
+ * BeanMap<Person> <jv>beanMap</jv> = <jv>beanContext</jv>.toBeanMap(<jv>person</jv>);
*
* <jc>// Get the field as a string (i.e. "'1901-03-03T04:05:06-5000'")</jc>
- * String s = myBeanMap.get(<js>"birthDate"</js>);
+ * String <jv>birthDate</jv> = <jv>beanMap</jv>.get(<js>"birthDate"</js>);
* </p>
*
* @param property The name of the property to get.
@@ -376,8 +376,8 @@ public class BeanMap<T> extends AbstractMap<String,Object> implements Delegate<T
* Convenience method for setting multiple property values by passing in JSON text.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
- * aPersonBean.load(<js>"{name:'John Smith',age:21}"</js>)
+ * <p class='bjava'>
+ * <jv>beanMap</jv>.load(<js>"{name:'John Smith',age:21}"</js>)
* </p>
*
* @param input The text that will get parsed into a map and then added to this map.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMapEntry.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMapEntry.java
index 878af2b..dc640a3 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMapEntry.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMapEntry.java
@@ -24,21 +24,21 @@ import org.apache.juneau.swap.*;
* This class can be used to get and set property values on a bean, or to get metadata on a property.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Construct a new bean</jc>
- * Person p = <jk>new</jk> Person();
+ * Person <jv>person</jv> = <jk>new</jk> Person();
*
* <jc>// Wrap it in a bean map</jc>
- * BeanMap<Person> b = BeanContext.<jsf>DEFAULT</jsf>.forBean(p);
+ * BeanMap<Person> <jv>beanMap</jv> = BeanContext.<jsf>DEFAULT</jsf>.toBeanMap(<jv>person</jv>);
*
* <jc>// Get a reference to the birthDate property</jc>
- * BeanMapEntry birthDate = b.getProperty(<js>"birthDate"</js>);
+ * BeanMapEntry <jv>birthDate</jv> = <jv>beanMap</jv>.getProperty(<js>"birthDate"</js>);
*
* <jc>// Set the property value</jc>
- * birthDate.setValue(<jk>new</jk> Date(1, 2, 3, 4, 5, 6));
+ * <jv>birthDate</jv>.setValue(<jk>new</jk> Date(1, 2, 3, 4, 5, 6));
*
* <jc>// Or if the DateSwap.DEFAULT_ISO8601DT is registered with the bean context, set a transformed value</jc>
- * birthDate.setValue(<js>"'1901-03-03T04:05:06-5000'"</js>);
+ * <jv>birthDate</jv>.setValue(<js>"'1901-03-03T04:05:06-5000'"</js>);
* </p>
*
* <ul class='seealso'>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
index 17ece9f..0d648f3 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
@@ -414,7 +414,7 @@ public class BeanMeta<T> {
// Check for missing properties.
for (String fp : fixedBeanProps)
if (! normalProps.containsKey(fp))
- throw new BeanRuntimeException(c, "The property ''{0}'' was defined on the @Bean(bpi=X) annotation of class ''{1}'' but was not found on the class definition.", fp, ci.getSimpleName());
+ throw new BeanRuntimeException(c, "The property ''{0}'' was defined on the @Bean(properties=X) annotation of class ''{1}'' but was not found on the class definition.", fp, ci.getSimpleName());
// Mark constructor arg properties.
for (String fp : constructorArgs) {
@@ -876,24 +876,24 @@ public class BeanMeta<T> {
*
* <p>
* For example, given the following classes...
- * <p class='bcode w800'>
- * public static class BeanA<T> {
- * public T x;
+ * <p class='bjava'>
+ * <jk>public static class</jk> BeanA<T> {
+ * <jk>public</jk> T <jf>x</jf>;
* }
- * public static class BeanB extends BeanA<Integer>} {...}
+ * <jk>public static class</jk> BeanB <jk>extends</jk> BeanA<Integer> {...}
* </p>
* <p>
* ...calling this method on {@code BeanB.class} will load the following data into {@code m} indicating
* that the {@code T} parameter on the BeanA class is implemented with an {@code Integer}:
- * <p class='bcode w800'>
+ * <p class='bcode'>
* {BeanA.class:[Integer.class]}
* </p>
*
* <p>
* TODO: This code doesn't currently properly handle the following situation:
- * <p class='bcode w800'>
- * public static class BeanB<T extends Number> extends BeanA<T>;
- * public static class BeanC extends BeanB<Integer>;
+ * <p class='bjava'>
+ * <jk>public static class</jk> BeanB<T <jk>extends</jk> Number> <jk>extends</jk> BeanA<>;
+ * <jk>public static class</jk> BeanC <jk>extends</jk> BeanB<Integer>;
* </p>
*
* <p>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMetaFiltered.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMetaFiltered.java
index bcebb67..21ed8cc 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMetaFiltered.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMetaFiltered.java
@@ -17,7 +17,7 @@ import java.util.*;
import org.apache.juneau.annotation.*;
/**
- * Same as {@link BeanMeta}, except the list of bean properties are limited by a {@link Beanp#properties() @Beanp(bpi)} annotation.
+ * Same as {@link BeanMeta}, except the list of bean properties are limited by a {@link Beanp#properties() @Beanp(properties)} annotation.
*
* <ul class='seealso'>
* <li class='extlink'>{@source}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
index 71224c4..28caae1 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
@@ -523,7 +523,7 @@ public final class BeanPropertyMeta {
}
/**
- * Returns the override list of properties defined through a {@link Beanp#properties() @Beanp(bpi)} annotation
+ * Returns the override list of properties defined through a {@link Beanp#properties() @Beanp(properties)} annotation
* on this property.
*
* @return The list of override properties, or <jk>null</jk> if annotation not specified.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
index 6d7d2e8..cf38017 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
@@ -987,9 +987,9 @@ public class BeanSession extends ContextSession {
* If object is already a {@link BeanMap}, simply returns the same object.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Construct a bean map around a bean instance</jc>
- * BeanMap<Person> bm = BeanContext.<jsf>DEFAULT</jsf>.forBean(<jk>new</jk> Person());
+ * BeanMap<Person> <jv>beanMap</jv> = BeanContext.<jsf>DEFAULT</jsf>.toBeanMap(<jk>new</jk> Person());
* </p>
*
* @param <T> The class of the object being wrapped.
@@ -1009,9 +1009,9 @@ public class BeanSession extends ContextSession {
* Same as {@link #toBeanMap(Object)} but allows you to specify a property namer instance.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Construct a bean map around a bean instance</jc>
- * BeanMap<Person> bm = BeanContext.<jsf>DEFAULT</jsf>.toBeanMap(<jk>new</jk> Person(), PropertyNamerDLC.<jsf>INSTANCE</jsf>);
+ * BeanMap<Person> <jv>beanMap</jv> = BeanContext.<jsf>DEFAULT</jsf>.toBeanMap(<jk>new</jk> Person(), PropertyNamerDLC.<jsf>INSTANCE</jsf>);
* </p>
*
* @param <T> The class of the object being wrapped.
@@ -1053,12 +1053,12 @@ public class BeanSession extends ContextSession {
* If object is not a true bean, throws a {@link BeanRuntimeException} with an explanation of why it's not a bean.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Construct a bean map for new bean using only properties defined in a superclass</jc>
- * BeanMap<MySubBean> bm = BeanContext.<jsf>DEFAULT</jsf>.forBean(<jk>new</jk> MySubBean(), MySuperBean.<jk>class</jk>);
+ * BeanMap<MySubBean> <jv>beanMap</jv> = BeanContext.<jsf>DEFAULT</jsf>.toBeanMap(<jk>new</jk> MySubBean(), MySuperBean.<jk>class</jk>);
*
* <jc>// Construct a bean map for new bean using only properties defined in an interface</jc>
- * BeanMap<MySubBean> bm = BeanContext.<jsf>DEFAULT</jsf>.forBean(<jk>new</jk> MySubBean(), MySuperInterface.<jk>class</jk>);
+ * BeanMap<MySubBean> <jv>beanMap</jv> = BeanContext.<jsf>DEFAULT</jsf>.toBeanMap(<jk>new</jk> MySubBean(), MySuperInterface.<jk>class</jk>);
* </p>
*
* @param <T> The class of the object being wrapped.
@@ -1093,9 +1093,9 @@ public class BeanSession extends ContextSession {
* bean.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Construct a new bean map wrapped around a new Person object</jc>
- * BeanMap<Person> bm = BeanContext.<jsf>DEFAULT</jsf>.newBeanMap(Person.<jk>class</jk>);
+ * BeanMap<Person> <jv>beanMap</jv> = BeanContext.<jsf>DEFAULT</jsf>.newBeanMap(Person.<jk>class</jk>);
* </p>
*
* @param <T> The class of the object being wrapped.
@@ -1132,9 +1132,9 @@ public class BeanSession extends ContextSession {
* be instantiated within another class instance.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Construct a new instance of the specified bean class</jc>
- * Person p = BeanContext.<jsf>DEFAULT</jsf>.newBean(Person.<jk>class</jk>);
+ * Person <jv>person</jv> = BeanContext.<jsf>DEFAULT</jsf>.newBean(Person.<jk>class</jk>);
* </p>
*
* @param <T> The class type of the bean being created.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseContext.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseContext.java
index 1bc8afa..ad144d2 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseContext.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseContext.java
@@ -25,13 +25,13 @@ import org.apache.juneau.utils.*;
/**
* Parent class for all classes that traverse POJOs.
- * {@review}
+ * {@reviewed}
*
* <h5 class='topic'>Description</h5>
- *
+ * <p>
* Base class that serves as the parent class for all serializers and other classes that traverse POJOs.
*
- * <ul class='spaced-list'>
+ * <ul class='notes'>
* <li class='note'>This class is thread safe and reusable.
* </ul>
*
@@ -126,7 +126,7 @@ public abstract class BeanTraverseContext extends BeanContextable {
* </ul>
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Create a serializer that automatically checks for recursions.</jc>
* WriterSerializer <jv>serializer</jv> = JsonSerializer
* .<jsm>create</jsm>()
@@ -137,11 +137,11 @@ public abstract class BeanTraverseContext extends BeanContextable {
* <jk>public class</jk> MyBean {
* <jk>public</jk> Object <jf>f</jf>;
* }
- * MyBean <jv>myBean</jv> = <jk>new</jk> MyBean();
- * <jv>serializer</jv>.<jf>f</jf> = <jv>serializer</jv>;
+ * MyBean <jv>bean</jv> = <jk>new</jk> MyBean();
+ * <jv>bean</jv>.<jf>f</jf> = <jv>bean</jv>;
*
* <jc>// Throws a SerializeException and not a StackOverflowError</jc>
- * String <jv>json</jv> = <jv>serializer</jv>.serialize(<jv>myBean</jv>);
+ * String <jv>json</jv> = <jv>serializer</jv>.serialize(<jv>bean</jv>);
* </p>
*
* @return This object.
@@ -170,10 +170,10 @@ public abstract class BeanTraverseContext extends BeanContextable {
* When enabled, when we encounter the same object when traversing a tree, we set the value to <jk>null</jk>.
*
* <p>
- * For example, if a model contains the links A->B->C->A, then the JSON generated will look like
+ * For example, if a model contains the links A->B->C->A, then the JSON generated will look like
* the following when this setting is <jk>true</jk>...
*
- * <p class='bcode w800'>
+ * <p class='bjson'>
* {A:{B:{C:<jk>null</jk>}}}
* </p>
*
@@ -183,7 +183,7 @@ public abstract class BeanTraverseContext extends BeanContextable {
* </ul>
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Create a serializer ignores recursions.</jc>
* WriterSerializer <jv>serializer</jv> = JsonSerializer
* .<jsm>create</jsm>()
@@ -194,11 +194,11 @@ public abstract class BeanTraverseContext extends BeanContextable {
* <jk>public class</jk> MyBean {
* <jk>public</jk> Object <jf>f</jf>;
* }
- * MyBean <jv>myBean</jv> = <jk>new</jk> MyBean();
- * <jv>myBean</jv>.<jf>f</jf> = <jv>myBean</jv>;
+ * MyBean <jv>bean</jv> = <jk>new</jk> MyBean();
+ * <jv>bean</jv>.<jf>f</jf> = <jv>bean</jv>;
*
* <jc>// Produces "{f:null}"</jc>
- * String <jv>json</jv> = <jv>serializer</jv>.serialize(<jv>myBean</jv>);
+ * String <jv>json</jv> = <jv>serializer</jv>.serialize(<jv>bean</jv>);
* </p>
*
* @return This object.
@@ -230,7 +230,7 @@ public abstract class BeanTraverseContext extends BeanContextable {
* Useful when constructing document fragments that need to be indented at a certain level when whitespace is enabled.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Create a serializer with whitespace enabled and an initial depth of 2.</jc>
* WriterSerializer <jv>serializer</jv> = JsonSerializer
* .<jsm>create</jsm>()
@@ -266,7 +266,7 @@ public abstract class BeanTraverseContext extends BeanContextable {
* This prevents stack overflows from occurring when trying to traverse models with recursive references.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Create a serializer that throws an exception if the depth reaches greater than 20.</jc>
* WriterSerializer <jv>serializer</jv> = JsonSerializer
* .<jsm>create</jsm>()
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BinaryFormat.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BinaryFormat.java
index 1d549fa..7f7e071 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BinaryFormat.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BinaryFormat.java
@@ -25,7 +25,7 @@ public enum BinaryFormat {
* Spaced-hex.
*
* <h5 class='figure'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bcode'>
* 12 34 56 78 90 AB CD EF
* </p>
*/
@@ -35,7 +35,7 @@ public enum BinaryFormat {
* Hex.
*
* <h5 class='figure'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bcode'>
* 1234567890ABCDEF
* </p>
*/
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
index 64a3449..ef5ca66 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
@@ -338,15 +338,15 @@ public abstract class Context implements AnnotationProvider {
* and {@link AnnotationApplier} which represents the code used to apply the values in that annotation to a specific builder.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A class annotated with a config annotation.</jc>
* <ja>@BeanConfig</ja>(sortProperties=<js>"$S{sortProperties,false}"</js>)
* <jk>public class</jk> MyClass {...}
*
* <jc>// Find all annotations that themselves are annotated with @ContextPropertiesApply.</jc>
- * List<AnnotationWork> <jv>work</jv> = ClassInfo.<jsm>of</jsm>(MyClass.<jk>class</jk>)
- * .getAnnotationList(ConfigAnnotationFilter.<jsf>INSTANCE</jsf>)
- * .getWork(VarResolver.<jsf>DEFAULT</jsf>.createSession());
+ * AnnotationList <jv>annotations</jv> = ClassInfo.<jsm>of</jsm>(MyClass.<jk>class</jk>).getAnnotationList(<jsf>CONTEXT_APPLY_FILTER</jsf>);
+ * VarResolverSession <jv>vrs</jv> = VarResolver.<jsf>DEFAULT</jsf>.createSession();
+ * AnnotationWorkList <jv>work</jv> = AnnotationWorkList.of(<jv>vrs</jv>, <jv>annotations</jv>);
*
* <jc>// Apply any settings found on the annotations.</jc>
* WriterSerializer <jv>serializer</jv> = JsonSerializer
@@ -401,7 +401,7 @@ public abstract class Context implements AnnotationProvider {
* <p>
* Any annotations found that themselves are annotated with {@link ContextApply} will be resolved and
* applied as properties to this builder. These annotations include:
- * <ul class='javatree'>
+ * <ul class='javatreec'>
* <li class ='ja'>{@link BeanConfig}
* <li class ='ja'>{@link CsvConfig}
* <li class ='ja'>{@link HtmlConfig}
@@ -433,7 +433,7 @@ public abstract class Context implements AnnotationProvider {
* The default var resolver {@link VarResolver#DEFAULT} is used to resolve any variables in annotation field values.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A class annotated with a config annotation.</jc>
* <ja>@BeanConfig</ja>(sortProperties=<js>"$S{sortProperties,false}"</js>)
* <jk>public class</jk> MyClass {...}
@@ -462,7 +462,7 @@ public abstract class Context implements AnnotationProvider {
* <p>
* Any annotations found that themselves are annotated with {@link ContextApply} will be resolved and
* applied as properties to this builder. These annotations include:
- * <ul class='javatree'>
+ * <ul class='javatreec'>
* <li class ='ja'>{@link BeanConfig}
* <li class ='ja'>{@link CsvConfig}
* <li class ='ja'>{@link HtmlConfig}
@@ -495,7 +495,7 @@ public abstract class Context implements AnnotationProvider {
* The default var resolver {@link VarResolver#DEFAULT} is used to resolve any variables in annotation field values.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A method annotated with a config annotation.</jc>
* <jk>public class</jk> MyClass {
* <ja>@BeanConfig</ja>(sortProperties=<js>"$S{sortProperties,false}"</js>)
@@ -537,7 +537,7 @@ public abstract class Context implements AnnotationProvider {
*
* <p>
* The following example shows the equivalent methods for applying the {@link Bean @Bean} annotation:
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Class with explicit annotation.</jc>
* <ja>@Bean</ja>(properties=<js>"street,city,state"</js>)
* <jk>public class</jk> A {...}
@@ -555,9 +555,9 @@ public abstract class Context implements AnnotationProvider {
* In general, the underlying framework uses this method when it finds dynamically applied annotations on
* config annotations. However, concrete implementations of annotations are also provided that can be passed
* directly into builder classes like so:
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Create a concrete @Bean annotation.</jc>
- * BeanAnnotation <jv>annotation</jv> = BeanAnnotation.<jsm>create</jsm>(B.<jk>class</jk>).properties(<js>"street,city,state"</js>);
+ * <ja>Bean</ja> <jv>annotation</jv> = BeanAnnotation.<jsm>create</jsm>(B.<jk>class</jk>).properties(<js>"street,city,state"</js>).build();
*
* <jc>// Apply it to a serializer.</jc>
* WriterSerializer <jv>serializer</jv> = JsonSerializer.<jsm>create</jsm>().annotations(<jv>annotation</jv>).build();
@@ -569,7 +569,7 @@ public abstract class Context implements AnnotationProvider {
* <p>
* The following is the list of annotations builders provided that can be constructed
* and passed into the builder class:
- * <ul class='javatree'>
+ * <ul class='javatreec'>
* <li class='ja'>{@link org.apache.juneau.annotation.BeanAnnotation}
* <li class='ja'>{@link org.apache.juneau.annotation.BeancAnnotation}
* <li class='ja'>{@link org.apache.juneau.annotation.BeanIgnoreAnnotation}
@@ -725,7 +725,7 @@ public abstract class Context implements AnnotationProvider {
* </ul>
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Create a serializer with debug enabled.</jc>
* WriterSerializer <jv>serializer</jv> = JsonSerializer
* .<jsm>create</jsm>()
@@ -736,11 +736,11 @@ public abstract class Context implements AnnotationProvider {
* <jk>public class</jk> MyBean {
* <jk>public</jk> Object <jf>f</jf>;
* }
- * MyBean <jv>myBean</jv> = <jk>new</jk> MyBean();
- * <jv>myBean</jv>.<jf>f</jf> = <jv>myBean</jv>;
+ * MyBean <jv>bean</jv> = <jk>new</jk> MyBean();
+ * <jv>bean</jv>.<jf>f</jf> = <jv>bean</jv>;
*
* <jc>// Throws a SerializeException and not a StackOverflowError</jc>
- * String <jv>json</jv> = <jv>serializer</jv>.serialize(<jv>myBean</jv>);
+ * String <jv>json</jv> = <jv>serializer</jv>.serialize(<jv>bean</jv>);
* </p>
*
* <ul class='seealso'>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyNamerDLC.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyNamerDLC.java
index 601b9c6..62cb4ba 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyNamerDLC.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyNamerDLC.java
@@ -20,9 +20,9 @@ import static org.apache.juneau.internal.StringUtils.*;
*
* <h5 class='section'>Example:</h5>
* <ul>
- * <li><js>"fooBar"</js> -> <js>"foo-bar"</js>
- * <li><js>"fooBarURL"</js> -> <js>"foo-bar-url"</js>
- * <li><js>"FooBarURL"</js> -> <js>"foo-bar-url"</js>
+ * <li><js>"fooBar"</js> -> <js>"foo-bar"</js>
+ * <li><js>"fooBarURL"</js> -> <js>"foo-bar-url"</js>
+ * <li><js>"FooBarURL"</js> -> <js>"foo-bar-url"</js>
* </ul>
*
* <ul class='seealso'>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyNamerDUCS.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyNamerDUCS.java
index ce1e8f4..09af694 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyNamerDUCS.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyNamerDUCS.java
@@ -20,9 +20,9 @@ import static org.apache.juneau.internal.StringUtils.*;
*
* <h5 class='section'>Example:</h5>
* <ul>
- * <li><js>"fooBar"</js> -> <js>"Foo-Bar"</js>
- * <li><js>"fooBarURL"</js> -> <js>"Foo-Bar-Url"</js>
- * <li><js>"FooBarURL"</js> -> <js>"Foo-Bar-Url"</js>
+ * <li><js>"fooBar"</js> -> <js>"Foo-Bar"</js>
+ * <li><js>"fooBarURL"</js> -> <js>"Foo-Bar-Url"</js>
+ * <li><js>"FooBarURL"</js> -> <js>"Foo-Bar-Url"</js>
* </ul>
*
* <ul class='seealso'>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyNamerULC.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyNamerULC.java
index 24d4384..d329ec7 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyNamerULC.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyNamerULC.java
@@ -20,9 +20,9 @@ import static org.apache.juneau.internal.StringUtils.*;
*
* <h5 class='section'>Example:</h5>
* <ul>
- * <li><js>"fooBar"</js> -> <js>"foo_bar"</js>
- * <li><js>"fooBarURL"</js> -> <js>"foo_bar_url"</js>
- * <li><js>"FooBarURL"</js> -> <js>"foo_bar_url"</js>
+ * <li><js>"fooBar"</js> -> <js>"foo_bar"</js>
+ * <li><js>"fooBarURL"</js> -> <js>"foo_bar_url"</js>
+ * <li><js>"FooBarURL"</js> -> <js>"foo_bar_url"</js>
* </ul>
*
* <ul class='seealso'>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/UriContext.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/UriContext.java
index 0c12e24..09005f9 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/UriContext.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/UriContext.java
@@ -25,7 +25,7 @@ import org.apache.juneau.parser.*;
*
* <p>
* A typical request against a URL takes the following form:
- * <p class='bcode w800'>
+ * <p class='bcode'>
* http://host:port/context-root/servlet-path/path-info
* | authority | context | resource | path |
* +--------------------------------------------------+
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/UriResolver.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/UriResolver.java
index 266a6dc..1e43142 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/UriResolver.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/UriResolver.java
@@ -139,9 +139,9 @@ public class UriResolver {
*
* <p>
* For example, to relativize a URI to its servlet-relative form:
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// relativeUri == "path/foo"</jc>
- * String relativeUri = resolver.relativize(<js>"servlet:/"</js>, <js>"/context/servlet/path/foo"</js>);
+ * String <jv>relativeUri</jv> = <jv>resolver</jv>.relativize(<js>"servlet:/"</js>, <js>"/context/servlet/path/foo"</js>);
* </p>
*
* @param relativeTo The URI to relativize against.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Version.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Version.java
index 753bc23..c094602 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Version.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Version.java
@@ -125,7 +125,7 @@ public class Version implements Comparable<Version> {
* Returns <jk>true</jk> if the specified version is at least this version.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jsm>assertTrue</jsm>(Version.<jsm>of</jsm>(<js>"1.2"</js>).isAtLeast(Version.<jsm>of</jsm>(<js>"1"</js>)));
* <jsm>assertFalse</jsm>(Version.<jsm>of</jsm>(<js>"1.2"</js>).isAtLeast(Version.<jsm>of</jsm>(<js>"2"</js>)));
* <jsm>assertTrue</jsm>(Version.<jsm>of</jsm>(<js>"1.2"</js>).isAtLeast(Version.<jsm>of</jsm>(<js>"1.2.3"</js>)));
@@ -144,7 +144,7 @@ public class Version implements Comparable<Version> {
* Returns <jk>true</jk> if the specified version is at least this version.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jsm>assertTrue</jsm>(Version.<jsm>of</jsm>(<js>"1.2.3"</js>).isAtLeast(Version.<jsm>of</jsm>(<js>"1.2.3"</js>, <jk>false</jk>)));
* <jsm>assertFalse</jsm>(Version.<jsm>of</jsm>(<js>"1.2.3"</js>).isAtLeast(Version.<jsm>of</jsm>(<js>"1.2.3"</js>, <jk>true</jk>)));
* </p>
@@ -171,7 +171,7 @@ public class Version implements Comparable<Version> {
* Returns <jk>true</jk> if the specified version is at most this version.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jsm>assertFalse</jsm>(Version.<jsm>of</jsm>(<js>"1.2.3"</js>).isAtMost(Version.<jsm>of</jsm>(<js>"1"</js>)));
* <jsm>assertTrue</jsm>(Version.<jsm>of</jsm>(<js>"1.2.3"</js>).isAtMost(Version.<jsm>of</jsm>(<js>"2"</js>)));
* <jsm>assertTrue</jsm>(Version.<jsm>of</jsm>(<js>"1.2.3"</js>).isAtMost(Version.<jsm>of</jsm>(<js>"1.2"</js>)));
@@ -189,7 +189,7 @@ public class Version implements Comparable<Version> {
* Returns <jk>true</jk> if the specified version is at most this version.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jsm>assertTrue</jsm>(Version.<jsm>of</jsm>(<js>"1.2.3"</js>).isAtMost(Version.<jsm>of</jsm>(<js>"1.2.3"</js>, <jk>false</jk>)));
* <jsm>assertFalse</jsm>(Version.<jsm>of</jsm>(<js>"1.2.3"</js>).isAtMost(Version.<jsm>of</jsm>(<js>"1.2.3"</js>, <jk>true</jk>)));
* </p>
@@ -216,7 +216,7 @@ public class Version implements Comparable<Version> {
* Returns <jk>true</jk> if the specified version is equal to this version.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jsm>assertTrue</jsm>(Version.<jsm>of</jsm>(<js>"1.2.3"</js>).isEqualsTo(Version.<jsm>of</jsm>(<js>"1.2.3"</js>)));
* <jsm>assertTrue</jsm>(Version.<jsm>of</jsm>(<js>"1.2.3"</js>).isEqualsTo(Version.<jsm>of</jsm>(<js>"1.2"</js>)));
* </p>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Visibility.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Visibility.java
index 3ac2774..1a1b5ad 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Visibility.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Visibility.java
@@ -56,7 +56,7 @@ public enum Visibility {
* Identifies if the specified mod matches this visibility.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jsf>PUBLIC</jsf>.isVisible(MyPublicClass.<jk>class</jk>.getModifiers()); <jc>//true</jc>
* <jsf>PUBLIC</jsf>.isVisible(MyPrivateClass.<jk>class</jk>.getModifiers()); <jc>//false</jc>
* <jsf>PRIVATE</jsf>.isVisible(MyPrivateClass.<jk>class</jk>.getModifiers()); <jc>//true</jc>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Bean.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Bean.java
index 0f80055..49d9ae4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Bean.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Bean.java
@@ -71,7 +71,7 @@ public @interface Bean {
* Examples are used in cases such as POJO examples in Swagger documents.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <ja>@Bean</ja>(example=<js>"{foo:'bar'}"</js>)
* <jk>public class</jk> MyClass {...}
* </p>
@@ -106,7 +106,7 @@ public @interface Bean {
* Specifies a list of properties that should be excluded from {@link BeanMap#entrySet()}.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Exclude the 'city' and 'state' properties from the Address class.</jc>
* <ja>@Bean</ja>(excludeProperties=<js>"city,state"</js>})
* <jk>public class</jk> Address {...}
@@ -132,11 +132,11 @@ public @interface Bean {
* When <jk>true</jk>, fluent setters will be detected on beans.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <ja>@Bean</ja>(findFluentSetters=<jk>true</jk>)
* <jk>public class</jk> MyBean {
* <jk>public int</jk> getId() {...}
- * <jk>public</jk> MyBean id(<jk>int</jk> id) {...}
+ * <jk>public</jk> MyBean id(<jk>int</jk> <jv>id</jv>) {...}
* }
* </p>
*
@@ -165,7 +165,7 @@ public @interface Bean {
* parse).
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <ja>@Bean</ja>(implClass=MyInterfaceImpl.<jk>class</jk>)
* <jk>public class</jk> MyInterface {...}
* <p>
@@ -191,7 +191,7 @@ public @interface Bean {
* When specified, only the list of properties defined on the interface class will be used during serialization.
* Additional properties on subclasses will be ignored.
*
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Parent class</jc>
* <ja>@Bean</ja>(interfaceClass=A.<jk>class</jk>)
* <jk>public abstract class</jk> A {
@@ -204,7 +204,7 @@ public @interface Bean {
* }
*
* <jc>// Produces "{f0:'f0'}"</jc>
- * String json = SimpleJsonSerializer.<jsf>DEFAULT</jsf>.serialize(<jk>new</jk> A1());
+ * String <jv>json</jv> = SimpleJsonSerializer.<jsf>DEFAULT</jsf>.serialize(<jk>new</jk> A1());
* </p>
*
* <p>
@@ -288,7 +288,7 @@ public @interface Bean {
* whereas on Oracle JREs, the order is entirely random.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Address class with only street/city/state properties (in that order).</jc>
* <ja>@Bean</ja>(properties=<js>"street,city,state"</js>)
* <jk>public class</jk> Address {...}
@@ -314,7 +314,7 @@ public @interface Bean {
* Property namers are used to transform bean property names from standard form to some other form.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Define a class with dashed-lowercase property names.</jc>
* <ja>@Bean</ja>(propertyNamer=PropertyNamerDashedLC.<jk>class</jk>)
* <jk>public class</jk> MyBean {...}
@@ -334,7 +334,7 @@ public @interface Bean {
* Serializers will serialize such properties as usual, but parsers will silently ignore them.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Exclude the 'city' and 'state' properties from being parsed, but not serialized.</jc>
* <ja>@Bean</ja>(readOnlyProperties=<js>"city,state"</js>})
* <jk>public class</jk> Address {...}
@@ -366,7 +366,7 @@ public @interface Bean {
* <br>Otherwise, the natural order of the bean properties is used which is dependent on the JVM vendor.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Sort bean properties alphabetically during serialization.</jc>
* <ja>@Bean</ja>(sort=<jk>true</jk>)
* <jk>public class</jk> MyBean {...}
@@ -388,7 +388,7 @@ public @interface Bean {
* <p>
* For example, in the following class hierarchy, instances of <c>C3</c> will include property <c>p3</c>,
* but not <c>p1</c> or <c>p2</c>.
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>public class</jk> C1 {
* <jk>public int</jk> getP1();
* }
@@ -417,7 +417,7 @@ public @interface Bean {
* It is also used to specify element names in XML.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Use _type='mybean' to identify this bean.</jc>
* <ja>@Bean</ja>(typeName=<js>"mybean"</js>)
* <jk>public class</jk> MyBean {...}
@@ -439,7 +439,7 @@ public @interface Bean {
* The default value if not specified is <js>"_type"</js> .
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Use 'type' instead of '_type' for bean names.</jc>
* <ja>@Bean</ja>(typePropertyName=<js>"type"</js>)
* <jk>public class</jk> MyBean {...}
@@ -465,7 +465,7 @@ public @interface Bean {
* Parsers will parse such properties as usual, but serializers will silently ignore them.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Exclude the 'city' and 'state' properties from being serialized, but not parsed.</jc>
* <ja>@Bean</ja>(writeOnlyProperties=<js>"city,state"</js>})
* <jk>public class</jk> Address {...}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java
index 2b0d77a..495cde0 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java
@@ -581,7 +581,7 @@ public @interface BeanConfig {
* When specified, only the list of properties defined on the interface class will be used during serialization
* of implementation classes. Additional properties on subclasses will be ignored.
*
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Parent class or interface</jc>
* <jk>public abstract class</jk> A {
* <jk>public</jk> String <jf>foo</jf> = <js>"foo"</js>;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Beanc.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Beanc.java
index 87cd03f..b3368d2 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Beanc.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Beanc.java
@@ -71,7 +71,7 @@ public @interface Beanc {
*
* <p>
* The following example shows this annotation in use:
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Our read-only bean.</jc>
* <jk>public class</jk> Person {
* <jk>private final</jk> String <jf>name</jf>;
@@ -98,7 +98,7 @@ public @interface Beanc {
* <ja>@Beanc</ja>(on=<js>"Person(String,int)"</js>, properties=<js>"name,age"</js>))
* <jk>public static class</jk> MyConfig {}
* </p>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Parsing into a read-only bean.</jc>
* String <jv>json</jv> = <js>"{name:'John Smith',age:45}"</js>;
* Person <jv>person</jv> = JsonParser.<jsf>DEFAULT</jsf>.copy().applyAnnotations(MyConfig.<jk>class</jk>).build().parse(<jv>json</jv>);
@@ -149,16 +149,16 @@ public @interface Beanc {
*
* <p>
* The definition of a read-only bean is a bean with properties with only getters, like shown below:
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Our read-only bean.</jc>
* <jk>public class</jk> Person {
* <jk>private final</jk> String <jf>name</jf>;
* <jk>private final int</jk> <jf>age</jf>;
*
* <ja>@Beanc</ja>(properties=<js>"name,age"</js>)
- * <jk>public</jk> Person(String name, <jk>int</jk> age) {
- * <jk>this</jk>.<jf>name</jf> = name;
- * <jk>this</jk>.<jf>age</jf> = age;
+ * <jk>public</jk> Person(String <jv>name</jv>, <jk>int</jk> <jv>age</jv>) {
+ * <jk>this</jk>.<jf>name</jf> = <jv>name</jv>;
+ * <jk>this</jk>.<jf>age</jf> = <jv>age</jv>;
* }
*
* <jc>// Read only properties.</jc>
@@ -173,12 +173,12 @@ public @interface Beanc {
* }
* }
* </p>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Parsing into a read-only bean.</jc>
- * String json = <js>"{name:'John Smith',age:45}"</js>;
- * Person p = JsonParser.<jsf>DEFAULT</jsf>.parse(json);
- * String name = p.getName(); <jc>// "John Smith"</jc>
- * <jk>int</jk> age = p.getAge(); <jc>// 45</jc>
+ * String <jv>json</jv> = <js>"{name:'John Smith',age:45}"</js>;
+ * Person <jv>person</jv> = JsonParser.<jsf>DEFAULT</jsf>.parse(<jv>json</jv>);
+ * String <jv>name</jv> = <jv>person</jv>.getName(); <jc>// "John Smith"</jc>
+ * <jk>int</jk> <jv>age</jv> = <jv>person</jv>.getAge(); <jc>// 45</jc>
* </p>
* <p>
* Note that the {@link Name @Name} annotation can also be used to identify bean property names on constructor
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Beanp.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Beanp.java
index 8620a8f..a371efd 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Beanp.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Beanp.java
@@ -75,7 +75,7 @@ public @interface Beanp {
* {@link BeanSession#convertToType(Object, Class)} but there is no guarantee that this will succeed.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <ja>@Beanp</ja>(format=<js>"$%.2f"</js>)
* <jk>public float</jk> <jf>price</jf>;
* </p>
@@ -84,7 +84,7 @@ public @interface Beanp {
* This annotation can also be used on private fields of a property like so:
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>public class</jk> MyBean {
*
* <ja>@Beanp</ja>(format=<js>"$%.2f"</js>)
@@ -120,13 +120,13 @@ public @interface Beanp {
*
* <p>
* The following examples show how to define dynamic bean properties.
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Option #1 - A simple public Map field.
* // The field name can be anything.</jc>
* <jk>public class</jk> BeanWithDynaField {
*
* <ja>@Beanp</ja>(name=<js>"*"</js>)
- * <jk>public</jk> Map<String,Object> extraStuff = <jk>new</jk> LinkedHashMap<String,Object>();
+ * <jk>public</jk> Map<String,Object> <jf>extraStuff</jf> = <jk>new</jk> LinkedHashMap<String,Object>();
* }
*
* <jc>// Option #2 - Getters and setters.
@@ -141,7 +141,7 @@ public @interface Beanp {
* }
*
* <ja>@Beanp</ja>(name=<js>"*"</js>)
- * <jk>public void</jk> setAnExtraField(String name, Object value) {
+ * <jk>public void</jk> setAnExtraField(String <jv>name</jv>, Object <jv>value</jv>) {
* ...
* }
* }
@@ -161,12 +161,12 @@ public @interface Beanp {
* <jk>public class</jk> BeanWithDynaExtraKeys {
*
* <ja>@Beanp</ja>(name=<js>"*"</js>)
- * <jk>public</jk> Object get(String name) {
+ * <jk>public</jk> Object get(String <jv>name</jv>) {
* ...
* }
*
* <ja>@Beanp</ja>(name=<js>"*"</js>)
- * <jk>public void</jk> set(String name, Object value) {
+ * <jk>public void</jk> set(String <jv>name</jv>, Object <jv>value</jv>) {
* ...
* }
*
@@ -180,7 +180,7 @@ public @interface Beanp {
*<p>
* Similar rules apply for value types and swaps.
* The property values optionally can be any serializable type or use swaps.
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A serializable type other than Object.</jc>
* <jk>public class</jk> BeanWithDynaFieldWithListValues {
*
@@ -280,7 +280,7 @@ public @interface Beanp {
* contents of the bean property object when the generic parameter types are interfaces or abstract classes.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>public class</jk> MyBean {
*
* <jc>// Identify concrete map type with String keys and Integer values.</jc>
@@ -293,7 +293,7 @@ public @interface Beanp {
* This annotation can also be used on private fields of a property like so:
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>public class</jk> MyBean {
*
* <ja>@Beanp</ja>(type=HashMap.<jk>class</jk>, params={String.<jk>class</jk>,Integer.<jk>class</jk>})
@@ -320,28 +320,28 @@ public @interface Beanp {
* </ul>
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>public class</jk> MyClass {
*
* <jc>// Only render 'f1' when serializing this bean property.</jc>
* <ja>@Beanp</ja>(properties=<js>"f1"</js>)
- * <jk>public</jk> MyChildClass x1 = <jk>new</jk> MyChildClass();
+ * <jk>public</jk> MyChildClass <jf>x1</jf> = <jk>new</jk> MyChildClass();
* }
*
* <jk>public class</jk> MyChildClass {
- * <jk>public int</jk> f1 = 1;
- * <jk>public int</jk> f2 = 2;
+ * <jk>public int</jk> <jf>f1</jf> = 1;
+ * <jk>public int</jk> <jf>f2</jf> = 2;
* }
*
* <jc>// Renders "{x1:{f1:1}}"</jc>
- * String json = JsonSerializer.<jsf>DEFAULT</jsf>.serialize(<jk>new</jk> MyClass());
+ * String <jv>json</jv> = JsonSerializer.<jsf>DEFAULT</jsf>.serialize(<jk>new</jk> MyClass());
* </p>
*
* <p>
* This annotation can also be used on private fields of a property like so:
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>public class</jk> MyBean {
*
* <ja>@Beanp</ja>(properties=<js>"f1"</js>)
@@ -362,7 +362,7 @@ public @interface Beanp {
* Serializers will serialize such properties as usual, but parsers will silently ignore them.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>public class</jk> MyBean {
* <ja>@Beanp</ja>(ro=<js>"true"</js>)
* <jk>public float</jk> <jf>price</jf>;
@@ -390,7 +390,7 @@ public @interface Beanp {
* This property must denote a concrete bean class with a no-arg constructor.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>public class</jk> MyBean {
*
* <jc>// Identify concrete map type.</jc>
@@ -403,7 +403,7 @@ public @interface Beanp {
* This annotation can also be used on private fields of a property like so:
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>public class</jk> MyBean {
*
* <ja>@Beanp</ja>(type=HashMap.<jk>class</jk>)
@@ -423,7 +423,7 @@ public @interface Beanp {
* <p>
* The following annotations are equivalent:
*
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <ja>@Beanp</ja>(name=<js>"foo"</js>)
*
* <ja>@Beanp</ja>(<js>"foo"</js>)
@@ -438,7 +438,7 @@ public @interface Beanp {
* Parsers will parse such properties as usual, but serializers will silently ignore them.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>public class</jk> MyBean {
* <ja>@Beanp</ja>(wo=<js>"true"</js>)
* <jk>public float</jk> <jf>price</jf>;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Builder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Builder.java
index 918253b..47c265c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Builder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Builder.java
@@ -21,7 +21,7 @@ import java.lang.annotation.*;
* Identifies a class as a builder for a POJO class.
*
* <h5 class='figure'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// POJO class.</jc>
* <ja>@Builder</ja>(MyBeanBuilder.<jk>class</jk>)
* <jk>public class</jk> MyBean {
@@ -31,9 +31,9 @@ import java.lang.annotation.*;
* <jk>public final int</jk> <jf>bar</jf>;
*
* <jc>// Constructor that takes in a builder.</jc>
- * <jk>public</jk> MyBean(MyBeanBuilder b) {
- * <jk>this</jk>.<jf>foo</jf> = b.foo;
- * <jk>this</jk>.<jf>bar</jf> = b.bar;
+ * <jk>public</jk> MyBean(MyBeanBuilder <jv>builder</jv>) {
+ * <jk>this</jk>.<jf>foo</jf> = <jv>builder</jv>.<jf>foo</jf>;
+ * <jk>this</jk>.<jf>bar</jf> = <jv>builder</jv>.<jf>bar</jf>;
* }
* }
*
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Example.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Example.java
index 8cf4b74..069a14a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Example.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Example.java
@@ -30,7 +30,7 @@ import java.lang.annotation.*;
* </ul>
*
* <h5 class='figure'>Examples:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// On a static method.</jc>
* <jk>public class</jk> A {
*
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Marshalled.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Marshalled.java
index 69314e1..7b78a5a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Marshalled.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Marshalled.java
@@ -55,7 +55,7 @@ public @interface Marshalled {
* Examples are used in cases such as POJO examples in Swagger documents.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <ja>@Marshalled</ja>(example=<js>"{foo:'bar'}"</js>)
* <jk>public class</jk> MyClass {...}
* </p>
@@ -92,7 +92,7 @@ public @interface Marshalled {
* parse).
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <ja>@Marshalled</ja>(implClass=MyInterfaceImpl.<jk>class</jk>)
* <jk>public class</jk> MyInterface {...}
* <p>
@@ -108,7 +108,7 @@ public @interface Marshalled {
*
* <p>
* The following example shows the equivalent methods for applying the {@link Bean @Bean} annotation to REST methods:
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Class with explicit annotation.</jc>
* <ja>@Marshalled</ja>(example=<js>"{foo:'bar'}"</js>)
* <jk>public class</jk> A {...}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Name.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Name.java
index 3e0991d..b2adcf6 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Name.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Name.java
@@ -27,12 +27,12 @@ import java.lang.annotation.*;
* </ul>
*
* <h5 class='figure'>Examples:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Identifying bean property names.
* // The field name can be anything.</jc>
* <jk>public class</jk> MyBean {
*
- * <jk>public</jk> MyBean(<ja>@Name</ja>("bar") <jk>int</jk> foo) {}
+ * <jk>public</jk> MyBean(<ja>@Name</ja>(<js>"bar"</js>) <jk>int</jk> <jv>foo</jv>) {}
* }
* </p>
*
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Swap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Swap.java
index de6acc3..7ef0393 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Swap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Swap.java
@@ -57,13 +57,13 @@ public @interface Swap {
* <p>
* In the following example, the swap is only invoked by the JSON serializer:
*
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <ja>@Swap</ja>(impl=ToStringSwap.<jk>class</jk>, mediaTypes=<js>"*/json"</js>)
* <jk>public class</jk> MyBean { ... }
*
* <jk>public class</jk> ToStringSwap <jk>extends</jk> ObjectSwap<Object,String> {
- * <jk>public</jk> String swap(BeanSession session, Object o) <jk>throws</jk> Exception {
- * <jk>return</jk> o.toString();
+ * <jk>public</jk> String swap(BeanSession <jv>session</jv>, Object <jv>value</jv>) <jk>throws</jk> Exception {
+ * <jk>return</jk> <jv>value</jv>.toString();
* }
* }
* </p>
@@ -183,7 +183,7 @@ public @interface Swap {
* <p>
* The following is an example of a templated swap class used to serialize POJOs to HTML using FreeMarker:
*
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Our templated swap class.</jc>
* <jk>public class</jk> FreeMarkerSwap <jk>extends</jk> ObjectSwap<Object,Reader> {
*
@@ -191,12 +191,12 @@ public @interface Swap {
* <jk>return</jk> MediaType.<jsm>forStrings</jsm>(<js>"*/html"</js>);
* }
*
- * <jk>public</jk> Reader swap(BeanSession session, Object o, String template) <jk>throws</jk> Exception {
- * <jk>return</jk> getFreeMarkerReader(template, o); <jc>// Some method that creates raw HTML.</jc>
+ * <jk>public</jk> Reader swap(BeanSession <jv>session</jv>, Object <jv>value</jv>, String <jv>template</jv>) <jk>throws</jk> Exception {
+ * <jk>return</jk> <jsm>getFreeMarkerReader</jsm>(<jv>template</jv>, <jv>value</jv>); <jc>// Some method that creates raw HTML.</jc>
* }
* }
* </p>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <ja>@Swap</ja>(impl=FreeMarkerSwap.<jk>class</jk>, template=<js>"MyPojo.div.ftl"</js>)
* <jk>public class</jk> MyPojo {}
* </p>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/AnyAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/AnyAssertion.java
index 3f641e4..1e443d1 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/AnyAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/AnyAssertion.java
@@ -27,7 +27,7 @@ import org.apache.juneau.serializer.*;
* methods to convert to more-specific assertion types.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
*
* List<MyBean> <jv>listOfBeans</jv> = ...;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ArrayAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ArrayAssertion.java
index dd7832b..9fa152e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ArrayAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ArrayAssertion.java
@@ -24,7 +24,7 @@ import org.apache.juneau.serializer.*;
* {@review}
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
*
* String[] <jv>array</jv> = {<js>"foo"</js>};
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/Assertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/Assertion.java
index c10d293..b7827cb 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/Assertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/Assertion.java
@@ -98,7 +98,7 @@ public class Assertion {
* String can contain <js>"{msg}"</js> to represent the original message.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
*
* <jc>// Throws an assertion with a custom message instead of the default "Value was null."</jc>
@@ -169,7 +169,7 @@ public class Assertion {
* If the throwable cannot be instantiated, a {@link RuntimeException} is thrown instead.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
*
* <jc>// Throws a BadRequest instead of an AssertionError if the string is null.</jc>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
index 904c756..ac09c08 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
@@ -36,15 +36,15 @@ import org.apache.juneau.cp.*;
* See {@link AssertionPredicates} for a set of predefined predicates for common use cases.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Asserts that a bean passes a custom test.</jc>
* <jc>// AssertionError with specified message is thrown otherwise.</jc>
- * Predicate<> <jv>p</jv> = <jk>new</jk> AssertionPredicate<MyBean>(
- * <jv>x</jv> -> <jv>x</jv>.getFoo().equals(<js>"bar"</js>),
+ * Predicate<MyBean> <jv>predicate</jv> = <jk>new</jk> AssertionPredicate<MyBean>(
+ * <jv>x</jv> -> <jv>x</jv>.getFoo().equals(<js>"bar"</js>),
* <js>"Foo did not equal bar. Bean was=''{0}''"</js>,
* <jsf>VALUE</jsf>
* );
- * <jsm>assertObject<jsm>(<jv>myBean</jv>).passes(<jv>p</jv>);
+ * <jsm>assertObject<jsm>(<jv>myBean</jv>).passes(<jv>predicate</jv>);
* </p>
*
* <ul class='seealso'>
@@ -159,7 +159,7 @@ public class AssertionPredicate<T> implements Predicate<T> {
* Encapsulates multiple predicates into a single AND operation.
*
* <p>
- * Similar to <c><jsm>stream</jsm>(<jv>predicates<jv>).reduce(<jv>x</jv>-><jk>true</jk>, Predicate::and)</c> but
+ * Similar to <c><jsm>stream</jsm>(<jv>predicates</jv>).reduce(<jv>x</jv>-><jk>true</jk>, Predicate::and)</c> but
* provides for {@link #getFailureMessage()} to return a useful message.
*
* @param <T> the type of input being tested.
@@ -206,7 +206,7 @@ public class AssertionPredicate<T> implements Predicate<T> {
* Encapsulates multiple predicates into a single OR operation.
*
* <p>
- * Similar to <c><jsm>stream</jsm>(<jv>predicates<jv>).reduce(<jv>x</jv>-><jk>true</jk>, Predicate::or)</c> but
+ * Similar to <c><jsm>stream</jsm>(<jv>predicates</jv>).reduce(<jv>x</jv>-><jk>true</jk>, Predicate::or)</c> but
* provides for {@link #getFailureMessage()} to return a useful message.
*
* @param <T> the type of input being tested.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java
index fddf76e..aadd446 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java
@@ -38,7 +38,7 @@ import org.apache.juneau.internal.*;
* </ul>
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Asserts that a list contains te specified values.</jc>
* List<Object> <jv>myList</jv> = AList.<jsm>of</jsm>(...);
* <jsm>assertList</jsm>(<jv>myList</jv>)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/Assertions.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/Assertions.java
index 5ed738e..181cf6f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/Assertions.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/Assertions.java
@@ -31,7 +31,7 @@ import org.apache.juneau.cp.*;
* Provides assertions for various common POJO types.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
*
* <jc>// Assert string is greater than 100 characters and contains "foo".</jc>
@@ -44,11 +44,11 @@ import org.apache.juneau.cp.*;
* Provides simple testing that {@link Throwable Throwables} are being thrown correctly.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
*
* <jc>// Assert that calling doBadCall() causes a RuntimeException.</jc>
- * <jsm>assertThrown</jsm>(() -> <jv>myPojo</jv>.doBadCall())
+ * <jsm>assertThrown</jsm>(() -> <jv>myPojo</jv>.doBadCall())
* .isType(RuntimeException.<jk>class</jk>)
* .message().contains(<js>"Bad thing happened."</js>);
* </p>
@@ -57,7 +57,7 @@ import org.apache.juneau.cp.*;
* Provides other assertion convenience methods such as asserting non-null method arguments.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
*
* <jk>public</jk> String getFoo(String <jv>bar</jv>) {
@@ -93,7 +93,7 @@ public class Assertions {
* return generic any-assertions so that they can be easily transformed into other assertion types.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
*
* <jc>// Asserts that the property 'foo' of a bean is 'bar'.</jc>
@@ -120,7 +120,7 @@ public class Assertions {
* Performs an assertion on an array of POJOs.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
*
* <jc>// Asserts that an Integer array contains [1,2,3].</jc>
@@ -147,7 +147,7 @@ public class Assertions {
* Performs an assertion on a Java bean.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
*
* <jc>// Asserts that the 'foo' and 'bar' properties of a bean are 1 and 2 respectively.</jc>
@@ -175,7 +175,7 @@ public class Assertions {
* Performs an assertion on a list of Java beans.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
*
* <jc>// Asserts that a bean list has 3 entries with 'foo' property values of 'bar','baz','qux'.</jc>
@@ -203,7 +203,7 @@ public class Assertions {
* Performs an assertion on a Boolean.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
*
* <jc>// Asserts that a Boolean is not null and TRUE.</jc>
@@ -229,13 +229,13 @@ public class Assertions {
* Performs an assertion on a boolean array.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
*
* <jc>// Asserts that a Boolean array has size of 3 and all entries are TRUE.</jc>
* <jsm>assertBooleanArray</jsm>(<jv>myBooleanArray</jv>)
* .isSize(3)
- * .all(<jv>x</jv> -> <jv>x</jv> == <jk>true</jk>);
+ * .all(<jv>x</jv> -> <jv>x</jv> == <jk>true</jk>);
* </p>
*
* <p>
@@ -261,13 +261,13 @@ public class Assertions {
* that can be decoded or transformed into a string.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.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>)
* .isSize(3)
- * .all(<jv>x</jv> -> <jv>x</jv> > 10);
+ * .all(<jv>x</jv> -> <jv>x</jv> > 10);
* </p>
*
* <p>
@@ -293,7 +293,7 @@ public class Assertions {
* that can be decoded or transformed into a string.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
*
* <jc>// Asserts that the byte array contains the string "foo".</jc>
@@ -319,7 +319,7 @@ public class Assertions {
* Performs an assertion on the contents of an input stream.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
*
* <jc>// Asserts that the stream contains the string "foo".</jc>
@@ -347,7 +347,7 @@ public class Assertions {
* Performs an assertion on a char array.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
*
* <jc>// Asserts that the char array contains the string "foo".</jc>
@@ -373,7 +373,7 @@ public class Assertions {
* Performs an assertion on a collection of POJOs.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
*
* <jc>// Asserts that a collection of strings has only one entry of 'foo'.</jc>
@@ -404,7 +404,7 @@ public class Assertions {
* Performs an assertion on a Comparable.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
*
* <jc>// Asserts a comparable is less than another comparable.</jc>
@@ -430,7 +430,7 @@ public class Assertions {
* Performs an assertion on a Date.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
*
* <jc>// Asserts the specified date is after the current date.</jc>
@@ -456,13 +456,13 @@ public class Assertions {
* Performs an assertion on a double array.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.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>)
* .size().isGte(100f)
- * .all(<jv>x</jv> -> <jv>x</jv> > 1000f);
+ * .all(<jv>x</jv> -> <jv>x</jv> > 1000f);
* </p>
*
* <p>
@@ -483,13 +483,13 @@ public class Assertions {
* Performs an assertion on a float array.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.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>)
* .size().isGte(100f)
- * .all(<jv>x</jv> -> <jv>x</jv> > 1000f);
+ * .all(<jv>x</jv> -> <jv>x</jv> > 1000f);
* </p>
*
* <p>
@@ -510,13 +510,13 @@ public class Assertions {
* Performs an assertion on an int array.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.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>)
* .size().isGte(100)
- * .all(<jv>x</jv> -> <jv>x</jv> > 1000);
+ * .all(<jv>x</jv> -> <jv>x</jv> > 1000);
* </p>
*
* <p>
@@ -537,7 +537,7 @@ public class Assertions {
* Performs an assertion on an Integer.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
*
* <jc>// Assert that an HTTP response status code is 200 or 404.</jc>
@@ -563,7 +563,7 @@ public class Assertions {
* Performs an assertion on a list of POJOs.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
*
* <jc>// Assert that the first entry in a list is "{foo:'bar'}" when serialized to simplified JSON.</jc>
@@ -590,7 +590,7 @@ public class Assertions {
* Performs an assertion on a stream of POJOs.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
*
* <jc>// Assert that the first entry in a list is "{foo:'bar'}" when serialized to simplified JSON.</jc>
@@ -617,7 +617,7 @@ public class Assertions {
* Performs an assertion on a Long.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
*
* <jc>// Throw a BadReqest if an HTTP response length is greater than 100k.</jc>
@@ -645,13 +645,13 @@ public class Assertions {
* Performs an assertion on a long array.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.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>)
* .size().isGte(100)
- * .all(<jv>x</jv> -> <jv>x</jv> > 1000);
+ * .all(<jv>x</jv> -> <jv>x</jv> > 1000);
* </p>
*
* <p>
@@ -672,7 +672,7 @@ public class Assertions {
* Performs an assertion on a map.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
*
* <jc>// Assert the specified map is a HashMap and contains the key "foo".</jc>
@@ -699,7 +699,7 @@ public class Assertions {
* Performs an assertion on a Java Object.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
*
* <jc>// Asserts the specified POJO is of type MyBean and is "{foo:'bar'}" </jc>
@@ -727,7 +727,7 @@ public class Assertions {
* Performs an assertion on a Java Object wrapped in an Optional.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
*
* <jc>// Asserts the specified POJO is of type MyBean and is "{foo:'bar'}" </jc>
@@ -755,7 +755,7 @@ public class Assertions {
* Performs an assertion on the contents of a Reader.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
*
* <jc>// Asserts the contents of the Reader contains "foo".</jc>
@@ -783,13 +783,13 @@ public class Assertions {
* Performs an assertion on a short array.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.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>)
* .size().isGte(10)
- * .all(<jv>x</jv> -> <jv>x</jv> > 100);
+ * .all(<jv>x</jv> -> <jv>x</jv> > 100);
* </p>
*
* <p>
@@ -810,7 +810,7 @@ public class Assertions {
* Performs an assertion on a String.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
*
* <jc>// Asserts a string is at least 100 characters long and contains "foo".</jc>
@@ -839,7 +839,7 @@ public class Assertions {
* Performs an assertion on a list of Strings.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
*
* <jc>// Asserts a list of strings contain "foo,bar,baz" after trimming all and joining.</jc>
@@ -868,7 +868,7 @@ public class Assertions {
* Performs an assertion on a Throwable.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
*
* <jc>// Asserts a throwable is a RuntimeException containing 'foobar' in the message.</jc>
@@ -895,7 +895,7 @@ public class Assertions {
* Performs an assertion on a Version.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
*
* <jc>// Asserts the specified major version is at least 2.</jc>
@@ -921,7 +921,7 @@ public class Assertions {
* Performs an assertion on a ZonedDateTime.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
*
* <jc>// Asserts the specified date is after the current date.</jc>
@@ -951,11 +951,11 @@ public class Assertions {
* Executes an arbitrary snippet of code and captures anything thrown from it as a Throwable assertion.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
*
* <jc>// Asserts that the specified method throws a RuntimeException containing "foobar" in the message. </jc>
- * <jsm>assertThrown</jsm>(()-><jv>foo</jv>.getBar())
+ * <jsm>assertThrown</jsm>(()-><jv>foo</jv>.getBar())
* .isType(RuntimeException.<jk>class</jk>)
* .message().contains(<js>"foobar"</js>);
* </p>
@@ -980,7 +980,7 @@ public class Assertions {
* Throws an {@link IllegalArgumentException} if the specified argument is <jk>null</jk>.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
*
* <jk>public</jk> String setFoo(String <jv>foo</jv>) {
@@ -1004,7 +1004,7 @@ public class Assertions {
* Throws an {@link IllegalArgumentException} if the specified expression is <jk>false</jk>.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
*
* <jk>public</jk> String setFoo(List<String> <jv>foo</jv>) {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/BeanAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/BeanAssertion.java
index 3cd7ded..658e810 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/BeanAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/BeanAssertion.java
@@ -23,11 +23,11 @@ import org.apache.juneau.serializer.*;
* {@review}
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Validates the specified POJO is the specified type and serializes to the specified value.</jc>
* <jsm>assertBean</jsm>(<jv>myBean</jv>)
- * .isType(MyBean.<jk>class</jk>)
- * .properties(<js>"foo,bar"</js>).asJson().is(<js>"{foo:1,bar:2}"</js>);
+ * .isType(MyBean.<jk>class</jk>)
+ * .properties(<js>"foo,bar"</js>).asJson().is(<js>"{foo:1,bar:2}"</js>);
* </p>
*
*
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/BeanListAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/BeanListAssertion.java
index 3425913..e3b315e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/BeanListAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/BeanListAssertion.java
@@ -24,7 +24,7 @@ import org.apache.juneau.serializer.*;
* {@review}
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Validates the specified list contains 3 beans with the specified values for the 'foo' property.</jc>
* <jsm>assertBeanList</jsm>(<jv>myBeanList</jv>)
* .property(<js>"foo"</js>)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ByteArrayAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ByteArrayAssertion.java
index 34b1cb8..9230519 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ByteArrayAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ByteArrayAssertion.java
@@ -24,7 +24,7 @@ import org.apache.juneau.serializer.*;
* {@review}
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Validates the byte array contains the string "foo".</jc>
* <jsm>assertBytes</jsm>(<jv>myByteArray</jv>).asHex().is(<js>"666F6F"</js>);
* </p>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/CollectionAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/CollectionAssertion.java
index 7d0a701..8b3c54b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/CollectionAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/CollectionAssertion.java
@@ -24,7 +24,7 @@ import org.apache.juneau.serializer.*;
* {@review}
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Validates the specified list is not empty.</jc>
* <jsm>assertCollection</jsm>(<jv>myList</jv>).isNotEmpty();
* </p>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/DateAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/DateAssertion.java
index 141d54d..2f00b3f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/DateAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/DateAssertion.java
@@ -25,7 +25,7 @@ import org.apache.juneau.serializer.*;
* {@review}
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Validates the specified date is after the current date.</jc>
* <jsm>assertDate</jsm>(<jv>myDate</jv>).isAfterNow();
* </p>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentAnyAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentAnyAssertion.java
index 3e44c05..542e9d7 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentAnyAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentAnyAssertion.java
@@ -34,11 +34,10 @@ import org.apache.juneau.serializer.*;
* methods to convert to more-specific assertion types.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
*
* List<MyBean> <jv>listOfBeans</jv> = ...;
- * FluentAnyAssertion<
* <jsm>assertList</jsm>(<jv>listOfBeans</jv>)
* .item(1) <jc>// Returns an AnyAssertion.</jc>
* .asBean() <jc>// Transforms to BeanAssertion.</jc>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
index 20ad794..b7fb7ce 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
@@ -213,9 +213,9 @@ public class FluentArrayAssertion<E,R> extends FluentObjectAssertion<E[],R> {
* Converts this assertion into a {@link FluentBeanListAssertion}.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Extracts the 'foo' property from an array of beans and validates their values.</jc>.
- * <jsm>assertObject<jsm>(myArrayOfBeans).asBeanList().property(<js>"foo"</js>).sorted().equals(<js>"value1"</js>,<js>"value2"</js>,<js>"value3"</js>);
+ * <jsm>assertObject<jsm>(<jv>myArrayOfBeans</jv>).asBeanList().property(<js>"foo"</js>).sorted().equals(<js>"value1"</js>,<js>"value2"</js>,<js>"value3"</js>);
* </p>
*
* @return A new fluent string assertion.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentAssertion.java
index 41f09d9..64d7e0e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentAssertion.java
@@ -25,19 +25,19 @@ import org.apache.juneau.internal.*;
* Assertion test methods that pass use this method to return to the origin of the call.
*
* <h5 class='figure'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Create a basic REST client with JSON support and download a bean.</jc>
- * MyPojo myPojo = ...;
- * MyTestedBean myTestedBean = ...;
+ * MyPojo <jv>myPojo</jv> = ...;
+ * MyTestedBean <jv>myTestedBean</jv> = ...;
*
- * Assertion assertion = new FluentBeanAssertion<MyPojo,MyTestedBean>(myPojo, myTestedBean);
- * myPojo = assertion.test(x -> x.getMyProperty().equals("foo")); <jc>// Returns myPojo after test.</jc>
+ * Assertion <jv>assertion</jv> = <jk>new</jk> FluentBeanAssertion<MyPojo,MyTestedBean>(<jv>myPojo</jv>, <jv>myTestedBean</jv>);
+ * <jv>myPojo</jv> = <jv>assertion</jv>.test(<jv>x</jv> -> <jv>x</jv>.getMyProperty().equals(<js>"foo"</js>)); <jc>// Returns myPojo after test.</jc>
* </p>
*
* For subclasses such as {@link IntegerAssertion}, the return object is simply itself so that multiple tests
* can be performed using the same assertion.
* <h5 class='figure'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>public class</jk> IntegerAssertion <jk>extends</jk> FluentIntegerAssertion<IntegerAssertion> {
* ...
* }
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentByteArrayAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentByteArrayAssertion.java
index 0198b6b..cf7608b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentByteArrayAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentByteArrayAssertion.java
@@ -140,9 +140,9 @@ public class FluentByteArrayAssertion<R> extends FluentPrimitiveArrayAssertion<B
* Converts this byte array to a UTF-8 encoded string and returns it as a new assertion.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Validates that the specified byte array contains the string "foobar".</jc>
- * <jsm>assertBytes<jsm>(myByteArray).asString().is(<js>"foobar"</js>);
+ * <jsm>assertBytes<jsm>(<jv>myByteArray</jv>).asString().is(<js>"foobar"</js>);
* </p>
*
* @return A new fluent string assertion.
@@ -156,9 +156,9 @@ public class FluentByteArrayAssertion<R> extends FluentPrimitiveArrayAssertion<B
* Converts this byte array to a string and returns it as a new assertion.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Validates that the specified byte array contains the string "foobar" encoded in ASCII.</jc>
- * <jsm>assertBytes<jsm>(myByteArray).string(<js>"iso8859-1"</js>).is(<js>"foobar"</js>);
+ * <jsm>assertBytes<jsm>(<jv>myByteArray</jv>).asString(<js>"iso8859-1"</js>).is(<js>"foobar"</js>);
* </p>
*
* @param cs The charset to use to decode the string.
@@ -172,9 +172,9 @@ public class FluentByteArrayAssertion<R> extends FluentPrimitiveArrayAssertion<B
* Converts this byte array to a base-64 encoded string and returns it as a new assertion.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Validates that the specified byte array contains the string "foo".</jc>
- * <jsm>assertBytes<jsm>(myByteArray).base64().is(<js>"Zm9v"</js>);
+ * <jsm>assertBytes<jsm>(<jv>myByteArray</jv>).asBase64().is(<js>"Zm9v"</js>);
* </p>
*
* @return A new fluent string assertion.
@@ -187,9 +187,9 @@ public class FluentByteArrayAssertion<R> extends FluentPrimitiveArrayAssertion<B
* Converts this byte array to hexadecimal and returns it as a new assertion.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Validates that the specified byte array contains the string "foo".</jc>
- * <jsm>assertBytes<jsm>(myByteArray).asHex().is(<js>"666F6F"</js>);
+ * <jsm>assertBytes<jsm>(<jv>myByteArray</jv>).asHex().is(<js>"666F6F"</js>);
* </p>
*
* @return A new string consisting of hexadecimal characters.
@@ -202,9 +202,9 @@ public class FluentByteArrayAssertion<R> extends FluentPrimitiveArrayAssertion<B
* Converts this byte array to spaced hexadecimal and returns it as a new assertion.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Validates that the specified byte array contains the string "foo".</jc>
- * <jsm>assertBytes<jsm>(myByteArray).asSpacedHex().is(<js>"66 6F 6F"</js>);
+ * <jsm>assertBytes<jsm>(<jv>myByteArray</jv>).asSpacedHex().is(<js>"66 6F 6F"</js>);
* </p>
*
* @return A new string consisting of hexadecimal characters.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
index b1f218e..848765b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
@@ -29,7 +29,7 @@ import org.apache.juneau.serializer.*;
* {@review}
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Validates the response expiration is after the current date.</jc>
* <jv>client</jv>
* .get(<jsf>URL</jsf>)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentIntegerAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentIntegerAssertion.java
index ee6eab1..752dd7a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentIntegerAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentIntegerAssertion.java
@@ -24,7 +24,7 @@ import org.apache.juneau.serializer.*;
* {@review}
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Validates the response status code is 200 or 404.</jc>
* <jv>client</jv>
* .get(<jsf>URL</jsf>)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentLongAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentLongAssertion.java
index 395d872..1a9d62b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentLongAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentLongAssertion.java
@@ -24,7 +24,7 @@ import org.apache.juneau.serializer.*;
* {@review}
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Validates the response length isn't too long.</jc>
* <jv>client</jv>
* .get(<jsf>URL</jsf>)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
index 8c8b433..58e9636 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
@@ -161,9 +161,9 @@ public class FluentObjectAssertion<T,R> extends FluentAssertion<R> {
* Converts this object to a string using {@link Object#toString} and returns it as a new assertion.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Validates that the specified object is "foobar" after converting to a string.</jc>
- * <jsm>assertObject<jsm>(myPojo).asString().is(<js>"foobar"</js>);
+ * <jsm>assertObject<jsm>(<jv>myPojo</jv>).asString().is(<js>"foobar"</js>);
* </p>
*
* @return A new fluent string assertion.
@@ -176,9 +176,9 @@ public class FluentObjectAssertion<T,R> extends FluentAssertion<R> {
* Converts this object to text using the specified serializer and returns it as a new assertion.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Validates that the specified object is an instance of MyBean.</jc>
- * <jsm>assertObject<jsm>(myPojo).asString(XmlSerializer.<jsf>DEFAULT</jsf>).is(<js>"<object><foo>bar</foo><baz>qux</baz></object>"</js>);
+ * <jsm>assertObject<jsm>(<jv>myPojo</jv>).asString(XmlSerializer.<jsf>DEFAULT</jsf>).is(<js>"<object><foo>bar</foo><baz>qux</baz></object>"</js>);
* </p>
*
* @param ws The serializer to use to convert the object to text.
@@ -196,9 +196,9 @@ public class FluentObjectAssertion<T,R> extends FluentAssertion<R> {
* Converts this object to a string using the specified function and returns it as a new assertion.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Validates that the specified object is "foobar" after converting to a string.</jc>
- * <jsm>assertObject<jsm>(myPojo).asString(<jv>x</jv>-><jv>x</jv>.toString()).is(<js>"foobar"</js>);
+ * <jsm>assertObject<jsm>(<jv>myPojo</jv>).asString(<jv>x</jv>-><jv>x</jv>.toString()).is(<js>"foobar"</js>);
* </p>
*
* @param function The conversion function.
@@ -212,9 +212,9 @@ public class FluentObjectAssertion<T,R> extends FluentAssertion<R> {
* Converts this object to simplified JSON and returns it as a new assertion.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Validates that the specified object is an instance of MyBean.</jc>
- * <jsm>assertObject<jsm>(myPojo).asJson().is(<js>"{foo:'bar',baz:'qux'}"</js>);
+ * <jsm>assertObject<jsm>(<jv>myPojo</jv>).asJson().is(<js>"{foo:'bar',baz:'qux'}"</js>);
* </p>
*
* @return A new fluent string assertion.
@@ -227,9 +227,9 @@ public class FluentObjectAssertion<T,R> extends FluentAssertion<R> {
* Converts this object to sorted simplified JSON and returns it as a new assertion.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Validates that the specified object is an instance of MyBean.</jc>
- * <jsm>assertObject<jsm>(myPojo).asJsonSorted().is(<js>"{baz:'qux',foo:'bar'}"</js>);
+ * <jsm>assertObject<jsm>(<jv>myPojo</jv>).asJsonSorted().is(<js>"{baz:'qux',foo:'bar'}"</js>);
* </p>
*
* @return A new fluent string assertion.
@@ -441,9 +441,9 @@ public class FluentObjectAssertion<T,R> extends FluentAssertion<R> {
* Asserts that the object is an instance of the specified class.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Validates that the specified object is an instance of MyBean.</jc>
- * <jsm>assertObject<jsm>(myPojo).isType(MyBean.<jk>class</jk>);
+ * <jsm>assertObject<jsm>(<jv>myPojo</jv>).isType(MyBean.<jk>class</jk>);
* </p>
*
* @param parent The value to check against.
@@ -461,9 +461,9 @@ public class FluentObjectAssertion<T,R> extends FluentAssertion<R> {
* Asserts that the object is an instance of the specified class.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Validates that the specified object is an instance of MyBean.</jc>
- * <jsm>assertObject<jsm>(myPojo).isExactType(MyBean.<jk>class</jk>);
+ * <jsm>assertObject<jsm>(<jv>myPojo</jv>).isExactType(MyBean.<jk>class</jk>);
* </p>
*
* @param type The value to check against.
@@ -494,9 +494,9 @@ public class FluentObjectAssertion<T,R> extends FluentAssertion<R> {
* Converts this object to simplified JSON and runs the {@link FluentStringAssertion#is(String)} on the result.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Validates that the specified object is an instance of MyBean.</jc>
- * <jsm>assertObject<jsm>(myPojo).asJson().is(<js>"{foo:'bar',baz:'qux'}"</js>);
+ * <jsm>assertObject<jsm>(<jv>myPojo</jv>).asJson().is(<js>"{foo:'bar',baz:'qux'}"</js>);
* </p>
*
* @param value The expected string value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
index 1f43880..b5edcc7 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
@@ -29,7 +29,7 @@ import org.apache.juneau.serializer.*;
* {@review}
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Validates the response body of an HTTP call is the text "OK".</jc>
* <jv>client</jv>
* .get(<jsf>URL</jsf>)
@@ -183,8 +183,8 @@ public class FluentStringAssertion<R> extends FluentObjectAssertion<String,R> {
/**
* When enabled, text in the message is converted to valid Java strings.
*
- * <p class='bcode w800'>
- * value.replaceAll(<js>"\\\\"</js>, <js>"\\\\\\\\"</js>).replaceAll(<js>"\n"</js>, <js>"\\\\n"</js>).replaceAll(<js>"\t"</js>, <js>"\\\\t"</js>);
+ * <p class='bjava'>
+ * <jv>value</jv>.replaceAll(<js>"\\\\"</js>, <js>"\\\\\\\\"</js>).replaceAll(<js>"\n"</js>, <js>"\\\\n"</js>).replaceAll(<js>"\t"</js>, <js>"\\\\t"</js>);
* </p>
*
* @return This object.
@@ -306,9 +306,9 @@ public class FluentStringAssertion<R> extends FluentObjectAssertion<String,R> {
* Similar to {@link #is(String)} except error message states diff position.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Validates the response body of an HTTP call is the text "OK".</jc>
- * client
+ * <jv>client</jv>
* .get(<jsf>URL</jsf>)
* .run()
* .assertBody().isEqualTo(<js>"OK"</js>);
@@ -347,9 +347,9 @@ public class FluentStringAssertion<R> extends FluentObjectAssertion<String,R> {
* Asserts that the lines of text equals the specified value.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Validates the response body of an HTTP call is the text "OK".</jc>
- * client
+ * <jv>client</jv>
* .get(<jsf>URL</jsf>)
* .run()
* .assertBody().isEqualLinesTo(
@@ -378,9 +378,9 @@ public class FluentStringAssertion<R> extends FluentObjectAssertion<String,R> {
* Asserts that the text equals the specified value after splitting both by newlines and sorting the rows.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Validates the response body of an HTTP call is the text "OK".</jc>
- * client
+ * <jv>client</jv>
* .get(<jsf>URL</jsf>)
* .run()
* .assertBody().isEqualSortedLinesTo(
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
index d5845e5..89c78be 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
@@ -151,9 +151,9 @@ public class FluentThrowableAssertion<T extends Throwable,R> extends FluentObjec
* Returns an assertion against the throwable message.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Asserts that the specified method throws an exception with 'foobar' somewhere in the messages. </jc>
- * ThrowableAssertion.<jsm>assertThrown</jsm>(() -> {<jv>foo</jv>.getBar();}).message().matches(<js>".*foobar.*"</js>);
+ * ThrowableAssertion.<jsm>assertThrown</jsm>(() -> <jv>foo</jv>.getBar()).message().matches(<js>".*foobar.*"</js>);
* </p>
*
* @return An assertion against the throwable message. Never <jk>null</jk>.
@@ -166,9 +166,9 @@ public class FluentThrowableAssertion<T extends Throwable,R> extends FluentObjec
* Returns an assertion against the throwable message and all caused-by messages.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Asserts that the specified method throws an exception with 'foobar' somewhere in the messages. </jc>
- * ThrowableAssertion.<jsm>assertThrown</jsm>(() -> {<jv>foo</jv>.getBar();}).messages().containsMatch(<js>".*foobar.*"</js>);
+ * ThrowableAssertion.<jsm>assertThrown</jsm>(() -> <jv>foo</jv>.getBar()).messages().containsMatch(<js>".*foobar.*"</js>);
* </p>
*
* @return An assertion against the throwable message. Never <jk>null</jk>.
@@ -194,9 +194,9 @@ public class FluentThrowableAssertion<T extends Throwable,R> extends FluentObjec
* Returns an assertion against the throwable localized message.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Asserts that the specified method throws an exception with 'foobar' somewhere in the localized messages. </jc>
- * ThrowableAssertion.<jsm>assertThrown</jsm>(() -> {<jv>foo</jv>.getBar();}).localizedMessage().matches(<js>".*foobar.*"</js>);
+ * ThrowableAssertion.<jsm>assertThrown</jsm>(() -> <jv>foo</jv>.getBar()).localizedMessage().matches(<js>".*foobar.*"</js>);
* </p>
*
* @return An assertion against the throwable localized message. Never <jk>null</jk>.
@@ -209,9 +209,9 @@ public class FluentThrowableAssertion<T extends Throwable,R> extends FluentObjec
* Returns an assertion against the throwable message and all caused-by messages.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Asserts that the specified method throws an exception with 'foobar' somewhere in the messages. </jc>
- * ThrowableAssertion.<jsm>assertThrown</jsm>(() -> {<jv>foo</jv>.getBar();}).localizedMessages().contains(<js>".*foobar.*"</js>);
+ * ThrowableAssertion.<jsm>assertThrown</jsm>(() -> <jv>foo</jv>.getBar()).localizedMessages().contains(<js>".*foobar.*"</js>);
* </p>
*
* @return An assertion against the throwable message. Never <jk>null</jk>.
@@ -237,9 +237,9 @@ public class FluentThrowableAssertion<T extends Throwable,R> extends FluentObjec
* Returns an assertion against the throwable localized message.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Asserts that the specified method throws an exception with 'foobar' somewhere in the stack trace. </jc>
- * ThrowableAssertion.<jsm>assertThrown</jsm>(() -> {<jv>foo</jv>.getBar();}).stackTrace().contains(<js>"foobar"</js>);
+ * ThrowableAssertion.<jsm>assertThrown</jsm>(() -> <jv>foo</jv>.getBar()).stackTrace().contains(<js>"foobar"</js>);
* </p>
*
* @return An assertion against the throwable stacktrace. Never <jk>null</jk>.
@@ -252,9 +252,9 @@ public class FluentThrowableAssertion<T extends Throwable,R> extends FluentObjec
* Returns an assertion against the caused-by throwable.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Asserts that the specified method throws an exception whose caused-by message contains 'foobar'. </jc>
- * ThrowableAssertion.<jsm>assertThrown</jsm>(() -> {<jv>foo</jv>.getBar();}).causedBy().message().contains(<js>"foobar"</js>);
+ * ThrowableAssertion.<jsm>assertThrown</jsm>(() -> <jv>foo</jv>.getBar()).causedBy().message().contains(<js>"foobar"</js>);
* </p>
*
* @return An assertion against the caused-by. Never <jk>null</jk>.
@@ -267,9 +267,9 @@ public class FluentThrowableAssertion<T extends Throwable,R> extends FluentObjec
* Returns an assertion against the caused-by throwable.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Asserts that the specified method throws an exception whose caused-by message contains 'foobar'. </jc>
- * ThrowableAssertion.<jsm>assertThrown</jsm>(() -> {<jv>foo</jv>.getBar();}).causedBy().message().contains(<js>"foobar"</js>);
+ * ThrowableAssertion.<jsm>assertThrown</jsm>(() -> <jv>foo</jv>.getBar()).causedBy().message().contains(<js>"foobar"</js>);
* </p>
*
* @param type The expected exception type.
@@ -286,9 +286,9 @@ public class FluentThrowableAssertion<T extends Throwable,R> extends FluentObjec
* Returns an assertion against the throwable localized message.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Asserts that the specified method throws an exception with a caused-by RuntimeException containing 'foobar'</jc>
- * ThrowableAssertion.<jsm>assertThrown</jsm>(() -> {<jv>foo</jv>.getBar();}).causedBy(RuntimeException.<jk>class</jk>).exists().contains(<js>"foobar"</js>);
+ * ThrowableAssertion.<jsm>assertThrown</jsm>(() -> <jv>foo</jv>.getBar()).causedBy(RuntimeException.<jk>class</jk>).exists().contains(<js>"foobar"</js>);
* </p>
*
* @param throwableClass The class type to search for in the caused-by chain.
@@ -312,9 +312,9 @@ public class FluentThrowableAssertion<T extends Throwable,R> extends FluentObjec
* Asserts that this throwable is of the specified type.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Asserts that the specified method throws a RuntimeException. </jc>
- * ThrowableAssertion.<jsm>assertThrown</jsm>(() -> {<jv>foo</jv>.getBar();})
+ * ThrowableAssertion.<jsm>assertThrown</jsm>(() -> <jv>foo</jv>.getBar())
* .isType(RuntimeException.<jk>class</jk>);
* </p>
*
@@ -333,9 +333,9 @@ public class FluentThrowableAssertion<T extends Throwable,R> extends FluentObjec
* Asserts that this throwable is exactly the specified type.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Asserts that the specified method throws a RuntimeException. </jc>
- * ThrowableAssertion.<jsm>assertThrown</jsm>(() -> {<jv>foo</jv>.getBar();})
+ * ThrowableAssertion.<jsm>assertThrown</jsm>(() -> <jv>foo</jv>.getBar())
* .isExactType(RuntimeException.<jk>class</jk>);
* </p>
*
@@ -354,9 +354,9 @@ public class FluentThrowableAssertion<T extends Throwable,R> extends FluentObjec
* Asserts that this throwable exists.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Asserts that the specified method throws any exception.</jc>
- * ThrowableAssertion.<jsm>assertThrown</jsm>(() -> {<jv>foo</jv>.getBar();}).exists();
+ * ThrowableAssertion.<jsm>assertThrown</jsm>(() -> <jv>foo</jv>.getBar()).exists();
* </p>
*
* @return The fluent return object.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentVersionAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentVersionAssertion.java
index bf10d3f..ae4bf21 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentVersionAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentVersionAssertion.java
@@ -24,7 +24,7 @@ import org.apache.juneau.serializer.*;
* {@review}
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Validates the response expiration is after the current date.</jc>
* <jv>client</jv>
* .get(<jsf>URL</jsf>)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentZonedDateTimeAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentZonedDateTimeAssertion.java
index 0191094..3029b38 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentZonedDateTimeAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentZonedDateTimeAssertion.java
@@ -28,7 +28,7 @@ import org.apache.juneau.serializer.*;
* {@review}
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Validates the response expiration is after the current date.</jc>
* <jv>client</jv>
* .get(<jsf>URL</jsf>)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/IntegerAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/IntegerAssertion.java
index 30e9b87..f50e8b7 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/IntegerAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/IntegerAssertion.java
@@ -23,7 +23,7 @@ import org.apache.juneau.serializer.*;
* {@review}
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Validates the response status code is 200 or 404.</jc>
* <jsm>assertInteger</jsm>(<jv>httpReponse</jv>).isAny(200,404);
* </p>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ListAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ListAssertion.java
index e8322ee..6663224 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ListAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ListAssertion.java
@@ -25,7 +25,7 @@ import org.apache.juneau.serializer.*;
* {@review}
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Validates the specified POJO is the specified type.</jc>
* <jsm>assertList</jsm>(<jv>myList</jv>).isNotEmpty();
* </p>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/LongAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/LongAssertion.java
index 9590b82..5cb5569 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/LongAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/LongAssertion.java
@@ -23,7 +23,7 @@ import org.apache.juneau.serializer.*;
* {@review}
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Validates the response length isn't too long.</jc>
* <jsm>assertLong</jsm>(<jv>responseLength</jv>).isLessThan(100000);
* </p>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/MapAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/MapAssertion.java
index 9d2b3ce..4de706e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/MapAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/MapAssertion.java
@@ -24,9 +24,9 @@ import org.apache.juneau.serializer.*;
* {@review}
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Validates the specified POJO is the specified type.</jc>
- * <jsm>assertMap</jsm>(<jv>mymap</jv>).isNotEmpty();
+ * <jsm>assertMap</jsm>(<jv>myMap</jv>).isNotEmpty();
* </p>
*
*
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ObjectAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ObjectAssertion.java
index fed0f0b..e494c1a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ObjectAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ObjectAssertion.java
@@ -23,7 +23,7 @@ import org.apache.juneau.serializer.*;
* {@review}
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Validates the specified POJO is the specified type.</jc>
* <jsm>assertObject</jsm>(<jv>myPojo</jv>).isType(MyBean.<jk>class</jk>);
* </p>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/PrimitiveArrayAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/PrimitiveArrayAssertion.java
index 80ae57e..2c63063 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/PrimitiveArrayAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/PrimitiveArrayAssertion.java
@@ -23,7 +23,7 @@ import org.apache.juneau.serializer.*;
* {@review}
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>int</jk>[] <jv>array</jv> = {1};
* <jsm>assertArray</jsm>(<jv>array</jv>).exists().isSize(1);
* </p>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/StringAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/StringAssertion.java
index 74205fd..49c01b7 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/StringAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/StringAssertion.java
@@ -26,7 +26,7 @@ import org.apache.juneau.serializer.*;
* {@review}
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Validates the response body of an HTTP call is the text "OK".</jc>
* <jsm>assertString</jsm>(<jv>httpBody</jv>).is(<js>"OK"</js>);
* </p>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ThrowableAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ThrowableAssertion.java
index 17cdb1e..72b7c68 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ThrowableAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ThrowableAssertion.java
@@ -23,7 +23,7 @@ import org.apache.juneau.serializer.*;
* {@review}
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Validates the throwable message or one of the parent messages contain 'Foobar'.</jc>
* <jsm>assertThrowable</jsm>(<jv>throwable</jv>).contains(<js>"Foobar"</js>);
* </p>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/Verify.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/Verify.java
index bcb1557..0e20f65 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/Verify.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/Verify.java
@@ -26,11 +26,11 @@ import org.apache.juneau.internal.*;
* error message.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Validates that our POJO is of type MyBean.</jc>
- * String errorMessage = <jsm>verify</jsm>(myPojo).isType(MyBean.<jk>class</jk>);
- * <jk>if</jk> (errorMessage != <jk>null</jk>)
- * <jk>throw new</jk> RuntimeException(errorMessage);
+ * String <jv>errorMessage</jv> = <jsm>verify</jsm>(<jv>myPojo</jv>).isType(MyBean.<jk>class</jk>);
+ * <jk>if</jk> (<jv>errorMessage</jv> != <jk>null</jk>)
+ * <jk>throw new</jk> RuntimeException(<jv>errorMessage</jv>);
* </p>
*
* <ul class='seealso'>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/VersionAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/VersionAssertion.java
index dc40c85..42febfa 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/VersionAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/VersionAssertion.java
@@ -24,7 +24,7 @@ import org.apache.juneau.serializer.*;
* {@review}
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Validates the specified date is after the current date.</jc>
* <jsm>assertVersion</jsm>(<jv>myVersion</jv>).major().isGreaterThan(2);
* </p>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ZonedDateTimeAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ZonedDateTimeAssertion.java
index 03b136e..c83d948 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ZonedDateTimeAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/ZonedDateTimeAssertion.java
@@ -25,7 +25,7 @@ import org.apache.juneau.serializer.*;
* {@review}
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Validates the specified date is after the current date.</jc>
* <jsm>assertZonedDateTime</jsm>(<jv>myZdt</jv>).isAfterNow();
* </p>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/AList.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/AList.java
index 99764da..6b2585a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/AList.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/AList.java
@@ -29,24 +29,24 @@ import org.apache.juneau.serializer.*;
* Provides various convenience methods for creating and populating a list with minimal code.
*
* <h5 class='figure'>Examples:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A list of strings.</jc>
- * AList<String> l = AList.<jsm>of</jsm>(<js>"foo"</js>,<js>"bar"</js>);
+ * AList<String> <jv>list</jv> = AList.<jsm>of</jsm>(<js>"foo"</js>,<js>"bar"</js>);
*
* <jc>// Append to list.</jc>
- * l.append(<js>"baz"</js>, <js>"qux"</js>);
+ * <jv>list</jv>.append(<js>"baz"</js>, <js>"qux"</js>);
*
* <jc>// Create an unmodifiable view of this list.</jc>
- * List<String> l2 = l.unmodifiable();
+ * List<String> <jv>list2</jv> = <jv>list</jv>.unmodifiable();
*
* <jc>// Convert it to an array.</jc>
- * String[] array = l.asArray();
+ * String[] <jv>array</jv> = <jv>list</jv>.asArray();
*
* <jc>// Convert to simplified JSON.</jc>
- * String json = l.asString();
+ * String <jv>json</jv> = <jv>list</jv>.asString();
*
* <jc>// Convert to XML.</jc>
- * String json = l.asString(XmlSerializer.<jsf>DEFAULT</jsm>);
+ * String <jv>json</jv> = <jv>list</jv>.asString(XmlSerializer.<jsf>DEFAULT</jsm>);
* </p>
*
* <ul class='spaced-list'>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/AMap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/AMap.java
index 2eb23c6..b025b27 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/AMap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/AMap.java
@@ -28,21 +28,21 @@ import org.apache.juneau.serializer.*;
* Provides various convenience methods for creating and populating a map with minimal code.
*
* <h5 class='figure'>Examples:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A map of string key/value pairs.</jc>
- * AMap<String,String> m = AMap.<jsm>of</jsm>(<js>"foo"</js>,<js>"bar"</js>);
+ * AMap<String,String> <jv>map</jv> = AMap.<jsm>of</jsm>(<js>"foo"</js>,<js>"bar"</js>);
*
* <jc>// Append to map.</jc>
- * m.a(<js>"baz"</js>, <js>"qux"</js>);
+ * <jv>map</jv>.a(<js>"baz"</js>, <js>"qux"</js>);
*
* <jc>// Create an unmodifiable view of this list.</jc>
- * Map<String,String> m2 = m.unmodifiable();
+ * Map<String,String> <jv>map2</jv> = <jv>map</jv>.unmodifiable();
*
* <jc>// Convert to simplified JSON.</jc>
- * String json = m.asString();
+ * String <jv>json</jv> = <jv>map</jv>.asString();
*
* <jc>// Convert to XML.</jc>
- * String json = m.asString(XmlSerializer.<jsf>DEFAULT</jsm>);
+ * String <jv>json</jv> = <jv>msp</jv>.asString(XmlSerializer.<jsf>DEFAULT</jsm>);
* </p>
*
* <ul class='spaced-list'>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/ASet.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/ASet.java
index 0f6479a..a981388 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/ASet.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/ASet.java
@@ -28,24 +28,24 @@ import org.apache.juneau.serializer.*;
* Provides various convenience methods for creating and populating a set with minimal code.
*
* <h5 class='figure'>Examples:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A set of strings.</jc>
- * ASet<String> s = ASet.<jsm>of</jsm>(<js>"foo"</js>,<js>"bar"</js>);
+ * ASet<String> <jv>set</jv> = ASet.<jsm>of</jsm>(<js>"foo"</js>,<js>"bar"</js>);
*
* <jc>// Append to set.</jc>
- * s.a(<js>"baz"</js>).a(<js>"qux"</js>);
+ * <jv>set</jv>.a(<js>"baz"</js>).a(<js>"qux"</js>);
*
* <jc>// Create an unmodifiable view of this set.</jc>
- * Set<String> s2 = s.unmodifiable();
+ * Set<String> <jv>set2</jv> = <jv>set</jv>.unmodifiable();
*
* <jc>// Convert it to an array.</jc>
- * String[] array = s.asArrayOf(String.<jk>class</jk>);
+ * String[] <jv>array</jv> = <jv>set</jv>.asArrayOf(String.<jk>class</jk>);
*
* <jc>// Convert to simplified JSON.</jc>
- * String json = s.asString();
+ * String <jv>json</jv> = <jv>set</jv>.asString();
*
* <jc>// Convert to XML.</jc>
- * String json = s.asString(XmlSerializer.<jsf>DEFAULT</jsm>);
+ * String <jv>json</jv> = <jv>set</jv>.asString(XmlSerializer.<jsf>DEFAULT</jsm>);
* </p>
*
* <ul class='spaced-list'>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/ASortedMap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/ASortedMap.java
index 2aacb1c..ff18370 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/ASortedMap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/ASortedMap.java
@@ -27,21 +27,21 @@ import org.apache.juneau.serializer.*;
* Provides various convenience methods for creating and populating a sorted map with minimal code.
*
* <h5 class='figure'>Examples:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A map of string key/value pairs.</jc>
- * AMap<String,String> m = AMap.<jsm>of</jsm>(<js>"foo"</js>,<js>"bar"</js>);
+ * AMap<String,String> <jv>map</jv> = AMap.<jsm>of</jsm>(<js>"foo"</js>,<js>"bar"</js>);
*
* <jc>// Append to map.</jc>
- * m.a(<js>"baz"</js>, <js>"qux"</js>);
+ * <jv>map</jv>.a(<js>"baz"</js>, <js>"qux"</js>);
*
* <jc>// Create an unmodifiable view of this list.</jc>
- * Map<String,String> m2 = m.unmodifiable();
+ * Map<String,String> <jv>map2</jv> = <jv>map</jv>.unmodifiable();
*
* <jc>// Convert to simplified JSON.</jc>
- * String json = m.asString();
+ * String <jv>json</jv> = <jv>map</jv>.asString();
*
* <jc>// Convert to XML.</jc>
- * String json = m.asString(XmlSerializer.<jsf>DEFAULT</jsm>);
+ * String <jv>json</jv> = <jv>map</jv>.asString(XmlSerializer.<jsf>DEFAULT</jsm>);
* </p>
*
* <ul class='spaced-list'>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/ASortedSet.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/ASortedSet.java
index 6e756de..5270cd7 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/ASortedSet.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/ASortedSet.java
@@ -26,24 +26,24 @@ import org.apache.juneau.serializer.*;
* Provides various convenience methods for creating and populating a sorted set with minimal code.
*
* <h5 class='figure'>Examples:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// A set of strings.</jc>
- * ASortedSet<String> s = ASortedSet.<jsm>of</jsm>(<js>"foo"</js>,<js>"bar"</js>);
+ * ASortedSet<String> <jv>set</jv> = ASortedSet.<jsm>of</jsm>(<js>"foo"</js>,<js>"bar"</js>);
*
* <jc>// Append to set.</jc>
- * s.a(<js>"baz"</js>).a(<js>"qux"</js>);
+ * <jv>set</jv>.a(<js>"baz"</js>).a(<js>"qux"</js>);
*
* <jc>// Create an unmodifiable view of this set.</jc>
- * Set<String> s2 = s.unmodifiable();
+ * Set<String> <jv>set2</jv> = <jv>set</jv>.unmodifiable();
*
* <jc>// Convert it to an array.</jc>
- * String[] array = s.asArrayOf(String.<jk>class</jk>);
+ * String[] <jv>array</jv> = <jv>set</jv>.asArrayOf(String.<jk>class</jk>);
*
* <jc>// Convert to simplified JSON.</jc>
- * String json = s.asString();
+ * String <jv>json</jv> = <jv>set</jv>.asString();
*
* <jc>// Convert to XML.</jc>
- * String json = s.asString(XmlSerializer.<jsf>DEFAULT</jsm>);
+ * String <jv>json</jv> = <jv>set</jv>.asString(XmlSerializer.<jsf>DEFAULT</jsm>);
* </p>
*
* <ul class='spaced-list'>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/Args.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/Args.java
index e07d4ca..05b40fa 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/Args.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/Args.java
@@ -45,58 +45,58 @@ import org.apache.juneau.internal.*;
* </ul>
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
*
* <jc>// Main method with arguments</jc>
- * <jk>public static void</jk> <jsm>main</jsm>(String[] args) {
+ * <jk>public static void</jk> <jsm>main</jsm>(String[] <jv>_args</jv>) {
*
* <jc>// Wrap in Args</jc>
- * Args a = new Args(args);
+ * Args <jv>args</jv> = <jk>new</jk> Args(<jv>_args</jv>);
*
* <jc>// One main argument</jc>
* <jc>// a1</jc>
- * String a1 = a.getArg(0); <jc>// "a1"</jc>
- * String a2 = a.getArg(1); <jc>// null</jc>
+ * String <jv>a1</jv> = <jv>args</jv>.getArg(0); <jc>// "a1"</jc>
+ * String <jv>a2</jv> = <jv>args</jv>.getArg(1); <jc>// null</jc>
*
* <jc>// Two main arguments</jc>
* <jc>// a1 a2</jc>
- * String a1 = a.getArg(0); <jc>// "a1"</jc>
- * String a2 = a.getArg(1); <jc>// "a2"</jc>
+ * String <jv>a1</jv> = <jv>args</jv>.getArg(0); <jc>// "a1"</jc>
+ * String <jv>a2</jv> = <jv>args</jv>.getArg(1); <jc>// "a2"</jc>
*
* <jc>// One main argument and one optional argument with no value</jc>
* <jc>// a1 -a2</jc>
- * String a1 = a.getArg(0);
- * <jk>boolean</jk> hasA2 = a.hasArg(<js>"a2"</js>); <jc>// true</jc>
- * <jk>boolean</jk> hasA3 = a.hasArg(<js>"a3"</js>); <jc>// false</jc>
+ * String <jv>a1</jv> = <jv>args</jv>.getArg(0);
+ * <jk>boolean</jk> <jv>hasA2</jv> = <jv>args</jv>.hasArg(<js>"a2"</js>); <jc>// true</jc>
+ * <jk>boolean</jk> <jv>hasA3</jv> = <jv>args</jv>.hasArg(<js>"a3"</js>); <jc>// false</jc>
*
* <jc>// One main argument and one optional argument with one value</jc>
* <jc>// a1 -a2 v2</jc>
- * String a1 = a.getArg(0);
- * String a2 = a.getArg(<js>"a2"</js>); <jc>// "v2"</jc>
- * String a3 = a.getArg(<js>"a3"</js>); <jc>// null</jc>
+ * String <jv>a1</jv> = <jv>args</jv>.getArg(0);
+ * String <jv>a2</jv> = <jv>args</jv>.getArg(<js>"a2"</js>); <jc>// "v2"</jc>
+ * String <jv>a3</jv> = <jv>args</jv>.getArg(<js>"a3"</js>); <jc>// null</jc>
*
* <jc>// One main argument and one optional argument with two values</jc>
* <jc>// a1 -a2 v2a v2b</jc>
* String a1 = a.getArg(0);
- * List<String> a2 = a.getArgs(<js>"a2"</js>); <jc>// Contains ["v2a","v2b"]</jc>
- * List<String> a3 = a.getArgs(<js>"a3"</js>); <jc>// Empty list</jc>
+ * List<String> <jv>a2</jv> = <jv>args</jv>.getArgs(<js>"a2"</js>); <jc>// Contains ["v2a","v2b"]</jc>
+ * List<String> <jv>a3</jv> = <jv>args</jv>.getArgs(<js>"a3"</js>); <jc>// Empty list</jc>
*
* <jc>// Same as previous, except specify optional argument name multiple times</jc>
* <jc>// a1 -a2 v2a -a2 v2b</jc>
- * String a1 = a.getArg(0);
- * List<String> a2 = a.getArgs(<js>"a2"</js>); <jc>// Contains ["v2a","v2b"]</jc>
+ * String <jv>a1</jv> = <jv>args</jv>.getArg(0);
+ * List<String> <jv>a2</jv> = <jv>args</jv>.getArgs(<js>"a2"</js>); <jc>// Contains ["v2a","v2b"]</jc>
* }
* </p>
*
* <p>
* Main arguments are available through numeric string keys (e.g. <js>"0"</js>, <js>"1"</js>, ...).
* So you could use the {@link OMap} API to convert main arguments directly to POJOs, such as an <c>Enum</c>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Get 1st main argument as an Enum</jc>
- * MyEnum e = a.get(MyEnum.<jk>class</jk>, <js>"0"</js>);
+ * MyEnum <jv>_enum</jv> = <jv>args</jv>.get(MyEnum.<jk>class</jk>, <js>"0"</js>);
*
* <jc>// Get 1st main argument as an integer</jc>
- * int i = a.get(<jk>int</jk>.<jk>class</jk>, <js>"0"</js>);
+ * <jk>int</jk> <jv>_int</jv> = <jv>args</jv>.get(<jk>int</jk>.<jk>class</jk>, <js>"0"</js>);
* </p>
*
* <p>
@@ -164,24 +164,24 @@ public final class Args extends OMap {
*
* <p>
* Can be used in conjunction with {@link #hasArg(int)} to check for existence of arg.
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Check for no arguments</jc>
- * <jk>if</jk> (! args.hasArg(0))
- * printUsageAndExit();
+ * <jk>if</jk> (! <jv>args</jv>.hasArg(0))
+ * <jsm>printUsageAndExit</jsm>();
*
* <jc>// Get the first argument</jc>
- * String firstArg = args.getArg(0);
+ * String <jv>firstArg</jv> = <jv>args</jv>.getArg(0);
* </p>
*
* <p>
* Since main arguments are stored as numeric keys, this method is essentially equivalent to...
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Check for no arguments</jc>
- * <jk>if</jk> (! args.containsKey(<js>"0"</js>))
- * printUsageAndExit();
+ * <jk>if</jk> (! <jv>args</jv>.containsKey(<js>"0"</js>))
+ * <jsm>printUsageAndExit</jsm>();
*
* <jc>// Get the first argument</jc>
- * String firstArg = args.getString("0");
+ * String <jv>firstArg</jv> = <jv>args</jv>.getString(<js>"0"</js>);
* </p>
*
* @param i The index position of the main argument (zero-indexed).
@@ -237,10 +237,10 @@ public final class Args extends OMap {
* If the optional arg has multiple values, returns only the first converted value.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Command: java com.sample.MyClass -verbose true -debug 5</jc>
- * <jk>boolean</jk> b = args.getArg(<jk>boolean</jk>.<jk>class</jk>, <js>"verbose"</js>);
- * <jk>int</jk> i = args.getArg(<jk>int</jk>.<jk>class</jk>, <js>"debug"</js>);
+ * <jk>boolean</jk> <jv>bool</jv> = <jv>args</jv>.getArg(<jk>boolean</jk>.<jk>class</jk>, <js>"verbose"</js>);
+ * <jk>int</jk> <jv>_int</jv> = <jv>args</jv>.getArg(<jk>int</jk>.<jk>class</jk>, <js>"debug"</js>);
* </p>
*
* @param c The class type to convert the value to.
@@ -259,10 +259,10 @@ public final class Args extends OMap {
* Returns the optional argument values as a list of strings.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Command: java com.sample.MyClass -extraArgs foo bar baz</jc>
- * List<String> l1 = args.getArgs(<js>"extraArgs"</js>); <jc>// ['foo','bar','baz']</jc>
- * List<String> l2 = args.getArgs(<js>"nonExistentArgs"</js>); <jc>// An empty list</jc>
+ * List<String> <jv>list1</jv> = <jv>args</jv>.getArgs(<js>"extraArgs"</js>); <jc>// ['foo','bar','baz']</jc>
+ * List<String> <jv>list2</jv> = <jv>args</jv>.getArgs(<js>"nonExistentArgs"</js>); <jc>// An empty list</jc>
* </p>
*
* @param name The optional argument name.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/OList.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/OList.java
index 708e994..a575d5a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/OList.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/OList.java
@@ -40,57 +40,57 @@ import org.apache.juneau.utils.*;
* when accessing elements in a list.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Construct an empty List</jc>
- * OList l = OList.<jsm>of</jsm>();
+ * OList <jv>list</jv> = OList.<jsm>of</jsm>();
*
* <jc>// Construct a list of objects using various methods</jc>
- * l = OList.<jsm>of</jsm>().a(<js>"foo"</js>).a(123).a(<jk>true</jk>);
- * l = OList.<jsm>of</jsm>().a(<js>"foo"</js>, 123, <jk>true</jk>); <jc>// Equivalent</jc>
- * l = OList.<jsm>of</jsm>(<js>"foo"</js>, 123, <jk>true</jk>); <jc>// Equivalent</jc>
+ * <jv>list</jv> = OList.<jsm>of</jsm>().a(<js>"foo"</js>).a(123).a(<jk>true</jk>);
+ * <jv>list</jv> = OList.<jsm>of</jsm>().a(<js>"foo"</js>, 123, <jk>true</jk>); <jc>// Equivalent</jc>
+ * <jv>list</jv> = OList.<jsm>of</jsm>(<js>"foo"</js>, 123, <jk>true</jk>); <jc>// Equivalent</jc>
*
* <jc>// Construct a list of integers from JSON</jc>
- * l = OList.<jsm>ofJson</jsm>(<js>"[1,2,3]"</js>);
+ * <jv>list</jv> = OList.<jsm>ofJson</jsm>(<js>"[1,2,3]"</js>);
*
* <jc>// Construct a list of generic OMap objects from JSON</jc>
- * l = OList.<jsm>ofJson</jsm>(<js>"[{foo:'bar'},{baz:'bing'}]"</js>);
+ * <jv>list</jv> = OList.<jsm>ofJson</jsm>(<js>"[{foo:'bar'},{baz:'bing'}]"</js>);
*
* <jc>// Construct a list of integers from XML</jc>
- * String xml = <js>"<array><number>1</number><number>2</number><number>3</number></array>"</js>;
- * l = OList.<jsm>of</jsm>(xml, XmlParser.<jsf>DEFAULT</jsf>);
- * l = (List)XmlParser.<jsf>DEFAULT</jsf>.parse(xml); <jc>// Equivalent</jc>
- * l = (List)XmlParser.<jsf>DEFAULT</jsf>.parse(Object.<jk>class</jk>, xml); <jc>// Equivalent</jc>
- * l = XmlParser.<jsf>DEFAULT</jsf>.parse(List.<jk>class</jk>, xml); <jc>// Equivalent</jc>
- * l = XmlParser.<jsf>DEFAULT</jsf>.parse(OList.<jk>class</jk>, xml); <jc>// Equivalent</jc>
+ * String <jv>xml</jv> = <js>"<array><number>1</number><number>2</number><number>3</number></array>"</js>;
+ * <jv>list</jv> = OList.<jsm>of</jsm>(<jv>xml</jv>, XmlParser.<jsf>DEFAULT</jsf>);
+ * <jv>list</jv> = (List)XmlParser.<jsf>DEFAULT</jsf>.parse(<jv>xml</jv>); <jc>// Equivalent</jc>
+ * <jv>list</jv> = (List)XmlParser.<jsf>DEFAULT</jsf>.parse(Object.<jk>class</jk>, <jv>xml</jv>); <jc>// Equivalent</jc>
+ * <jv>list</jv> = XmlParser.<jsf>DEFAULT</jsf>.parse(List.<jk>class</jk>, <jv>xml</jv>); <jc>// Equivalent</jc>
+ * <jv>list</jv> = XmlParser.<jsf>DEFAULT</jsf>.parse(OList.<jk>class</jk>, <jv>xml</jv>); <jc>// Equivalent</jc>
*
* <jc>// Construct JSON from OList</jc>
- * l = OList.<jsm>ofJson</jsm>(<js>"[{foo:'bar'},{baz:'bing'}]"</js>);
- * String json = l.toString(); <jc>// Produces "[{foo:'bar'},{baz:'bing'}]"</jc>
- * json = l.toString(JsonSerializer.<jsf>DEFAULT</jsf>); <jc>// Equivalent</jc>
- * json = JsonSerializer.<jsf>DEFAULT</jsf>.serialize(l); <jc>// Equivalent</jc>
+ * <jv>list</jv> = OList.<jsm>ofJson</jsm>(<js>"[{foo:'bar'},{baz:'bing'}]"</js>);
+ * String <jv>json</jv> = <jv>list</jv>.toString(); <jc>// Produces "[{foo:'bar'},{baz:'bing'}]"</jc>
+ * <jv>json</jv> = <jv>list</jv>.toString(JsonSerializer.<jsf>DEFAULT</jsf>); <jc>// Equivalent</jc>
+ * <jv>json</jv> = JsonSerializer.<jsf>DEFAULT</jsf>.serialize(<jv>list</jv>); <jc>// Equivalent</jc>
*
* <jc>// Get one of the entries in the list as an Integer</jc>
- * l = OList.<jsm>ofJson</jsm>(<js>"[1,2,3]"</js>);
- * Integer i = l.getInt(1);
- * i = l.get(Integer.<jk>class</jk>, 1); <jc>// Equivalent</jc>
+ * <jv>list</jv> = OList.<jsm>ofJson</jsm>(<js>"[1,2,3]"</js>);
+ * Integer <jv>integer</jv> = <jv>list</jv>.getInt(1);
+ * <jv>list</jv> = <jv>list</jv>.get(Integer.<jk>class</jk>, 1); <jc>// Equivalent</jc>
*
* <jc>// Get one of the entries in the list as an Float</jc>
- * l = OList.<jsm>ofJson</jsm>(<js>"[1,2,3]"</js>);
- * Float f = l.getFloat(1); <jc>// Returns 2f </jc>
- * f = l.get(Float.<jk>class</jk>, 1); <jc>// Equivalent</jc>
+ * <jv>list</jv> = OList.<jsm>ofJson</jsm>(<js>"[1,2,3]"</js>);
+ * Float <jv>_float</jv> = <jv>list</jv>.getFloat(1); <jc>// Returns 2f </jc>
+ * <jv>_float</jv> = <jv>list</jv>.get(Float.<jk>class</jk>, 1); <jc>// Equivalent</jc>
*
* <jc>// Same as above, except converted to a String</jc>
- * l = OList.<jsm>ofJson</jsm>(<js>"[1,2,3]"</js>);
- * String s = l.getString(1); <jc>// Returns "2" </jc>
- * s = l.get(String.<jk>class</jk>, 1); <jc>// Equivalent</jc>
+ * <jv>list</jv> = OList.<jsm>ofJson</jsm>(<js>"[1,2,3]"</js>);
+ * String <jv>string</jv> = <jv>list</jv>.getString(1); <jc>// Returns "2" </jc>
+ * <jv>string</jv> = <jv>list</jv>.get(String.<jk>class</jk>, 1); <jc>// Equivalent</jc>
*
* <jc>// Get one of the entries in the list as a bean (converted to a bean if it isn't already one)</jc>
- * l = OList.<jsm>ofJson</jsm>(<js>"[{name:'John Smith',age:45}]"</js>);
- * Person p = l.get(Person.<jk>class</jk>, 0);
+ * <jv>list</jv> = OList.<jsm>ofJson</jsm>(<js>"[{name:'John Smith',age:45}]"</js>);
+ * Person <jv>person</jv> = <jv>list</jv>.get(Person.<jk>class</jk>, 0);
*
* <jc>// Iterate over a list of beans using the elements() method</jc>
- * OList l = OList.<jsm>ofJson</jsm>(<js>"[{name:'John Smith',age:45}]"</js>);
- * <jk>for</jk> (Person p : l.elements(Person.<jk>class</jk>) {
+ * <jv>list</jv> = OList.<jsm>ofJson</jsm>(<js>"[{name:'John Smith',age:45}]"</js>);
+ * <jk>for</jk> (Person <jv>person</jv> : <jv>list</jv>.elements(Person.<jk>class</jk>) {
* <jc>// Do something with p</jc>
* }
* </p>
@@ -540,23 +540,23 @@ public class OList extends LinkedList<Object> {
* This is the preferred get method for simple types.
*
* <h5 class='section'>Examples:</h5>
- * <p class='bcode w800'>
- * OList l = OList.<jsm>ofJson</jsm>(<js>"..."</js>);
+ * <p class='bjava'>
+ * OList <jv>list</jv> = OList.<jsm>ofJson</jsm>(<js>"..."</js>);
*
* <jc>// Value converted to a string.</jc>
- * String s = l.get(1, String.<jk>class</jk>);
+ * String <jv>string</jv> = <jv>list</jv>.get(1, String.<jk>class</jk>);
*
* <jc>// Value converted to a bean.</jc>
- * MyBean b = l.get(2, MyBean.<jk>class</jk>);
+ * MyBean <jv>bean</jv> = <jv>list</jv>.get(2, MyBean.<jk>class</jk>);
*
* <jc>// Value converted to a bean array.</jc>
- * MyBean[] ba = l.get(3, MyBean[].<jk>class</jk>);
+ * MyBean[] <jv>beanArray</jv> = <jv>list</jv>.get(3, MyBean[].<jk>class</jk>);
*
* <jc>// Value converted to a linked-list of objects.</jc>
- * List l1 = l.get(4, LinkedList.<jk>class</jk>);
+ * List <jv>list2</jv> = <jv>list</jv>.get(4, LinkedList.<jk>class</jk>);
*
* <jc>// Value converted to a map of object keys/values.</jc>
- * Map m1 = l.get(5, TreeMap.<jk>class</jk>);
+ * Map <jv>map</jv> = <jv>list</jv>.get(5, TreeMap.<jk>class</jk>);
* </p>
*
* <p>
@@ -578,23 +578,23 @@ public class OList extends LinkedList<Object> {
* The type can be a simple type (e.g. beans, strings, numbers) or parameterized type (collections/maps).
*
* <h5 class='section'>Examples:</h5>
- * <p class='bcode w800'>
- * OList l = OList.<jsm>ofJson</jsm>(<js>"..."</js>);
+ * <p class='bjava'>
+ * OList <jv>list</jv> = OList.<jsm>ofJson</jsm>(<js>"..."</js>);
*
* <jc>// Value converted to a linked-list of strings.</jc>
- * List<String> l1 = l.get(1, LinkedList.<jk>class</jk>, String.<jk>class</jk>);
+ * List<String> <jv>list1</jv> = <jv>list</jv>.get(1, LinkedList.<jk>class</jk>, String.<jk>class</jk>);
*
* <jc>// Value converted to a linked-list of beans.</jc>
- * List<MyBean> l2 = l.get(2, LinkedList.<jk>class</jk>, MyBean.<jk>class</jk>);
+ * List<MyBean> <jv>list2</jv> = <jv>list</jv>.get(2, LinkedList.<jk>class</jk>, MyBean.<jk>class</jk>);
*
* <jc>// Value converted to a linked-list of linked-lists of strings.</jc>
- * List<List<String>> l3 = l.get(3, LinkedList.<jk>class</jk>, LinkedList.<jk>class</jk>, String.<jk>class</jk>);
+ * List<List<String>> <jv>list3</jv> = <jv>list</jv>.get(3, LinkedList.<jk>class</jk>, LinkedList.<jk>class</jk>, String.<jk>class</jk>);
*
* <jc>// Value converted to a map of string keys/values.</jc>
- * Map<String,String> m1 = l.get(4, TreeMap.<jk>class</jk>, String.<jk>class</jk>, String.<jk>class</jk>);
+ * Map<String,String> <jv>map1</jv> = <jv>list</jv>.get(4, TreeMap.<jk>class</jk>, String.<jk>class</jk>, String.<jk>class</jk>);
*
* <jc>// Value converted to a map containing string keys and values of lists containing beans.</jc>
- * Map<String,List<MyBean>> m2 = l.get(5, TreeMap.<jk>class</jk>, String.<jk>class</jk>, List.<jk>class</jk>, MyBean.<jk>class</jk>);
+ * Map<String,List<MyBean>> <jv>map2</jv> = <jv>list</jv>.get(5, TreeMap.<jk>class</jk>, String.<jk>class</jk>, List.<jk>class</jk>, MyBean.<jk>class</jk>);
* </p>
*
* <p>
@@ -720,14 +720,14 @@ public class OList extends LinkedList<Object> {
* <p>
* For example, the following code is equivalent:
* </p>
- * <p class='bcode w800'>
- * OList ol = OList.<jsm>ofJson</jsm>(<js>"..."</js>);
+ * <p class='bjava'>
+ * OList <jv>list</jv> = OList.<jsm>ofJson</jsm>(<js>"..."</js>);
*
* <jc>// Long way</jc>
- * <jk>long</jk> l = ol.getMap(<js>"0"</js>).getLong(<js>"baz"</js>);
+ * <jk>long</jk> <jv>long1</jv> = <jv>list</jv>.getMap(<js>"0"</js>).getLong(<js>"baz"</js>);
*
* <jc>// Using this method</jc>
- * <jk>long</jk> l = ol.getAt(<js>"0/baz"</js>, <jk>long</jk>.<jk>class</jk>);
+ * <jk>long</jk> <jv>long2</jv> = <jv>list</jv>.getAt(<js>"0/baz"</js>, <jk>long</jk>.<jk>class</jk>);
* </p>
*
* <p>
@@ -765,14 +765,14 @@ public class OList extends LinkedList<Object> {
* <p>
* For example, the following code is equivalent:
* </p>
- * <p class='bcode w800'>
- * OList ol = OList.<jsm>ofJson</jsm>(<js>"..."</js>);
+ * <p class='bjava'>
+ * OList <jv>list</jv> = OList.<jsm>ofJson</jsm>(<js>"..."</js>);
*
* <jc>// Long way</jc>
- * ol.getMap(<js>"0"</js>).put(<js>"baz"</js>, 123);
+ * <jv>list</jv>.getMap(<js>"0"</js>).put(<js>"baz"</js>, 123);
*
* <jc>// Using this method</jc>
- * ol.putAt(<js>"0/baz"</js>, 123);
+ * <jv>list</jv>.putAt(<js>"0/baz"</js>, 123);
* </p>
*
* <p>
@@ -793,14 +793,14 @@ public class OList extends LinkedList<Object> {
* <p>
* For example, the following code is equivalent:
* </p>
- * <p class='bcode w800'>
- * OList ol = OList.<jsm>ofJson</jsm>(<js>"..."</js>);
+ * <p class='bjava'>
+ * OList <jv>list</jv> = OList.<jsm>ofJson</jsm>(<js>"..."</js>);
*
* <jc>// Long way</jc>
- * ol.getMap(0).getList(<js>"bar"</js>).append(123);
+ * <jv>list</jv>.getMap(0).getList(<js>"bar"</js>).append(123);
*
* <jc>// Using this method</jc>
- * ol.postAt(<js>"0/bar"</js>, 123);
+ * <jv>list</jv>.postAt(<js>"0/bar"</js>, 123);
* </p>
*
* <p>
@@ -822,14 +822,14 @@ public class OList extends LinkedList<Object> {
* <p>
* For example, the following code is equivalent:
* </p>
- * <p class='bcode w800'>
- * OList ol = OList.<jsm>ofJson</jsm>(<js>"..."</js>);
+ * <p class='bjava'>
+ * OList <jv>list</jv> = OList.<jsm>ofJson</jsm>(<js>"..."</js>);
*
* <jc>// Long way</jc>
- * ol.getMap(0).getList(<js>"bar"</js>).delete(0);
+ * <jv>list</jv>.getMap(0).getList(<js>"bar"</js>).delete(0);
*
* <jc>// Using this method</jc>
- * m.deleteAt(<js>"0/bar/0"</js>);
+ * <jv>list</jv>.deleteAt(<js>"0/bar/0"</js>);
* </p>
*
* <p>
@@ -881,23 +881,23 @@ public class OList extends LinkedList<Object> {
* See {@link BeanSession#convertToType(Object, ClassMeta)} for a description of valid conversions.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Iterate over a list of OMaps.</jc>
- * OList l = OList.<jsm>ofJson</jsm>(<js>"[{foo:'bar'},{baz:123}]"</js>);
- * for (OMap m : l.elements(OMap.<jk>class</jk>)) {
- * <jc>// Do something with m.</jc>
+ * OList <jv>list</jv> = OList.<jsm>ofJson</jsm>(<js>"[{foo:'bar'},{baz:123}]"</js>);
+ * <jk>for</jk> (OMap <jv>map</jv> : <jv>list</jv>.elements(OMap.<jk>class</jk>)) {
+ * <jc>// Do something with map.</jc>
* }
*
* <jc>// Iterate over a list of ints.</jc>
- * OList l = OList.<jsm>ofJson</jsm>(<js>"[1,2,3]"</js>);
- * for (Integer i : l.elements(Integer.<jk>class</jk>)) {
+ * OList <jv>list</jv> = OList.<jsm>ofJson</jsm>(<js>"[1,2,3]"</js>);
+ * <jk>for</jk> (Integer <jv>i</jv> : <jv>list</jv>.elements(Integer.<jk>class</jk>)) {
* <jc>// Do something with i.</jc>
* }
*
* <jc>// Iterate over a list of beans.</jc>
* <jc>// Automatically converts to beans.</jc>
- * OList l = OList.<jsm>ofJson</jsm>(<js>"[{name:'John Smith',age:45}]"</js>);
- * for (Person p : l.elements(Person.<jk>class</jk>)) {
+ * OList <jv>list</jv> = OList.<jsm>ofJson</jsm>(<js>"[{name:'John Smith',age:45}]"</js>);
+ * <jk>for</jk> (Person <jv>p</jv> : <jv>list</jv>.elements(Person.<jk>class</jk>)) {
* <jc>// Do something with p.</jc>
* }
* </p>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/OMap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/OMap.java
index 084ef9e..71f7b1f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/OMap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/OMap.java
@@ -42,53 +42,53 @@ import org.apache.juneau.utils.*;
* typecasting when accessing elements in a list.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Construct an empty Map</jc>
- * OMap m = OMap.<jsm>of</jsm>();
+ * OMap <jv>map</jv> = OMap.<jsm>of</jsm>();
*
* <jc>// Construct a Map from JSON</jc>
- * m = OMap.<jsm>ofJson</jsm>(<js>"{a:'A',b:{c:'C',d:123}}"</js>);
+ * <jv>map</jv> = OMap.<jsm>ofJson</jsm>(<js>"{a:'A',b:{c:'C',d:123}}"</js>);
*
* <jc>// Construct a Map using the append method</jc>
- * m = OMap.<jsm>of</jsm>().a(<js>"foo"</js>,<js>"x"</js>).a(<js>"bar"</js>,123).a(<js>"baz"</js>,<jk>true</jk>);
+ * <jv>map</jv> = OMap.<jsm>of</jsm>().a(<js>"foo"</js>,<js>"x"</js>).a(<js>"bar"</js>,123).a(<js>"baz"</js>,<jk>true</jk>);
*
* <jc>// Construct a Map from XML generated by XmlSerializer</jc>
- * String xml = <js>"<object><a type='string'>A</a><b type='object'><c type='string'>C</c><d type='number'>123</d></b></object>"</js>;
- * m = OMap.<jsm>of</jsm>(xml, XmlParser.<jsf>DEFAULT</jsf>);
+ * String <jv>xml</jv> = <js>"<object><a type='string'>A</a><b type='object'><c type='string'>C</c><d type='number'>123</d></b></object>"</js>;
+ * <jv>map</jv> = OMap.<jsm>of</jsm>(<jv>xml</jv>, XmlParser.<jsf>DEFAULT</jsf>);
*
* <jc>// Construct a Map from a URL GET parameter string generated by UrlEncodingParser</jc>
- * String urlParams = <js>"?a='A'&b={c:'C',d:123}"</js>;
- * m = OMap.<jsm>of</jsm>(urlParams, UrlEncodingParser.<jsf>DEFAULT</jsf>);
+ * String <jv>urlParams</jv> = <js>"?a='A'&b={c:'C',d:123}"</js>;
+ * <jv>map</jv> = OMap.<jsm>of</jsm>(<jv>urlParams</jv>, UrlEncodingParser.<jsf>DEFAULT</jsf>);
*
* <jc>// Construct JSON from OMap</jc>
- * m = OMap.<jsm>ofJson</jsm>(<js>"{foo:'bar'},{baz:[123,true]}"</js>);
- * json = m.toString(); <jc>// Produces "{foo:'bar'},{baz:[123,true]}"</jc>
- * json = m.toString(JsonSerializer.<jsf>DEFAULT</jsf>); <jc>// Equivalent</jc>
- * json = JsonSerializer.<jsf>DEFAULT</jsf>.serialize(m); <jc>// Equivalent</jc>
+ * <jv>map</jv> = OMap.<jsm>ofJson</jsm>(<js>"{foo:'bar'},{baz:[123,true]}"</js>);
+ * String <jv>json</jv> = <jv>map</jv>.toString(); <jc>// Produces "{foo:'bar'},{baz:[123,true]}"</jc>
+ * <jv>json</jv> = <jv>map</jv>.toString(JsonSerializer.<jsf>DEFAULT</jsf>); <jc>// Equivalent</jc>
+ * <jv>json</jv> = JsonSerializer.<jsf>DEFAULT</jsf>.serialize(<jv>map</jv>); <jc>// Equivalent</jc>
*
* <jc>// Get a map entry as an Integer</jc>
- * m = OMap.<jsm>ofJson</jsm>(<js>"{foo:123}"</js>);
- * Integer i = m.getInt(<js>"foo"</js>);
- * i = m.get(Integer.<jk>class</jk>, <js>"foo"</js>); <jc>// Equivalent</jc>
+ * <jv>map</jv> = OMap.<jsm>ofJson</jsm>(<js>"{foo:123}"</js>);
+ * Integer <jv>integer</jv> = <jv>map</jv>.getInt(<js>"foo"</js>);
+ * <jv>integer</jv> = <jv>map</jv>.get(Integer.<jk>class</jk>, <js>"foo"</js>); <jc>// Equivalent</jc>
*
* <jc>// Get a map entry as a Float</jc>
- * m = OMap.<jsm>ofJson</jsm>(<js>"{foo:123}"</js>);
- * Float f = m.getFloat(<js>"foo"</js>);
- * f = m.get(Float.<jk>class</jk>, <js>"foo"</js>); <jc>// Equivalent</jc>
+ * <jv>map</jv> = OMap.<jsm>ofJson</jsm>(<js>"{foo:123}"</js>);
+ * Float <jv>_float</jv> = <jv>map</jv>.getFloat(<js>"foo"</js>);
+ * <jv>_float</jv> = <jv>map</jv>.get(Float.<jk>class</jk>, <js>"foo"</js>); <jc>// Equivalent</jc>
*
* <jc>// Same as above, except converted to a String</jc>
- * m = OMap.<jsm>ofJson</jsm>(<js>"{foo:123}"</js>);
- * String s = m.getString(<js>"foo"</js>); <jc>// Returns "123"</jc>
- * s = m.get(String.<jk>class</jk>, <js>"foo"</js>); <jc>// Equivalent</jc>
+ * <jv>map</jv> = OMap.<jsm>ofJson</jsm>(<js>"{foo:123}"</js>);
+ * String <jv>string</jv> = <jv>map</jv>.getString(<js>"foo"</js>); <jc>// Returns "123"</jc>
+ * <jv>string</jv> = <jv>map</jv>.get(String.<jk>class</jk>, <js>"foo"</js>); <jc>// Equivalent</jc>
*
* <jc>// Get one of the entries in the list as a bean (converted to a bean if it isn't already one)</jc>
- * m = OMap.<jsm>ofJson</jsm>(<js>"{person:{name:'John Smith',age:45}}"</js>);
- * Person p = m.get(Person.<jk>class</jk>, <js>"person"</js>);
+ * <jv>map</jv> = OMap.<jsm>ofJson</jsm>(<js>"{person:{name:'John Smith',age:45}}"</js>);
+ * Person <jv>person</jv> = <jv>map</jv>.get(Person.<jk>class</jk>, <js>"person"</js>);
*
* <jc>// Add an inner map</jc>
- * OMap m1 = OMap.<jsm>ofJson</jsm>(<js>"{a:1}"</js>);
- * OMap m2 = OMap.<jsm>ofJson</jsm>(<js>"{b:2}"</js>).setInner(m1);
- * <jk>int</jk> a = m2.getInt(<js>"a"</js>); <jc>// a == 1 </jc>
+ * OMap <jv>map1</jv> = OMap.<jsm>ofJson</jsm>(<js>"{a:1}"</js>);
+ * OMap <jv>map2</jv> = OMap.<jsm>ofJson</jsm>(<js>"{b:2}"</js>).setInner(<jv>map1</jv>);
+ * <jk>int</jk> <jv>_int</jv> = <jv>map2</jv>.getInt(<js>"a"</js>); <jc>// a == 1 </jc>
* </p>
*
* <ul class='spaced-list'>
@@ -235,8 +235,8 @@ public class OMap extends LinkedHashMap<String,Object> {
* Construct a map initialized with the specified key/value pairs.
*
* <h5 class='section'>Examples:</h5>
- * <p class='bcode w800'>
- * OMap m = <jk>new</jk> OMap(<js>"key1"</js>,<js>"val1"</js>,<js>"key2"</js>,<js>"val2"</js>);
+ * <p class='bjava'>
+ * OMap <jv>map</jv> = <jk>new</jk> OMap(<js>"key1"</js>,<js>"val1"</js>,<js>"key2"</js>,<js>"val2"</js>);
* </p>
*
* @param keyValuePairs A list of key/value pairs to add to this map.
@@ -253,8 +253,8 @@ public class OMap extends LinkedHashMap<String,Object> {
* Same as {@link #of(Object...)} but calls {@link #filtered()} on the created map.
*
* <h5 class='section'>Examples:</h5>
- * <p class='bcode w800'>
- * OMap m = <jk>new</jk> OMap(<js>"key1"</js>,<js>"val1"</js>,<js>"key2"</js>,<js>"val2"</js>);
+ * <p class='bjava'>
+ * OMap <jv>map</jv> = <jk>new</jk> OMap(<js>"key1"</js>,<js>"val1"</js>,<js>"key2"</js>,<js>"val2"</js>);
* </p>
*
* @param keyValuePairs A list of key/value pairs to add to this map.
@@ -365,8 +365,8 @@ public class OMap extends LinkedHashMap<String,Object> {
* Construct a map initialized with the specified key/value pairs.
*
* <h5 class='section'>Examples:</h5>
- * <p class='bcode w800'>
- * OMap m = <jk>new</jk> OMap(<js>"key1"</js>,<js>"val1"</js>,<js>"key2"</js>,<js>"val2"</js>);
+ * <p class='bjava'>
+ * OMap <jv>map</jv> = <jk>new</jk> OMap(<js>"key1"</js>,<js>"val1"</js>,<js>"key2"</js>,<js>"val2"</js>);
* </p>
*
* @param keyValuePairs A list of key/value pairs to add to this map.
@@ -392,12 +392,12 @@ public class OMap extends LinkedHashMap<String,Object> {
* In addition to providing the ability to chain maps, this method also provides the ability to wrap an existing map
* inside another map so that you can add entries to the outer map without affecting the values on the inner map.
*
- * <p class='bcode w800'>
- * OMap m1 = OMap.<jsm>ofJson</jsm>(<js>"{foo:1}"</js>);
- * OMap m2 = OMap.<jsm>of</jsm>().setInner(m1);
- * m2.put(<js>"foo"</js>, 2); <jc>// Overwrite the entry</jc>
- * <jk>int</jk> foo1 = m1.getInt(<js>"foo"</js>); <jc>// foo1 == 1 </jc>
- * <jk>int</jk> foo2 = m2.getInt(<js>"foo"</js>); <jc>// foo2 == 2 </jc>
+ * <p class='bjava'>
+ * OMap <jv>map1</jv> = OMap.<jsm>ofJson</jsm>(<js>"{foo:1}"</js>);
+ * OMap <jv>map2</jv> = OMap.<jsm>of</jsm>().setInner(<jv>map1</jv>);
+ * <jv>map2</jv>.put(<js>"foo"</js>, 2); <jc>// Overwrite the entry</jc>
+ * <jk>int</jk> <jv>foo1</jv> = <jv>map1</jv>.getInt(<js>"foo"</js>); <jc>// foo1 == 1 </jc>
+ * <jk>int</jk> <jv>foo2</jv> = <jv>map2</jv>.getInt(<js>"foo"</js>); <jc>// foo2 == 2 </jc>
* </p>
*
* @param inner
@@ -665,23 +665,23 @@ public class OMap extends LinkedHashMap<String,Object> {
* This is the preferred get method for simple types.
*
* <h5 class='section'>Examples:</h5>
- * <p class='bcode w800'>
- * OMap m = OMap.<jsm>ofJson</jsm>(<js>"..."</js>);
+ * <p class='bjava'>
+ * OMap <jv>map</jv> = OMap.<jsm>ofJson</jsm>(<js>"..."</js>);
*
* <jc>// Value converted to a string.</jc>
- * String s = m.get(<js>"key1"</js>, String.<jk>class</jk>);
+ * String <jv>string</jv> = <jv>map</jv>.get(<js>"key1"</js>, String.<jk>class</jk>);
*
* <jc>// Value converted to a bean.</jc>
- * MyBean b = m.get(<js>"key2"</js>, MyBean.<jk>class</jk>);
+ * MyBean <jv>bean</jv> = <jv>map</jv>.get(<js>"key2"</js>, MyBean.<jk>class</jk>);
*
* <jc>// Value converted to a bean array.</jc>
- * MyBean[] ba = m.get(<js>"key3"</js>, MyBean[].<jk>class</jk>);
+ * MyBean[] <jv>beanArray</jv> = <jv>map</jv>.get(<js>"key3"</js>, MyBean[].<jk>class</jk>);
*
* <jc>// Value converted to a linked-list of objects.</jc>
- * List l = m.get(<js>"key4"</js>, LinkedList.<jk>class</jk>);
+ * List <jv>list</jv> = <jv>map</jv>.get(<js>"key4"</js>, LinkedList.<jk>class</jk>);
*
* <jc>// Value converted to a map of object keys/values.</jc>
- * Map m2 = m.get(<js>"key5"</js>, TreeMap.<jk>class</jk>);
+ * Map <jv>map2</jv> = <jv>map</jv>.get(<js>"key5"</js>, TreeMap.<jk>class</jk>);
* </p>
*
* <p>
@@ -703,23 +703,23 @@ public class OMap extends LinkedHashMap<String,Object> {
* The type can be a simple type (e.g. beans, strings, numbers) or parameterized type (collections/maps).
*
* <h5 class='section'>Examples:</h5>
- * <p class='bcode w800'>
- * OMap m = OMap.<jsm>ofJson</jsm>(<js>"..."</js>);
+ * <p class='bjava'>
+ * OMap <jv>map</jv> = OMap.<jsm>ofJson</jsm>(<js>"..."</js>);
*
* <jc>// Value converted to a linked-list of strings.</jc>
- * List<String> l1 = m.get(<js>"key1"</js>, LinkedList.<jk>class</jk>, String.<jk>class</jk>);
+ * List<String> <jv>list1</jv> = <jv>map</jv>.get(<js>"key1"</js>, LinkedList.<jk>class</jk>, String.<jk>class</jk>);
*
* <jc>// Value converted to a linked-list of beans.</jc>
- * List<MyBean> l2 = m.get(<js>"key2"</js>, LinkedList.<jk>class</jk>, MyBean.<jk>class</jk>);
+ * List<MyBean> <jv>list2</jv> = <jv>map</jv>.get(<js>"key2"</js>, LinkedList.<jk>class</jk>, MyBean.<jk>class</jk>);
*
* <jc>// Value converted to a linked-list of linked-lists of strings.</jc>
- * List<List<String>> l3 = m.get(<js>"key3"</js>, LinkedList.<jk>class</jk>, LinkedList.<jk>class</jk>, String.<jk>class</jk>);
+ * List<List<String>> <jv>list3</jv> = <jv>map</jv>.get(<js>"key3"</js>, LinkedList.<jk>class</jk>, LinkedList.<jk>class</jk>, String.<jk>class</jk>);
*
* <jc>// Value converted to a map of string keys/values.</jc>
- * Map<String,String> m1 = m.get(<js>"key4"</js>, TreeMap.<jk>class</jk>, String.<jk>class</jk>, String.<jk>class</jk>);
+ * Map<String,String> <jv>map1</jv> = <jv>map</jv>.get(<js>"key4"</js>, TreeMap.<jk>class</jk>, String.<jk>class</jk>, String.<jk>class</jk>);
*
* <jc>// Value converted to a map containing string keys and values of lists containing beans.</jc>
- * Map<String,List<MyBean>> m2 = m.get(<js>"key5"</js>, TreeMap.<jk>class</jk>, String.<jk>class</jk>, List.<jk>class</jk>, MyBean.<jk>class</jk>);
+ * Map<String,List<MyBean>> <jv>map2</jv> = <jv>map</jv>.get(<js>"key5"</js>, TreeMap.<jk>class</jk>, String.<jk>class</jk>, List.<jk>class</jk>, MyBean.<jk>class</jk>);
* </p>
*
* <p>
@@ -1500,14 +1500,14 @@ public class OMap extends LinkedHashMap<String,Object> {
* <p>
* For example, the following code is equivalent:
* </p>
- * <p class='bcode w800'>
- * OMap m = OMap.<jsm>ofJson</jsm>(<js>"..."</js>);
+ * <p class='bjava'>
+ * OMap <jv>map</jv> = OMap.<jsm>ofJson</jsm>(<js>"..."</js>);
*
* <jc>// Long way</jc>
- * <jk>long</jk> l = m.getMap(<js>"foo"</js>).getList(<js>"bar"</js>).getMap(<js>"0"</js>).getLong(<js>"baz"</js>);
+ * <jk>long</jk> <jv>_long</jv> = <jv>map</jv>.getMap(<js>"foo"</js>).getList(<js>"bar"</js>).getMap(<js>"0"</js>).getLong(<js>"baz"</js>);
*
* <jc>// Using this method</jc>
- * <jk>long</jk> l = m.getAt(<js>"foo/bar/0/baz"</js>, <jk>long</jk>.<jk>class</jk>);
+ * <jk>long</jk> <jv>_long</jv> = <jv>map</jv>.getAt(<js>"foo/bar/0/baz"</js>, <jk>long</jk>.<jk>class</jk>);
* </p>
*
* <p>
@@ -1549,14 +1549,14 @@ public class OMap extends LinkedHashMap<String,Object> {
* <p>
* For example, the following code is equivalent:
* </p>
- * <p class='bcode w800'>
- * OMap m = OMap.<jsm>ofJson</jsm>(<js>"..."</js>);
+ * <p class='bjava'>
+ * OMap <jv>map</jv> = OMap.<jsm>ofJson</jsm>(<js>"..."</js>);
*
* <jc>// Long way</jc>
- * m.getMap(<js>"foo"</js>).getList(<js>"bar"</js>).getMap(<js>"0"</js>).put(<js>"baz"</js>, 123);
+ * <jv>map</jv>.getMap(<js>"foo"</js>).getList(<js>"bar"</js>).getMap(<js>"0"</js>).put(<js>"baz"</js>, 123);
*
* <jc>// Using this method</jc>
- * m.putAt(<js>"foo/bar/0/baz"</js>, 123);
+ * <jv>map</jv>.putAt(<js>"foo/bar/0/baz"</js>, 123);
* </p>
*
* <p>
@@ -1577,14 +1577,14 @@ public class OMap extends LinkedHashMap<String,Object> {
* <p>
* For example, the following code is equivalent:
* </p>
- * <p class='bcode w800'>
- * OMap m = OMap.<jsm>ofJson</jsm>(<js>"..."</js>);
+ * <p class='bjava'>
+ * OMap <jv>map</jv> = OMap.<jsm>ofJson</jsm>(<js>"..."</js>);
*
* <jc>// Long way</jc>
- * m.getMap(<js>"foo"</js>).getList(<js>"bar"</js>).append(123);
+ * <jv>map</jv>.getMap(<js>"foo"</js>).getList(<js>"bar"</js>).append(123);
*
* <jc>// Using this method</jc>
- * m.postAt(<js>"foo/bar"</js>, 123);
+ * <jv>map</jv>.postAt(<js>"foo/bar"</js>, 123);
* </p>
*
* <p>
@@ -1606,14 +1606,14 @@ public class OMap extends LinkedHashMap<String,Object> {
* <p>
* For example, the following code is equivalent:
* </p>
- * <p class='bcode w800'>
- * OMap m = OMap.<jsm>ofJson</jsm>(<js>"..."</js>);
+ * <p class='bjava'>
+ * OMap <jv>map</jv> = OMap.<jsm>ofJson</jsm>(<js>"..."</js>);
*
* <jc>// Long way</jc>
- * m.getMap(<js>"foo"</js>).getList(<js>"bar"</js>).getMap(0).remove(<js>"baz"</js>);
+ * <jv>map</jv>.getMap(<js>"foo"</js>).getList(<js>"bar"</js>).getMap(0).remove(<js>"baz"</js>);
*
* <jc>// Using this method</jc>
- * m.deleteAt(<js>"foo/bar/0/baz"</js>);
+ * <jv>map</jv>.deleteAt(<js>"foo/bar/0/baz"</js>);
* </p>
*
* <p>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicFileFinder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicFileFinder.java
index 968a877..6aa725e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicFileFinder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicFileFinder.java
@@ -35,7 +35,7 @@ import org.apache.juneau.internal.*;
* Specialized behavior can be implemented by overridding the {@link #find(String, Locale)} method.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>public class</jk> MyFileFinder <jk>extends</jk> BasicFileFinder {
* <ja>@Override</ja>
* <jk>protected</jk> Optional<InputStream> find(String <jv>name</jv>, Locale <jv>locale</jv>) <jk>throws</jk> IOException {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanCreateMethodFinder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanCreateMethodFinder.java
index a375441..1e4daee 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanCreateMethodFinder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanCreateMethodFinder.java
@@ -39,7 +39,7 @@ import org.apache.juneau.reflect.*;
* </ul>
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// The bean we want to create.</jc>
* <jk>public class</jk> A {}
*
@@ -48,8 +48,8 @@ import org.apache.juneau.reflect.*;
*
* <jc>// Creator method.</jc>
* <jc>// Bean store must have a C bean and optionally a D bean.</jc>
- * <jk>public</jk> A createA(C <mv>c</mv>, Optional<D> <mv>d</mv>) {
- * <jk>return new</jk> A(<mv>c</mv>, <mv>d</mv>.orElse(<jk>null</jk>));
+ * <jk>public</jk> A createA(C <jv>c</jv>, Optional<D> <jv>d</jv>) {
+ * <jk>return new</jk> A(<jv>c</jv>, <jv>d</jv>.orElse(<jk>null</jk>));
* }
* }
*
@@ -64,7 +64,7 @@ import org.apache.juneau.reflect.*;
* .createMethodFinder(A.<jk>class</jk>, <mv>b</mv>) <jc>// Looking for creator for A on b object.</jc>
* .find(<js>"createA"</js>) <jc>// Look for method called "createA".</jc>
* .thenFind(<js>"createA2"</js>) <jc>// Then look for method called "createA2".</jc>
- * .withDefault(()-><jk>new</jk> A()) <jc>// Optionally supply a default value if method not found.</jc>
+ * .withDefault(()-><jk>new</jk> A()) <jc>// Optionally supply a default value if method not found.</jc>
* .run(); <jc>// Execute.</jc>
* </p>
*
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanCreator.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanCreator.java
index 94ec17f..6b89dfb 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanCreator.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanCreator.java
@@ -40,7 +40,7 @@ import org.apache.juneau.reflect.*;
* </ul>
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Construct and throw a RuntimeException using a bean store.</jc>
* <jk>throw</jk> BeanStore
* .<jsm>create</jsm>()
@@ -56,15 +56,14 @@ import org.apache.juneau.reflect.*;
* Looks for the following methods for creating a bean:
* <ol class='spaced-list'>
* <li>Looks for a singleton no-arg method of the form:
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>public static</jk> MyClass <jsm>getInstance</jsm>();
* </p>
* <ul>
* <li>Deprecated and {@link BeanIgnore @BeanIgnore-annotated} methods are ignored.
- * <li>Enabled by {@linnk #findSingleton()}.
* </ul>
* <li>Looks for a static creator method of the form:
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>public static</jk> MyClass <jsm>create</jsm>(<ja><args></ja>);
* </p>
* <ul>
@@ -73,7 +72,7 @@ import org.apache.juneau.reflect.*;
* <li>Deprecated and {@link BeanIgnore @BeanIgnore-annotated} methods are ignored.
* </ul>
* <li>Looks for a public constructor of the form:
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>public</jk> MyClass(<ja><args></ja>);
* </p>
* <ul>
@@ -82,7 +81,7 @@ import org.apache.juneau.reflect.*;
* <li>Deprecated and {@link BeanIgnore @BeanIgnore-annotated} methods are ignored.
* </ul>
* <li>Looks for a protected constructor of the form:
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>protected</jk> MyClass(<ja><args></ja>);
* </p>
* <ul>
@@ -91,7 +90,7 @@ import org.apache.juneau.reflect.*;
* <li>Deprecated and {@link BeanIgnore @BeanIgnore-annotated} methods are ignored.
* </ul>
* <li>Looks for a static no-arg create method that returns a builder object that can be passed in to a protected constructor.
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>public static</jk> MyClass.Builder <jsm>create</jsm>();
*
* <jk>protected</jk> MyClass(MyClass.Builder <jv>builder</jv>);
@@ -114,14 +113,14 @@ import org.apache.juneau.reflect.*;
* @param <T> The bean type being created.
*/
public class BeanCreator<T> {
-
+
//-----------------------------------------------------------------------------------------------------------------
// Static
//-----------------------------------------------------------------------------------------------------------------
/**
* Shortcut for calling <c>BeanStore.INSTANCE.createBean(beanType)</c>.
- *
+ *
* @param beanType The bean type to create.
* @return A new creator.
*/
@@ -393,7 +392,7 @@ public class BeanCreator<T> {
&& m.hasNoAnnotation(BeanIgnore.class)
&& m.hasName("create");
}
-
+
//-----------------------------------------------------------------------------------------------------------------
// Helpers
//-----------------------------------------------------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java
index 1d8587a..0bc8dd9 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java
@@ -28,7 +28,7 @@ import org.apache.juneau.internal.*;
* Utility class for finding regular or localized files on the classpath and file system.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Constructor a file source that looks for files in the "files" working directory, then in the
* // package "foo.bar", then in the package "foo.bar.files", then in the package "files".</jc>
* FileFinder <jv>finder</jv> = FileFinder
@@ -63,15 +63,15 @@ import org.apache.juneau.internal.*;
* The {@link Builder#type(Class)} method is provided for instantiating other instances.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>public class</jk> MyFileFinder <jk>extends</jk> BasicFileFinder {
* <jk>public</jk> MyFileFinder(Builder <jv>builder</jv>) {
- * <jk>super</jk>(builder);
+ * <jk>super</jk>(<jv>builder</jv>);
* }
* }
*
* <jc>// Instantiate subclass.</jc>
- * FileFinder <jv>myFinder</jv> = FileFinder.<jsm>create</jsm>().implClass(MyFileFinder.<jk>class</jk>).build();
+ * FileFinder <jv>myFinder</jv> = FileFinder.<jsm>create</jsm>().type(MyFileFinder.<jk>class</jk>).build();
* </p>
*
* <p>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/Messages.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/Messages.java
index 763ed3f..be05b10 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/Messages.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/Messages.java
@@ -49,12 +49,12 @@ import org.apache.juneau.utils.*;
* <p>
* The following example shows the basic usage of this class for retrieving localized messages:
*
- * <p class='bcode w800'>
+ * <p class='bini'>
* <cc># Contents of MyClass.properties</cc>
* <ck>foo</ck> = <cv>foo {0}</cv>
* <ck>MyClass.bar</ck> = <cv>bar {0}</cv>
* </p>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>public class</jk> MyClass {
* <jk>private static final</jk> Messages <jsf>MESSAGES</jsf> = Messages.<jsm>of</jsm>(MyClass.<jk>class</jk>);
*
@@ -78,7 +78,7 @@ import org.apache.juneau.utils.*;
* <p>
* The following shows how to retrieve messages from a common bundle:
*
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>public class</jk> MyClass {
* <jk>private static final</jk> Messages <jsf>MESSAGES</jsf> = Messages.<jsm>of</jsm>(MyClass.<jk>class</jk>, <js>"Messages"</js>);
* }
@@ -99,7 +99,7 @@ import org.apache.juneau.utils.*;
* <p>
* Localized messages can be retrieved in the following way:
*
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Return value from Japan locale bundle.</jc>
* String <jv>foo</jv> = <jsf>MESSAGES</jsf>.forLocale(Locale.<jsf>JAPAN</jsf>).getString(<js>"foo"</js>);
* </p>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderSet.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderSet.java
index 311e36a..07667c6 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderSet.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderSet.java
@@ -51,7 +51,7 @@ import org.apache.juneau.internal.*;
* E4.<jk>class</jk>)</code> will result in the order <c>E3, E4, E1, E2</c>.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Create an encoder group with support for gzip compression.</jc>
* EncoderSet <jv>encoders</jv> = EncoderSet
* .<jsm>create</jsm>()
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
index 314a958..437bd45 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
@@ -50,7 +50,7 @@ import org.apache.juneau.xml.*;
* Configurable properties are typically specified via <ja>@HtmlDocConfig</ja>.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <ja>@Rest</ja>(
* messages=<js>"nls/AddressBookResource"</js>,
* title=<js>"$L{title}"</js>,
@@ -222,7 +222,7 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
* By default, the aside section is empty.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* WriterSerializer <jv>serializer</jv> = HtmlDocSerializer
* .<jsm>create</jsm>()
* .aside(
@@ -289,7 +289,7 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
* By default, the aside section is floated to the right.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* WriterSerializer <jv>serializer</jv> = HtmlDocSerializer
* .<jsm>create</jsm>()
* .aside(
@@ -323,7 +323,7 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
* By default, the footer section is empty.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* WriterSerializer <jv>serializer</jv> = HtmlDocSerializer
* .<jsm>create</jsm>()
* .footer(
@@ -364,7 +364,7 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
* Adds the specified HTML content to the head section of the page.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* WriterSerializer <jv>serializer</jv> = HtmlDocSerializer
* .<jsm>create</jsm>()
* .head(
@@ -406,7 +406,7 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
* The header section normally contains the title and description at the top of the page.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* WriterSerializer <jv>serializer</jv> = HtmlDocSerializer
* .<jsm>create</jsm>()
* .header(
@@ -448,7 +448,7 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
* The nav section normally contains the page links at the top of the page.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* WriterSerializer <jv>serializer</jv> = HtmlDocSerializer
* .<jsm>create</jsm>()
* .nav(
@@ -511,7 +511,7 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
* <js>"servlet:/..."</js>.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* WriterSerializer <jv>serializer</jv> = HtmlDocSerializer
* .<jsm>create</jsm>()
* .navlinks(
@@ -554,10 +554,10 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
* Allows you to specify the string message used when trying to serialize an empty array or empty list.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* WriterSerializer <jv>serializer</jv> = HtmlDocSerializer
* .<jsm>create</jsm>()
- * .noResultsMessage("<b>This interface is great!</b>"</js>)
+ * .noResultsMessage(<js>"<b>This interface is great!</b>"</js>)
* .build();
* </p>
*
@@ -606,7 +606,7 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
*
* <p>
* A shortcut on <ja>@Rest</ja> is also provided for this setting:
- * <p class='bcode w800'>
+ * <p class='bjava'>
* WriterSerializer <jv>serializer</jv> = HtmlDocSerializer
* .<jsm>create</jsm>()
* .script(<js>"alert('hello!');"</js>)
@@ -641,7 +641,7 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
/**
* Adds the specified CSS instructions to the HTML page.
*
- * <p class='bcode w800'>
+ * <p class='bjava'>
* WriterSerializer <jv>serializer</jv> = HtmlDocSerializer
* .<jsm>create</jsm>()
* .style(
@@ -718,10 +718,10 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
* can be overridden with your own custom implementation class.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* WriterSerializer <jv>serializer</jv> = HtmlDocSerializer
* .<jsm>create</jsm>()
- * .template9MySpecialDocTemplate.<jk>class</jk>)
+ * .template(MySpecialDocTemplate.<jk>class</jk>)
* .build();
* </p>
*
@@ -757,7 +757,7 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
* The following examples shows how to associate a widget with a REST method and then have it rendered in the links
* and aside section of the page:
*
- * <p class='bcode w800'>
+ * <p class='bjava'>
* WriterSerializer <jv>serializer</jv> = HtmlDocSerializer
* .<jsm>create</jsm>()
* .widgets(
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocTemplate.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocTemplate.java
index 49598d2..19a443d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocTemplate.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocTemplate.java
@@ -18,7 +18,7 @@ package org.apache.juneau.html;
*
* <p>
* The HTML doc serializer produces the following document structure with the typical contents:
- * <p class='bcode w800'>
+ * <p class='bxml'>
* <xt><html>
* <head>
* <style>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
index d7c4a9c..a175ecb 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
@@ -243,7 +243,7 @@ public final class HtmlSchemaDocSerializer extends HtmlDocSerializer {
*
* <p>
* When enabled, schemas on beans will be serialized as the following:
- * <p class='bcode w800'>
+ * <p class='bjson'>
* {
* type: <js>'object'</js>,
* <js>'$ref'</js>: <js>'#/definitions/TypeId'</js>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java
index da2cc45..3777c88 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java
@@ -311,7 +311,7 @@ public class HtmlSchemaSerializer extends HtmlSerializer {
*
* <p>
* When enabled, schemas on beans will be serialized as the following:
- * <p class='bcode w800'>
+ * <p class='bjson'>
* {
* type: <js>'object'</js>,
* <js>'$ref'</js>: <js>'#/definitions/TypeId'</js>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
index 9113015..25e7a44 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
@@ -73,22 +73,22 @@ import org.apache.juneau.xml.*;
* </ul>
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Use one of the default serializers to serialize a POJO</jc>
- * String html = HtmlSerializer.<jsf>DEFAULT</jsf>.serialize(someObject);
+ * String <jv>html</jv> = HtmlSerializer.<jsf>DEFAULT</jsf>.serialize(<jv>someObject</jv>);
*
* <jc>// Create a custom serializer that doesn't use whitespace and newlines</jc>
- * HtmlSerializer serializer = <jk>new</jk> HtmlSerializerBuider().ws().build();
+ * HtmlSerializer <jv>serializer</jv> = HtmlSerializer.<jsm>create</jsm>().ws().build();
*
* <jc>// Same as above, except uses cloning</jc>
- * HtmlSerializer serializer = HtmlSerializer.<jsf>DEFAULT</jsf>.copy().ws().build();
+ * HtmlSerializer <jv>serializer</jv> = HtmlSerializer.<jsf>DEFAULT</jsf>.copy().ws().build();
*
* <jc>// Serialize POJOs to HTML</jc>
*
* <jc>// Produces: </jc>
* <jc>// <ul><li>1<li>2<li>3</ul></jc>
- * List l = OList.<jsm>of</jsm>(1, 2, 3);
- * String html = HtmlSerializer.<jsf>DEFAULT</jsf>.serialize(l);
+ * List <jv>list</jv> = OList.<jsm>of</jsm>(1, 2, 3);
+ * String <jv>html</jv> = HtmlSerializer.<jsf>DEFAULT</jsf>.serialize(<jv>list</jv>);
*
* <jc>// Produces: </jc>
* <jc>// <table> </jc>
@@ -97,12 +97,12 @@ import org.apache.juneau.xml.*;
* <jc>// <tr><td>Billy</td><td>TheKid</td></tr> </jc>
* <jc>// <tr><td>Barney</td><td>Miller</td></tr> </jc>
* <jc>// </table> </jc>
- * l = OList.<jsm>of</jsm>(
+ * <jv>html</jv> = OList.<jsm>of</jsm>(
* OMap.<jsm>ofJson</jsm>(<js>"{firstName:'Bob',lastName:'Costas'}"</js>),
* OMap.<jsm>ofJson</jsm>(<js>"{firstName:'Billy',lastName:'TheKid'}"</js>),
* OMap.<jsm>ofJson</jsm>(<js>"{firstName:'Barney',lastName:'Miller'}"</js>)
* );
- * String html = HtmlSerializer.<jsf>DEFAULT</jsf>.serialize(l);
+ * String <jv>html</jv> = HtmlSerializer.<jsf>DEFAULT</jsf>.serialize(<jv>list</jv>);
*
* <jc>// Produces: </jc>
* <jc>// <table> </jc>
@@ -110,8 +110,8 @@ import org.apache.juneau.xml.*;
* <jc>// <tr><td>foo</td><td>bar</td></tr> </jc>
* <jc>// <tr><td>baz</td><td>123</td></tr> </jc>
* <jc>// </table> </jc>
- * Map m = OMap.<jsm>ofJson</jsm>(<js>"{foo:'bar',baz:123}"</js>);
- * String html = HtmlSerializer.<jsf>DEFAULT</jsf>.serialize(m);
+ * Map <jv>map</jv> = OMap.<jsm>ofJson</jsm>(<js>"{foo:'bar',baz:123}"</js>);
+ * String <jv>html</jv> = HtmlSerializer.<jsf>DEFAULT</jsf>.serialize(<jv>map</jv>);
*
* <jc>// HTML elements can be nested arbitrarily deep</jc>
* <jc>// Produces: </jc>
@@ -127,10 +127,10 @@ import org.apache.juneau.xml.*;
* <jc>// </table> </jc>
* <jc>// </td></tr> </jc>
* <jc>// </table> </jc>
- * Map m = OMap.<jsm>ofJson</jsm>(<js>"{foo:'bar',baz:123}"</js>);
- * m.put(<js>"someNumbers"</js>, OList.<jsm>of</jsm>(1, 2, 3));
- * m.put(<js>"someSubMap"</js>, OMap.<jsm>ofJson</jsm>(<js>"{a:'b'}"</js>));
- * String html = HtmlSerializer.<jsf>DEFAULT</jsf>.serialize(m);
+ * Map <jv>map</jv> = OMap.<jsm>ofJson</jsm>(<js>"{foo:'bar',baz:123}"</js>);
+ * <jv>map</jv>.put(<js>"someNumbers"</js>, OList.<jsm>of</jsm>(1, 2, 3));
+ * <jv>map</jv>.put(<js>"someSubMap"</js>, OMap.<jsm>ofJson</jsm>(<js>"{a:'b'}"</js>));
+ * String <jv>html</jv> = HtmlSerializer.<jsf>DEFAULT</jsf>.serialize(<jv>map</jv>);
* </p>
*
* <ul class='spaced-list'>
@@ -320,7 +320,7 @@ public class HtmlSerializer extends XmlSerializer implements HtmlMetaProvider {
* When enabled, <bc>key</bc> and <bc>value</bc> column headers are added to tables.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjson'>
* <jc>// Our bean class.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String <jf>f1</jf> = <js>"foo"</js>;
@@ -392,7 +392,7 @@ public class HtmlSerializer extends XmlSerializer implements HtmlMetaProvider {
* and make it into a hyperlink based on the rules specified by {@link Builder#uriAnchorText(AnchorText)}.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjson'>
* <jc>// Our bean class with a property containing what looks like a URL.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> String <jf>f1</jf> = <js>"http://www.apache.org"</js>;
@@ -485,7 +485,7 @@ public class HtmlSerializer extends XmlSerializer implements HtmlMetaProvider {
* The parameter name can be changed via the {@link #labelParameter(String)} property.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjson'>
* <jc>// Our bean class with a property containing what looks like a URL.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> URI <jf>f1</jf> = URI.<jsm>create</jsm>(<js>"http://www.apache.org?label=Apache%20Foundation"</js>);
@@ -567,7 +567,7 @@ public class HtmlSerializer extends XmlSerializer implements HtmlMetaProvider {
* <li class='jf'>{@link AnchorText#TO_STRING TO_STRING} (default) - Set to whatever is returned by {@link #toString()} on the object.
* <br>
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjson'>
* <jc>// Our bean class with a URI property.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> URI <jf>f1</jf> = URI.<jsm>create</jsm>(<js>"http://www.apache.org?foo=bar#myAnchor"</js>);
@@ -582,7 +582,7 @@ public class HtmlSerializer extends XmlSerializer implements HtmlMetaProvider {
* <li class='jf'>{@link AnchorText#PROPERTY_NAME PROPERTY_NAME} - Set to the bean property name.
* <br>
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjson'>
* <jc>// Our bean class with a URI property.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> URI <jf>f1</jf> = URI.<jsm>create</jsm>(<js>"http://www.apache.org?foo=bar#myAnchor"</js>);
@@ -597,7 +597,7 @@ public class HtmlSerializer extends XmlSerializer implements HtmlMetaProvider {
* <li class='jf'>{@link AnchorText#URI URI} - Set to the URI value.
* <br>
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjson'>
* <jc>// Our bean class with a URI property.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> URI <jf>f1</jf> = URI.<jsm>create</jsm>(<js>"http://www.apache.org?foo=bar#myAnchor"</js>);
@@ -612,7 +612,7 @@ public class HtmlSerializer extends XmlSerializer implements HtmlMetaProvider {
* <li class='jf'>{@link AnchorText#LAST_TOKEN LAST_TOKEN} - Set to the last token of the URI value.
* <br>
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjson'>
* <jc>// Our bean class with a URI property.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> URI <jf>f1</jf> = URI.<jsm>create</jsm>(<js>"http://www.apache.org/foo/bar?baz=qux#myAnchor"</js>);
@@ -627,7 +627,7 @@ public class HtmlSerializer extends XmlSerializer implements HtmlMetaProvider {
* <li class='jf'>{@link AnchorText#URI_ANCHOR URI_ANCHOR} - Set to the anchor of the URL.
* <br>
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjson'>
* <jc>// Our bean class with a URI property.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> URI <jf>f1</jf> = URI.<jsm>create</jsm>(<js>"http://www.apache.org/foo/bar?baz=qux#myAnchor"</js>);
@@ -642,7 +642,7 @@ public class HtmlSerializer extends XmlSerializer implements HtmlMetaProvider {
* <li class='jf'>{@link AnchorText#CONTEXT_RELATIVE CONTEXT_RELATIVE} - Same as {@link AnchorText#TO_STRING TO_STRING} but assumes it's a context-relative path.
* <br>
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjson'>
* <jc>// Our bean class with a URI property.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> URI <jf>f1</jf> = URI.<jsm>create</jsm>(<js>"bar/baz"</js>);
@@ -663,7 +663,7 @@ public class HtmlSerializer extends XmlSerializer implements HtmlMetaProvider {
* <li class='jf'>{@link AnchorText#SERVLET_RELATIVE SERVLET_RELATIVE} - Same as {@link AnchorText#TO_STRING TO_STRING} but assumes it's a servlet-relative path.
* <br>
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjson'>
* <jc>// Our bean class with a URI property.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> URI <jf>f1</jf> = URI.<jsm>create</jsm>(<js>"bar/baz"</js>);
@@ -684,7 +684,7 @@ public class HtmlSerializer extends XmlSerializer implements HtmlMetaProvider {
* <li class='jf'>{@link AnchorText#PATH_RELATIVE PATH_RELATIVE} - Same as {@link AnchorText#TO_STRING TO_STRING} but assumes it's a path-relative path.
* <br>
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjson'>
* <jc>// Our bean class with a URI property.</jc>
* <jk>public class</jk> MyBean {
* <jk>public</jk> URI <jf>f1</jf> = URI.<jsm>create</jsm>(<js>"bar/baz"</js>);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/SimpleHtmlWriter.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/SimpleHtmlWriter.java
index 3bd4071..bca2205 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/SimpleHtmlWriter.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/SimpleHtmlWriter.java
@@ -18,8 +18,8 @@ import java.io.*;
* Utility class for creating custom HTML.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
- * String table = <jk>new</jk> SimpleHtmlWriter().sTag(<js>"table"</js>).sTag(<js>"tr"</js>).sTag(<js>"td"</js>)
+ * <p class='bjson'>
+ * String <jv>table</jv> = <jk>new</jk> SimpleHtmlWriter().sTag(<js>"table"</js>).sTag(<js>"tr"</js>).sTag(<js>"td"</js>)
* .append(<js>"hello"</js>).eTag(<js>"td"</js>).eTag(<js>"tr"</js>).eTag(<js>"table"</js>).toString();
* </p>
*
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/Html.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/Html.java
index 027d51f..9417a37 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/Html.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/Html.java
@@ -51,7 +51,7 @@ public @interface Html {
* The text can contain any bean property values resolved through variables of the form <js>"{property-name}"</js>.
*
* <h5 class='figure'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Produces <a href='...'>drive</a> when serialized to HTML.</jc>
* <ja>@Html</ja>(anchorText=<js>"drive"</js>)
* <ja>@URI</ja> <jc>// Treat property as a URL</jc>
@@ -85,7 +85,7 @@ public @interface Html {
* </ul>
*
* <h5 class='figure'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>public class</jk> FileSpace {
*
* <ja>@Html</ja>(link=<js>"servlet:/drive/{drive}"</js>)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfig.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfig.java
index 7d516a8..5415078 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfig.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfig.java
@@ -60,7 +60,7 @@ public @interface HtmlDocConfig {
* the page.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <ja>@HtmlDocConfig</ja>(
* aside={
* <js>"<ul>"</js>,
@@ -107,7 +107,7 @@ public @interface HtmlDocConfig {
* By default, the aside section is floated to the right.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <ja>@HtmlDocConfig</ja>(
* aside={
* <js>"<ul>"</js>,
@@ -153,7 +153,7 @@ public @interface HtmlDocConfig {
* Allows you to specify the contents of the footer section on the HTML page.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <ja>@HtmlDocConfig</ja>(
* footer={
* <js>"<b>This interface is great!</b>"</js>
@@ -193,7 +193,7 @@ public @interface HtmlDocConfig {
* Adds the specified HTML content to the head section of the page.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <ja>@HtmlDocConfig</ja>(
* head={
* <js>"<link rel='icon' href='$U{servlet:/htdocs/mypageicon.ico}'>"</js>
@@ -232,7 +232,7 @@ public @interface HtmlDocConfig {
* The header section normally contains the title and description at the top of the page.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <ja>@HtmlDocConfig</ja>(
* header={
* <js>"<h1>My own header</h1>"</js>
@@ -273,7 +273,7 @@ public @interface HtmlDocConfig {
* The nav section normally contains the page links at the top of the page.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <ja>@HtmlDocConfig</ja>(
* nav={
* <js>"<p class='special-navigation'>This is my special navigation content</p>"</js>
@@ -334,7 +334,7 @@ public @interface HtmlDocConfig {
* <js>"servlet:/..."</js>.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <ja>@HtmlDocConfig</ja>(
* navlinks={
* <js>"api: servlet:/api"</js>,
@@ -377,7 +377,7 @@ public @interface HtmlDocConfig {
* Allows you to specify the string message used when trying to serialize an empty array or empty list.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <ja>@HtmlDocConfig</ja>(
* noResultsMessage=<js>"<b>This interface is great!</b>"</js>
* )
@@ -430,7 +430,7 @@ public @interface HtmlDocConfig {
* Adds the specified Javascript code to the HTML page.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <ja>@HtmlDocConfig</ja>(
* script={
* <js>"alert('hello!');"</js>
@@ -470,7 +470,7 @@ public @interface HtmlDocConfig {
* Adds the specified CSS instructions to the HTML page.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <ja>@HtmlDocConfig</ja>(
* style={
* <js>"h3 { color: red; }"</js>,
@@ -543,7 +543,7 @@ public @interface HtmlDocConfig {
* can be overridden with your own custom implementation class.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <ja>@HtmlDocConfig</ja>(
* template=MySpecialDocTemplate.<jk>class</jk>
* )
@@ -582,7 +582,7 @@ public @interface HtmlDocConfig {
* The following examples shows how to associate a widget with a REST method and then have it rendered in the links
* and aside section of the page:
*
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <ja>@HtmlDocConfig</ja>(
* widgets={
* MyWidget.<jk>class</jk>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpEntities.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpEntities.java
index 660a2c5..2ed3cde 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpEntities.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpEntities.java
@@ -36,7 +36,7 @@ public class HttpEntities {
* <p>
* Assumes no content type.
*
- * @param content The entity content. Can be <jk>null<jk>.
+ * @param content The entity content. Can be <jk>null</jk>.
* @return A new {@link ByteArrayEntity} builder.
*/
public static final HttpEntityBuilder<ByteArrayEntity> byteArrayEntity(byte[] content) {
@@ -46,7 +46,7 @@ public class HttpEntities {
/**
* Creates a new {@link ByteArrayEntity} builder.
*
- * @param content The entity content. Can be <jk>null<jk>.
+ * @param content The entity content. Can be <jk>null</jk>.
* @param contentType The entity content type, or <jk>null</jk> if not specified.
* @return A new {@link ByteArrayEntity} builder.
*/
@@ -60,7 +60,7 @@ public class HttpEntities {
* <p>
* Assumes no content type.
*
- * @param content The entity content supplier. Can be <jk>null<jk>.
+ * @param content The entity content supplier. Can be <jk>null</jk>.
* @return A new {@link ByteArrayEntity} builder.
*/
public static final HttpEntityBuilder<ByteArrayEntity> byteArrayEntity(Supplier<byte[]> content) {
@@ -70,7 +70,7 @@ public class HttpEntities {
/**
* Creates a new {@link ByteArrayEntity} builder.
*
- * @param content The entity content supplier. Can be <jk>null<jk>.
+ * @param content The entity content supplier. Can be <jk>null</jk>.
* @param contentType The entity content type, or <jk>null</jk> if not specified.
* @return A new {@link ByteArrayEntity} builder.
*/
@@ -84,7 +84,7 @@ public class HttpEntities {
* <p>
* Assumes no content type.
*
- * @param content The entity content. Can be <jk>null<jk>.
+ * @param content The entity content. Can be <jk>null</jk>.
* @return A new {@link FileEntity} builder.
*/
public static final HttpEntityBuilder<FileEntity> fileEntity(File content) {
@@ -94,7 +94,7 @@ public class HttpEntities {
/**
* Creates a new {@link FileEntity} builder.
*
- * @param content The entity content. Can be <jk>null<jk>.
+ * @param content The entity content. Can be <jk>null</jk>.
* @param contentType The entity content type, or <jk>null</jk> if not specified.
* @return A new {@link FileEntity} builder.
*/
@@ -128,7 +128,7 @@ public class HttpEntities {
*
* @param content
* The Java POJO representing the content.
- * <br>Can be <jk>null<jk>.
+ * <br>Can be <jk>null</jk>.
* @param serializer
* The serializer to use to serialize the POJO.
* <br>If <jk>null</jk>, POJO will be converted to a string using {@link Object#toString()}.
@@ -143,7 +143,7 @@ public class HttpEntities {
*
* @param content
* The supplier of a Java POJO representing the content.
- * <br>Can be <jk>null<jk>.
+ * <br>Can be <jk>null</jk>.
* @param serializer
* The serializer to use to serialize the POJO.
* <br>If <jk>null</jk>, POJO will be converted to a string using {@link Object#toString()}.
@@ -158,7 +158,7 @@ public class HttpEntities {
*
* @param content
* The Java POJO representing the content.
- * <br>Can be <jk>null<jk>.
+ * <br>Can be <jk>null</jk>.
* @param serializer
* The serializer to use to serialize the POJO.
* <br>If <jk>null</jk>, POJO will be converted to a string using {@link Object#toString()}.
@@ -175,7 +175,7 @@ public class HttpEntities {
*
* @param content
* The supplier of a Java POJO representing the content.
- * <br>Can be <jk>null<jk>.
+ * <br>Can be <jk>null</jk>.
* @param serializer
* The serializer to use to serialize the POJO.
* <br>If <jk>null</jk>, POJO will be converted to a string using {@link Object#toString()}.
@@ -193,7 +193,7 @@ public class HttpEntities {
* <p>
* Assumes no content type.
*
- * @param content The entity content. Can be <jk>null<jk>.
+ * @param content The entity content. Can be <jk>null</jk>.
* @return A new {@link InputStreamEntity} builder.
*/
public static final HttpEntityBuilder<InputStreamEntity> streamEntity(InputStream content) {
@@ -203,7 +203,7 @@ public class HttpEntities {
/**
* Creates a new {@link InputStreamEntity} builder.
*
- * @param content The entity content. Can be <jk>null<jk>.
+ * @param content The entity content. Can be <jk>null</jk>.
* @param contentType The entity content type, or <jk>null</jk> if not specified.
* @param length The content length, or <c>-1</c> if not known.
* @return A new {@link InputStreamEntity} builder.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpParts.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpParts.java
index 1760e0d..d4ad472 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpParts.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpParts.java
@@ -508,8 +508,8 @@ public class HttpParts {
* <p>
* Looks for one of the following constructors:
* <ul class='javatree'>
- * <li class='jm><c><jk>public</jv> T(String <jv>value</jv>);</c>
- * <li class='jm><c><jk>public</jv> T(String <jv>name</jv>, String <jv>value</jv>);</c>
+ * <li class='jm><c><jk>public</jk> T(String <jv>value</jv>);</c>
+ * <li class='jm><c><jk>public</jk> T(String <jv>name</jv>, String <jv>value</jv>);</c>
* </ul>
*
* @param type The header type to find the constructor on.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpResources.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpResources.java
index 9882e56..a5c9800 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpResources.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpResources.java
@@ -38,7 +38,7 @@ public class HttpResources {
* <p>
* Assumes no content type.
*
- * @param content The entity content. Can be <jk>null<jk>.
+ * @param content The entity content. Can be <jk>null</jk>.
* @return A new {@link ByteArrayResource} builder.
*/
public static final HttpResourceBuilder<ByteArrayResource> byteArrayResource(byte[] content) {
@@ -48,7 +48,7 @@ public class HttpResources {
/**
* Creates a new {@link ByteArrayResource} builder.
*
- * @param content The entity content. Can be <jk>null<jk>.
+ * @param content The entity content. Can be <jk>null</jk>.
* @param contentType The entity content type, or <jk>null</jk> if not specified.
* @return A new {@link ByteArrayResource} builder.
*/
@@ -62,7 +62,7 @@ public class HttpResources {
* <p>
* Assumes no content type.
*
- * @param content The entity content supplier. Can be <jk>null<jk>.
+ * @param content The entity content supplier. Can be <jk>null</jk>.
* @return A new {@link ByteArrayResource} builder.
*/
public static final HttpResourceBuilder<ByteArrayResource> byteArrayResource(Supplier<byte[]> content) {
@@ -72,7 +72,7 @@ public class HttpResources {
/**
* Creates a new {@link ByteArrayResource} builder.
*
- * @param content The entity content supplier. Can be <jk>null<jk>.
+ * @param content The entity content supplier. Can be <jk>null</jk>.
* @param contentType The entity content type, or <jk>null</jk> if not specified.
* @return A new {@link ByteArrayResource} builder.
*/
@@ -86,7 +86,7 @@ public class HttpResources {
* <p>
* Assumes no content type.
*
- * @param content The entity content. Can be <jk>null<jk>.
+ * @param content The entity content. Can be <jk>null</jk>.
* @return A new {@link FileResource} builder.
*/
public static final HttpResourceBuilder<FileResource> fileResource(File content) {
@@ -96,7 +96,7 @@ public class HttpResources {
/**
* Creates a new {@link FileResource} builder.
*
- * @param content The entity content. Can be <jk>null<jk>.
+ * @param content The entity content. Can be <jk>null</jk>.
* @param contentType The entity content type, or <jk>null</jk> if not specified.
* @return A new {@link FileResource} builder.
*/
@@ -125,77 +125,13 @@ public class HttpResources {
return ReaderResource.create().content(content).contentType(contentType);
}
-// /**
-// * Creates a new {@link SerializedResource} object.
-// *
-// * @param content
-// * The Java POJO representing the content.
-// * <br>Can be <jk>null<jk>.
-// * @param serializer
-// * The serializer to use to serialize the POJO.
-// * <br>If <jk>null</jk>, POJO will be converted to a string using {@link Object#toString()}.
-// * @return A new {@link SerializedResource} object.
-// */
-// public static final SerializedResourceBuilder<SerializedResource> serializedResource(Object content, Serializer serializer) {
-// return SerializedResource.create().content(content).serializer(serializer);
-// }
-//
-// /**
-// * Creates a new {@link SerializedResource} object.
-// *
-// * @param content
-// * The supplier of a Java POJO representing the content.
-// * <br>Can be <jk>null<jk>.
-// * @param serializer
-// * The serializer to use to serialize the POJO.
-// * <br>If <jk>null</jk>, POJO will be converted to a string using {@link Object#toString()}.
-// * @return A new {@link SerializedResource} object.
-// */
-// public static final SerializedResourceBuilder<SerializedResource> serializedResource(Supplier<?> content, Serializer serializer) {
-// return SerializedResource.create().contentSupplier(content).serializer(serializer);
-// }
-//
-// /**
-// * Creates a new {@link SerializedResource} object.
-// *
-// * @param content
-// * The Java POJO representing the content.
-// * <br>Can be <jk>null<jk>.
-// * @param serializer
-// * The serializer to use to serialize the POJO.
-// * <br>If <jk>null</jk>, POJO will be converted to a string using {@link Object#toString()}.
-// * @param schema
-// * Optional HTTP-part schema for providing instructionst to the serializer on the format of the entity.
-// * @return A new {@link SerializedResource} object.
-// */
-// public static final SerializedResourceBuilder<SerializedResource> serializedResource(Object content, Serializer serializer, HttpPartSchema schema) {
-// return SerializedResource.create().content(content).serializer(serializer).schema(schema);
-// }
-//
-// /**
-// * Creates a new {@link SerializedResource} object.
-// *
-// * @param content
-// * The supplier of a Java POJO representing the content.
-// * <br>Can be <jk>null<jk>.
-// * @param serializer
-// * The serializer to use to serialize the POJO.
-// * <br>If <jk>null</jk>, POJO will be converted to a string using {@link Object#toString()}.
-// * @param schema
-// * Optional HTTP-part schema for providing instructionst to the serializer on the format of the entity.
-// * @return A new {@link SerializedResource} object.
-// */
-// public static final SerializedResourceBuilder<SerializedResource> serializedResource(Supplier<?> content, Serializer serializer, HttpPartSchema schema) {
-// return SerializedResource.create().contentSupplier(content).serializer(serializer).schema(schema);
-// }
-
/**
* Creates a new {@link InputStreamResource} builder.
*
* <p>
* Assumes no content type.
*
- * @param content The entity content. Can be <jk>null<jk>.
+ * @param content The entity content. Can be <jk>null</jk>.
* @return A new {@link InputStreamResource} builder.
*/
public static final HttpResourceBuilder<InputStreamResource> streamResource(InputStream content) {
@@ -205,7 +141,7 @@ public class HttpResources {
/**
* Creates a new {@link InputStreamResource} builder.
*
- * @param content The entity content. Can be <jk>null<jk>.
+ * @param content The entity content. Can be <jk>null</jk>.
* @param contentType The entity content type, or <jk>null</jk> if not specified.
* @param length The content length, or <c>-1</c> if not known.
* @return A new {@link InputStreamResource} builder.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Body.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Body.java
index 19b27b3..95a6b77 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Body.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Body.java
@@ -41,15 +41,15 @@ import org.apache.juneau.json.*;
* On server-side REST, this annotation can be applied to method parameters or parameter classes to identify them as the body of an HTTP request.
*
* <h5 class='section'>Examples:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Used on parameter</jc>
* <ja>@RestPost</ja>(<js>"/pets"</js>)
- * <jk>public void</jk> addPet(<ja>@Body</ja> Pet pet) {...}
+ * <jk>public void</jk> addPet(<ja>@Body</ja> Pet <jv>pet</jv>) {...}
* </p>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Used on class</jc>
* <ja>@RestPost</ja>(<js>"/pets"</js>)
- * <jk>public void</jk> addPet(Pet pet) {...}
+ * <jk>public void</jk> addPet(Pet <jv>pet</jv>) {...}
*
* <ja>@Body</ja>
* <jk>public class</jk> Pet {...}
@@ -57,10 +57,10 @@ import org.apache.juneau.json.*;
*
* <p>
* This is functionally equivalent to the following code...
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <ja>@RestPost</ja>(<js>"/pets"</js>)
* <jk>public void</jk> addPet(RestRequest <jv>req</jv>) {
- * Pet <jv>pet</jv> = <jv>req</jv>.getBody().asType(Pet.<jk>class</jk>);
+ * Pet <jv>pet</jv> = <jv>req</jv>.getBody().as(Pet.<jk>class</jk>);
* ...
* }
* </p>
@@ -69,7 +69,7 @@ import org.apache.juneau.json.*;
* Also used to populate the auto-generated Swagger documentation.
*
* <h5 class='section'>Examples:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <ja>@RestPost</ja>(<js>"/pets"</js>)
* <jk>public void</jk> addPet(Pet <jv>pet</jv>) {...}
*
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Contact.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Contact.java
index a866e1e..8bda498 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Contact.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Contact.java
@@ -27,7 +27,7 @@ import java.lang.annotation.*;
* Used to populate the auto-generated Swagger documentation and UI for server-side <ja>@Rest</ja>-annotated classes.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <ja>@Rest</ja>(
* swagger=<ja>@Swagger</ja>(
* contact=<ja>@Contact</ja>(
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ExternalDocs.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ExternalDocs.java
index f800641..66e1796 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ExternalDocs.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ExternalDocs.java
@@ -27,7 +27,7 @@ import java.lang.annotation.*;
* Used to populate the auto-generated Swagger documentation and UI for server-side <ja>@Rest</ja>-annotated classes.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <ja>@Rest</ja>(
* swagger=<ja>@Swagger</ja>(
* externalDocs=<ja>@ExternalDocs</ja>(
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormData.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormData.java
index 7744b2e..5ae074c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormData.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormData.java
@@ -41,7 +41,7 @@ import org.apache.juneau.oapi.*;
* Annotation that can be applied to a parameter of a <ja>@RestOp</ja>-annotated method to identify it as a form-data parameter.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <ja>@RestPost</ja>
* <jk>public void</jk> doPost(
* <ja>@FormData</ja>(<js>"p1"</js>) <jk>int</jk> <jv>p1</jv>,
@@ -52,12 +52,12 @@ import org.apache.juneau.oapi.*;
*
* <p>
* This is functionally equivalent to the following code...
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <ja>@RestPost</ja>
* <jk>public void</jk> doPost(RestRequest <jv>req</jv>) {
- * <jk>int</jk> <jv>p1</jv> = <jv>req</jv>.getFormData(<jk>int</jk>.<jk>class</jk>, <js>"p1"</js>, 0);
- * String <jv>p2</jv> = <jv>req</jv>.getFormData(String.<jk>class</jk>, <js>"p2"</js>);
- * UUID <jv>p3</jv> = <jv>req</jv>.getFormData(UUID.<jk>class</jk>, <js>"p3"</js>);
+ * <jk>int</jk> <jv>p1</jv> = <jv>req</jv>.getFormParam(<js>"p1"</js>).as(<jk>int</jk>.<jk>class</jk>).orElse(0);
+ * String <jv>p2</jv> = <jv>req</jv>.getFormParam(<js>"p2"</js>).asString().orElse(<jk>null</jk>);
+ * UUID <jv>p3</jv> = <jv>req</jv>.getFormParam(<js>"p3"</js>).as(UUID.<jk>class</jk>).orElse(<jk>null</jk>);
* ...
* }
* </p>
@@ -140,12 +140,12 @@ public @interface FormData {
* then it's the equivalent to <js>"*"</js> which will cause the value to be serialized as name/value pairs.
*
* <h5 class='figure'>Examples:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// When used on a REST method</jc>
* <ja>@RestPost</ja>(<js>"/addPet"</js>)
* <jk>public void</jk> addPet(<ja>@FormData</ja> OMap <jv>allFormDataParameters</jv>) {...}
* </p>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// When used on a remote method parameter</jc>
* <ja>@RemoteResource</ja>(path=<js>"/myproxy"</js>)
* <jk>public interface</jk> MyProxy {
@@ -155,7 +155,7 @@ public @interface FormData {
* String myProxyMethod1(<ja>@FormData</ja> Map<String,Object> <jv>allFormDataParameters</jv>);
* }
* </p>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// When used on a request bean method</jc>
* <jk>public interface</jk> MyRequest {
*
@@ -169,7 +169,7 @@ public @interface FormData {
* If used on a request bean method, uses the bean property name.
*
* <h5 class='figure'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>public interface</jk> MyRequest {
*
* <jc>// Equivalent to @FormData("foo")</jc>
@@ -255,10 +255,10 @@ public @interface FormData {
*
* <p>
* The following are completely equivalent ways of defining a form post entry:
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>public</jk> Order placeOrder(<ja>@FormData</ja>(name=<js>"petId"</js>) <jk>long</jk> <jv>petId</jv>) {...}
* </p>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>public</jk> Order placeOrder(<ja>@FormData</ja>(<js>"petId"</js>) <jk>long</jk> <jv>petId</jv>) {...}
* </p>
*/
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasFormData.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasFormData.java
index 5f9ec0a..b3fe3dd 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasFormData.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasFormData.java
@@ -36,17 +36,17 @@ import java.lang.annotation.*;
</ul>
<h5 class='figure'>Example:</h5>
-<p class='bcode w800'>
+<p class='bjava'>
<ja>@RestPost</ja>
<jk>public void</jk> doPost(<ja>@HasFormData</ja>(<js>"p1"</js>) <jk>boolean</jk> <jv>p1</jv>) {...}
</p>
<p>
This is functionally equivalent to the following code:
</p>
-<p class='bcode w800'>
+<p class='bjava'>
<ja>@RestPost</ja>
<jk>public void</jk> doPost(RestRequest <jv>req</jv>) {
- <jk>boolean</jk> <jv>p1</jv> = <jv>req</jv>.hasFormData(<js>"p1"</js>);
+ <jk>boolean</jk> <jv>p1</jv> = <jv>req</jv>.getFormParam(<js>"p1"</js>).isPresent();
...
}
</p>
@@ -127,11 +127,11 @@ public @interface HasFormData {
*
* <p>
* The following are completely equivalent ways of defining the existence of a form post entry:
- * <p class='bcode w800'>
- * <jk>public</jk> Order placeOrder(<ja>@HasFormData</ja>(name=<js>"petId"</js>) <jk>boolean</jk> hasPetId) {...}
+ * <p class='bjava'>
+ * <jk>public</jk> Order placeOrder(<ja>@HasFormData</ja>(name=<js>"petId"</js>) <jk>boolean</jk> <jv>hasPetId</jv>) {...}
* </p>
- * <p class='bcode w800'>
- * <jk>public</jk> Order placeOrder(<ja>@HasFormData</ja>(<js>"petId"</js>) <jk>boolean</jk> hasPetId) {...}
+ * <p class='bjava'>
+ * <jk>public</jk> Order placeOrder(<ja>@HasFormData</ja>(<js>"petId"</js>) <jk>boolean</jk> <jv>hasPetId</jv>) {...}
* </p>
*/
String value() default "";
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasQuery.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasQuery.java
index 290d1fd..6e198c3 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasQuery.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasQuery.java
@@ -43,17 +43,17 @@ import java.lang.annotation.*;
{@code RestRequestgetBody()} method for <c>application/x-www-form-urlencoded POST</c> calls.
</p>
<h5 class='figure'>Example:</h5>
-<p class='bcode w800'>
+<p class='bjava'>
<ja>@RestGet</ja>
<jk>public void</jk> doGet(<ja>@HasQuery</ja>(<js>"p1"</js>) <jk>boolean</jk> <jv>p1</jv>) {...}
</p>
<p>
This is functionally equivalent to the following code:
</p>
-<p class='bcode w800'>
+<p class='bjava'>
<ja>@RestGet</ja>
<jk>public void</jk> doGet(RestRequest <jv>req</jv>) {
- <jk>boolean</jk> <jv>p1</jv> = <jv>req</jv>.hasQuery(<js>"p1"</js>);
+ <jk>boolean</jk> <jv>p1</jv> = <jv>req</jv>.getQueryParam(<js>"p1"</js>).isPresent();
...
}
</p>
@@ -122,11 +122,11 @@ public @interface HasQuery {
*
* <p>
* The following are completely equivalent ways of defining the existence of a query entry:
- * <p class='bcode w800'>
- * <jk>public</jk> Order placeOrder(<ja>@HasQuery</ja>(name=<js>"petId"</js>) <jk>boolean</jk> hasPetId) {...}
+ * <p class='bjava'>
+ * <jk>public</jk> Order placeOrder(<ja>@HasQuery</ja>(name=<js>"petId"</js>) <jk>boolean</jk> <jv>hasPetId</jv>) {...}
* </p>
- * <p class='bcode w800'>
- * <jk>public</jk> Order placeOrder(<ja>@HasQuery</ja>(<js>"petId"</js>) <jk>boolean</jk> hasPetId) {...}
+ * <p class='bjava'>
+ * <jk>public</jk> Order placeOrder(<ja>@HasQuery</ja>(<js>"petId"</js>) <jk>boolean</jk> <jv>hasPetId</jv>) {...}
* </p>
*/
String value() default "";
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Header.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Header.java
index c9952b9..553e0ac 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Header.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Header.java
@@ -42,17 +42,17 @@ import org.apache.juneau.oapi.*;
* request header.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <ja>@RestGet</ja>
* <jk>public void</jk> doGet(<ja>@Header</ja>(<js>"ETag"</js>) UUID <jv>etag</jv>) {...}
* </p>
*
* <p>
* This is functionally equivalent to the following code...
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <ja>@RestGet</ja>
* <jk>public void</jk> doGet(RestRequest <jv>req</jv>, RestResponse <jv>res</jv>) {
- * UUID <jv>etag</jv> = <jv>req</jv>.getHeader(UUID.<jk>class</jk>, <js>"ETag"</js>);
+ * UUID <jv>etag</jv> = <jv>req</jv>.getHeader(<js>"ETag"</js>).as(UUID.<jk>class</jk>).orElse(<jk>null</jk>);
* ...
* }
* </p>
@@ -105,12 +105,12 @@ public @interface Header {
* then it's the equivalent to <js>"*"</js> which will cause the value to be serialized as name/value pairs.
*
* <h5 class='figure'>Examples:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// When used on a REST method</jc>
* <ja>@RestPost</ja>(<js>"/addPet"</js>)
* <jk>public void</jk> addPet(<ja>@Header</ja> OMap <jv>allHeaderParameters</jv>) {...}
* </p>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// When used on a remote method parameter</jc>
* <ja>@RemoteResource</ja>(path=<js>"/myproxy"</js>)
* <jk>public interface</jk> MyProxy {
@@ -120,7 +120,7 @@ public @interface Header {
* String myProxyMethod1(<ja>@Header</ja> Map<String,Object> <jv>allHeaderParameters</jv>);
* }
* </p>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// When used on a request bean method</jc>
* <jk>public interface</jk> MyRequest {
*
@@ -134,7 +134,7 @@ public @interface Header {
* If used on a request bean method, uses the bean property name.
*
* <h5 class='figure'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>public interface</jk> MyRequest {
*
* <jc>// Equivalent to @Header("Foo")</jc>
@@ -216,10 +216,10 @@ public @interface Header {
*
* <p>
* The following are completely equivalent ways of defining a header entry:
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>public</jk> Order placeOrder(<ja>@Header</ja>(name=<js>"api_key"</js>) String <jv>apiKey</jv>) {...}
* </p>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>public</jk> Order placeOrder(<ja>@Header</ja>(<js>"api_key"</js>) String <jv>apiKey</jv>) {...}
* </p>
*/
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Items.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Items.java
index 2cf4d13..680700a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Items.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Items.java
@@ -30,7 +30,7 @@ import org.apache.juneau.oapi.*;
* <br>Also used to define OpenAPI schema information for POJOs serialized through {@link OpenApiSerializer} and parsed through {@link OpenApiParser}.
*
* <h5 class='section'>Examples:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// Items have a specific set of enumerated string values</jc>
* <ja>@Query</ja>(
* name=<js>"status"</js>,
@@ -43,7 +43,7 @@ import org.apache.juneau.oapi.*;
* )
* )
* </p>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// An array of arrays, the internal array being of type integer, numbers must be between 0 and 63 (inclusive)</jc>
* <ja>@Query</ja>(
* name=<js>"status"</js>,
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/License.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/License.java
index 988691b..a8f786c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/License.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/License.java
@@ -27,7 +27,7 @@ import java.lang.annotation.*;
* Used to populate the auto-generated Swagger documentation and UI for server-side <ja>@Rest</ja>-annotated classes.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <ja>@Rest</ja>(
* swagger=<ja>@Swagger</ja>(
* license=<ja>@License</ja>(
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Path.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Path.java
index 5daca20..1625e97 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Path.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Path.java
@@ -42,7 +42,7 @@ import org.apache.juneau.oapi.*;
* in a URL path pattern.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <ja>@RestGet</ja>(<js>"/myurl/{foo}/{bar}/{baz}/*"</js>)
* <jk>public void</jk> doGet(
* <ja>@Path</ja>(<js>"foo"</js>) String <jv>foo</jv>,
@@ -104,12 +104,12 @@ public @interface Path {
* then it's the equivalent to <js>"*"</js> which will cause the value to be treated as name/value pairs.
*
* <h5 class='figure'>Examples:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// When used on a REST method</jc>
* <ja>@RestPost</ja>
* <jk>public void</jk> addPet(<ja>@Path</ja> OMap <jv>allPathParameters</jv>) {...}
* </p>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// When used on a remote method parameter</jc>
* <ja>@RemoteResource</ja>(path=<js>"/myproxy"</js>)
* <jk>public interface</jk> MyProxy {
@@ -119,7 +119,7 @@ public @interface Path {
* String myProxyMethod1(<ja>@Path</ja> Map<String,Object> <jv>allPathParameters</jv>);
* }
* </p>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// When used on a request bean method</jc>
* <jk>public interface</jk> MyRequest {
*
@@ -133,7 +133,7 @@ public @interface Path {
* If used on a request bean method, uses the bean property name.
*
* <h5 class='figure'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>public interface</jk> MyRequest {
*
* <jc>// Equivalent to @Path("foo")</jc>
@@ -221,11 +221,11 @@ public @interface Path {
*
* <p>
* The following are completely equivalent ways of defining a path entry:
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <ja>@RestGet</ja>(<js>"/pet/{petId}"</js>)
* <jk>public</jk> Pet getPet(<ja>@Path</ja>(name=<js>"petId"</js>) <jk>long</jk> <jv>petId</jv>) { ... }
* </p>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <ja>@RestGet</ja>(<js>"/pet/{petId}"</js>)
* <jk>public</jk> Pet getPet(<ja>@Path</ja>(<js>"petId"</js>) <jk>long</jk> <jv>petId</jv>) { ... }
* </p>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Query.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Query.java
index b498f52..e4e1d04 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Query.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Query.java
@@ -47,7 +47,7 @@ import org.apache.juneau.oapi.*;
* <c>RestRequest.getBody()</c> method for <c>application/x-www-form-urlencoded POST</c> calls.
*
* <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <ja>@RestGet</ja>
* <jk>public void</jk> doGet(
* <ja>@Query</ja>(<js>"p1"</js>) <jk>int</jk> <jv>p1</jv>,
@@ -58,12 +58,12 @@ import org.apache.juneau.oapi.*;
*
* <p>
* This is functionally equivalent to the following code...
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <ja>@RestGet</ja>
* <jk>public void</jk> doGet(RestRequest <jv>req</jv>, RestResponse <jv>res</jv>) {
- * <jk>int</jk> <jv>p1</jv> = <jv>req</jv>.getQueryParameter(<jk>int</jk>.<jk>class</jk>, <js>"p1"</js>, 0);
- * String <jv>p2</jv> = <jv>req</jv>.getQueryParameter(String.<jk>class</jk>, <js>"p2"</js>);
- * UUID <jv>p3</jv> = <jv>req</jv>.getQueryParameter(UUID.<jk>class</jk>, <js>"p3"</js>);
+ * <jk>int</jk> <jv>p1</jv> = <jv>req</jv>.getQueryParam(<js>"p1"</js>).asInteger().orElse(0);
+ * String <jv>p2</jv> = <jv>req</jv>.getQueryParam(<js>"p2"</js>).asString().orElse(<jk>null</jk>);
+ * UUID <jv>p3</jv> = <jv>req</jv>.getQueryParam(<js>"p3"</js>).as(UUID.<jk>class</jk>).orElse(<jk>null</jk>);
* ...
* }
* </p>
@@ -113,12 +113,12 @@ public @interface Query {
* then it's the equivalent to <js>"*"</js> which will cause the value to be serialized as name/value pairs.
*
* <h5 class='figure'>Examples:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// When used on a REST method</jc>
* <ja>@RestPost</ja>
* <jk>public void</jk> addPet(<ja>@Query</ja> OMap <jv>allQueryParameters</jv>) {...}
* </p>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// When used on a remote method parameter</jc>
* <ja>@RemoteResource</ja>(path=<js>"/myproxy"</js>)
* <jk>public interface</jk> MyProxy {
@@ -128,7 +128,7 @@ public @interface Query {
* String myProxyMethod1(<ja>@Query</ja> Map<String,Object> <jv>allQueryParameters</jv>);
* }
* </p>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jc>// When used on a request bean method</jc>
* <jk>public interface</jk> MyRequest {
*
@@ -142,7 +142,7 @@ public @interface Query {
* If used on a request bean method, uses the bean property name.
*
* <h5 class='figure'>Example:</h5>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>public interface</jk> MyRequest {
*
* <jc>// Equivalent to @Query("foo")</jc>
@@ -227,10 +227,10 @@ public @interface Query {
*
* <p>
* The following are completely equivalent ways of defining the existence of a query entry:
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>public</jk> Order placeOrder(<ja>@Query</ja>(name=<js>"petId"</js>) <jk>long</jk> <jv>petId</jv>) {...}
* </p>
- * <p class='bcode w800'>
+ * <p class='bjava'>
* <jk>public</jk> Order placeOrder(<ja>@Query</ja>(<js>"petId"</js>) <jk>long</jk> <jv>petId</jv>) {...}
* </p>
... 30713 lines suppressed ...