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 2018/07/01 22:04:45 UTC
[juneau] branch master updated: Code cleanup.
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 f0cd947 Code cleanup.
f0cd947 is described below
commit f0cd9474fe4c2aaf161cc4696126ae84b2c71d4b
Author: JamesBognar <ja...@apache.org>
AuthorDate: Sun Jul 1 18:03:54 2018 -0400
Code cleanup.
---
.../main/java/org/apache/juneau/config/Config.java | 478 +++----
.../org/apache/juneau/config/ConfigBuilder.java | 102 +-
.../java/org/apache/juneau/config/ConfigMod.java | 26 +-
.../apache/juneau/config/encode/ConfigEncoder.java | 12 +-
.../juneau/config/encode/ConfigXorEncoder.java | 4 +-
.../apache/juneau/config/event/ConfigEvent.java | 46 +-
.../juneau/config/event/ConfigEventListener.java | 2 +-
.../juneau/config/event/ConfigEventType.java | 6 +-
.../apache/juneau/config/internal/ConfigEntry.java | 48 +-
.../apache/juneau/config/internal/ConfigMap.java | 196 +--
.../juneau/config/store/ConfigFileStore.java | 108 +-
.../config/store/ConfigFileStoreBuilder.java | 72 +-
.../juneau/config/store/ConfigMemoryStore.java | 28 +-
.../config/store/ConfigMemoryStoreBuilder.java | 4 +-
.../apache/juneau/config/store/ConfigStore.java | 38 +-
.../juneau/config/store/ConfigStoreBuilder.java | 4 +-
.../juneau/config/store/ConfigStoreListener.java | 6 +-
.../juneau/config/store/WatcherSensitivity.java | 14 +-
.../org/apache/juneau/config/vars/ConfigVar.java | 14 +-
.../java/org/apache/juneau/dto/LinkString.java | 22 +-
.../java/org/apache/juneau/dto/ResultSetList.java | 6 +-
.../org/apache/juneau/dto/atom/AtomBuilder.java | 46 +-
.../java/org/apache/juneau/dto/atom/Category.java | 20 +-
.../java/org/apache/juneau/dto/atom/Common.java | 16 +-
.../org/apache/juneau/dto/atom/CommonEntry.java | 46 +-
.../java/org/apache/juneau/dto/atom/Content.java | 22 +-
.../java/org/apache/juneau/dto/atom/Entry.java | 28 +-
.../main/java/org/apache/juneau/dto/atom/Feed.java | 32 +-
.../java/org/apache/juneau/dto/atom/Generator.java | 22 +-
.../main/java/org/apache/juneau/dto/atom/Icon.java | 18 +-
.../main/java/org/apache/juneau/dto/atom/Id.java | 10 +-
.../main/java/org/apache/juneau/dto/atom/Link.java | 32 +-
.../main/java/org/apache/juneau/dto/atom/Logo.java | 18 +-
.../java/org/apache/juneau/dto/atom/Person.java | 22 +-
.../java/org/apache/juneau/dto/atom/Source.java | 22 +-
.../main/java/org/apache/juneau/dto/atom/Text.java | 22 +-
.../java/org/apache/juneau/dto/atom/Utils.java | 4 +-
.../java/org/apache/juneau/dto/cognos/Column.java | 24 +-
.../java/org/apache/juneau/dto/cognos/DataSet.java | 26 +-
.../main/java/org/apache/juneau/dto/html5/A.java | 30 +-
.../java/org/apache/juneau/dto/html5/Abbr.java | 2 +-
.../java/org/apache/juneau/dto/html5/Address.java | 2 +-
.../java/org/apache/juneau/dto/html5/Area.java | 42 +-
.../java/org/apache/juneau/dto/html5/Article.java | 10 +-
.../java/org/apache/juneau/dto/html5/Aside.java | 2 +-
.../java/org/apache/juneau/dto/html5/Audio.java | 38 +-
.../main/java/org/apache/juneau/dto/html5/B.java | 2 +-
.../java/org/apache/juneau/dto/html5/Base.java | 14 +-
.../main/java/org/apache/juneau/dto/html5/Bdi.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Bdo.java | 2 +-
.../org/apache/juneau/dto/html5/Blockquote.java | 6 +-
.../java/org/apache/juneau/dto/html5/Body.java | 14 +-
.../main/java/org/apache/juneau/dto/html5/Br.java | 2 +-
.../java/org/apache/juneau/dto/html5/Button.java | 54 +-
.../java/org/apache/juneau/dto/html5/Canvas.java | 10 +-
.../java/org/apache/juneau/dto/html5/Caption.java | 2 +-
.../java/org/apache/juneau/dto/html5/Cite.java | 2 +-
.../java/org/apache/juneau/dto/html5/Code.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Col.java | 6 +-
.../java/org/apache/juneau/dto/html5/Colgroup.java | 6 +-
.../java/org/apache/juneau/dto/html5/Data.java | 6 +-
.../java/org/apache/juneau/dto/html5/Datalist.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Dd.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Del.java | 10 +-
.../main/java/org/apache/juneau/dto/html5/Dfn.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Div.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Dl.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Dt.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Em.java | 2 +-
.../java/org/apache/juneau/dto/html5/Embed.java | 22 +-
.../java/org/apache/juneau/dto/html5/Fieldset.java | 14 +-
.../org/apache/juneau/dto/html5/Figcaption.java | 2 +-
.../java/org/apache/juneau/dto/html5/Figure.java | 2 +-
.../java/org/apache/juneau/dto/html5/Footer.java | 2 +-
.../java/org/apache/juneau/dto/html5/Form.java | 38 +-
.../main/java/org/apache/juneau/dto/html5/H1.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/H2.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/H3.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/H4.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/H5.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/H6.java | 2 +-
.../java/org/apache/juneau/dto/html5/Head.java | 2 +-
.../java/org/apache/juneau/dto/html5/Header.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Hr.java | 2 +-
.../java/org/apache/juneau/dto/html5/Html.java | 6 +-
.../juneau/dto/html5/HtmlBeanDictionary.java | 2 +-
.../org/apache/juneau/dto/html5/HtmlBuilder.java | 428 +++---
.../org/apache/juneau/dto/html5/HtmlElement.java | 146 +-
.../juneau/dto/html5/HtmlElementContainer.java | 20 +-
.../apache/juneau/dto/html5/HtmlElementMixed.java | 20 +-
.../juneau/dto/html5/HtmlElementRawText.java | 8 +-
.../apache/juneau/dto/html5/HtmlElementText.java | 8 +-
.../apache/juneau/dto/html5/HtmlElementVoid.java | 4 +-
.../main/java/org/apache/juneau/dto/html5/I.java | 2 +-
.../java/org/apache/juneau/dto/html5/Iframe.java | 30 +-
.../main/java/org/apache/juneau/dto/html5/Img.java | 34 +-
.../java/org/apache/juneau/dto/html5/Input.java | 130 +-
.../main/java/org/apache/juneau/dto/html5/Ins.java | 10 +-
.../main/java/org/apache/juneau/dto/html5/Kbd.java | 2 +-
.../java/org/apache/juneau/dto/html5/Keygen.java | 26 +-
.../java/org/apache/juneau/dto/html5/Label.java | 10 +-
.../java/org/apache/juneau/dto/html5/Legend.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Li.java | 2 +-
.../java/org/apache/juneau/dto/html5/Link.java | 34 +-
.../java/org/apache/juneau/dto/html5/Main.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Map.java | 6 +-
.../java/org/apache/juneau/dto/html5/Mark.java | 2 +-
.../java/org/apache/juneau/dto/html5/Meta.java | 18 +-
.../java/org/apache/juneau/dto/html5/Meter.java | 26 +-
.../main/java/org/apache/juneau/dto/html5/Nav.java | 2 +-
.../java/org/apache/juneau/dto/html5/Noscript.java | 2 +-
.../java/org/apache/juneau/dto/html5/Object2.java | 34 +-
.../main/java/org/apache/juneau/dto/html5/Ol.java | 14 +-
.../java/org/apache/juneau/dto/html5/Optgroup.java | 10 +-
.../java/org/apache/juneau/dto/html5/Option.java | 18 +-
.../java/org/apache/juneau/dto/html5/Output.java | 14 +-
.../main/java/org/apache/juneau/dto/html5/P.java | 2 +-
.../java/org/apache/juneau/dto/html5/Param.java | 10 +-
.../main/java/org/apache/juneau/dto/html5/Pre.java | 2 +-
.../java/org/apache/juneau/dto/html5/Progress.java | 10 +-
.../main/java/org/apache/juneau/dto/html5/Q.java | 6 +-
.../main/java/org/apache/juneau/dto/html5/Rb.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Rp.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Rt.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Rtc.java | 2 +-
.../java/org/apache/juneau/dto/html5/Ruby.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/S.java | 2 +-
.../java/org/apache/juneau/dto/html5/Samp.java | 2 +-
.../java/org/apache/juneau/dto/html5/Script.java | 30 +-
.../java/org/apache/juneau/dto/html5/Section.java | 2 +-
.../java/org/apache/juneau/dto/html5/Select.java | 36 +-
.../java/org/apache/juneau/dto/html5/Small.java | 2 +-
.../java/org/apache/juneau/dto/html5/Source.java | 14 +-
.../java/org/apache/juneau/dto/html5/Span.java | 2 +-
.../java/org/apache/juneau/dto/html5/Strong.java | 2 +-
.../java/org/apache/juneau/dto/html5/Style.java | 10 +-
.../main/java/org/apache/juneau/dto/html5/Sub.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Sup.java | 2 +-
.../java/org/apache/juneau/dto/html5/Table.java | 4 +-
.../java/org/apache/juneau/dto/html5/Tbody.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Td.java | 14 +-
.../java/org/apache/juneau/dto/html5/Template.java | 2 +-
.../java/org/apache/juneau/dto/html5/Textarea.java | 62 +-
.../java/org/apache/juneau/dto/html5/Tfoot.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Th.java | 26 +-
.../java/org/apache/juneau/dto/html5/Thead.java | 2 +-
.../java/org/apache/juneau/dto/html5/Time.java | 6 +-
.../java/org/apache/juneau/dto/html5/Title.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Tr.java | 2 +-
.../java/org/apache/juneau/dto/html5/Track.java | 26 +-
.../main/java/org/apache/juneau/dto/html5/U.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Ul.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Var.java | 2 +-
.../java/org/apache/juneau/dto/html5/Video.java | 50 +-
.../main/java/org/apache/juneau/dto/html5/Wbr.java | 2 +-
.../apache/juneau/dto/jsonschema/JsonSchema.java | 244 ++--
.../juneau/dto/jsonschema/JsonSchemaArray.java | 6 +-
.../juneau/dto/jsonschema/JsonSchemaMap.java | 28 +-
.../juneau/dto/jsonschema/JsonSchemaProperty.java | 6 +-
.../jsonschema/JsonSchemaPropertySimpleArray.java | 8 +-
.../juneau/dto/jsonschema/JsonSchemaRef.java | 12 +-
.../org/apache/juneau/dto/jsonschema/JsonType.java | 8 +-
.../juneau/dto/jsonschema/JsonTypeArray.java | 6 +-
.../org/apache/juneau/dto/swagger/Contact.java | 78 +-
.../juneau/dto/swagger/ExternalDocumentation.java | 62 +-
.../org/apache/juneau/dto/swagger/HeaderInfo.java | 312 ++---
.../java/org/apache/juneau/dto/swagger/Info.java | 118 +-
.../java/org/apache/juneau/dto/swagger/Items.java | 306 ++---
.../org/apache/juneau/dto/swagger/License.java | 56 +-
.../org/apache/juneau/dto/swagger/Operation.java | 308 ++---
.../apache/juneau/dto/swagger/OperationMap.java | 8 +-
.../apache/juneau/dto/swagger/ParameterInfo.java | 372 ++---
.../apache/juneau/dto/swagger/ResponseInfo.java | 124 +-
.../org/apache/juneau/dto/swagger/SchemaInfo.java | 366 ++---
.../apache/juneau/dto/swagger/SecurityScheme.java | 148 +-
.../org/apache/juneau/dto/swagger/Swagger.java | 342 ++---
.../apache/juneau/dto/swagger/SwaggerBuilder.java | 84 +-
.../apache/juneau/dto/swagger/SwaggerElement.java | 44 +-
.../java/org/apache/juneau/dto/swagger/Tag.java | 66 +-
.../java/org/apache/juneau/dto/swagger/Xml.java | 92 +-
.../apache/juneau/dto/swagger/ui/SwaggerUI.java | 118 +-
.../java/org/apache/juneau/jena/Constants.java | 14 +-
.../java/org/apache/juneau/jena/RdfBeanMeta.java | 10 +-
.../apache/juneau/jena/RdfBeanPropertyMeta.java | 18 +-
.../java/org/apache/juneau/jena/RdfClassMeta.java | 14 +-
.../apache/juneau/jena/RdfCollectionFormat.java | 4 +-
.../java/org/apache/juneau/jena/RdfCommon.java | 194 +--
.../java/org/apache/juneau/jena/RdfParser.java | 60 +-
.../org/apache/juneau/jena/RdfParserBuilder.java | 102 +-
.../org/apache/juneau/jena/RdfParserSession.java | 24 +-
.../java/org/apache/juneau/jena/RdfSerializer.java | 92 +-
.../apache/juneau/jena/RdfSerializerBuilder.java | 138 +-
.../apache/juneau/jena/RdfSerializerSession.java | 42 +-
.../main/java/org/apache/juneau/jena/RdfUtils.java | 4 +-
.../org/apache/juneau/jena/annotation/Rdf.java | 16 +-
.../org/apache/juneau/jena/annotation/RdfNs.java | 2 +-
.../apache/juneau/jena/annotation/RdfSchema.java | 26 +-
.../main/java/org/apache/juneau/BeanContext.java | 706 +++++-----
.../java/org/apache/juneau/BeanContextBuilder.java | 500 +++----
.../java/org/apache/juneau/BeanDictionaryList.java | 14 +-
.../java/org/apache/juneau/BeanDictionaryMap.java | 18 +-
.../src/main/java/org/apache/juneau/BeanMap.java | 98 +-
.../main/java/org/apache/juneau/BeanMapEntry.java | 28 +-
.../src/main/java/org/apache/juneau/BeanMeta.java | 80 +-
.../java/org/apache/juneau/BeanMetaExtended.java | 6 +-
.../java/org/apache/juneau/BeanMetaFiltered.java | 6 +-
.../java/org/apache/juneau/BeanPropertyMeta.java | 90 +-
.../apache/juneau/BeanPropertyMetaExtended.java | 6 +-
.../java/org/apache/juneau/BeanPropertyValue.java | 12 +-
.../apache/juneau/BeanProxyInvocationHandler.java | 6 +-
.../main/java/org/apache/juneau/BeanRegistry.java | 12 +-
.../org/apache/juneau/BeanRuntimeException.java | 10 +-
.../main/java/org/apache/juneau/BeanSession.java | 164 +--
.../java/org/apache/juneau/BeanSessionArgs.java | 18 +-
.../main/java/org/apache/juneau/BinaryFormat.java | 10 +-
.../src/main/java/org/apache/juneau/ClassMeta.java | 286 ++--
.../java/org/apache/juneau/ClassMetaExtended.java | 8 +-
.../apache/juneau/ClassMetaRuntimeException.java | 10 +-
.../java/org/apache/juneau/ConfigException.java | 4 +-
.../src/main/java/org/apache/juneau/Context.java | 158 +--
.../java/org/apache/juneau/ContextBuilder.java | 38 +-
.../main/java/org/apache/juneau/ContextCache.java | 36 +-
.../org/apache/juneau/ContextRuntimeException.java | 6 +-
.../src/main/java/org/apache/juneau/Delegate.java | 8 +-
.../java/org/apache/juneau/FormattedException.java | 6 +-
.../juneau/FormattedIllegalArgumentException.java | 4 +-
.../apache/juneau/FormattedRuntimeException.java | 8 +-
.../juneau/InvalidDataConversionException.java | 4 +-
.../main/java/org/apache/juneau/ObjectList.java | 212 +--
.../src/main/java/org/apache/juneau/ObjectMap.java | 382 +++---
.../java/org/apache/juneau/PropertyConverter.java | 16 +-
.../main/java/org/apache/juneau/PropertyNamer.java | 6 +-
.../java/org/apache/juneau/PropertyNamerDLC.java | 2 +-
.../org/apache/juneau/PropertyNamerDefault.java | 4 +-
.../java/org/apache/juneau/PropertyNamerULC.java | 2 +-
.../main/java/org/apache/juneau/PropertyStore.java | 278 ++--
.../org/apache/juneau/PropertyStoreBuilder.java | 218 +--
.../main/java/org/apache/juneau/PropertyType.java | 60 +-
.../src/main/java/org/apache/juneau/Session.java | 70 +-
.../main/java/org/apache/juneau/SessionArgs.java | 8 +-
.../src/main/java/org/apache/juneau/Setter.java | 2 +-
.../main/java/org/apache/juneau/Streamable.java | 6 +-
.../main/java/org/apache/juneau/UriContext.java | 64 +-
.../main/java/org/apache/juneau/UriResolver.java | 18 +-
.../main/java/org/apache/juneau/Visibility.java | 26 +-
.../src/main/java/org/apache/juneau/Writable.java | 6 +-
.../java/org/apache/juneau/annotation/Bean.java | 92 +-
.../apache/juneau/annotation/BeanConstructor.java | 12 +-
.../org/apache/juneau/annotation/BeanIgnore.java | 8 +-
.../org/apache/juneau/annotation/BeanProperty.java | 80 +-
.../java/org/apache/juneau/annotation/Builder.java | 14 +-
.../java/org/apache/juneau/annotation/Example.java | 24 +-
.../org/apache/juneau/annotation/NameProperty.java | 4 +-
.../apache/juneau/annotation/ParentProperty.java | 6 +-
.../java/org/apache/juneau/annotation/Swap.java | 28 +-
.../java/org/apache/juneau/annotation/Swaps.java | 4 +-
.../java/org/apache/juneau/annotation/URI.java | 4 +-
.../main/java/org/apache/juneau/csv/CsvParser.java | 8 +-
.../org/apache/juneau/csv/CsvParserBuilder.java | 6 +-
.../org/apache/juneau/csv/CsvParserSession.java | 4 +-
.../java/org/apache/juneau/csv/CsvSerializer.java | 10 +-
.../apache/juneau/csv/CsvSerializerBuilder.java | 4 +-
.../apache/juneau/csv/CsvSerializerSession.java | 4 +-
.../java/org/apache/juneau/encoders/Encoder.java | 12 +-
.../org/apache/juneau/encoders/EncoderGroup.java | 42 +-
.../juneau/encoders/EncoderGroupBuilder.java | 14 +-
.../org/apache/juneau/encoders/EncoderMatch.java | 4 +-
.../org/apache/juneau/encoders/Finishable.java | 8 +-
.../org/apache/juneau/encoders/GzipEncoder.java | 2 +-
.../java/org/apache/juneau/html/AnchorText.java | 4 +-
.../apache/juneau/html/HtmlBeanPropertyMeta.java | 36 +-
.../java/org/apache/juneau/html/HtmlClassMeta.java | 24 +-
.../org/apache/juneau/html/HtmlDocSerializer.java | 118 +-
.../juneau/html/HtmlDocSerializerSession.java | 38 +-
.../org/apache/juneau/html/HtmlDocTemplate.java | 34 +-
.../apache/juneau/html/HtmlDocTemplateBasic.java | 2 +-
.../java/org/apache/juneau/html/HtmlParser.java | 20 +-
.../org/apache/juneau/html/HtmlParserBuilder.java | 8 +-
.../org/apache/juneau/html/HtmlParserSession.java | 14 +-
.../java/org/apache/juneau/html/HtmlRender.java | 46 +-
.../org/apache/juneau/html/HtmlSerializer.java | 174 +--
.../apache/juneau/html/HtmlSerializerBuilder.java | 56 +-
.../apache/juneau/html/HtmlSerializerSession.java | 46 +-
.../juneau/html/HtmlStrippedDocSerializer.java | 12 +-
.../html/HtmlStrippedDocSerializerSession.java | 4 +-
.../java/org/apache/juneau/html/HtmlWriter.java | 2 +-
.../org/apache/juneau/html/SimpleHtmlWriter.java | 2 +-
.../org/apache/juneau/html/annotation/Html.java | 22 +-
.../apache/juneau/html/annotation/HtmlFormat.java | 8 +-
.../apache/juneau/html/annotation/HtmlLink.java | 6 +-
.../juneau/htmlschema/HtmlSchemaDocSerializer.java | 20 +-
.../htmlschema/HtmlSchemaDocSerializerSession.java | 6 +-
.../main/java/org/apache/juneau/http/Accept.java | 60 +-
.../java/org/apache/juneau/http/AcceptCharset.java | 24 +-
.../org/apache/juneau/http/AcceptEncoding.java | 26 +-
.../org/apache/juneau/http/AcceptLanguage.java | 36 +-
.../java/org/apache/juneau/http/AcceptRanges.java | 20 +-
.../src/main/java/org/apache/juneau/http/Age.java | 22 +-
.../main/java/org/apache/juneau/http/Allow.java | 26 +-
.../java/org/apache/juneau/http/Authorization.java | 22 +-
.../java/org/apache/juneau/http/CacheControl.java | 22 +-
.../java/org/apache/juneau/http/Connection.java | 30 +-
.../java/org/apache/juneau/http/Constants.java | 2 +-
.../org/apache/juneau/http/ContentEncoding.java | 22 +-
.../apache/juneau/http/ContentEncodingEnum.java | 2 +-
.../org/apache/juneau/http/ContentLanguage.java | 22 +-
.../java/org/apache/juneau/http/ContentLength.java | 20 +-
.../org/apache/juneau/http/ContentLocation.java | 22 +-
.../java/org/apache/juneau/http/ContentRange.java | 36 +-
.../java/org/apache/juneau/http/ContentType.java | 18 +-
.../src/main/java/org/apache/juneau/http/Date.java | 22 +-
.../src/main/java/org/apache/juneau/http/ETag.java | 16 +-
.../org/apache/juneau/http/EntityValidator.java | 12 +-
.../main/java/org/apache/juneau/http/Expect.java | 24 +-
.../main/java/org/apache/juneau/http/Expires.java | 30 +-
.../src/main/java/org/apache/juneau/http/From.java | 22 +-
.../java/org/apache/juneau/http/HeaderDate.java | 8 +-
.../apache/juneau/http/HeaderEntityValidator.java | 8 +-
.../juneau/http/HeaderEntityValidatorArray.java | 8 +-
.../java/org/apache/juneau/http/HeaderEnum.java | 14 +-
.../java/org/apache/juneau/http/HeaderInteger.java | 10 +-
.../org/apache/juneau/http/HeaderRangeArray.java | 12 +-
.../java/org/apache/juneau/http/HeaderString.java | 14 +-
.../org/apache/juneau/http/HeaderStringArray.java | 14 +-
.../java/org/apache/juneau/http/HeaderUri.java | 12 +-
.../src/main/java/org/apache/juneau/http/Host.java | 20 +-
.../java/org/apache/juneau/http/HttpMethod.java | 6 +-
.../org/apache/juneau/http/HttpMethodName.java | 2 +-
.../main/java/org/apache/juneau/http/IfMatch.java | 30 +-
.../org/apache/juneau/http/IfModifiedSince.java | 28 +-
.../java/org/apache/juneau/http/IfNoneMatch.java | 30 +-
.../main/java/org/apache/juneau/http/IfRange.java | 22 +-
.../org/apache/juneau/http/IfUnmodifiedSince.java | 24 +-
.../java/org/apache/juneau/http/LastModified.java | 24 +-
.../main/java/org/apache/juneau/http/Location.java | 18 +-
.../java/org/apache/juneau/http/MaxForwards.java | 20 +-
.../java/org/apache/juneau/http/MediaType.java | 32 +-
.../org/apache/juneau/http/MediaTypeRange.java | 40 +-
.../main/java/org/apache/juneau/http/Pragma.java | 22 +-
.../org/apache/juneau/http/ProxyAuthenticate.java | 16 +-
.../org/apache/juneau/http/ProxyAuthorization.java | 16 +-
.../main/java/org/apache/juneau/http/Range.java | 42 +-
.../main/java/org/apache/juneau/http/Referer.java | 18 +-
.../java/org/apache/juneau/http/RetryAfter.java | 22 +-
.../main/java/org/apache/juneau/http/Server.java | 20 +-
.../java/org/apache/juneau/http/StringRange.java | 42 +-
.../src/main/java/org/apache/juneau/http/TE.java | 24 +-
.../main/java/org/apache/juneau/http/Trailer.java | 20 +-
.../org/apache/juneau/http/TransferEncoding.java | 22 +-
.../main/java/org/apache/juneau/http/Upgrade.java | 26 +-
.../java/org/apache/juneau/http/UserAgent.java | 16 +-
.../src/main/java/org/apache/juneau/http/Vary.java | 20 +-
.../src/main/java/org/apache/juneau/http/Via.java | 36 +-
.../main/java/org/apache/juneau/http/Warning.java | 34 +-
.../org/apache/juneau/http/WwwAuthenticate.java | 16 +-
.../org/apache/juneau/http/annotation/Body.java | 144 +-
.../org/apache/juneau/http/annotation/Contact.java | 38 +-
.../juneau/http/annotation/ExternalDocs.java | 26 +-
.../apache/juneau/http/annotation/FormData.java | 320 ++---
.../apache/juneau/http/annotation/HasFormData.java | 24 +-
.../apache/juneau/http/annotation/HasQuery.java | 16 +-
.../org/apache/juneau/http/annotation/Header.java | 300 ++--
.../org/apache/juneau/http/annotation/Items.java | 144 +-
.../org/apache/juneau/http/annotation/License.java | 34 +-
.../org/apache/juneau/http/annotation/Path.java | 260 ++--
.../juneau/http/annotation/PathRemainder.java | 6 +-
.../org/apache/juneau/http/annotation/Query.java | 310 ++---
.../juneau/http/annotation/ResponseStatus.java | 56 +-
.../juneau/http/annotation/ResponseStatuses.java | 2 +-
.../apache/juneau/http/annotation/Responses.java | 2 +-
.../org/apache/juneau/http/annotation/Schema.java | 242 ++--
.../apache/juneau/http/annotation/SubItems.java | 142 +-
.../org/apache/juneau/http/annotation/Tag.java | 44 +-
.../org/apache/juneau/httppart/HttpPartParser.java | 14 +-
.../apache/juneau/httppart/HttpPartSerializer.java | 18 +-
.../org/apache/juneau/httppart/HttpPartType.java | 2 +-
.../httppart/SchemaValidationParseException.java | 4 +-
.../SchemaValidationSerializeException.java | 4 +-
.../apache/juneau/httppart/SimplePartParser.java | 6 +-
.../juneau/httppart/SimplePartSerializer.java | 2 +-
.../juneau/httppart/oapi/OapiPartParser.java | 70 +-
.../httppart/oapi/OapiPartParserBuilder.java | 14 +-
.../juneau/httppart/oapi/OapiPartSerializer.java | 18 +-
.../httppart/oapi/OapiPartSerializerBuilder.java | 12 +-
.../httppart/uon/SimpleUonPartSerializer.java | 16 +-
.../uon/SimpleUonPartSerializerBuilder.java | 4 +-
.../apache/juneau/httppart/uon/UonPartParser.java | 20 +-
.../juneau/httppart/uon/UonPartParserBuilder.java | 6 +-
.../juneau/httppart/uon/UonPartSerializer.java | 16 +-
.../httppart/uon/UonPartSerializerBuilder.java | 4 +-
.../org/apache/juneau/internal/ArrayUtils.java | 62 +-
.../java/org/apache/juneau/internal/AsciiMap.java | 10 +-
.../java/org/apache/juneau/internal/AsciiSet.java | 38 +-
.../apache/juneau/internal/BeanPropertyUtils.java | 82 +-
.../org/apache/juneau/internal/ByteArrayCache.java | 8 +-
.../juneau/internal/ByteArrayInOutStream.java | 2 +-
.../java/org/apache/juneau/internal/Cache.java | 10 +-
.../apache/juneau/internal/CharSequenceReader.java | 2 +-
.../org/apache/juneau/internal/ClassFlags.java | 18 +-
.../org/apache/juneau/internal/ClassUtils.java | 364 ++---
.../apache/juneau/internal/CollectionUtils.java | 56 +-
.../java/org/apache/juneau/internal/DateUtils.java | 26 +-
.../apache/juneau/internal/DelegateBeanMap.java | 12 +-
.../org/apache/juneau/internal/DelegateList.java | 4 +-
.../org/apache/juneau/internal/DelegateMap.java | 8 +-
.../apache/juneau/internal/FileReaderBuilder.java | 44 +-
.../java/org/apache/juneau/internal/FileUtils.java | 24 +-
.../apache/juneau/internal/FileWriterBuilder.java | 46 +-
.../org/apache/juneau/internal/FilteredMap.java | 4 +-
.../java/org/apache/juneau/internal/HashCode.java | 18 +-
.../java/org/apache/juneau/internal/IOUtils.java | 80 +-
.../org/apache/juneau/internal/IdentityList.java | 6 +-
.../org/apache/juneau/internal/JuneauLogger.java | 36 +-
.../org/apache/juneau/internal/KeywordSet.java | 4 +-
.../org/apache/juneau/internal/MultiIterable.java | 6 +-
.../java/org/apache/juneau/internal/MultiSet.java | 8 +-
.../juneau/internal/NoCloseOutputStream.java | 16 +-
.../org/apache/juneau/internal/NoCloseWriter.java | 26 +-
.../org/apache/juneau/internal/ObjectUtils.java | 46 +-
.../main/java/org/apache/juneau/internal/Pair.java | 8 +-
.../apache/juneau/internal/ReflectionUtils.java | 30 +-
.../java/org/apache/juneau/internal/SimpleMap.java | 8 +-
.../juneau/internal/StringBuilderWriter.java | 6 +-
.../org/apache/juneau/internal/StringUtils.java | 316 ++---
.../org/apache/juneau/internal/SystemUtils.java | 6 +-
.../apache/juneau/internal/TeeOutputStream.java | 12 +-
.../java/org/apache/juneau/internal/TeeWriter.java | 12 +-
.../org/apache/juneau/internal/ThrowableUtils.java | 10 +-
.../java/org/apache/juneau/internal/Transform.java | 12 +-
.../org/apache/juneau/internal/TransformCache.java | 38 +-
.../java/org/apache/juneau/internal/Utils.java | 2 +-
.../java/org/apache/juneau/internal/Version.java | 16 +-
.../org/apache/juneau/internal/VersionRange.java | 6 +-
.../org/apache/juneau/internal/WrappedMap.java | 4 +-
.../main/java/org/apache/juneau/jso/JsoParser.java | 16 +-
.../org/apache/juneau/jso/JsoParserBuilder.java | 8 +-
.../org/apache/juneau/jso/JsoParserSession.java | 4 +-
.../java/org/apache/juneau/jso/JsoSerializer.java | 14 +-
.../apache/juneau/jso/JsoSerializerBuilder.java | 4 +-
.../apache/juneau/jso/JsoSerializerSession.java | 4 +-
.../java/org/apache/juneau/json/JsonClassMeta.java | 6 +-
.../java/org/apache/juneau/json/JsonParser.java | 52 +-
.../org/apache/juneau/json/JsonParserBuilder.java | 24 +-
.../org/apache/juneau/json/JsonParserSession.java | 18 +-
.../org/apache/juneau/json/JsonSerializer.java | 92 +-
.../apache/juneau/json/JsonSerializerBuilder.java | 40 +-
.../apache/juneau/json/JsonSerializerSession.java | 20 +-
.../java/org/apache/juneau/json/JsonWriter.java | 14 +-
.../org/apache/juneau/json/annotation/Json.java | 14 +-
.../juneau/jsonschema/BasicBeanDefMapper.java | 14 +-
.../apache/juneau/jsonschema/BeanDefMapper.java | 10 +-
.../jsonschema/JsonSchemaBeanPropertyMeta.java | 14 +-
.../juneau/jsonschema/JsonSchemaClassMeta.java | 12 +-
.../juneau/jsonschema/JsonSchemaSerializer.java | 82 +-
.../jsonschema/JsonSchemaSerializerBuilder.java | 70 +-
.../jsonschema/JsonSchemaSerializerSession.java | 78 +-
.../org/apache/juneau/jsonschema/TypeCategory.java | 42 +-
.../juneau/jsonschema/annotation/JsonSchema.java | 10 +-
.../apache/juneau/msgpack/MsgPackInputStream.java | 8 +-
.../apache/juneau/msgpack/MsgPackOutputStream.java | 4 +-
.../org/apache/juneau/msgpack/MsgPackParser.java | 20 +-
.../juneau/msgpack/MsgPackParserBuilder.java | 8 +-
.../juneau/msgpack/MsgPackParserSession.java | 4 +-
.../apache/juneau/msgpack/MsgPackSerializer.java | 28 +-
.../juneau/msgpack/MsgPackSerializerBuilder.java | 4 +-
.../juneau/msgpack/MsgPackSerializerSession.java | 6 +-
.../apache/juneau/parser/InputStreamParser.java | 22 +-
.../juneau/parser/InputStreamParserBuilder.java | 14 +-
.../juneau/parser/InputStreamParserSession.java | 14 +-
.../org/apache/juneau/parser/ParseException.java | 24 +-
.../main/java/org/apache/juneau/parser/Parser.java | 198 +--
.../org/apache/juneau/parser/ParserBuilder.java | 76 +-
.../java/org/apache/juneau/parser/ParserGroup.java | 52 +-
.../apache/juneau/parser/ParserGroupBuilder.java | 118 +-
.../apache/juneau/parser/ParserInputStream.java | 8 +-
.../org/apache/juneau/parser/ParserListener.java | 6 +-
.../java/org/apache/juneau/parser/ParserMatch.java | 6 +-
.../java/org/apache/juneau/parser/ParserPipe.java | 52 +-
.../org/apache/juneau/parser/ParserReader.java | 52 +-
.../org/apache/juneau/parser/ParserSession.java | 148 +-
.../apache/juneau/parser/ParserSessionArgs.java | 16 +-
.../java/org/apache/juneau/parser/Position.java | 22 +-
.../org/apache/juneau/parser/Positionable.java | 4 +-
.../org/apache/juneau/parser/ReaderParser.java | 42 +-
.../apache/juneau/parser/ReaderParserBuilder.java | 42 +-
.../apache/juneau/parser/ReaderParserSession.java | 10 +-
.../apache/juneau/plaintext/PlainTextParser.java | 24 +-
.../juneau/plaintext/PlainTextParserBuilder.java | 8 +-
.../juneau/plaintext/PlainTextParserSession.java | 4 +-
.../juneau/plaintext/PlainTextSerializer.java | 22 +-
.../plaintext/PlainTextSerializerBuilder.java | 4 +-
.../plaintext/PlainTextSerializerSession.java | 4 +-
.../org/apache/juneau/remoteable/RemoteMethod.java | 12 +-
.../apache/juneau/remoteable/RemoteMethodArg.java | 4 +-
.../org/apache/juneau/remoteable/Remoteable.java | 10 +-
.../apache/juneau/remoteable/RemoteableMeta.java | 8 +-
.../remoteable/RemoteableMetadataException.java | 6 +-
.../juneau/remoteable/RemoteableMethodMeta.java | 26 +-
.../org/apache/juneau/remoteable/RequestBean.java | 40 +-
.../juneau/serializer/OutputStreamSerializer.java | 26 +-
.../serializer/OutputStreamSerializerBuilder.java | 18 +-
.../serializer/OutputStreamSerializerSession.java | 14 +-
.../juneau/serializer/SerializeException.java | 12 +-
.../org/apache/juneau/serializer/Serializer.java | 302 ++--
.../juneau/serializer/SerializerBuilder.java | 220 +--
.../apache/juneau/serializer/SerializerGroup.java | 56 +-
.../juneau/serializer/SerializerGroupBuilder.java | 254 ++--
.../juneau/serializer/SerializerListener.java | 6 +-
.../apache/juneau/serializer/SerializerMatch.java | 4 +-
.../apache/juneau/serializer/SerializerPipe.java | 34 +-
.../juneau/serializer/SerializerSession.java | 126 +-
.../juneau/serializer/SerializerSessionArgs.java | 16 +-
.../apache/juneau/serializer/SerializerWriter.java | 54 +-
.../apache/juneau/serializer/WriterSerializer.java | 54 +-
.../juneau/serializer/WriterSerializerBuilder.java | 52 +-
.../juneau/serializer/WriterSerializerSession.java | 24 +-
.../org/apache/juneau/soap/SoapXmlSerializer.java | 16 +-
.../juneau/soap/SoapXmlSerializerBuilder.java | 10 +-
.../juneau/soap/SoapXmlSerializerSession.java | 10 +-
.../transform/AnnotationBeanFilterBuilder.java | 8 +-
.../org/apache/juneau/transform/BeanFilter.java | 34 +-
.../apache/juneau/transform/BeanFilterBuilder.java | 212 +--
.../java/org/apache/juneau/transform/Builder.java | 8 +-
.../org/apache/juneau/transform/BuilderSwap.java | 70 +-
.../transform/InterfaceBeanFilterBuilder.java | 10 +-
.../java/org/apache/juneau/transform/MapSwap.java | 10 +-
.../java/org/apache/juneau/transform/PojoSwap.java | 84 +-
.../apache/juneau/transform/PropertyFilter.java | 48 +-
.../org/apache/juneau/transform/StringSwap.java | 10 +-
.../org/apache/juneau/transform/Surrogate.java | 22 +-
.../org/apache/juneau/transform/SurrogateSwap.java | 10 +-
.../apache/juneau/transforms/BeanStringSwap.java | 6 +-
.../org/apache/juneau/transforms/CalendarSwap.java | 58 +-
.../org/apache/juneau/transforms/DateSwap.java | 58 +-
.../apache/juneau/transforms/EnumerationSwap.java | 2 +-
.../org/apache/juneau/transforms/IteratorSwap.java | 2 +-
.../org/apache/juneau/transforms/ReaderSwap.java | 14 +-
.../apache/juneau/transforms/StringFormatSwap.java | 2 +-
.../transforms/XMLGregorianCalendarSwap.java | 4 +-
.../java/org/apache/juneau/uon/ParamFormat.java | 8 +-
.../main/java/org/apache/juneau/uon/UonParser.java | 52 +-
.../org/apache/juneau/uon/UonParserBuilder.java | 40 +-
.../org/apache/juneau/uon/UonParserSession.java | 18 +-
.../main/java/org/apache/juneau/uon/UonReader.java | 8 +-
.../java/org/apache/juneau/uon/UonSerializer.java | 88 +-
.../apache/juneau/uon/UonSerializerBuilder.java | 32 +-
.../apache/juneau/uon/UonSerializerSession.java | 8 +-
.../main/java/org/apache/juneau/uon/UonUtils.java | 4 +-
.../main/java/org/apache/juneau/uon/UonWriter.java | 12 +-
.../juneau/urlencoding/UrlEncodingClassMeta.java | 6 +-
.../juneau/urlencoding/UrlEncodingParser.java | 52 +-
.../urlencoding/UrlEncodingParserBuilder.java | 20 +-
.../urlencoding/UrlEncodingParserSession.java | 8 +-
.../juneau/urlencoding/UrlEncodingSerializer.java | 76 +-
.../urlencoding/UrlEncodingSerializerBuilder.java | 18 +-
.../urlencoding/UrlEncodingSerializerSession.java | 6 +-
.../juneau/urlencoding/annotation/UrlEncoding.java | 2 +-
.../main/java/org/apache/juneau/utils/AList.java | 16 +-
.../main/java/org/apache/juneau/utils/AMap.java | 6 +-
.../main/java/org/apache/juneau/utils/ASet.java | 14 +-
.../main/java/org/apache/juneau/utils/Args.java | 64 +-
.../org/apache/juneau/utils/CalendarUtils.java | 62 +-
.../juneau/utils/ClasspathResourceFinder.java | 14 +-
.../juneau/utils/ClasspathResourceFinderBasic.java | 14 +-
.../utils/ClasspathResourceFinderSimple.java | 30 +-
.../juneau/utils/ClasspathResourceManager.java | 56 +-
.../main/java/org/apache/juneau/utils/IOPipe.java | 24 +-
.../java/org/apache/juneau/utils/IdGenerator.java | 12 +-
.../java/org/apache/juneau/utils/IdGenerators.java | 20 +-
.../main/java/org/apache/juneau/utils/IdMap.java | 30 +-
.../java/org/apache/juneau/utils/ManifestFile.java | 8 +-
.../org/apache/juneau/utils/MessageBundle.java | 54 +-
.../java/org/apache/juneau/utils/MetadataMap.java | 6 +-
.../apache/juneau/utils/MockHttpConnection.java | 8 +-
.../org/apache/juneau/utils/MockHttpRequest.java | 24 +-
.../org/apache/juneau/utils/MockHttpResponse.java | 20 +-
.../org/apache/juneau/utils/PojoIntrospector.java | 10 +-
.../java/org/apache/juneau/utils/PojoMerge.java | 32 +-
.../java/org/apache/juneau/utils/PojoQuery.java | 76 +-
.../java/org/apache/juneau/utils/PojoRest.java | 192 +--
.../org/apache/juneau/utils/PojoRestException.java | 12 +-
.../java/org/apache/juneau/utils/ProcBuilder.java | 68 +-
.../java/org/apache/juneau/utils/SearchArgs.java | 80 +-
.../org/apache/juneau/utils/StringMessage.java | 4 +-
.../java/org/apache/juneau/utils/StringObject.java | 10 +-
.../main/java/org/apache/juneau/utils/Value.java | 24 +-
.../org/apache/juneau/utils/ValueListener.java | 6 +-
.../java/org/apache/juneau/utils/ZipFileList.java | 16 +-
.../main/java/org/apache/juneau/xml/Namespace.java | 36 +-
.../java/org/apache/juneau/xml/XmlBeanMeta.java | 30 +-
.../org/apache/juneau/xml/XmlBeanPropertyMeta.java | 12 +-
.../java/org/apache/juneau/xml/XmlClassMeta.java | 12 +-
.../org/apache/juneau/xml/XmlDocSerializer.java | 14 +-
.../apache/juneau/xml/XmlDocSerializerSession.java | 4 +-
.../main/java/org/apache/juneau/xml/XmlParser.java | 66 +-
.../org/apache/juneau/xml/XmlParserBuilder.java | 54 +-
.../org/apache/juneau/xml/XmlParserSession.java | 28 +-
.../main/java/org/apache/juneau/xml/XmlReader.java | 6 +-
.../java/org/apache/juneau/xml/XmlSerializer.java | 122 +-
.../apache/juneau/xml/XmlSerializerBuilder.java | 68 +-
.../apache/juneau/xml/XmlSerializerSession.java | 22 +-
.../main/java/org/apache/juneau/xml/XmlUtils.java | 26 +-
.../main/java/org/apache/juneau/xml/XmlWriter.java | 86 +-
.../java/org/apache/juneau/xml/annotation/Xml.java | 30 +-
.../apache/juneau/xml/annotation/XmlFormat.java | 52 +-
.../org/apache/juneau/xml/annotation/XmlNs.java | 2 +-
.../apache/juneau/xml/annotation/XmlSchema.java | 18 +-
.../juneau/xmlschema/XmlSchemaDocSerializer.java | 10 +-
.../xmlschema/XmlSchemaDocSerializerSession.java | 4 +-
.../juneau/xmlschema/XmlSchemaSerializer.java | 14 +-
.../xmlschema/XmlSchemaSerializerBuilder.java | 4 +-
.../xmlschema/XmlSchemaSerializerSession.java | 10 +-
.../apache/juneau/yaml/proto/YamlClassMeta.java | 4 +-
.../org/apache/juneau/yaml/proto/YamlParser.java | 34 +-
.../juneau/yaml/proto/YamlParserBuilder.java | 8 +-
.../juneau/yaml/proto/YamlParserSession.java | 10 +-
.../apache/juneau/yaml/proto/YamlSerializer.java | 76 +-
.../juneau/yaml/proto/YamlSerializerBuilder.java | 20 +-
.../juneau/yaml/proto/YamlSerializerSession.java | 8 +-
.../org/apache/juneau/yaml/proto/YamlWriter.java | 14 +-
.../apache/juneau/yaml/proto/annotation/Yaml.java | 4 +-
.../java/org/apache/juneau/svl/DefaultingVar.java | 10 +-
.../main/java/org/apache/juneau/svl/MapVar.java | 4 +-
.../apache/juneau/svl/MultipartResolvingVar.java | 8 +-
.../java/org/apache/juneau/svl/MultipartVar.java | 8 +-
.../org/apache/juneau/svl/ResolvingObjectMap.java | 8 +-
.../main/java/org/apache/juneau/svl/SimpleVar.java | 8 +-
.../java/org/apache/juneau/svl/StreamedVar.java | 8 +-
.../src/main/java/org/apache/juneau/svl/Var.java | 48 +-
.../java/org/apache/juneau/svl/VarResolver.java | 46 +-
.../org/apache/juneau/svl/VarResolverBuilder.java | 36 +-
.../org/apache/juneau/svl/VarResolverContext.java | 14 +-
.../apache/juneau/svl/VarResolverException.java | 6 +-
.../org/apache/juneau/svl/VarResolverSession.java | 44 +-
.../java/org/apache/juneau/svl/vars/ArgsVar.java | 24 +-
.../org/apache/juneau/svl/vars/CoalesceVar.java | 6 +-
.../apache/juneau/svl/vars/EnvVariablesVar.java | 10 +-
.../java/org/apache/juneau/svl/vars/IfVar.java | 12 +-
.../org/apache/juneau/svl/vars/LowerCaseVar.java | 8 +-
.../apache/juneau/svl/vars/ManifestFileVar.java | 26 +-
.../org/apache/juneau/svl/vars/NotEmptyVar.java | 8 +-
.../apache/juneau/svl/vars/PatternMatchVar.java | 12 +-
.../java/org/apache/juneau/svl/vars/SwitchVar.java | 16 +-
.../juneau/svl/vars/SystemPropertiesVar.java | 10 +-
.../org/apache/juneau/svl/vars/UpperCaseVar.java | 8 +-
.../core/json/JsonConfigurationExample.java | 10 +-
.../examples/core/json/JsonSimpleExample.java | 10 +-
.../org/apache/juneau/examples/core/pojo/Pojo.java | 4 +-
.../juneau/examples/core/rdf/RdfExample.java | 10 +-
.../juneau/examples/addressbook/CreatePerson.java | 6 +-
.../apache/juneau/examples/addressbook/Person.java | 14 +-
.../juneau/examples/rest/AtomFeedResource.java | 8 +-
.../examples/rest/DockerRegistryResource.java | 4 +-
.../apache/juneau/examples/rest/EchoCommand.java | 4 +-
.../juneau/examples/rest/JsonSchemaResource.java | 8 +-
.../examples/rest/MethodExampleResource.java | 12 +-
.../juneau/examples/rest/PhotosResource.java | 8 +-
.../examples/rest/PredefinedLabelsResource.java | 6 +-
.../examples/rest/SampleRemoteableServlet.java | 2 +-
.../juneau/examples/rest/SqlQueryResource.java | 18 +-
.../examples/rest/SystemPropertiesResource.java | 32 +-
.../juneau/examples/rest/TempDirResource.java | 18 +-
.../examples/rest/UrlEncodedFormResource.java | 6 +-
.../rest/addressbook/AddressBookResource.java | 10 +-
.../examples/rest/petstore/AddOrderMenuItem.java | 12 +-
.../examples/rest/petstore/AddPetMenuItem.java | 10 +-
.../juneau/examples/rest/petstore/ApiResponse.java | 4 +-
.../juneau/examples/rest/petstore/CreateOrder.java | 4 +-
.../juneau/examples/rest/petstore/IdConflict.java | 4 +-
.../juneau/examples/rest/petstore/IdNotFound.java | 4 +-
.../juneau/examples/rest/petstore/InvalidId.java | 2 +-
.../examples/rest/petstore/InvalidLogin.java | 4 +-
.../examples/rest/petstore/InvalidSpecies.java | 2 +-
.../juneau/examples/rest/petstore/InvalidTag.java | 2 +-
.../examples/rest/petstore/InvalidUsername.java | 2 +-
.../juneau/examples/rest/petstore/Order.java | 20 +-
.../juneau/examples/rest/petstore/OrderStatus.java | 12 +-
.../apache/juneau/examples/rest/petstore/Pet.java | 28 +-
.../juneau/examples/rest/petstore/PetCreate.java | 6 +-
.../juneau/examples/rest/petstore/PetStatus.java | 12 +-
.../juneau/examples/rest/petstore/PetStore.java | 64 +-
.../examples/rest/petstore/PetStoreResource.java | 156 +--
.../juneau/examples/rest/petstore/PetUpdate.java | 6 +-
.../juneau/examples/rest/petstore/Species.java | 14 +-
.../apache/juneau/examples/rest/petstore/Tag.java | 8 +-
.../apache/juneau/examples/rest/petstore/User.java | 6 +-
.../juneau/examples/rest/petstore/UserStatus.java | 10 +-
.../examples/rest/AddressBookResourceTest.java | 14 +-
.../juneau/examples/rest/ContentComboTestBase.java | 12 +-
.../apache/juneau/examples/rest/RestTestcase.java | 2 +-
.../juneau/examples/rest/RootContentTest.java | 2 +-
.../juneau/examples/rest/RootResourcesTest.java | 6 +-
.../apache/juneau/microservice/JettyLogger.java | 20 +-
.../apache/juneau/microservice/Microservice.java | 258 ++--
.../juneau/microservice/RestMicroservice.java | 144 +-
.../microservice/console/ConsoleCommand.java | 84 +-
.../juneau/microservice/console/ExitCommand.java | 6 +-
.../juneau/microservice/console/HelpCommand.java | 28 +-
.../microservice/console/RestartCommand.java | 4 +-
.../microservice/resources/ConfigResource.java | 38 +-
.../microservice/resources/DebugResource.java | 4 +-
.../microservice/resources/DirectoryResource.java | 50 +-
.../microservice/resources/LogEntryFormatter.java | 26 +-
.../juneau/microservice/resources/LogParser.java | 8 +-
.../microservice/resources/LogsResource.java | 52 +-
.../microservice/resources/ShutdownResource.java | 2 +-
.../microservice/sample/HelloWorldResource.java | 4 +-
.../org/apache/juneau/rest/test/ConfigTest.java | 2 +-
.../org/apache/juneau/rest/test/MockRestTest.java | 8 +-
.../org/apache/juneau/rest/test/RestTestcase.java | 6 +-
.../rest/test/client/CallbackStringsTest.java | 2 +-
.../juneau/rest/test/client/ClientFuturesTest.java | 2 +-
.../juneau/rest/test/client/FormDataTest.java | 2 +-
.../rest/test/client/InterfaceProxyTest.java | 18 +-
.../rest/test/client/RequestBeanProxyTest.java | 148 +-
.../juneau/rest/test/client/RestClientTest.java | 2 +-
.../juneau/rest/client/AllowAllRedirects.java | 2 +-
.../org/apache/juneau/rest/client/DateHeader.java | 4 +-
.../org/apache/juneau/rest/client/HttpMethod.java | 2 +-
.../apache/juneau/rest/client/NameValuePairs.java | 18 +-
.../apache/juneau/rest/client/ResponsePattern.java | 20 +-
.../org/apache/juneau/rest/client/RestCall.java | 440 +++---
.../juneau/rest/client/RestCallException.java | 32 +-
.../juneau/rest/client/RestCallInterceptor.java | 10 +-
.../apache/juneau/rest/client/RestCallLogger.java | 6 +-
.../org/apache/juneau/rest/client/RestClient.java | 208 +--
.../juneau/rest/client/RestClientBuilder.java | 748 +++++-----
.../juneau/rest/client/RestRequestEntity.java | 2 +-
.../org/apache/juneau/rest/client/RetryOn.java | 6 +-
.../rest/client/SerializedNameValuePair.java | 8 +-
.../juneau/rest/client/SimpleX509TrustManager.java | 2 +-
.../rest/client/mock/MockHttpClientConnection.java | 14 +-
.../mock/MockHttpClientConnectionManager.java | 10 +-
.../org/apache/juneau/rest/jaxrs/BaseProvider.java | 10 +-
.../apache/juneau/rest/jaxrs/BasicProvider.java | 2 +-
.../apache/juneau/rest/jaxrs/JuneauProvider.java | 26 +-
.../apache/juneau/rest/BasicRestCallHandler.java | 50 +-
.../org/apache/juneau/rest/BasicRestConfig.java | 8 +-
.../apache/juneau/rest/BasicRestInfoProvider.java | 354 ++---
.../org/apache/juneau/rest/BasicRestLogger.java | 48 +-
.../juneau/rest/BasicRestResourceResolver.java | 8 +-
.../org/apache/juneau/rest/BasicRestServlet.java | 22 +-
.../apache/juneau/rest/BasicRestServletGroup.java | 10 +-
.../apache/juneau/rest/ClientVersionMatcher.java | 4 +-
.../org/apache/juneau/rest/HtmlDocBuilder.java | 102 +-
.../main/java/org/apache/juneau/rest/Inherit.java | 20 +-
.../apache/juneau/rest/MessageBundleLocation.java | 12 +-
.../org/apache/juneau/rest/NoOpRestLogger.java | 8 +-
.../src/main/java/org/apache/juneau/rest/None.java | 16 +-
.../java/org/apache/juneau/rest/RequestBody.java | 92 +-
.../org/apache/juneau/rest/RequestFormData.java | 142 +-
.../org/apache/juneau/rest/RequestHeaders.java | 278 ++--
.../org/apache/juneau/rest/RequestPathMatch.java | 72 +-
.../org/apache/juneau/rest/RequestProperties.java | 8 +-
.../java/org/apache/juneau/rest/RequestQuery.java | 142 +-
.../org/apache/juneau/rest/ResponseHandler.java | 18 +-
.../org/apache/juneau/rest/RestCallHandler.java | 20 +-
.../org/apache/juneau/rest/RestCallRouter.java | 6 +-
.../java/org/apache/juneau/rest/RestChild.java | 18 +-
.../java/org/apache/juneau/rest/RestContext.java | 1446 ++++++++++----------
.../org/apache/juneau/rest/RestContextBuilder.java | 700 +++++-----
.../apache/juneau/rest/RestContextProperties.java | 6 +-
.../java/org/apache/juneau/rest/RestConverter.java | 24 +-
.../java/org/apache/juneau/rest/RestException.java | 16 +-
.../java/org/apache/juneau/rest/RestGuard.java | 34 +-
.../org/apache/juneau/rest/RestInfoProvider.java | 46 +-
.../org/apache/juneau/rest/RestJavaMethod.java | 42 +-
.../java/org/apache/juneau/rest/RestLogger.java | 28 +-
.../java/org/apache/juneau/rest/RestMatcher.java | 24 +-
.../org/apache/juneau/rest/RestMethodParam.java | 32 +-
.../apache/juneau/rest/RestMethodProperties.java | 10 +-
.../org/apache/juneau/rest/RestMethodReturn.java | 16 +-
.../org/apache/juneau/rest/RestMethodThrown.java | 16 +-
.../org/apache/juneau/rest/RestParamDefaults.java | 28 +-
.../java/org/apache/juneau/rest/RestParamType.java | 8 +-
.../java/org/apache/juneau/rest/RestRequest.java | 350 ++---
.../apache/juneau/rest/RestResourceResolver.java | 20 +-
.../java/org/apache/juneau/rest/RestResponse.java | 90 +-
.../java/org/apache/juneau/rest/RestServlet.java | 20 +-
.../apache/juneau/rest/RestServletException.java | 4 +-
.../org/apache/juneau/rest/StaticFileMapping.java | 48 +-
.../apache/juneau/rest/annotation/HookEvent.java | 90 +-
.../org/apache/juneau/rest/annotation/HtmlDoc.java | 134 +-
.../org/apache/juneau/rest/annotation/Method.java | 8 +-
.../juneau/rest/annotation/MethodSwagger.java | 110 +-
.../apache/juneau/rest/annotation/Property.java | 6 +-
.../juneau/rest/annotation/ResourceSwagger.java | 104 +-
.../apache/juneau/rest/annotation/RestHook.java | 14 +-
.../apache/juneau/rest/annotation/RestMethod.java | 246 ++--
.../juneau/rest/annotation/RestResource.java | 356 ++---
.../juneau/rest/converters/Introspectable.java | 8 +-
.../apache/juneau/rest/converters/Queryable.java | 12 +-
.../apache/juneau/rest/converters/Traversable.java | 10 +-
.../apache/juneau/rest/exception/BadRequest.java | 24 +-
.../org/apache/juneau/rest/exception/Conflict.java | 24 +-
.../juneau/rest/exception/ExpectationFailed.java | 24 +-
.../juneau/rest/exception/FailedDependency.java | 24 +-
.../apache/juneau/rest/exception/Forbidden.java | 26 +-
.../org/apache/juneau/rest/exception/Gone.java | 30 +-
.../rest/exception/HttpVersionNotSupported.java | 24 +-
.../juneau/rest/exception/InsufficientStorage.java | 24 +-
.../juneau/rest/exception/InternalServerError.java | 24 +-
.../juneau/rest/exception/LengthRequired.java | 24 +-
.../org/apache/juneau/rest/exception/Locked.java | 24 +-
.../apache/juneau/rest/exception/LoopDetected.java | 24 +-
.../juneau/rest/exception/MethodNotAllowed.java | 24 +-
.../juneau/rest/exception/MisdirectedRequest.java | 24 +-
.../exception/NetworkAuthenticationRequired.java | 26 +-
.../juneau/rest/exception/NotAcceptable.java | 24 +-
.../apache/juneau/rest/exception/NotExtended.java | 24 +-
.../org/apache/juneau/rest/exception/NotFound.java | 26 +-
.../juneau/rest/exception/NotImplemented.java | 26 +-
.../juneau/rest/exception/PayloadTooLarge.java | 26 +-
.../juneau/rest/exception/PreconditionFailed.java | 24 +-
.../rest/exception/PreconditionRequired.java | 26 +-
.../juneau/rest/exception/RangeNotSatisfiable.java | 26 +-
.../exception/RequestHeaderFieldsTooLarge.java | 24 +-
.../juneau/rest/exception/ServiceUnavailable.java | 26 +-
.../juneau/rest/exception/TooManyRequests.java | 26 +-
.../apache/juneau/rest/exception/Unauthorized.java | 28 +-
.../rest/exception/UnavailableForLegalReasons.java | 24 +-
.../juneau/rest/exception/UnprocessableEntity.java | 24 +-
.../rest/exception/UnsupportedMediaType.java | 26 +-
.../juneau/rest/exception/UpgradeRequired.java | 24 +-
.../apache/juneau/rest/exception/UriTooLong.java | 26 +-
.../rest/exception/VariantAlsoNegotiates.java | 24 +-
.../apache/juneau/rest/helper/BeanDescription.java | 10 +-
.../rest/helper/ChildResourceDescriptions.java | 12 +-
.../java/org/apache/juneau/rest/helper/Ok.java | 10 +-
.../apache/juneau/rest/helper/ReaderResource.java | 26 +-
.../juneau/rest/helper/ReaderResourceBuilder.java | 20 +-
.../org/apache/juneau/rest/helper/Redirect.java | 18 +-
.../juneau/rest/helper/RedirectToServletRoot.java | 6 +-
.../juneau/rest/helper/ResourceDescription.java | 18 +-
.../juneau/rest/helper/ResourceDescriptions.java | 4 +-
.../apache/juneau/rest/helper/StreamResource.java | 22 +-
.../juneau/rest/helper/StreamResourceBuilder.java | 26 +-
.../rest/matchers/MultipartFormDataMatcher.java | 2 +-
.../rest/matchers/UrlEncodedFormMatcher.java | 2 +-
.../apache/juneau/rest/mock/MockHttpSession.java | 8 +-
.../java/org/apache/juneau/rest/mock/MockRest.java | 54 +-
.../juneau/rest/mock/MockServletRequest.java | 264 ++--
.../juneau/rest/mock/MockServletResponse.java | 60 +-
.../remoteable/RemoteableServiceProperties.java | 10 +-
.../juneau/rest/remoteable/RemoteableServlet.java | 40 +-
.../juneau/rest/response/DefaultHandler.java | 20 +-
.../juneau/rest/response/InputStreamHandler.java | 6 +-
.../apache/juneau/rest/response/ReaderHandler.java | 4 +-
.../juneau/rest/response/RedirectHandler.java | 2 +-
.../juneau/rest/response/StreamableHandler.java | 4 +-
.../juneau/rest/response/WritableHandler.java | 4 +-
.../rest/response/ZipFileListResponseHandler.java | 6 +-
.../apache/juneau/rest/util/AnnotationUtils.java | 8 +-
.../rest/util/BoundedServletInputStream.java | 12 +-
.../juneau/rest/util/FinishablePrintWriter.java | 6 +-
.../rest/util/FinishableServletOutputStream.java | 20 +-
.../org/apache/juneau/rest/util/RestUtils.java | 40 +-
.../apache/juneau/rest/util/UrlPathPattern.java | 16 +-
.../java/org/apache/juneau/rest/vars/FileVar.java | 22 +-
.../apache/juneau/rest/vars/LocalizationVar.java | 10 +-
.../juneau/rest/vars/RequestAttributeVar.java | 18 +-
.../juneau/rest/vars/RequestFormDataVar.java | 18 +-
.../apache/juneau/rest/vars/RequestHeaderVar.java | 18 +-
.../apache/juneau/rest/vars/RequestPathVar.java | 18 +-
.../apache/juneau/rest/vars/RequestQueryVar.java | 18 +-
.../org/apache/juneau/rest/vars/RequestVar.java | 18 +-
.../org/apache/juneau/rest/vars/RestInfoVar.java | 30 +-
.../juneau/rest/vars/SerializedRequestAttrVar.java | 10 +-
.../juneau/rest/vars/ServletInitParamVar.java | 10 +-
.../org/apache/juneau/rest/vars/UrlEncodeVar.java | 8 +-
.../java/org/apache/juneau/rest/vars/UrlVar.java | 10 +-
.../org/apache/juneau/rest/vars/WidgetVar.java | 8 +-
.../juneau/rest/widget/ContentTypeMenuItem.java | 8 +-
.../apache/juneau/rest/widget/MenuItemWidget.java | 18 +-
.../apache/juneau/rest/widget/PoweredByJuneau.java | 10 +-
.../apache/juneau/rest/widget/QueryMenuItem.java | 14 +-
.../apache/juneau/rest/widget/ThemeMenuItem.java | 6 +-
.../org/apache/juneau/rest/widget/Tooltip.java | 12 +-
.../java/org/apache/juneau/rest/widget/Widget.java | 76 +-
.../juneau/rest/BasicRestInfoProviderTest.java | 358 ++---
.../juneau/rest/BeanContextPropertiesTest.java | 2 +-
.../test/java/org/apache/juneau/rest/NlsTest.java | 8 +-
.../java/org/apache/juneau/rest/PathsTest.java | 14 +-
.../org/apache/juneau/rest/RestParamsTest.java | 6 +-
.../org/apache/juneau/rest/StatusCodesTest.java | 20 +-
.../juneau/rest/annotation/BodyAnnotationTest.java | 84 +-
.../rest/annotation/FormDataAnnotationTest.java | 36 +-
.../rest/annotation/HasFormDataAnnotationTest.java | 6 +-
.../rest/annotation/HasQueryAnnotationTest.java | 6 +-
.../rest/annotation/HeaderAnnotationTest.java | 20 +-
.../juneau/rest/annotation/HtmlDocAsideTest.java | 6 +-
.../juneau/rest/annotation/HtmlDocFooterTest.java | 2 +-
.../juneau/rest/annotation/HtmlDocHeaderTest.java | 2 +-
.../juneau/rest/annotation/HtmlDocNavTest.java | 2 +-
.../rest/annotation/HtmlDocNavlinksTest.java | 14 +-
.../juneau/rest/annotation/HtmlDocScriptTest.java | 2 +-
.../juneau/rest/annotation/HtmlDocStyleTest.java | 2 +-
.../juneau/rest/annotation/PathAnnotationTest.java | 18 +-
.../annotation/PathRemainderAnnotationTest.java | 8 +-
.../rest/annotation/QueryAnnotationTest.java | 50 +-
.../rest/annotation/ResponseAnnotationTest.java | 28 +-
.../annotation/ResponseHeaderAnnotationTest.java | 14 +-
.../annotation/ResponseStatusAnnotationTest.java | 20 +-
.../rest/annotation/ResponsesAnnotationTest.java | 14 +-
.../juneau/rest/annotation/RestHookTest.java | 24 +-
.../juneau/rest/annotation/RestMethodBpiTest.java | 16 +-
.../rest/annotation/RestMethodGuardsTest.java | 4 +-
.../rest/annotation/RestMethodInheritTest.java | 10 +-
.../rest/annotation/RestMethodMatchersTest.java | 4 +-
.../juneau/rest/annotation/RestMethodPathTest.java | 2 +-
.../rest/annotation/RestResourceMessagesTest.java | 10 +-
.../rest/annotation/RestResourceParsersTest.java | 12 +-
.../rest/annotation/RestResourcePathTest.java | 2 +-
.../rest/annotation/RestResourcePojoSwapsTest.java | 4 +-
.../annotation/RestResourcePropertiesTest.java | 6 +-
.../annotation/RestResourceSerializersTest.java | 4 +-
.../juneau/rest/headers/AcceptCharsetTest.java | 4 +-
.../juneau/rest/headers/AcceptEncodingTest.java | 20 +-
.../org/apache/juneau/rest/headers/AcceptTest.java | 22 +-
.../juneau/rest/headers/ClientVersionTest.java | 4 +-
.../juneau/rest/headers/ContentEncodingTest.java | 14 +-
.../juneau/rest/headers/ContentTypeTest.java | 26 +-
.../apache/juneau/rest/headers/HeadersTest.java | 26 +-
.../juneau/rest/mock/MockServletRequestTest.java | 20 +-
.../org/apache/juneau/rest/testutils/DTOs.java | 4 +-
.../org/apache/juneau/rest/testutils/TestEnum.java | 2 +-
.../apache/juneau/rest/testutils/TestUtils.java | 4 +-
.../org/apache/juneau/rest/util/RestUtilsTest.java | 2 +-
928 files changed, 17918 insertions(+), 17918 deletions(-)
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
index b71364b..057d753 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
@@ -2,7 +2,7 @@
// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
-// * with the License. You may obtain a copy of the License at *
+// * with the License. You may obtain a copy of the License at *
// * *
// * http://www.apache.org/licenses/LICENSE-2.0 *
// * *
@@ -37,7 +37,7 @@ import org.apache.juneau.svl.*;
/**
* Main configuration API class.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../overview-summary.html#juneau-config'>Overview > juneau-config</a>
@@ -53,18 +53,18 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Configuration property: Configuration name.
- *
+ *
* <h5 class='section'>Property:</h5>
* <ul>
* <li><b>Name:</b> <js>"Config.name.s"</js>
* <li><b>Data type:</b> <code>String</code>
* <li><b>Default:</b> <js>"Configuration.cfg"</js>
- * <li><b>Methods:</b>
+ * <li><b>Methods:</b>
* <ul>
* <li class='jm'>{@link ConfigBuilder#name(String)}
* </ul>
* </ul>
- *
+ *
* <h5 class='section'>Description:</h5>
* <p>
* Specifies the configuration name.
@@ -75,18 +75,18 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Configuration property: Configuration store.
- *
+ *
* <h5 class='section'>Property:</h5>
* <ul>
* <li><b>Name:</b> <js>"Config.store.o"</js>
* <li><b>Data type:</b> {@link ConfigStore}
* <li><b>Default:</b> {@link ConfigFileStore#DEFAULT}
- * <li><b>Methods:</b>
+ * <li><b>Methods:</b>
* <ul>
* <li class='jm'>{@link ConfigBuilder#store(ConfigStore)}
* </ul>
* </ul>
- *
+ *
* <h5 class='section'>Description:</h5>
* <p>
* The configuration store used for retrieving and storing configurations.
@@ -95,19 +95,19 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Configuration property: POJO serializer.
- *
+ *
* <h5 class='section'>Property:</h5>
* <ul>
* <li><b>Name:</b> <js>"Config.serializer.o"</js>
* <li><b>Data type:</b> {@link WriterSerializer}
* <li><b>Default:</b> {@link JsonSerializer#DEFAULT_LAX}
- * <li><b>Methods:</b>
+ * <li><b>Methods:</b>
* <ul>
* <li class='jm'>{@link ConfigBuilder#serializer(Class)}
* <li class='jm'>{@link ConfigBuilder#serializer(WriterSerializer)}
* </ul>
* </ul>
- *
+ *
* <h5 class='section'>Description:</h5>
* <p>
* The serializer to use for serializing POJO values.
@@ -116,19 +116,19 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Configuration property: POJO parser.
- *
+ *
* <h5 class='section'>Property:</h5>
* <ul>
* <li><b>Name:</b> <js>"Config.parser.o"</js>
* <li><b>Data type:</b> {@link ReaderParser}
* <li><b>Default:</b> {@link JsonParser#DEFAULT}
- * <li><b>Methods:</b>
+ * <li><b>Methods:</b>
* <ul>
* <li class='jm'>{@link ConfigBuilder#parser(Class)}
* <li class='jm'>{@link ConfigBuilder#parser(ReaderParser)}
* </ul>
* </ul>
- *
+ *
* <h5 class='section'>Description:</h5>
* <p>
* The parser to use for parsing values to POJOs.
@@ -137,19 +137,19 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Configuration property: Value encoder.
- *
+ *
* <h5 class='section'>Property:</h5>
* <ul>
* <li><b>Name:</b> <js>"Config.encoder.o"</js>
* <li><b>Data type:</b> {@link ConfigEncoder}
* <li><b>Default:</b> {@link ConfigXorEncoder#INSTANCE}
- * <li><b>Methods:</b>
+ * <li><b>Methods:</b>
* <ul>
* <li class='jm'>{@link ConfigBuilder#encoder(Class)}
* <li class='jm'>{@link ConfigBuilder#encoder(ConfigEncoder)}
* </ul>
* </ul>
- *
+ *
* <h5 class='section'>Description:</h5>
* <p>
* The encoder to use for encoding encoded configuration values.
@@ -158,19 +158,19 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Configuration property: SVL variable resolver.
- *
+ *
* <h5 class='section'>Property:</h5>
* <ul>
* <li><b>Name:</b> <js>"Config.varResolver.o"</js>
* <li><b>Data type:</b> {@link VarResolver}
* <li><b>Default:</b> {@link VarResolver#DEFAULT}
- * <li><b>Methods:</b>
+ * <li><b>Methods:</b>
* <ul>
* <li class='jm'>{@link ConfigBuilder#varResolver(Class)}
* <li class='jm'>{@link ConfigBuilder#varResolver(VarResolver)}
* </ul>
* </ul>
- *
+ *
* <h5 class='section'>Description:</h5>
* <p>
* The resolver to use for resolving SVL variables.
@@ -179,18 +179,18 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Configuration property: Binary value line length.
- *
+ *
* <h5 class='section'>Property:</h5>
* <ul>
* <li><b>Name:</b> <js>"Config.binaryLineLength.i"</js>
* <li><b>Data type:</b> <code>Integer</code>
* <li><b>Default:</b> <code>-1</code>
- * <li><b>Methods:</b>
+ * <li><b>Methods:</b>
* <ul>
* <li class='jm'>{@link ConfigBuilder#binaryLineLength(int)}
* </ul>
* </ul>
- *
+ *
* <h5 class='section'>Description:</h5>
* <p>
* When serializing binary values, lines will be split after this many characters.
@@ -200,22 +200,22 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Configuration property: Binary value format.
- *
+ *
* <h5 class='section'>Property:</h5>
* <ul>
* <li><b>Name:</b> <js>"Config.binaryFormat.s"</js>
* <li><b>Data type:</b> {@link BinaryFormat}
* <li><b>Default:</b> {@link BinaryFormat#BASE64}
- * <li><b>Methods:</b>
+ * <li><b>Methods:</b>
* <ul>
* <li class='jm'>{@link ConfigBuilder#binaryFormat(BinaryFormat)}
* </ul>
* </ul>
- *
+ *
* <h5 class='section'>Description:</h5>
* <p>
* The format to use when persisting byte arrays.
- *
+ *
* <p>
* Possible values:
* <ul>
@@ -228,38 +228,38 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Configuration property: Multi-line values should always be on separate lines.
- *
+ *
* <h5 class='section'>Property:</h5>
* <ul>
* <li><b>Name:</b> <js>"Config.multiLineValuesOnSeparateLines.b"</js>
* <li><b>Data type:</b> <code>Boolean</code>
* <li><b>Default:</b> <jk>false</jk>
- * <li><b>Methods:</b>
+ * <li><b>Methods:</b>
* <ul>
* <li class='jm'>{@link ConfigBuilder#multiLineValuesOnSeparateLines()}
* </ul>
* </ul>
- *
+ *
* <h5 class='section'>Description:</h5>
* <p>
* When enabled, multi-line values will always be placed on a separate line from the key.
*/
public static final String CONFIG_multiLineValuesOnSeparateLines = PREFIX + "multiLineValuesOnSeparateLines.b";
-
+
/**
* Configuration property: Read-only.
- *
+ *
* <h5 class='section'>Property:</h5>
* <ul>
* <li><b>Name:</b> <js>"Config.readOnly.b"</js>
* <li><b>Data type:</b> <code>Boolean</code>
* <li><b>Default:</b> <jk>false</jk>
- * <li><b>Methods:</b>
+ * <li><b>Methods:</b>
* <ul>
* <li class='jm'>{@link ConfigBuilder#readOnly()}
* </ul>
* </ul>
- *
+ *
* <h5 class='section'>Description:</h5>
* <p>
* When enabled, attempts to call any setters on this object will throw an {@link UnsupportedOperationException}.
@@ -286,22 +286,22 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Instantiates a new clean-slate {@link ConfigBuilder} object.
- *
+ *
* <p>
* This is equivalent to simply calling <code><jk>new</jk> ConfigBuilder()</code>.
- *
+ *
* @return A new {@link ConfigBuilder} object.
*/
public static ConfigBuilder create() {
return new ConfigBuilder();
}
-
+
/**
* Same as {@link #create()} but initializes the builder with the specified config name.
- *
+ *
* <p>
* This is equivalent to simply calling <code><jk>new</jk> ConfigBuilder().name(name)</code>.
- *
+ *
* @param name The configuration name.
* @return A new {@link ConfigBuilder} object.
*/
@@ -313,17 +313,17 @@ public final class Config extends Context implements ConfigEventListener, Writab
public ConfigBuilder builder() {
return new ConfigBuilder(getPropertyStore());
}
-
+
/**
* Constructor.
- *
+ *
* @param ps
* The property store containing all the settings for this object.
- * @throws IOException
+ * @throws IOException
*/
public Config(PropertyStore ps) throws IOException {
super(ps);
-
+
name = getStringProperty(CONFIG_name, "Configuration.cfg");
store = getInstanceProperty(CONFIG_store, ConfigStore.class, ConfigFileStore.DEFAULT);
configMap = store.getMap(name);
@@ -343,8 +343,8 @@ public final class Config extends Context implements ConfigEventListener, Writab
multiLineValuesOnSeparateLines = getBooleanProperty(CONFIG_multiLineValuesOnSeparateLines, false);
readOnly = getBooleanProperty(CONFIG_readOnly, false);
}
-
- Config(Config copyFrom, VarResolverSession varSession) {
+
+ Config(Config copyFrom, VarResolverSession varSession) {
super(null);
name = copyFrom.name;
store = copyFrom.store;
@@ -360,20 +360,20 @@ public final class Config extends Context implements ConfigEventListener, Writab
readOnly = copyFrom.readOnly;
beanSession = copyFrom.beanSession;
}
-
+
/**
* Creates a copy of this config using the specified var session for resolving variables.
- *
+ *
* <p>
* This creates a shallow copy of the config but replacing the variable resolver.
- *
+ *
* @param varSession The var session used for resolving string variables.
* @return A new config object.
*/
public Config resolving(VarResolverSession varSession) {
return new Config(this, varSession);
}
-
+
//--------------------------------------------------------------------------------
// Workhorse getters
@@ -381,23 +381,23 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Returns the specified value as a string from the config file.
- *
+ *
* <p>
* Unlike {@link #getString(String)}, this method doesn't replace SVL variables.
- *
- * @param key The key.
+ *
+ * @param key The key.
* @return The value, or <jk>null</jk> if the section or value doesn't exist.
*/
public String get(String key) {
-
+
String sname = sname(key);
- String skey = skey(key);
-
+ String skey = skey(key);
+
ConfigEntry ce = configMap.getEntry(sname, skey);
-
+
if (ce == null || ce.getValue() == null)
return null;
-
+
String val = ce.getValue();
for (ConfigMod m : ConfigMod.asModifiersReverse(ce.getModifiers())) {
if (m == ENCODED) {
@@ -405,10 +405,10 @@ public final class Config extends Context implements ConfigEventListener, Writab
val = encoder.decode(key, val);
}
}
-
+
return val;
}
-
+
//--------------------------------------------------------------------------------
// Workhorse setters
@@ -416,8 +416,8 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Sets a value in this config.
- *
- * @param key The key.
+ *
+ * @param key The key.
* @param value The value.
* @return This object (for method chaining).
* @throws UnsupportedOperationException If configuration is read only.
@@ -426,14 +426,14 @@ public final class Config extends Context implements ConfigEventListener, Writab
checkWrite();
assertFieldNotNull(key, "key");
String sname = sname(key);
- String skey = skey(key);
-
+ String skey = skey(key);
+
ConfigEntry ce = configMap.getEntry(sname, skey);
if (ce == null && value == null)
return this;
-
+
String mod = ce == null ? "" : ce.getModifiers();
-
+
String s = asString(value);
for (ConfigMod m : ConfigMod.asModifiers(mod)) {
if (m == ENCODED) {
@@ -448,10 +448,10 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Adds or replaces an entry with the specified key with a POJO serialized to a string using the registered
* serializer.
- *
+ *
* <p>
* Equivalent to calling <code>put(key, value, isEncoded(key))</code>.
- *
+ *
* @param key The key.
* @param value The new value POJO.
* @return The previous value, or <jk>null</jk> if the section or key did not previously exist.
@@ -466,7 +466,7 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Same as {@link #set(String, Object)} but allows you to specify the serializer to use to serialize the
* value.
- *
+ *
* @param key The key.
* @param value The new value.
* @param serializer
@@ -480,22 +480,22 @@ public final class Config extends Context implements ConfigEventListener, Writab
public Config set(String key, Object value, Serializer serializer) throws SerializeException {
return set(key, serialize(value, serializer));
}
-
+
/**
* Same as {@link #set(String, Object)} but allows you to specify all aspects of a value.
- *
+ *
* @param key The key.
* @param value The new value.
* @param serializer
* The serializer to use for serializing the object.
* If <jk>null</jk>, then uses the predefined serializer on the config file.
- * @param modifier
+ * @param modifier
* Optional modifier to apply to the value.
* <br>If <jk>null</jk>, then previous value will not be replaced.
- * @param comment
+ * @param comment
* Optional same-line comment to add to this value.
* <br>If <jk>null</jk>, then previous value will not be replaced.
- * @param preLines
+ * @param preLines
* Optional comment or blank lines to add before this entry.
* <br>If <jk>null</jk>, then previous value will not be replaced.
* @return The previous value, or <jk>null</jk> if the section or key did not previously exist.
@@ -509,19 +509,19 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Same as {@link #set(String, Object)} but allows you to specify all aspects of a value.
- *
+ *
* @param key The key.
* @param value The new value.
* @param serializer
* The serializer to use for serializing the object.
* If <jk>null</jk>, then uses the predefined serializer on the config file.
- * @param modifiers
+ * @param modifiers
* Optional modifiers to apply to the value.
* <br>If <jk>null</jk>, then previous value will not be replaced.
- * @param comment
+ * @param comment
* Optional same-line comment to add to this value.
* <br>If <jk>null</jk>, then previous value will not be replaced.
- * @param preLines
+ * @param preLines
* Optional comment or blank lines to add before this entry.
* <br>If <jk>null</jk>, then previous value will not be replaced.
* @return The previous value, or <jk>null</jk> if the section or key did not previously exist.
@@ -533,8 +533,8 @@ public final class Config extends Context implements ConfigEventListener, Writab
checkWrite();
assertFieldNotNull(key, "key");
String sname = sname(key);
- String skey = skey(key);
-
+ String skey = skey(key);
+
String s = serialize(value, serializer);
if (modifiers != null) {
for (ConfigMod m : modifiers) {
@@ -543,14 +543,14 @@ public final class Config extends Context implements ConfigEventListener, Writab
}
}
}
-
+
configMap.setEntry(sname, skey, s, modifiers == null ? null : ConfigMod.asString(modifiers), comment, preLines);
return this;
}
/**
* Removes an entry with the specified key.
- *
+ *
* @param key The key.
* @return The previous value, or <jk>null</jk> if the section or key did not previously exist.
* @throws UnsupportedOperationException If configuration is read only.
@@ -558,18 +558,18 @@ public final class Config extends Context implements ConfigEventListener, Writab
public Config remove(String key) {
checkWrite();
String sname = sname(key);
- String skey = skey(key);
+ String skey = skey(key);
configMap.removeEntry(sname, skey);
return this;
}
-
+
/**
* Encodes and unencoded entries in this config.
- *
+ *
* <p>
* If any entries in the config are marked as encoded but not actually encoded,
* this will encode them.
- *
+ *
* @return This object (for method chaining).
* @throws UnsupportedOperationException If configuration is read only.
*/
@@ -583,17 +583,17 @@ public final class Config extends Context implements ConfigEventListener, Writab
}
}
}
-
+
return this;
}
-
+
//--------------------------------------------------------------------------------
// API methods
//--------------------------------------------------------------------------------
/**
* Gets the entry with the specified key.
- *
+ *
* <p>
* The key can be in one of the following formats...
* <ul class='spaced-list'>
@@ -602,7 +602,7 @@ public final class Config extends Context implements ConfigEventListener, Writab
* <li>
* <js>"section/key"</js> - A value from the specified section.
* </ul>
- *
+ *
* @param key The key.
* @return The value, or <jk>null</jk> if the section or key does not exist.
*/
@@ -617,7 +617,7 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Gets the entry with the specified key.
- *
+ *
* <p>
* The key can be in one of the following formats...
* <ul class='spaced-list'>
@@ -626,7 +626,7 @@ public final class Config extends Context implements ConfigEventListener, Writab
* <li>
* <js>"section/key"</js> - A value from the specified section.
* </ul>
- *
+ *
* @param key The key.
* @param def The default value if the value does not exist.
* @return The value, or the default value if the section or key does not exist.
@@ -642,7 +642,7 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Gets the entry with the specified key, splits the value on commas, and returns the values as trimmed strings.
- *
+ *
* @param key The key.
* @return The value, or an empty array if the section or key does not exist.
*/
@@ -652,7 +652,7 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Same as {@link #getStringArray(String)} but returns a default value if the value cannot be found.
- *
+ *
* @param key The key.
* @param def The default value if the value does not exist.
* @return The value, or the default value if the section or key does not exist or is blank.
@@ -667,10 +667,10 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Convenience method for getting int config values.
- *
+ *
* <p>
* <js>"K"</js>, <js>"M"</js>, and <js>"G"</js> can be used to identify kilo, mega, and giga.
- *
+ *
* <h5 class='section'>Example:</h5>
* <ul class='spaced-list'>
* <li>
@@ -678,7 +678,7 @@ public final class Config extends Context implements ConfigEventListener, Writab
* <li>
* <code><js>"100M"</js> => 104857600</code>
* </ul>
- *
+ *
* <p>
* Uses {@link Integer#decode(String)} underneath, so any of the following integer formats are supported:
* <ul>
@@ -687,7 +687,7 @@ public final class Config extends Context implements ConfigEventListener, Writab
* <li><js>"#..."</js>
* <li><js>"0..."</js>
* </ul>
- *
+ *
* @param key The key.
* @return The value, or <code>0</code> if the value does not exist or the value is empty.
*/
@@ -697,7 +697,7 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Same as {@link #getInt(String)} but returns a default value if not set.
- *
+ *
* @param key The key.
* @param def The default value if the value does not exist.
* @return The value, or the default value if the value does not exist or the value is empty.
@@ -711,7 +711,7 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Convenience method for getting boolean config values.
- *
+ *
* @param key The key.
* @return The value, or <jk>false</jk> if the section or key does not exist or cannot be parsed as a boolean.
*/
@@ -721,7 +721,7 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Convenience method for getting boolean config values.
- *
+ *
* @param key The key.
* @param def The default value if the value does not exist.
* @return The value, or the default value if the section or key does not exist or cannot be parsed as a boolean.
@@ -733,10 +733,10 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Convenience method for getting long config values.
- *
+ *
* <p>
* <js>"K"</js>, <js>"M"</js>, and <js>"G"</js> can be used to identify kilo, mega, and giga.
- *
+ *
* <h5 class='section'>Example:</h5>
* <ul class='spaced-list'>
* <li>
@@ -744,7 +744,7 @@ public final class Config extends Context implements ConfigEventListener, Writab
* <li>
* <code><js>"100M"</js> => 104857600</code>
* </ul>
- *
+ *
* <p>
* Uses {@link Long#decode(String)} underneath, so any of the following number formats are supported:
* <ul>
@@ -753,7 +753,7 @@ public final class Config extends Context implements ConfigEventListener, Writab
* <li><js>"#..."</js>
* <li><js>"0..."</js>
* </ul>
- *
+ *
* @param key The key.
* @return The value, or <code>0</code> if the value does not exist or the value is empty.
*/
@@ -763,7 +763,7 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Same as {@link #getLong(String)} but returns a default value if not set.
- *
+ *
* @param key The key.
* @param def The default value if the value does not exist.
* @return The value, or the default value if the value does not exist or the value is empty.
@@ -774,10 +774,10 @@ public final class Config extends Context implements ConfigEventListener, Writab
return def;
return parseLongWithSuffix(s);
}
-
+
/**
* Convenience method for getting double config values.
- *
+ *
* <p>
* Uses {@link Double#valueOf(String)} underneath, so any of the following number formats are supported:
* <ul>
@@ -786,7 +786,7 @@ public final class Config extends Context implements ConfigEventListener, Writab
* <li><js>"#..."</js>
* <li><js>"0..."</js>
* </ul>
- *
+ *
* @param key The key.
* @return The value, or <code>0</code> if the value does not exist or the value is empty.
*/
@@ -796,7 +796,7 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Same as {@link #getDouble(String)} but returns a default value if not set.
- *
+ *
* @param key The key.
* @param def The default value if the value does not exist.
* @return The value, or the default value if the value does not exist or the value is empty.
@@ -810,7 +810,7 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Convenience method for getting float config values.
- *
+ *
* <p>
* Uses {@link Float#valueOf(String)} underneath, so any of the following number formats are supported:
* <ul>
@@ -819,7 +819,7 @@ public final class Config extends Context implements ConfigEventListener, Writab
* <li><js>"#..."</js>
* <li><js>"0..."</js>
* </ul>
- *
+ *
* @param key The key.
* @return The value, or <code>0</code> if the value does not exist or the value is empty.
*/
@@ -829,7 +829,7 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Same as {@link #getFloat(String)} but returns a default value if not set.
- *
+ *
* @param key The key.
* @param def The default value if the value does not exist.
* @return The value, or the default value if the value does not exist or the value is empty.
@@ -843,16 +843,16 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Convenience method for getting byte array config values.
- *
+ *
* <p>
* This is equivalent to calling the following:
* <p class='bcode'>
* <jk>byte</jk>[] b = config.getObject(key, <jk>byte</jk>[].<jk>class</jk>);
* </p>
- *
+ *
* Byte arrays are stored as encoded strings, typically BASE64, but dependent on the {@link #CONFIG_binaryFormat} setting.
- *
- * @param key The key.
+ *
+ * @param key The key.
* @return The value, or <jk>null</jk> if the section or key does not exist.
* @throws ParseException If value could not be converted to a byte array.
*/
@@ -864,11 +864,11 @@ public final class Config extends Context implements ConfigEventListener, Writab
return new byte[0];
return getObject(key, byte[].class);
}
-
+
/**
* Same as {@link #getBytes(String)} but with a default value if the entry doesn't exist.
- *
- * @param key The key.
+ *
+ * @param key The key.
* @param def The default value if the value does not exist.
* @return The value, or the default value if the section or key does not exist.
* @throws ParseException If value could not be converted to a byte array.
@@ -884,7 +884,7 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Gets the entry with the specified key and converts it to the specified value.
- *
+ *
* <p>
* The key can be in one of the following formats...
* <ul class='spaced-list'>
@@ -893,49 +893,49 @@ public final class Config extends Context implements ConfigEventListener, Writab
* <li>
* <js>"section/key"</js> - A value from the specified section.
* </ul>
- *
+ *
* <p>
* 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'>
* Config cf = Config.<jsm>create</jsm>().name(<js>"MyConfig.cfg"</js>).build();
- *
+ *
* <jc>// Parse into a linked-list of strings.</jc>
* List l = cf.getObject(<js>"MySection/myListOfStrings"</js>, LinkedList.<jk>class</jk>, String.<jk>class</jk>);
- *
+ *
* <jc>// Parse into a linked-list of beans.</jc>
* List l = cf.getObject(<js>"MySection/myListOfBeans"</js>, LinkedList.<jk>class</jk>, MyBean.<jk>class</jk>);
- *
+ *
* <jc>// Parse into a linked-list of linked-lists of strings.</jc>
* List l = cf.getObject(<js>"MySection/my2dListOfStrings"</js>, 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.getObject(<js>"MySection/myMap"</js>, 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.getObject(<js>"MySection/myMapOfListsOfBeans"</js>, TreeMap.<jk>class</jk>, String.<jk>class</jk>,
* List.<jk>class</jk>, MyBean.<jk>class</jk>);
* </p>
- *
+ *
* <p>
* <code>Collection</code> classes are assumed to be followed by zero or one objects indicating the element type.
- *
+ *
* <p>
* <code>Map</code> classes are assumed to be followed by zero or two meta objects indicating the key and value
* types.
- *
+ *
* <p>
* The array can be arbitrarily long to indicate arbitrarily complex data structures.
- *
+ *
* <h5 class='section'>Notes:</h5>
* <ul class='spaced-list'>
* <li>
* Use the {@link #getObject(String, Class)} method instead if you don't need a parameterized map/collection.
* </ul>
- *
+ *
* @param key The key.
* @param type
* The object type to create.
@@ -953,7 +953,7 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Same as {@link #getObject(String, Type, Type...)} but allows you to specify the parser to use to parse the value.
- *
+ *
* @param key The key.
* @param parser
* The parser to use for parsing the object.
@@ -975,30 +975,30 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Same as {@link #getObject(String, Type, Type...)} except optimized for a non-parameterized class.
- *
+ *
* <p>
* This is the preferred parse method for simple types since you don't need to cast the results.
- *
+ *
* <h5 class='section'>Examples:</h5>
* <p class='bcode'>
* Config cf = Config.<jsm>create</jsm>().name(<js>"MyConfig.cfg"</js>).build();
- *
+ *
* <jc>// Parse into a string.</jc>
* String s = cf.getObject(<js>"MySection/mySimpleString"</js>, String.<jk>class</jk>);
- *
+ *
* <jc>// Parse into a bean.</jc>
* MyBean b = cf.getObject(<js>"MySection/myBean"</js>, MyBean.<jk>class</jk>);
- *
+ *
* <jc>// Parse into a bean array.</jc>
* MyBean[] b = cf.getObject(<js>"MySection/myBeanArray"</js>, MyBean[].<jk>class</jk>);
- *
+ *
* <jc>// Parse into a linked-list of objects.</jc>
* List l = cf.getObject(<js>"MySection/myList"</js>, LinkedList.<jk>class</jk>);
- *
+ *
* <jc>// Parse into a map of object keys/values.</jc>
* Map m = cf.getObject(<js>"MySection/myMap"</js>, TreeMap.<jk>class</jk>);
* </p>
- *
+ *
* @param <T> The class type of the object being created.
* @param key The key.
* @param type The object type to create.
@@ -1013,7 +1013,7 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Same as {@link #getObject(String, Class)} but allows you to specify the parser to use to parse the value.
- *
+ *
* @param <T> The class type of the object being created.
* @param key The key.
* @param parser
@@ -1032,10 +1032,10 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Gets the entry with the specified key and converts it to the specified value.
- *
+ *
* <p>
* Same as {@link #getObject(String, Class)}, but with a default value.
- *
+ *
* @param key The key.
* @param def The default value if the value does not exist.
* @param type The class to convert the value to.
@@ -1049,7 +1049,7 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Same as {@link #getObjectWithDefault(String, Object, Class)} but allows you to specify the parser to use to parse
* the value.
- *
+ *
* @param key The key.
* @param parser
* The parser to use for parsing the object.
@@ -1067,10 +1067,10 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Gets the entry with the specified key and converts it to the specified value.
- *
+ *
* <p>
* Same as {@link #getObject(String, Type, Type...)}, but with a default value.
- *
+ *
* @param key The key.
* @param def The default value if the value does not exist.
* @param type
@@ -1090,7 +1090,7 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Same as {@link #getObjectWithDefault(String, Object, Type, Type...)} but allows you to specify the parser to use
* to parse the value.
- *
+ *
* @param key The key.
* @param parser
* The parser to use for parsing the object.
@@ -1114,8 +1114,8 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Returns the keys of the entries in the specified section.
- *
- * @param section
+ *
+ * @param section
* The section name to write from.
* <br>If empty, refers to the default section.
* <br>Must not be <jk>null</jk>.
@@ -1128,8 +1128,8 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Copies the entries in a section to the specified bean by calling the public setters on that bean.
- *
- * @param section
+ *
+ * @param section
* The section name to write from.
* <br>If empty, refers to the default section.
* <br>Must not be <jk>null</jk>.
@@ -1152,7 +1152,7 @@ public final class Config extends Context implements ConfigEventListener, Writab
Set<String> keys = configMap.getKeys(section);
if (keys == null)
throw new IllegalArgumentException("Section '"+section+"' not found in configuration.");
-
+
BeanMap<?> bm = beanSession.toBeanMap(bean);
for (String k : keys) {
BeanPropertyMeta bpm = bm.getPropertyMeta(k);
@@ -1163,14 +1163,14 @@ public final class Config extends Context implements ConfigEventListener, Writab
bm.put(k, getObject(section + '/' + k, bpm.getClassMeta().getInnerClass()));
}
}
-
+
return this;
}
/**
* Shortcut for calling <code>getSectionAsBean(sectionName, c, <jk>false</jk>)</code>.
- *
- * @param section
+ *
+ * @param section
* The section name to write from.
* <br>If empty, refers to the default section.
* <br>Must not be <jk>null</jk>.
@@ -1184,10 +1184,10 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Converts this config file section to the specified bean instance.
- *
+ *
* <p>
* 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'>
* <cs>[MyAddress]</cs>
@@ -1197,7 +1197,7 @@ public final class Config extends Context implements ConfigEventListener, Writab
* <ck>state</ck> = <cv>NY</cv>
* <ck>zip</ck> = <cv>12345</cv>
* </p>
- *
+ *
* <h5 class='figure'>Example bean</h5>
* <p class='bcode'>
* <jk>public class</jk> Address {
@@ -1206,14 +1206,14 @@ public final class Config extends Context implements ConfigEventListener, Writab
* public int zip;
* }
* </p>
- *
+ *
* <h5 class='figure'>Example usage</h5>
* <p class='bcode'>
* Config cf = Config.<jsm>create</jsm>().name(<js>"MyConfig.cfg"</js>).build();
* Address myAddress = cf.getSectionAsBean(<js>"MySection"</js>, Address.<jk>class</jk>);
* </p>
- *
- * @param section
+ *
+ * @param section
* The section name to write from.
* <br>If empty, refers to the default section.
* <br>Must not be <jk>null</jk>.
@@ -1227,12 +1227,12 @@ public final class Config extends Context implements ConfigEventListener, Writab
public <T> T getSectionAsBean(String section, Class<T> c, boolean ignoreUnknownProperties) throws ParseException {
assertFieldNotNull(c, "c");
section = section(section);
-
+
if (! configMap.hasSection(section))
return null;
Set<String> keys = configMap.getKeys(section);
-
+
BeanMap<T> bm = beanSession.newBeanMap(c);
for (String k : keys) {
BeanPropertyMeta bpm = bm.getPropertyMeta(k);
@@ -1243,39 +1243,39 @@ public final class Config extends Context implements ConfigEventListener, Writab
bm.put(k, getObject(section + '/' + k, bpm.getClassMeta().getInnerClass()));
}
}
-
+
return bm.getBean();
}
/**
* Returns a section of this config copied into an {@link ObjectMap}.
- *
- * @param section
+ *
+ * @param section
* The section name to write from.
* <br>If empty, refers to the default section.
* <br>Must not be <jk>null</jk>.
* @return A new {@link ObjectMap}, or <jk>null</jk> if the section doesn't exist.
- * @throws ParseException
+ * @throws ParseException
*/
public ObjectMap getSectionAsMap(String section) throws ParseException {
section = section(section);
-
+
if (! configMap.hasSection(section))
return null;
-
+
Set<String> keys = configMap.getKeys(section);
-
+
ObjectMap om = new ObjectMap();
- for (String k : keys)
+ for (String k : keys)
om.put(k, getObject(section + '/' + k, Object.class));
return om;
}
-
-
+
+
/**
* Wraps a config file section inside a Java interface so that values in the section can be read and
* write using getters and setters.
- *
+ *
* <h5 class='figure'>Example config file</h5>
* <p class='bcode'>
* <cs>[MySection]</cs>
@@ -1286,50 +1286,50 @@ public final class Config extends Context implements ConfigEventListener, Writab
* <ck>int3dArray</ck> = <cv>[[[123,null],null],null]</cv>
* <ck>bean1d3dListMap</ck> = <cv>{key:[[[[{foo:'bar',baz:123}]]]]}</cv>
* </p>
- *
+ *
* <h5 class='figure'>Example interface</h5>
* <p class='bcode'>
* <jk>public interface</jk> MyConfigInterface {
- *
+ *
* String getString();
* <jk>void</jk> setString(String x);
- *
+ *
* <jk>int</jk> getInt();
* <jk>void</jk> setInt(<jk>int</jk> x);
- *
+ *
* MyEnum getEnum();
* <jk>void</jk> setEnum(MyEnum x);
- *
+ *
* MyBean getBean();
* <jk>void</jk> setBean(MyBean x);
- *
+ *
* <jk>int</jk>[][][] getInt3dArray();
* <jk>void</jk> setInt3dArray(<jk>int</jk>[][][] x);
- *
+ *
* Map<String,List<MyBean[][][]>> getBean1d3dListMap();
* <jk>void</jk> setBean1d3dListMap(Map<String,List<MyBean[][][]>> x);
* }
* </p>
- *
+ *
* <h5 class='figure'>Example usage</h5>
* <p class='bcode'>
* Config cf = Config.<jsm>create</jsm>().name(<js>"MyConfig.cfg"</js>).build();
- *
+ *
* MyConfigInterface ci = cf.getSectionAsInterface(<js>"MySection"</js>, MyConfigInterface.<jk>class</jk>);
- *
+ *
* <jk>int</jk> myInt = ci.getInt();
- *
+ *
* ci.setBean(<jk>new</jk> MyBean());
- *
+ *
* cf.save();
* </p>
- *
+ *
* <h5 class='notes'>
* <ul class='spaced-list'>
* <li>Calls to setters when the configuration is read-only will cause {@link UnsupportedOperationException} to be thrown.
* </ul>
- *
- * @param section
+ *
+ * @param section
* The section name to write from.
* <br>If empty, refers to the default section.
* <br>Must not be <jk>null</jk>.
@@ -1365,7 +1365,7 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Returns <jk>true</jk> if this section contains the specified key and the key has a non-blank value.
- *
+ *
* @param key The key.
* @return <jk>true</jk> if this section contains the specified key and the key has a non-blank value.
*/
@@ -1375,15 +1375,15 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Creates the specified section if it doesn't exist.
- *
+ *
* <p>
* Returns the existing section if it already exists.
- *
- * @param name
+ *
+ * @param name
* The section name.
* <br>Must not be <jk>null</jk>.
* <br>Use blank for the default section.
- * @param preLines
+ * @param preLines
* Optional comment and blank lines to add immediately before the section.
* <br>If <jk>null</jk>, previous pre-lines will not be replaced.
* @return The appended or existing section.
@@ -1399,35 +1399,35 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Creates the specified section if it doesn't exist.
- *
- * @param name
+ *
+ * @param name
* The section name.
* <br>Must not be <jk>null</jk>.
* <br>Use blank for the default section.
- * @param preLines
+ * @param preLines
* Optional comment and blank lines to add immediately before the section.
* <br>If <jk>null</jk>, previous pre-lines will not be replaced.
- * @param contents
+ * @param contents
* Values to set in the new section.
* <br>Can be <jk>null</jk>.
* @return The appended or existing section.
- * @throws SerializeException
+ * @throws SerializeException
* @throws UnsupportedOperationException If configuration is read only.
*/
public Config setSection(String name, List<String> preLines, Map<String,Object> contents) throws SerializeException {
checkWrite();
configMap.setSection(section(name), preLines);
-
+
if (contents != null)
for (Map.Entry<String,Object> e : contents.entrySet())
set(section(name) + '/' + e.getKey(), e.getValue());
-
+
return this;
}
/**
* Removes the section with the specified name.
- *
+ *
* @param name The name of the section to remove
* @return This object (for method chaining).
* @throws UnsupportedOperationException If configuration is read only.
@@ -1437,10 +1437,10 @@ public final class Config extends Context implements ConfigEventListener, Writab
configMap.removeSection(name);
return this;
}
-
+
/**
* Loads the contents of the specified map of maps into this config.
- *
+ *
* @param m The maps to load.
* @return This object (for method chaining).
* @throws SerializeException
@@ -1455,9 +1455,9 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Commit the changes in this config to the store.
- *
+ *
* @return This object (for method chaining).
- * @throws IOException
+ * @throws IOException
* @throws UnsupportedOperationException If configuration is read only.
*/
public Config commit() throws IOException {
@@ -1468,10 +1468,10 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Saves this config file to the specified writer as an INI file.
- *
+ *
* <p>
* The writer will automatically be closed.
- *
+ *
* @param w The writer to send the output to.
* @return This object (for method chaining).
* @throws IOException If a problem occurred trying to send contents to the writer.
@@ -1483,10 +1483,10 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Add a listener to this config to react to modification events.
- *
+ *
* <p>
* Listeners should be removed using {@link #removeListener(ConfigEventListener)}.
- *
+ *
* @param listener The new listener to add.
* @return This object (for method chaining).
*/
@@ -1494,10 +1494,10 @@ public final class Config extends Context implements ConfigEventListener, Writab
listeners.add(listener);
return this;
}
-
+
/**
* Removes a listener from this config.
- *
+ *
* @param listener The listener to remove.
* @return This object (for method chaining).
*/
@@ -1508,16 +1508,16 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Closes this configuration object by unregistering it from the underlying config map.
- *
+ *
* @throws IOException
*/
public void close() throws IOException {
configMap.unregister(this);
}
-
+
/**
* Overwrites the contents of the config file.
- *
+ *
* @param contents The new contents of the config file.
* @param synchronous Wait until the change has been persisted before returning this map.
* @return This object (for method chaining).
@@ -1533,7 +1533,7 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Overwrites the contents of the config file.
- *
+ *
* @param contents The new contents of the config file.
* @param synchronous Wait until the change has been persisted before returning this map.
* @return This object (for method chaining).
@@ -1549,7 +1549,7 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Does a rollback of any changes on this config currently in memory.
- *
+ *
* @return This object (for method chaining).
* @throws UnsupportedOperationException If configuration is read only.
*/
@@ -1561,25 +1561,25 @@ public final class Config extends Context implements ConfigEventListener, Writab
/**
* Returns the values in this config map as a map of maps.
- *
+ *
* <p>
* This is considered a snapshot copy of the config map.
- *
+ *
* <p>
* The returned map is modifiable, but modifications to the returned map are not reflected in the config map.
- *
+ *
* @return A copy of this config as a map of maps.
*/
@Override /* Context */
public ObjectMap asMap() {
return configMap.asMap();
}
-
-
+
+
//-----------------------------------------------------------------------------------------------------------------
// Interface methods
//-----------------------------------------------------------------------------------------------------------------
-
+
/**
* Unused.
*/
@@ -1601,25 +1601,25 @@ public final class Config extends Context implements ConfigEventListener, Writab
for (ConfigEventListener l : listeners)
l.onConfigChange(events);
}
-
+
@Override /* Writable */
public MediaType getMediaType() {
return MediaType.PLAIN;
}
-
+
//-----------------------------------------------------------------------------------------------------------------
// Private methods
//-----------------------------------------------------------------------------------------------------------------
-
+
private String serialize(Object value, Serializer serializer) throws SerializeException {
if (value == null)
return "";
if (serializer == null)
serializer = this.serializer;
Class<?> c = value.getClass();
- if (value instanceof CharSequence)
- return nlIfMl((CharSequence)value);
+ if (value instanceof CharSequence)
+ return nlIfMl((CharSequence)value);
if (isSimpleType(c))
return value.toString();
@@ -1636,11 +1636,11 @@ public final class Config extends Context implements ConfigEventListener, Writab
if (l <= 0 || s.length() <= l)
return s;
StringBuilder sb = new StringBuilder();
- for (int i = 0; i < s.length(); i += l)
+ for (int i = 0; i < s.length(); i += l)
sb.append(binaryLineLength > 0 ? "\n" : "").append(s.substring(i, Math.min(s.length(), i + l)));
return sb.toString();
}
-
+
String r = null;
if (multiLineValuesOnSeparateLines)
r = "\n" + (String)serializer.serialize(value);
@@ -1651,14 +1651,14 @@ public final class Config extends Context implements ConfigEventListener, Writab
return r.substring(1, r.length()-1);
return r;
}
-
+
private String nlIfMl(CharSequence cs) {
String s = cs.toString();
if (s.indexOf('\n') != -1 && multiLineValuesOnSeparateLines)
return "\n" + s;
return s;
}
-
+
@SuppressWarnings({ "unchecked" })
private <T> T parse(String s, Parser parser, Type type, Type...args) throws ParseException {
@@ -1667,7 +1667,7 @@ public final class Config extends Context implements ConfigEventListener, Writab
if (isSimpleType(type))
return (T)beanSession.convertToType(s, (Class<?>)type);
-
+
if (type == byte[].class) {
if (s.indexOf('\n') != -1)
s = s.replaceAll("\n", "");
@@ -1681,10 +1681,10 @@ public final class Config extends Context implements ConfigEventListener, Writab
throw new ParseException(e, "Value could not be converted to a byte array.");
}
}
-
+
if (parser == null)
parser = this.parser;
-
+
if (parser instanceof JsonParser) {
char s1 = firstNonWhitespaceChar(s);
if (isArray(type) && s1 != '[')
@@ -1731,13 +1731,13 @@ public final class Config extends Context implements ConfigEventListener, Writab
return "";
return section;
}
-
+
private void checkWrite() {
if (readOnly)
throw new UnsupportedOperationException("Cannot call this method on a read-only configuration.");
}
-
+
//-----------------------------------------------------------------------------------------------------------------
// Other methods
//-----------------------------------------------------------------------------------------------------------------
@@ -1746,7 +1746,7 @@ public final class Config extends Context implements ConfigEventListener, Writab
public String toString() {
return configMap.toString();
}
-
+
@Override /* Object */
protected void finalize() throws Throwable {
close();
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/ConfigBuilder.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/ConfigBuilder.java
index 218d653..d518c35 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/ConfigBuilder.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/ConfigBuilder.java
@@ -26,13 +26,13 @@ import org.apache.juneau.svl.*;
/**
* Builder for creating instances of {@link Config Configs}.
- *
+ *
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
* Config cf = Config.<jsm>create</jsm>().name(<js>"MyConfig.cfg"</js>).build();
* String setting = cf.getString(<js>"MySection/mysetting"</js>);
* </p>
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../overview-summary.html#juneau-config'>Overview > juneau-config</a>
@@ -49,7 +49,7 @@ public class ConfigBuilder extends ContextBuilder {
/**
* Constructor.
- *
+ *
* @param ps The initial configuration settings for this builder.
*/
public ConfigBuilder(PropertyStore ps) {
@@ -68,13 +68,13 @@ public class ConfigBuilder extends ContextBuilder {
/**
* Configuration property: Configuration name.
- *
+ *
* <p>
* Specifies the configuration name.
* <br>This is typically the configuration file name, although
* the name can be anything identifiable by the {@link ConfigStore} used for retrieving and storing the configuration.
- *
- * @param value
+ *
+ * @param value
* The new value for this property.
* <br>The default is <js>"Configuration"</js>.
* @return This object (for method chaining).
@@ -85,11 +85,11 @@ public class ConfigBuilder extends ContextBuilder {
/**
* Configuration property: Configuration store.
- *
+ *
* <p>
* The configuration store used for retrieving and storing configurations.
- *
- * @param value
+ *
+ * @param value
* The new value for this property.
* <br>The default is {@link ConfigFileStore#DEFAULT}.
* @return This object (for method chaining).
@@ -100,10 +100,10 @@ public class ConfigBuilder extends ContextBuilder {
/**
* Configuration property: Configuration store.
- *
+ *
* <p>
* Convenience method for calling <code>store(ConfigMemoryStore.<jsf>DEFAULT</jsf>)</code>.
- *
+ *
* @return This object (for method chaining).
*/
public ConfigBuilder memStore() {
@@ -112,11 +112,11 @@ public class ConfigBuilder extends ContextBuilder {
/**
* Configuration property: POJO serializer.
- *
+ *
* <p>
* The serializer to use for serializing POJO values.
- *
- * @param value
+ *
+ * @param value
* The new value for this property.
* <br>The default is {@link JsonSerializer#DEFAULT_LAX}.
* @return This object (for method chaining).
@@ -127,11 +127,11 @@ public class ConfigBuilder extends ContextBuilder {
/**
* Configuration property: POJO serializer.
- *
+ *
* <p>
* The serializer to use for serializing POJO values.
- *
- * @param value
+ *
+ * @param value
* The new value for this property.
* <br>The default is {@link JsonSerializer#DEFAULT_LAX}.
* @return This object (for method chaining).
@@ -142,11 +142,11 @@ public class ConfigBuilder extends ContextBuilder {
/**
* Configuration property: POJO parser.
- *
+ *
* <p>
* The parser to use for parsing values to POJOs.
- *
- * @param value
+ *
+ * @param value
* The new value for this property.
* <br>The default is {@link JsonParser#DEFAULT}.
* @return This object (for method chaining).
@@ -157,11 +157,11 @@ public class ConfigBuilder extends ContextBuilder {
/**
* Configuration property: POJO parser.
- *
+ *
* <p>
* The parser to use for parsing values to POJOs.
- *
- * @param value
+ *
+ * @param value
* The new value for this property.
* <br>The default is {@link JsonParser#DEFAULT}.
* @return This object (for method chaining).
@@ -172,11 +172,11 @@ public class ConfigBuilder extends ContextBuilder {
/**
* Configuration property: Value encoder.
- *
+ *
* <p>
* The encoder to use for encoding encoded configuration values.
- *
- * @param value
+ *
+ * @param value
* The new value for this property.
* <br>The default is {@link ConfigXorEncoder#INSTANCE}.
* @return This object (for method chaining).
@@ -187,11 +187,11 @@ public class ConfigBuilder extends ContextBuilder {
/**
* Configuration property: Value encoder.
- *
+ *
* <p>
* The encoder to use for encoding encoded configuration values.
- *
- * @param value
+ *
+ * @param value
* The new value for this property.
* <br>The default is {@link ConfigXorEncoder#INSTANCE}.
* @return This object (for method chaining).
@@ -199,14 +199,14 @@ public class ConfigBuilder extends ContextBuilder {
public ConfigBuilder encoder(Class<? extends ConfigEncoder> value) {
return set(CONFIG_encoder, value);
}
-
+
/**
* Configuration property: SVL variable resolver.
- *
+ *
* <p>
* The resolver to use for resolving SVL variables.
- *
- * @param value
+ *
+ * @param value
* The new value for this property.
* <br>The default is {@link VarResolver#DEFAULT}.
* @return This object (for method chaining).
@@ -217,11 +217,11 @@ public class ConfigBuilder extends ContextBuilder {
/**
* Configuration property: SVL variable resolver.
- *
+ *
* <p>
* The resolver to use for resolving SVL variables.
- *
- * @param value
+ *
+ * @param value
* The new value for this property.
* <br>The default is {@link VarResolver#DEFAULT}.
* @return This object (for method chaining).
@@ -229,15 +229,15 @@ public class ConfigBuilder extends ContextBuilder {
public ConfigBuilder varResolver(Class<? extends VarResolver> value) {
return set(CONFIG_varResolver, value);
}
-
+
/**
* Configuration property: Binary value line length.
- *
+ *
* <p>
* When serializing binary values, lines will be split after this many characters.
* <br>Use <code>-1</code> to represent no line splitting.
- *
- * @param value
+ *
+ * @param value
* The new value for this property.
* <br>The default is <code>-1</code>.
* @return This object (for method chaining).
@@ -245,13 +245,13 @@ public class ConfigBuilder extends ContextBuilder {
public ConfigBuilder binaryLineLength(int value) {
return set(CONFIG_binaryLineLength, value);
}
-
+
/**
* Configuration property: Binary value format.
- *
+ *
* <p>
* The format to use when persisting byte arrays.
- *
+ *
* <p>
* Possible values:
* <ul>
@@ -259,8 +259,8 @@ public class ConfigBuilder extends ContextBuilder {
* <li>{@link BinaryFormat#HEX} - Hexadecimal.
* <li>{@link BinaryFormat#SPACED_HEX} - Hexadecimal with spaces between bytes.
* </ul>
- *
- * @param value
+ *
+ * @param value
* The new value for this property.
* <br>The default is {@link BinaryFormat#BASE64}.
* @return This object (for method chaining).
@@ -271,28 +271,28 @@ public class ConfigBuilder extends ContextBuilder {
/**
* Configuration property: Multi-line values on separate lines.
- *
+ *
* <p>
* When enabled, multi-line values will always be placed on a separate line from the key.
- *
+ *
* @return This object (for method chaining).
*/
public ConfigBuilder multiLineValuesOnSeparateLines() {
return set(CONFIG_multiLineValuesOnSeparateLines, true);
}
-
+
/**
* Configuration property: Beans on separate lines.
- *
+ *
* <p>
* When enabled, attempts to call any setters on this object will throw an {@link UnsupportedOperationException}.
- *
+ *
* @return This object (for method chaining).
*/
public ConfigBuilder readOnly() {
return set(CONFIG_readOnly, true);
}
-
+
@Override /* ContextBuilder */
public ConfigBuilder set(String name, Object value) {
super.set(name, value);
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/ConfigMod.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/ConfigMod.java
index 2da946a..12270b6 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/ConfigMod.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/ConfigMod.java
@@ -2,7 +2,7 @@
// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
-// * with the License. You may obtain a copy of the License at *
+// * with the License. You may obtain a copy of the License at *
// * *
// * http://www.apache.org/licenses/LICENSE-2.0 *
// * *
@@ -22,22 +22,22 @@ import org.apache.juneau.config.encode.*;
* Identifies the supported modification types for config entries.
*/
public enum ConfigMod {
-
+
/**
* Encoded using the registered {@link ConfigEncoder}.
*/
ENCODED("*");
-
-
+
+
private final String c;
-
+
private ConfigMod(String c) {
this.c = c;
}
-
+
/**
* Converts an array of modifiers to a modifier string.
- *
+ *
* @param mods The modifiers.
* @return A modifier string, or an empty string if there are no modifiers.
*/
@@ -51,17 +51,17 @@ public enum ConfigMod {
sb.append(m.c);
return sb.toString();
}
-
+
private static ConfigMod fromChar(char c) {
if (c == '*')
return ENCODED;
return null;
}
-
+
/**
- * Converts a modifier string (e.g. <js>"^*"</js>) into a list of {@link ConfigMod Modifiers}
+ * Converts a modifier string (e.g. <js>"^*"</js>) into a list of {@link ConfigMod Modifiers}
* in reverse order of how they appear in the string.
- *
+ *
* @param s The modifier string.
* @return The list of modifiers, or an empty list if the string is empty or <jk>null</jk>.
*/
@@ -80,10 +80,10 @@ public enum ConfigMod {
}
return l;
}
-
+
/**
* Converts a modifier string (e.g. <js>"^*"</js>) into a list of {@link ConfigMod Modifiers}.
- *
+ *
* @param s The modifier string.
* @return The list of modifiers, or an empty list if the string is empty or <jk>null</jk>.
*/
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/encode/ConfigEncoder.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/encode/ConfigEncoder.java
index 4dacb98..55cc8a4 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/encode/ConfigEncoder.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/encode/ConfigEncoder.java
@@ -16,7 +16,7 @@ import org.apache.juneau.config.*;
/**
* API for defining a string encoding/decoding mechanism for entries in {@link Config}.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-config.EncodedEntries'>Overview > juneau-config > Encoded Entries</a>
@@ -26,7 +26,7 @@ public interface ConfigEncoder {
/**
* Encode a string.
- *
+ *
* @param fieldName The field name being encoded.
* @param in The unencoded input string.
* @return The encoded output string.
@@ -35,18 +35,18 @@ public interface ConfigEncoder {
/**
* Decode a string.
- *
+ *
* @param fieldName The field name being decoded.
* @param in The encoded input string.
* @return The decoded output string.
*/
public String decode(String fieldName, String in);
-
+
/**
* Returns <jk>true</jk> if the specified string is encoded.
- *
+ *
* @param in The input string.
- * @return
+ * @return
* <jk>true</jk> if the specified string is encoded.
* <br>Returns <jk>false</jk> if the string is <jk>null</jk>.
*/
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/encode/ConfigXorEncoder.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/encode/ConfigXorEncoder.java
index dd97a29..c40139a 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/encode/ConfigXorEncoder.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/encode/ConfigXorEncoder.java
@@ -18,10 +18,10 @@ import static org.apache.juneau.internal.IOUtils.*;
/**
* Simply XOR+Base64 encoder for obscuring passwords and other sensitive data in INI config files.
- *
+ *
* <p>
* This is not intended to be used as strong encryption.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-config.EncodedEntries'>Overview > juneau-config > Encoded Entries</a>
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/event/ConfigEvent.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/event/ConfigEvent.java
index 2e72079..956f1ae 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/event/ConfigEvent.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/event/ConfigEvent.java
@@ -2,7 +2,7 @@
// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
-// * with the License. You may obtain a copy of the License at *
+// * with the License. You may obtain a copy of the License at *
// * *
// * http://www.apache.org/licenses/LICENSE-2.0 *
// * *
@@ -25,12 +25,12 @@ import org.apache.juneau.internal.*;
*/
@BeanIgnore
public class ConfigEvent {
-
+
private final ConfigEventType type;
private final String section, key, value, comment;
private final List<String> preLines;
private final String modifiers;
-
+
private ConfigEvent(ConfigEventType type, String section, String key, String value, String modifiers, String comment, List<String> preLines) {
this.type = type;
this.section = section;
@@ -40,15 +40,15 @@ public class ConfigEvent {
this.preLines = preLines;
this.modifiers = modifiers;
}
-
+
//---------------------------------------------------------------------------------------------
// Static creators.
//---------------------------------------------------------------------------------------------
-
+
/**
* Sets or replaces a value in a configuration.
- *
- * @param section
+ *
+ * @param section
* The section name.
* <br>Must not be <jk>null</jk>.
* @param key
@@ -61,7 +61,7 @@ public class ConfigEvent {
* Optional comment string to add on the same line as the entry.
* @param modifiers
* Optional entry modifiers.
- * @param prelines
+ * @param prelines
* Comment lines that occur before this entry.
* <br>Must not be <jk>null</jk>.
* @return
@@ -70,11 +70,11 @@ public class ConfigEvent {
public static ConfigEvent setEntry(String section, String key, String value, String modifiers, String comment, List<String> prelines) {
return new ConfigEvent(SET_ENTRY, section, key, value, modifiers, comment, prelines);
}
-
+
/**
* Removes a value from a configuration.
- *
- * @param section
+ *
+ * @param section
* The section name.
* <br>Must not be <jk>null</jk>.
* @param key
@@ -86,13 +86,13 @@ public class ConfigEvent {
public static ConfigEvent removeEntry(String section, String key) {
return new ConfigEvent(REMOVE_ENTRY, section, key, null, null, null, null);
}
-
+
/**
* Adds a new empty section to the config.
- *
+ *
* @param section
* The section name.
- * @param prelines
+ * @param prelines
* Comment lines that occur before this section.
* <br>Must not be <jk>null</jk>.
* @return
@@ -101,10 +101,10 @@ public class ConfigEvent {
public static ConfigEvent setSection(String section, List<String> prelines) {
return new ConfigEvent(SET_SECTION, section, null, null, null, null, prelines);
}
-
+
/**
* Removes a section from the config.
- *
+ *
* @param section
* The section name.
* @return
@@ -113,12 +113,12 @@ public class ConfigEvent {
public static ConfigEvent removeSection(String section) {
return new ConfigEvent(REMOVE_SECTION, section, null, null, null, null, null);
}
-
-
+
+
//---------------------------------------------------------------------------------------------
// Instance methods.
//---------------------------------------------------------------------------------------------
-
+
/**
* Returns the event type.
*
@@ -175,15 +175,15 @@ public class ConfigEvent {
/**
* Returns the modifiers on this entry.
- *
- * @return
+ *
+ * @return
* The modifier characters.
* <br>Never <jk>null</jk>.
*/
public String getModifiers() {
return modifiers;
}
-
+
@Override /* Object */
public String toString() {
switch(type) {
@@ -205,7 +205,7 @@ public class ConfigEvent {
if (val.indexOf('#') != -1)
val = val.replaceAll("#", "\\\\#");
out.append(val);
- if (isNotEmpty(comment))
+ if (isNotEmpty(comment))
out.append(" # ").append(comment);
out.append(')');
return out.toString();
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/event/ConfigEventListener.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/event/ConfigEventListener.java
index b14657a..64a3a51 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/event/ConfigEventListener.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/event/ConfigEventListener.java
@@ -21,7 +21,7 @@ public interface ConfigEventListener {
/**
* Gets called immediately after a config file has been loaded.
- *
+ *
* @param events The change events.
*/
void onConfigChange(List<ConfigEvent> events);
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/event/ConfigEventType.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/event/ConfigEventType.java
index 09402bf..84aa584 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/event/ConfigEventType.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/event/ConfigEventType.java
@@ -2,7 +2,7 @@
// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
-// * with the License. You may obtain a copy of the License at *
+// * with the License. You may obtain a copy of the License at *
// * *
// * http://www.apache.org/licenses/LICENSE-2.0 *
// * *
@@ -21,7 +21,7 @@ public enum ConfigEventType {
* Set an individual entry value in a config.
*/
SET_ENTRY,
-
+
/**
* Removes an entry value from a config.
*/
@@ -31,7 +31,7 @@ public enum ConfigEventType {
* Adds or replaces a section in a config.
*/
SET_SECTION,
-
+
/**
* Removes a section from a config.
*/
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigEntry.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigEntry.java
index 06090c4..78a657b 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigEntry.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigEntry.java
@@ -2,7 +2,7 @@
// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
-// * with the License. You may obtain a copy of the License at *
+// * with the License. You may obtain a copy of the License at *
// * *
// * http://www.apache.org/licenses/LICENSE-2.0 *
// * *
@@ -22,7 +22,7 @@ import org.apache.juneau.internal.*;
/**
* Represents a single entry in a configuration.
- *
+ *
* This is a read-only object.
*/
public class ConfigEntry {
@@ -30,26 +30,26 @@ public class ConfigEntry {
final String key, value, comment;
final String modifiers;
final List<String> preLines;
-
+
static final ConfigEntry NULL = new ConfigEntry(null, null, null, null, null);
-
+
private final static AsciiSet MOD_CHARS = AsciiSet.create("#$%&*+^@~");
ConfigEntry(String line, List<String> preLines) {
this.rawLine = line;
int i = line.indexOf('=');
String key = line.substring(0, i).trim();
-
+
int modIndex = key.length();
- for (int j = key.length()-1; j > 0; j--)
+ for (int j = key.length()-1; j > 0; j--)
if (MOD_CHARS.contains(key.charAt(j)))
modIndex--;
this.modifiers = key.substring(modIndex);
this.key = key.substring(0, modIndex);
-
+
line = line.substring(i+1);
-
+
i = line.indexOf('#');
if (i != -1) {
String[] l2 = StringUtils.split(line, '#', 2);
@@ -61,12 +61,12 @@ public class ConfigEntry {
} else {
this.comment = null;
}
-
+
this.value = StringUtils.replaceUnicodeSequences(line.trim());
this.preLines = immutableList(preLines);
}
-
+
ConfigEntry(String key, String value, String modifiers, String comment, List<String> preLines) {
this.rawLine = null;
this.key = key;
@@ -75,19 +75,19 @@ public class ConfigEntry {
this.modifiers = modifiers;
this.preLines = immutableList(preLines);
}
-
+
/**
* Returns the raw value of this entry.
- *
+ *
* @return The raw value of this entry.
*/
public String getValue() {
return value;
}
-
+
/**
* Returns the same-line comment of this entry.
- *
+ *
* @return The same-line comment of this entry.
*/
public String getComment() {
@@ -96,7 +96,7 @@ public class ConfigEntry {
/**
* Returns the pre-lines of this entry.
- *
+ *
* @return The pre-lines of this entry as an unmodifiable list.
*/
public List<String> getPreLines() {
@@ -105,7 +105,7 @@ public class ConfigEntry {
/**
* Returns whether this entry has the specified modifier.
- *
+ *
* @param m The modifier character.
* @return <jk>true</jk> if this entry is encoded.
*/
@@ -115,13 +115,13 @@ public class ConfigEntry {
/**
* Returns the modifiers for this entry.
- *
+ *
* @return The modifiers for this entry, or an empty string if it has no modifiers.
*/
public String getModifiers() {
return modifiers;
}
-
+
Writer writeTo(Writer w) throws IOException {
if (value == null)
return w;
@@ -132,7 +132,7 @@ public class ConfigEntry {
char c = rawLine.charAt(i);
if (c == '\n')
w.append('\n').append('\t');
- else if (c != '\r')
+ else if (c != '\r')
w.append(c);
}
w.append('\n');
@@ -141,7 +141,7 @@ public class ConfigEntry {
if (modifiers != null)
w.append(modifiers);
w.append(" = ");
-
+
String val = value;
for (int i = 0; i < val.length(); i++) {
char c = val.charAt(i);
@@ -155,14 +155,14 @@ public class ConfigEntry {
}
}
}
-
- if (isNotEmpty(comment))
+
+ if (isNotEmpty(comment))
w.append(" # ").append(comment);
-
+
w.append('\n');
}
return w;
}
-
+
private static final AsciiSet REPLACE_CHARS = AsciiSet.create("\\#");
}
\ No newline at end of file
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
index 0f6e306..930e366 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
@@ -2,7 +2,7 @@
// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
-// * with the License. You may obtain a copy of the License at *
+// * with the License. You may obtain a copy of the License at *
// * *
// * http://www.apache.org/licenses/LICENSE-2.0 *
// * *
@@ -35,10 +35,10 @@ public class ConfigMap implements ConfigStoreListener {
private final String name; // The name of this object.
private final static AsciiSet MOD_CHARS = AsciiSet.create("#$%&*+^@~");
-
+
// Changes that have been applied since the last load.
private final List<ConfigEvent> changes = Collections.synchronizedList(new ArrayList<ConfigEvent>());
-
+
// Registered listeners listening for changes during saves or reloads.
private final Set<ConfigEventListener> listeners = Collections.synchronizedSet(new HashSet<ConfigEventListener>());
@@ -47,12 +47,12 @@ public class ConfigMap implements ConfigStoreListener {
// The original entries of this map before any changes were applied.
final Map<String,ConfigSection> oentries = Collections.synchronizedMap(new LinkedHashMap<String,ConfigSection>());
-
+
private final ReadWriteLock lock = new ReentrantReadWriteLock();
-
+
/**
* Constructor.
- *
+ *
* @param store The config store.
* @param name The config name.
* @throws IOException
@@ -68,15 +68,15 @@ public class ConfigMap implements ConfigStoreListener {
this.name = null;
load(contents);
}
-
+
private ConfigMap load(String contents) {
if (contents == null)
contents = "";
this.contents = contents;
-
+
entries.clear();
oentries.clear();
-
+
List<String> lines = new LinkedList<>();
try (Scanner scanner = new Scanner(contents)) {
while (scanner.hasNextLine()) {
@@ -91,7 +91,7 @@ public class ConfigMap implements ConfigStoreListener {
lines.add(line);
}
}
-
+
// Add [blank] section.
boolean inserted = false;
boolean foundComment = false;
@@ -104,12 +104,12 @@ public class ConfigMap implements ConfigStoreListener {
inserted = true;
}
break;
- }
+ }
foundComment = true;
}
if (! inserted)
lines.add(0, "[]");
-
+
// Collapse any multi-lines.
ListIterator<String> li = lines.listIterator(lines.size());
String accumulator = null;
@@ -130,19 +130,19 @@ public class ConfigMap implements ConfigStoreListener {
accumulator = null;
}
}
-
+
lines = new ArrayList<>(lines);
int last = lines.size()-1;
int S1 = 1; // Looking for section.
int S2 = 2; // Found section, looking for start.
int state = S1;
-
+
List<ConfigSection> sections = new ArrayList<>();
-
+
for (int i = last; i >= 0; i--) {
String l = lines.get(i);
char c = firstChar(l);
-
+
if (state == S1) {
if (c == '[') {
state = S2;
@@ -157,7 +157,7 @@ public class ConfigMap implements ConfigStoreListener {
}
sections.add(new ConfigSection(lines.subList(0, last+1)));
-
+
for (int i = sections.size() - 1; i >= 0; i--) {
ConfigSection cs = sections.get(i);
if (entries.containsKey(cs.name))
@@ -168,20 +168,20 @@ public class ConfigMap implements ConfigStoreListener {
oentries.putAll(entries);
return this;
}
-
-
+
+
//-----------------------------------------------------------------------------------------------------------------
// Getters
//-----------------------------------------------------------------------------------------------------------------
-
+
/**
* Reads an entry from this map.
- *
- * @param section
+ *
+ * @param section
* The section name.
* <br>Must not be <jk>null</jk>.
* <br>Use blank to refer to the default section.
- * @param key
+ * @param key
* The entry key.
* <br>Must not be <jk>null</jk>.
* @return The entry, or <jk>null</jk> if the entry doesn't exist.
@@ -200,11 +200,11 @@ public class ConfigMap implements ConfigStoreListener {
/**
* Returns the pre-lines on the specified section.
- *
+ *
* <p>
* The pre-lines are all lines such as blank lines and comments that preceed a section.
- *
- * @param section
+ *
+ * @param section
* The section name.
* <br>Must not be <jk>null</jk>.
* <br>Use blank to refer to the default section.
@@ -224,7 +224,7 @@ public class ConfigMap implements ConfigStoreListener {
/**
* Returns the keys of the entries in the specified section.
- *
+ *
* @return
* An unmodifiable set of keys.
*/
@@ -234,8 +234,8 @@ public class ConfigMap implements ConfigStoreListener {
/**
* Returns the keys of the entries in the specified section.
- *
- * @param section
+ *
+ * @param section
* The section name.
* <br>Must not be <jk>null</jk>.
* <br>Use blank to refer to the default section.
@@ -247,11 +247,11 @@ public class ConfigMap implements ConfigStoreListener {
ConfigSection cs = entries.get(section);
return cs == null ? Collections.<String>emptySet() : Collections.unmodifiableSet(cs.entries.keySet());
}
-
+
/**
* Returns <jk>true</jk> if this config has the specified section.
- *
- * @param section
+ *
+ * @param section
* The section name.
* <br>Must not be <jk>null</jk>.
* <br>Use blank to refer to the default section.
@@ -261,15 +261,15 @@ public class ConfigMap implements ConfigStoreListener {
checkSectionName(section);
return entries.get(section) != null;
}
-
+
//-----------------------------------------------------------------------------------------------------------------
// Setters
//-----------------------------------------------------------------------------------------------------------------
/**
* Adds a new section or replaces the pre-lines on an existing section.
- *
- * @param section
+ *
+ * @param section
* The section name.
* <br>Must not be <jk>null</jk>.
* <br>Use blank to refer to the default section.
@@ -282,27 +282,27 @@ public class ConfigMap implements ConfigStoreListener {
checkSectionName(section);
return applyChange(true, ConfigEvent.setSection(section, preLines));
}
-
+
/**
* Adds or overwrites an existing entry.
- *
- * @param section
+ *
+ * @param section
* The section name.
* <br>Must not be <jk>null</jk>.
* <br>Use blank to refer to the default section.
- * @param key
+ * @param key
* The entry key.
* <br>Must not be <jk>null</jk>.
- * @param value
+ * @param value
* The entry value.
* <br>If <jk>null</jk>, the previous value will not be overwritten.
- * @param modifiers
+ * @param modifiers
* Optional modifiers.
* <br>If <jk>null</jk>, the previous value will not be overwritten.
- * @param comment
- * Optional comment.
+ * @param comment
+ * Optional comment.
* <br>If <jk>null</jk>, the previous value will not be overwritten.
- * @param preLines
+ * @param preLines
* Optional pre-lines.
* <br>If <jk>null</jk>, the previous value will not be overwritten.
* @return This object (for method chaining).
@@ -314,14 +314,14 @@ public class ConfigMap implements ConfigStoreListener {
throw new ConfigException("Invalid modifiers: {0}", modifiers);
return applyChange(true, ConfigEvent.setEntry(section, key, value, modifiers, comment, preLines));
}
-
+
/**
* Removes a section.
- *
+ *
* <p>
* This eliminates all entries in the section as well.
- *
- * @param section
+ *
+ * @param section
* The section name.
* <br>Must not be <jk>null</jk>.
* <br>Use blank to refer to the default section.
@@ -331,15 +331,15 @@ public class ConfigMap implements ConfigStoreListener {
checkSectionName(section);
return applyChange(true, ConfigEvent.removeSection(section));
}
-
+
/**
* Removes an entry.
- *
- * @param section
+ *
+ * @param section
* The section name.
* <br>Must not be <jk>null</jk>.
* <br>Use blank to refer to the default section.
- * @param key
+ * @param key
* The entry key.
* <br>Must not be <jk>null</jk>.
* @return This object (for method chaining).
@@ -366,10 +366,10 @@ public class ConfigMap implements ConfigStoreListener {
if (oe == null)
oe = ConfigEntry.NULL;
cs.addEntry(
- ce.getKey(),
- ce.getValue() == null ? oe.value : ce.getValue(),
- ce.getModifiers() == null ? oe.modifiers : ce.getModifiers(),
- ce.getComment() == null ? oe.comment : ce.getComment(),
+ ce.getKey(),
+ ce.getValue() == null ? oe.value : ce.getValue(),
+ ce.getModifiers() == null ? oe.modifiers : ce.getModifiers(),
+ ce.getComment() == null ? oe.comment : ce.getComment(),
ce.getPreLines() == null ? oe.preLines : ce.getPreLines()
);
} else if (ce.getType() == SET_SECTION) {
@@ -391,12 +391,12 @@ public class ConfigMap implements ConfigStoreListener {
} finally {
writeUnlock();
}
- return this;
- }
-
+ return this;
+ }
+
/**
* Overwrites the contents of the config file.
- *
+ *
* @param contents The new contents of the config file.
* @param synchronous Wait until the change has been persisted before returning this map.
* @return This object (for method chaining).
@@ -404,7 +404,7 @@ public class ConfigMap implements ConfigStoreListener {
* @throws InterruptedException
*/
public ConfigMap load(String contents, boolean synchronous) throws IOException, InterruptedException {
-
+
if (synchronous) {
final CountDownLatch latch = new CountDownLatch(1);
ConfigStoreListener l = new ConfigStoreListener() {
@@ -422,25 +422,25 @@ public class ConfigMap implements ConfigStoreListener {
}
return this;
}
-
+
//-----------------------------------------------------------------------------------------------------------------
// Lifecycle events
//-----------------------------------------------------------------------------------------------------------------
-
+
/**
* Persist any changes made to this map and signal all listeners.
- *
+ *
* <p>
* If the underlying contents of the file have changed, this will reload it and apply the changes
* on top of the modified file.
- *
+ *
* <p>
* Subsequent changes made to the underlying file will also be signaled to all listeners.
- *
+ *
* <p>
* We try saving the file up to 10 times.
* <br>If the file keeps changing on the file system, we throw an exception.
- *
+ *
* @return This object (for method chaining).
* @throws IOException
*/
@@ -452,7 +452,7 @@ public class ConfigMap implements ConfigStoreListener {
if (i == 10)
throw new ConfigException("Unable to store contents of config to store.");
String currentContents = store.write(name, contents, newContents);
- if (currentContents == null)
+ if (currentContents == null)
break;
onChange(currentContents);
}
@@ -463,14 +463,14 @@ public class ConfigMap implements ConfigStoreListener {
return this;
}
-
+
//-----------------------------------------------------------------------------------------------------------------
// Listeners
//-----------------------------------------------------------------------------------------------------------------
-
+
/**
* Registers an event listener on this map.
- *
+ *
* @param listener The new listener.
* @return This object (for method chaining).
*/
@@ -478,10 +478,10 @@ public class ConfigMap implements ConfigStoreListener {
listeners.add(listener);
return this;
}
-
+
/**
* Unregisters an event listener from this map.
- *
+ *
* @param listener The listener to remove.
* @return This object (for method chaining).
*/
@@ -489,7 +489,7 @@ public class ConfigMap implements ConfigStoreListener {
listeners.remove(listener);
return this;
}
-
+
@Override /* ConfigStoreListener */
public void onChange(String newContents) {
List<ConfigEvent> changes = null;
@@ -498,7 +498,7 @@ public class ConfigMap implements ConfigStoreListener {
if (! StringUtils.isEquals(contents, newContents)) {
changes = findDiffs(newContents);
load(newContents);
-
+
// Reapply our changes on top of the modifications.
for (ConfigEvent ce : this.changes)
applyChange(false, ce);
@@ -509,7 +509,7 @@ public class ConfigMap implements ConfigStoreListener {
if (changes != null && ! changes.isEmpty())
signal(changes);
}
-
+
@Override /* Object */
public String toString() {
readLock();
@@ -519,16 +519,16 @@ public class ConfigMap implements ConfigStoreListener {
readUnlock();
}
}
-
+
/**
* Returns the values in this config map as a map of maps.
- *
+ *
* <p>
* This is considered a snapshot copy of the config map.
- *
+ *
* <p>
* The returned map is modifiable, but modifications to the returned map are not reflected in the config map.
- *
+ *
* @return A copy of this config as a map of maps.
*/
public ObjectMap asMap() {
@@ -549,7 +549,7 @@ public class ConfigMap implements ConfigStoreListener {
/**
* Serializes this map to the specified writer.
- *
+ *
* @param w The writer to serialize to.
* @return The same writer passed in.
* @throws IOException
@@ -567,7 +567,7 @@ public class ConfigMap implements ConfigStoreListener {
/**
* Does a rollback of any changes on this map currently in memory.
- *
+ *
* @return This object (for method chaining).
*/
public ConfigMap rollback() {
@@ -583,7 +583,7 @@ public class ConfigMap implements ConfigStoreListener {
return this;
}
-
+
//--------------------------------------------------------------------------------
// Private methods
//--------------------------------------------------------------------------------
@@ -694,19 +694,19 @@ public class ConfigMap implements ConfigStoreListener {
throw new RuntimeException(e); // Not possible.
}
}
-
-
+
+
//---------------------------------------------------------------------------------------------
// ConfigSection
//---------------------------------------------------------------------------------------------
-
+
class ConfigSection {
final String name; // The config section name, or blank if the default section. Never null.
final List<String> preLines = Collections.synchronizedList(new ArrayList<String>());
private final String rawLine;
-
+
final Map<String,ConfigEntry> oentries = Collections.synchronizedMap(new LinkedHashMap<String,ConfigEntry>());
final Map<String,ConfigEntry> entries = Collections.synchronizedMap(new LinkedHashMap<String,ConfigEntry>());
@@ -717,19 +717,19 @@ public class ConfigMap implements ConfigStoreListener {
this.name = name;
this.rawLine = "[" + name + "]";
}
-
+
/**
* Constructor.
*/
ConfigSection(List<String> lines) {
-
+
String name = null, rawLine = null;
-
+
int S1 = 1; // Looking for section.
int S2 = 2; // Found section, looking for end.
int state = S1;
int start = 0;
-
+
for (int i = 0; i < lines.size(); i++) {
String l = lines.get(i);
char c = StringUtils.firstNonWhitespaceChar(l);
@@ -750,15 +750,15 @@ public class ConfigMap implements ConfigStoreListener {
throw new ConfigException("Duplicate entry found in section [{0}] of configuration: {1}", name, e.key);
entries.put(e.key, e);
start = i+1;
- }
+ }
}
}
-
+
this.name = name;
this.rawLine = rawLine;
this.oentries.putAll(entries);
}
-
+
ConfigSection addEntry(String key, String value, String modifiers, String comment, List<String> preLines) {
ConfigEntry e = new ConfigEntry(key, value, modifiers, comment, preLines);
this.entries.put(e.key, e);
@@ -770,11 +770,11 @@ public class ConfigMap implements ConfigStoreListener {
this.preLines.addAll(preLines);
return this;
}
-
+
Writer writeTo(Writer w) throws IOException {
for (String s : preLines)
w.append(s).append('\n');
-
+
if (! name.equals(""))
w.append(rawLine).append('\n');
else {
@@ -783,9 +783,9 @@ public class ConfigMap implements ConfigStoreListener {
w.append('\n');
}
- for (ConfigEntry e : entries.values())
+ for (ConfigEntry e : entries.values())
e.writeTo(w);
-
+
return w;
}
}
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigFileStore.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigFileStore.java
index 7ccfe9e..fd0bf4b 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigFileStore.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigFileStore.java
@@ -2,7 +2,7 @@
// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
-// * with the License. You may obtain a copy of the License at *
+// * with the License. You may obtain a copy of the License at *
// * *
// * http://www.apache.org/licenses/LICENSE-2.0 *
// * *
@@ -27,7 +27,7 @@ import org.apache.juneau.*;
/**
* Filesystem-based storage location for configuration files.
- *
+ *
* <p>
* Points to a file system directory containing configuration files.
*/
@@ -41,19 +41,19 @@ public class ConfigFileStore extends ConfigStore {
/**
* Configuration property: Local file system directory.
- *
+ *
* <h5 class='section'>Property:</h5>
* <ul>
* <li><b>Name:</b> <js>"ConfigFileStore.directory.s"</js>
* <li><b>Data type:</b> <code>String</code>
* <li><b>Default:</b> <js>"."</js>
- * <li><b>Methods:</b>
+ * <li><b>Methods:</b>
* <ul>
* <li class='jm'>{@link ConfigFileStoreBuilder#directory(String)}
* <li class='jm'>{@link ConfigFileStoreBuilder#directory(File)}
* </ul>
* </ul>
- *
+ *
* <h5 class='section'>Description:</h5>
* <p>
* Identifies the path of the directory containing the configuration files.
@@ -62,90 +62,90 @@ public class ConfigFileStore extends ConfigStore {
/**
* Configuration property: Charset.
- *
+ *
* <h5 class='section'>Property:</h5>
* <ul>
* <li><b>Name:</b> <js>"ConfigFileStore.charset.s"</js>
* <li><b>Data type:</b> {@link Charset}
* <li><b>Default:</b> {@link Charset#defaultCharset()}
- * <li><b>Methods:</b>
+ * <li><b>Methods:</b>
* <ul>
* <li class='jm'>{@link ConfigFileStoreBuilder#charset(String)}
* <li class='jm'>{@link ConfigFileStoreBuilder#charset(Charset)}
* </ul>
* </ul>
- *
+ *
* <h5 class='section'>Description:</h5>
* <p>
* Identifies the charset of external files.
*/
public static final String FILESTORE_charset = PREFIX + "charset.s";
-
+
/**
* Configuration property: Use watcher.
- *
+ *
* <h5 class='section'>Property:</h5>
* <ul>
* <li><b>Name:</b> <js>"ConfigFileStore.useWatcher.b"</js>
* <li><b>Data type:</b> <code>Boolean</code>
* <li><b>Default:</b> <jk>false</jk>
- * <li><b>Methods:</b>
+ * <li><b>Methods:</b>
* <ul>
* <li class='jm'>{@link ConfigFileStoreBuilder#useWatcher()}
* </ul>
* </ul>
- *
+ *
* <h5 class='section'>Description:</h5>
* <p>
* Use a file system watcher for file system changes.
- *
+ *
* <h5 class='section'>Notes:</h5>
* <ul class='spaced-list'>
* <li>Calling {@link #close()} on this object closes the watcher.
* </ul>
*/
public static final String FILESTORE_useWatcher = PREFIX + "useWatcher.s";
-
+
/**
* Configuration property: Watcher sensitivity.
- *
+ *
* <h5 class='section'>Property:</h5>
* <ul>
* <li><b>Name:</b> <js>"ConfigFileStore.watcherSensitivity.s"</js>
* <li><b>Data type:</b> {@link WatcherSensitivity}
* <li><b>Default:</b> {@link WatcherSensitivity#MEDIUM}
- * <li><b>Methods:</b>
+ * <li><b>Methods:</b>
* <ul>
* <li class='jm'>{@link ConfigFileStoreBuilder#watcherSensitivity(WatcherSensitivity)}
* <li class='jm'>{@link ConfigFileStoreBuilder#watcherSensitivity(String)}
* </ul>
* </ul>
- *
+ *
* <h5 class='section'>Description:</h5>
* <p>
* Determines how frequently the file system is polled for updates.
- *
+ *
* <h5 class='section'>Notes:</h5>
* <ul class='spaced-list'>
* <li>This relies on internal Sun packages and may not work on all JVMs.
* </ul>
*/
public static final String FILESTORE_watcherSensitivity = PREFIX + "watcherSensitivity.s";
-
+
/**
* Configuration property: Update-on-write.
- *
+ *
* <h5 class='section'>Property:</h5>
* <ul>
* <li><b>Name:</b> <js>"ConfigFileStore.updateOnWrite.b"</js>
* <li><b>Data type:</b> <code>Boolean</code>
* <li><b>Default:</b> <jk>false</jk>
- * <li><b>Methods:</b>
+ * <li><b>Methods:</b>
* <ul>
* <li class='jm'>{@link ConfigFileStoreBuilder#updateOnWrite()}
* </ul>
* </ul>
- *
+ *
* <h5 class='section'>Description:</h5>
* <p>
* When enabled, the {@link #update(String, String)} method will be called immediately following
@@ -156,7 +156,7 @@ public class ConfigFileStore extends ConfigStore {
*/
public static final String FILESTORE_updateOnWrite = PREFIX + "updateOnWrite.b";
-
+
//-------------------------------------------------------------------------------------------------------------------
// Predefined instances
//-------------------------------------------------------------------------------------------------------------------
@@ -168,16 +168,16 @@ public class ConfigFileStore extends ConfigStore {
//-------------------------------------------------------------------------------------------------------------------
// Instance
//-------------------------------------------------------------------------------------------------------------------
-
+
/**
* Create a new builder for this object.
- *
+ *
* @return A new builder for this object.
*/
public static ConfigFileStoreBuilder create() {
return new ConfigFileStoreBuilder();
}
-
+
@Override /* Context */
public ConfigFileStoreBuilder builder() {
return new ConfigFileStoreBuilder(getPropertyStore());
@@ -188,10 +188,10 @@ public class ConfigFileStore extends ConfigStore {
private final WatcherThread watcher;
private final boolean updateOnWrite;
private final ConcurrentHashMap<String,String> cache = new ConcurrentHashMap<>();
-
+
/**
* Constructor.
- *
+ *
* @param ps The settings for this content store.
*/
protected ConfigFileStore(PropertyStore ps) {
@@ -209,23 +209,23 @@ public class ConfigFileStore extends ConfigStore {
throw new RuntimeException(e);
}
}
-
+
@Override /* ConfigStore */
public synchronized String read(String name) throws IOException {
String s = cache.get(name);
if (s != null)
return s;
-
+
dir.mkdirs();
-
+
// If file doesn't exist, don't trigger creation.
Path p = dir.toPath().resolve(name);
- if (! Files.exists(p))
+ if (! Files.exists(p))
return "";
-
+
boolean isWritable = isWritable(p);
OpenOption[] oo = isWritable ? new OpenOption[]{READ,WRITE,CREATE} : new OpenOption[]{READ};
-
+
try (FileChannel fc = FileChannel.open(p, oo)) {
try (FileLock lock = isWritable ? fc.lock() : null) {
ByteBuffer buf = ByteBuffer.allocate(1024);
@@ -238,7 +238,7 @@ public class ConfigFileStore extends ConfigStore {
cache.put(name, s);
}
}
-
+
return cache.get(name);
}
@@ -251,13 +251,13 @@ public class ConfigFileStore extends ConfigStore {
dir.mkdirs();
Path p = dir.toPath().resolve(name);
-
+
boolean exists = Files.exists(p);
-
+
// Don't create the file if we're not going to match.
if ((!exists) && isNotEmpty(expectedContents))
return "";
-
+
if (isWritable(p)) {
try (FileChannel fc = FileChannel.open(p, READ, WRITE, CREATE)) {
try (FileLock lock = fc.lock()) {
@@ -283,15 +283,15 @@ public class ConfigFileStore extends ConfigStore {
}
}
}
-
+
if (updateOnWrite)
update(name, newContents);
- else
+ else
cache.remove(name); // Invalidate the cache.
-
+
return null;
}
-
+
private synchronized boolean isWritable(Path p) {
try {
if (! Files.exists(p)) {
@@ -304,7 +304,7 @@ public class ConfigFileStore extends ConfigStore {
}
return Files.isWritable(p);
}
-
+
@Override /* ConfigStore */
public synchronized ConfigFileStore update(String name, String newContents) {
cache.put(name, newContents);
@@ -317,22 +317,22 @@ public class ConfigFileStore extends ConfigStore {
if (watcher != null)
watcher.interrupt();
}
-
-
+
+
//---------------------------------------------------------------------------------------------
// WatcherThread
//---------------------------------------------------------------------------------------------
final class WatcherThread extends Thread {
private final WatchService watchService;
-
+
WatcherThread(File dir, WatcherSensitivity s) throws Exception {
watchService = FileSystems.getDefault().newWatchService();
WatchEvent.Kind<?>[] kinds = new WatchEvent.Kind[]{ENTRY_CREATE, ENTRY_DELETE, ENTRY_MODIFY};
WatchEvent.Modifier modifier = lookupModifier(s);
dir.toPath().register(watchService, kinds, modifier);
}
-
+
@SuppressWarnings("restriction")
private WatchEvent.Modifier lookupModifier(WatcherSensitivity s) {
try {
@@ -345,9 +345,9 @@ public class ConfigFileStore extends ConfigStore {
/* Ignore */
}
return null;
-
+
}
-
+
@SuppressWarnings("unchecked")
@Override /* Thread */
public void run() {
@@ -356,7 +356,7 @@ public class ConfigFileStore extends ConfigStore {
while ((key = watchService.take()) != null) {
for (WatchEvent<?> event : key.pollEvents()) {
WatchEvent.Kind<?> kind = event.kind();
- if (kind != OVERFLOW)
+ if (kind != OVERFLOW)
ConfigFileStore.this.onFileEvent(((WatchEvent<Path>)event));
}
if (! key.reset())
@@ -367,7 +367,7 @@ public class ConfigFileStore extends ConfigStore {
throw new RuntimeException(e);
}
};
-
+
@Override /* Thread */
public void interrupt() {
try {
@@ -379,16 +379,16 @@ public class ConfigFileStore extends ConfigStore {
}
}
}
-
+
/**
* Gets called when the watcher service on this store is triggered with a file system change.
- *
+ *
* @param e The file system event.
* @throws IOException
*/
protected synchronized void onFileEvent(WatchEvent<Path> e) throws IOException {
String fn = e.context().getFileName().toString();
-
+
String oldContents = cache.get(fn);
cache.remove(fn);
String newContents = read(fn);
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigFileStoreBuilder.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigFileStoreBuilder.java
index daf16d9..ad70d45 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigFileStoreBuilder.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigFileStoreBuilder.java
@@ -2,7 +2,7 @@
// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
-// * with the License. You may obtain a copy of the License at *
+// * with the License. You may obtain a copy of the License at *
// * *
// * http://www.apache.org/licenses/LICENSE-2.0 *
// * *
@@ -33,30 +33,30 @@ public class ConfigFileStoreBuilder extends ConfigStoreBuilder {
/**
* Constructor.
- *
+ *
* @param ps The initial configuration settings for this builder.
*/
public ConfigFileStoreBuilder(PropertyStore ps) {
super(ps);
}
-
+
//--------------------------------------------------------------------------------
// Properties
//--------------------------------------------------------------------------------
/**
* Configuration property: Local file system directory.
- *
+ *
* <p>
* Identifies the path of the directory containing the configuration files.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul>
* <li class='jf'>{@link ConfigFileStore#FILESTORE_directory}
* </ul>
- *
- * @param value
+ *
+ * @param value
* The new value for this property.
* <br>The default is <js>"."</js>.
* @return This object (for method chaining).
@@ -68,16 +68,16 @@ public class ConfigFileStoreBuilder extends ConfigStoreBuilder {
/**
* Configuration property: Local file system directory.
- *
+ *
* <p>
* Identifies the path of the directory containing the configuration files.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul>
* <li class='jf'>{@link ConfigFileStore#FILESTORE_directory}
* </ul>
- *
- * @param value
+ *
+ * @param value
* The new value for this property.
* <br>The default is <js>"."</js>.
* @return This object (for method chaining).
@@ -89,16 +89,16 @@ public class ConfigFileStoreBuilder extends ConfigStoreBuilder {
/**
* Configuration property: Charset.
- *
+ *
* <p>
* Identifies the charset of external files.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul>
* <li class='jf'>{@link ConfigFileStore#FILESTORE_charset}
* </ul>
- *
- * @param value
+ *
+ * @param value
* The new value for this property.
* <br>The default is <js>"."</js>.
* @return This object (for method chaining).
@@ -107,19 +107,19 @@ public class ConfigFileStoreBuilder extends ConfigStoreBuilder {
super.set(FILESTORE_charset, value);
return this;
}
-
+
/**
* Configuration property: Charset.
- *
+ *
* <p>
* Identifies the charset of external files.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul>
* <li class='jf'>{@link ConfigFileStore#FILESTORE_charset}
* </ul>
- *
- * @param value
+ *
+ * @param value
* The new value for this property.
* <br>The default is <js>"."</js>.
* @return This object (for method chaining).
@@ -128,37 +128,37 @@ public class ConfigFileStoreBuilder extends ConfigStoreBuilder {
super.set(FILESTORE_charset, value);
return this;
}
-
+
/**
* Configuration property: Use watcher.
- *
+ *
* <p>
* Shortcut for calling <code>useWatcher(<jk>true</jk>)</code>.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul>
* <li class='jf'>{@link ConfigFileStore#FILESTORE_useWatcher}
* </ul>
- *
+ *
* @return This object (for method chaining).
*/
public ConfigFileStoreBuilder useWatcher() {
super.set(FILESTORE_useWatcher, true);
return this;
}
-
+
/**
* Configuration property: Watcher sensitivity.
- *
+ *
* <p>
* Determines how frequently the file system is polled for updates.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul>
* <li class='jf'>{@link ConfigFileStore#FILESTORE_watcherSensitivity}
* </ul>
- *
- * @param value
+ *
+ * @param value
* The new value for this property.
* <br>The default is {@link WatcherSensitivity#MEDIUM}
* @return This object (for method chaining).
@@ -170,15 +170,15 @@ public class ConfigFileStoreBuilder extends ConfigStoreBuilder {
/**
* Configuration property: Update-on-write.
- *
+ *
* <p>
* Shortcut for calling <code>useWatcher(<jk>true</jk>)</code>.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul>
* <li class='jf'>{@link ConfigFileStore#FILESTORE_updateOnWrite}
* </ul>
- *
+ *
* @return This object (for method chaining).
*/
public ConfigFileStoreBuilder updateOnWrite() {
@@ -188,16 +188,16 @@ public class ConfigFileStoreBuilder extends ConfigStoreBuilder {
/**
* Configuration property: Watcher sensitivity.
- *
+ *
* <p>
* Determines how frequently the file system is polled for updates.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul>
* <li class='jf'>{@link ConfigFileStore#FILESTORE_watcherSensitivity}
* </ul>
- *
- * @param value
+ *
+ * @param value
* The new value for this property.
* <br>The default is {@link WatcherSensitivity#MEDIUM}
* @return This object (for method chaining).
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigMemoryStore.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigMemoryStore.java
index 8c522cd..fe6cc90 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigMemoryStore.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigMemoryStore.java
@@ -2,7 +2,7 @@
// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
-// * with the License. You may obtain a copy of the License at *
+// * with the License. You may obtain a copy of the License at *
// * *
// * http://www.apache.org/licenses/LICENSE-2.0 *
// * *
@@ -21,7 +21,7 @@ import org.apache.juneau.*;
/**
* Filesystem-based storage location for configuration files.
- *
+ *
* <p>
* Points to a file system directory containing configuration files.
*/
@@ -38,32 +38,32 @@ public class ConfigMemoryStore extends ConfigStore {
//-------------------------------------------------------------------------------------------------------------------
// Instance
//-------------------------------------------------------------------------------------------------------------------
-
+
/**
* Create a new builder for this object.
- *
+ *
* @return A new builder for this object.
*/
public static ConfigMemoryStoreBuilder create() {
return new ConfigMemoryStoreBuilder();
}
-
+
@Override /* Context */
public ConfigMemoryStoreBuilder builder() {
return new ConfigMemoryStoreBuilder(getPropertyStore());
}
private final ConcurrentHashMap<String,String> cache = new ConcurrentHashMap<>();
-
+
/**
* Constructor.
- *
+ *
* @param ps The settings for this content store.
*/
protected ConfigMemoryStore(PropertyStore ps) {
super(ps);
}
-
+
@Override /* ConfigStore */
public synchronized String read(String name) {
return emptyIfNull(cache.get(name));
@@ -75,18 +75,18 @@ public class ConfigMemoryStore extends ConfigStore {
// This is a no-op.
if (isEquals(expectedContents, newContents))
return null;
-
+
String currentContents = read(name);
-
- if (expectedContents != null && ! isEquals(currentContents, expectedContents))
+
+ if (expectedContents != null && ! isEquals(currentContents, expectedContents))
return currentContents;
-
+
update(name, newContents);
-
+
return null;
}
-
+
@Override /* ConfigStore */
public synchronized ConfigMemoryStore update(String name, String newContents) {
cache.put(name, newContents);
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigMemoryStoreBuilder.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigMemoryStoreBuilder.java
index 198085b..bc28d71 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigMemoryStoreBuilder.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigMemoryStoreBuilder.java
@@ -2,7 +2,7 @@
// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
-// * with the License. You may obtain a copy of the License at *
+// * with the License. You may obtain a copy of the License at *
// * *
// * http://www.apache.org/licenses/LICENSE-2.0 *
// * *
@@ -28,7 +28,7 @@ public class ConfigMemoryStoreBuilder extends ConfigStoreBuilder {
/**
* Constructor.
- *
+ *
* @param ps The initial configuration settings for this builder.
*/
public ConfigMemoryStoreBuilder(PropertyStore ps) {
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigStore.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigStore.java
index 7012c19..5f36bf4 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigStore.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigStore.java
@@ -21,7 +21,7 @@ import org.apache.juneau.config.internal.*;
/**
* Represents a storage location for configuration files.
- *
+ *
* <p>
* Content stores require two methods to be implemented:
* <ul>
@@ -30,13 +30,13 @@ import org.apache.juneau.config.internal.*;
* </ul>
*/
public abstract class ConfigStore extends Context implements Closeable {
-
+
private final ConcurrentHashMap<String,Set<ConfigStoreListener>> listeners = new ConcurrentHashMap<>();
private final ConcurrentHashMap<String,ConfigMap> configMaps = new ConcurrentHashMap<>();
-
+
/**
* Constructor.
- *
+ *
* @param ps The settings for this content store.
*/
protected ConfigStore(PropertyStore ps) {
@@ -45,9 +45,9 @@ public abstract class ConfigStore extends Context implements Closeable {
/**
* Returns the contents of the configuration file.
- *
+ *
* @param name The config file name.
- * @return
+ * @return
* The contents of the configuration file.
* <br>A blank string if the config does not exist.
* <br>Never <jk>null</jk>.
@@ -57,11 +57,11 @@ public abstract class ConfigStore extends Context implements Closeable {
/**
* Saves the contents of the configuration file if the underlying storage hasn't been modified.
- *
+ *
* @param name The config file name.
* @param expectedContents The expected contents of the file.
* @param newContents The new contents.
- * @return
+ * @return
* If <jk>null</jk>, then we successfully stored the contents of the file.
* <br>Otherwise the contents of the file have changed and we return the new contents of the file.
* @throws IOException
@@ -70,7 +70,7 @@ public abstract class ConfigStore extends Context implements Closeable {
/**
* Registers a new listener on this store.
- *
+ *
* @param name The configuration name to listen for.
* @param l The new listener.
* @return This object (for method chaining).
@@ -84,26 +84,26 @@ public abstract class ConfigStore extends Context implements Closeable {
s.add(l);
return this;
}
-
+
/**
* Unregisters a listener from this store.
- *
+ *
* @param name The configuration name to listen for.
* @param l The listener to unregister.
* @return This object (for method chaining).
*/
public synchronized ConfigStore unregister(String name, ConfigStoreListener l) {
Set<ConfigStoreListener> s = listeners.get(name);
- if (s != null)
+ if (s != null)
s.remove(l);
return this;
}
/**
* Returns a map file containing the parsed contents of a configuration.
- *
+ *
* @param name The configuration name.
- * @return
+ * @return
* The parsed configuration.
* <br>Never <jk>null</jk>.
* @throws IOException
@@ -119,13 +119,13 @@ public abstract class ConfigStore extends Context implements Closeable {
register(name, cm);
return cm;
}
-
+
/**
* Called when the physical contents of a config file have changed.
- *
+ *
* <p>
* Triggers calls to {@link ConfigStoreListener#onChange(String)} on all registered listeners.
- *
+ *
* @param name The config name (e.g. the filename without the extension).
* @param contents The new contents.
* @return This object (for method chaining).
@@ -140,7 +140,7 @@ public abstract class ConfigStore extends Context implements Closeable {
/**
* Convenience method for updating the contents of a file with lines.
- *
+ *
* @param name The config name (e.g. the filename without the extension).
* @param contentLines The new contents.
* @return This object (for method chaining).
@@ -151,7 +151,7 @@ public abstract class ConfigStore extends Context implements Closeable {
sb.append(l).append('\n');
return update(name, sb.toString());
}
-
+
/**
* Unused.
*/
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigStoreBuilder.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigStoreBuilder.java
index 5aea461..9a14574 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigStoreBuilder.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigStoreBuilder.java
@@ -2,7 +2,7 @@
// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
-// * with the License. You may obtain a copy of the License at *
+// * with the License. You may obtain a copy of the License at *
// * *
// * http://www.apache.org/licenses/LICENSE-2.0 *
// * *
@@ -28,7 +28,7 @@ public abstract class ConfigStoreBuilder extends ContextBuilder {
/**
* Constructor.
- *
+ *
* @param ps The initial configuration settings for this builder.
*/
public ConfigStoreBuilder(PropertyStore ps) {
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigStoreListener.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigStoreListener.java
index 9771afe..3c63d08 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigStoreListener.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigStoreListener.java
@@ -2,7 +2,7 @@
// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
-// * with the License. You may obtain a copy of the License at *
+// * with the License. You may obtain a copy of the License at *
// * *
// * http://www.apache.org/licenses/LICENSE-2.0 *
// * *
@@ -16,10 +16,10 @@ package org.apache.juneau.config.store;
* Listens for changes to stored config files.
*/
public interface ConfigStoreListener {
-
+
/**
* Called when the physical contents of a config file have changed.
- *
+ *
* @param contents The new config contents;
*/
void onChange(String contents);
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/WatcherSensitivity.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/WatcherSensitivity.java
index 6c12dbe..7555c3f 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/WatcherSensitivity.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/WatcherSensitivity.java
@@ -2,7 +2,7 @@
// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
-// * with the License. You may obtain a copy of the License at *
+// * with the License. You may obtain a copy of the License at *
// * *
// * http://www.apache.org/licenses/LICENSE-2.0 *
// * *
@@ -14,20 +14,20 @@ package org.apache.juneau.config.store;
/**
* Determines how often the file system is polled by the watcher in {@link ConfigFileStore}.
- *
+ *
* <h5 class='section'>Notes:</h5>
* <ul class='spaced-list'>
* <li>This relies on internal Sun packages and may not work on all JVMs.
* </ul>
*/
public enum WatcherSensitivity {
-
+
/** 30 seconds */
- LOW,
-
+ LOW,
+
/** 10 seconds */
- MEDIUM,
-
+ MEDIUM,
+
/** 2 seconds */
HIGH;
}
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 c7e0829..30a7142 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
@@ -17,32 +17,32 @@ import org.apache.juneau.svl.*;
/**
* Config file variable resolver.
- *
+ *
* <p>
* The format for this var is <js>"$C{key[,defaultValue]}"</js>.
* See {@link Config#getString(String)} for the format of the key.
- *
+ *
* <p>
* This variable resolver requires that a {@link Config} object be set as a context object on the resolver or a
* session object on the resolver session.
- *
+ *
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
* <jc>// Create a config object.</jc>
* Config config = 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 r = <jk>new</jk> VarResolver().addVars(ConfigVar.<js>class</js>)
* .addContextObject(<jsf>SESSION_config</jsf>, configFile);
- *
+ *
* <jc>// Use it!</jc>
* System.<jsf>out</jsf>.println(r.resolve(<js>"Value for myKey in section MySection is $C{MySection/myKey}"</js>));
* </p>
- *
+ *
* <p>
* Since this is a {@link SimpleVar}, any variables contained in the result will be recursively resolved.
* Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul>
* <li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-svl.VarResolvers">Overview > juneau-svl > VarResolvers and VarResolverSessions</a>
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 0b38c7b..b2f0ecc 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
@@ -25,13 +25,13 @@ import org.apache.juneau.utils.*;
/**
* Simple bean that implements a hyperlink for the HTML serializer.
- *
+ *
* <p>
* The name and url properties correspond to the following parts of a hyperlink in an HTML document...
* <p class='bcode'>
* <xt><a</xt> <xa>href</xa>=<xs>'href'</xs><xt>></xt>name<xt></a></xt>
* </p>
- *
+ *
* <p>
* When encountered by the {@link HtmlSerializer} class, this object gets converted to a hyperlink.
* All other serializers simply convert it to a simple bean.
@@ -47,7 +47,7 @@ public class LinkString implements Comparable<LinkString> {
/**
* Constructor.
- *
+ *
* @param name Corresponds to the text inside of the <xt><A></xt> element.
* @param uri Corresponds to the value of the <xa>href</xa> attribute of the <xt><A></xt> element.
* @param uriArgs Optional arguments for {@link MessageFormat} style arguments in the href.
@@ -64,10 +64,10 @@ public class LinkString implements Comparable<LinkString> {
/**
* Bean property getter: <property>name</property>.
- *
+ *
* <p>
* Corresponds to the text inside of the <xt><A></xt> element.
- *
+ *
* @return The value of the <property>name</property> property on this bean, or <jk>null</jk> if it is not set.
*/
public String getName() {
@@ -76,7 +76,7 @@ public class LinkString implements Comparable<LinkString> {
/**
* Bean property setter: <property>name</property>.
- *
+ *
* @param name The new value for the <property>name</property> property on this bean.
* @return This object (for method chaining).
*/
@@ -87,10 +87,10 @@ public class LinkString implements Comparable<LinkString> {
/**
* Bean property getter: <property>uri</property>.
- *
+ *
* <p>
* Corresponds to the value of the <xa>href</xa> attribute of the <xt><A></xt> element.
- *
+ *
* @return The value of the <property>href</property> property on this bean, or <jk>null</jk> if it is not set.
*/
public java.net.URI getUri() {
@@ -99,7 +99,7 @@ public class LinkString implements Comparable<LinkString> {
/**
* Bean property setter: <property>uri</property>.
- *
+ *
* @param uri The new value for the <property>href</property> property on this bean.
* @return This object (for method chaining).
*/
@@ -110,10 +110,10 @@ public class LinkString implements Comparable<LinkString> {
/**
* Bean property setter: <property>uri</property>.
- *
+ *
* <p>
* Same as {@link #uri(String)} except allows for {@link MessageFormat} style arguments.
- *
+ *
* @param uri The new href.
* @param args Optional {@link MessageFormat}-style arguments.
* @return This object (for method chaining).
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/ResultSetList.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/ResultSetList.java
index ea26c37..4f4e2c0 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/ResultSetList.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/ResultSetList.java
@@ -30,7 +30,7 @@ public final class ResultSetList extends LinkedList<Map<String,Object>> {
/**
* Constructor.
- *
+ *
* @param rs The result set to load into this DTO.
* @param pos The start position (zero-indexed).
* @param limit The maximum number of rows to retrieve.
@@ -75,10 +75,10 @@ public final class ResultSetList extends LinkedList<Map<String,Object>> {
/**
* Reads the specified column from the current row in the result set.
- *
+ *
* <p>
* Subclasses can override this method to handle specific data types in special ways.
- *
+ *
* @param rs The result set to read from.
* @param col The column number (indexed by 1).
* @param dataType The {@link Types type} of the entry.
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 2061126..74c9af5 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
@@ -19,12 +19,12 @@ import org.apache.juneau.*;
/**
* Various useful static methods for creating ATOM elements.
- *
+ *
* <p>
* Typically, you'll want to do a static import on this class and then call the methods like so...
* <p class='bcode'>
* <jk>import static</jk> org.apache.juneau.dto.atom.AtomBuilder.*;
- *
+ *
* Feed feed =
* <jsm>feed</jsm>(<js>"tag:juneau.sample.com,2013:1"</js>, <js>"Juneau ATOM specification"</js>,
* <js>"2013-05-08T12:29:29Z"</js>)
@@ -36,7 +36,7 @@ import org.apache.juneau.*;
* <jsm>link</jsm>(<js>"self"</js>, <js>"application/atom+xml"</js>, <js>"http://www.sample.com/feed.atom"</js>)
* );
* </p>
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.Atom'>Overview > juneau-dto > Atom</a>
@@ -47,7 +47,7 @@ public class AtomBuilder {
/**
* Creates a {@link Category} element with the specified {@link Category#term(String)} attribute.
- *
+ *
* @param term The {@link Category#term(String)} attribute.
* @return The new element.
*/
@@ -57,7 +57,7 @@ public class AtomBuilder {
/**
* Creates a {@link Content} element with the specified {@link Content#type(String)} attribute.
- *
+ *
* @return The new element.
*/
public static final Content content() {
@@ -66,7 +66,7 @@ public class AtomBuilder {
/**
* Creates a {@link Content} element.
- *
+ *
* @param type The {@link Content#type(String)} attribute.
* @return The new element.
*/
@@ -77,7 +77,7 @@ public class AtomBuilder {
/**
* Creates an {@link Entry} element with the specified {@link Entry#id(Id)}, {@link Entry#title(Text)}, and
* {@link Entry#updated(Calendar)} attributes.
- *
+ *
* @param id The {@link Entry#id(Id)} attribute.
* @param title The {@link Entry#title(Text)} attribute.
* @param updated The {@link Entry#updated(Calendar)} attribute.
@@ -90,7 +90,7 @@ public class AtomBuilder {
/**
* Creates an {@link Entry} element with the specified {@link Entry#id(Id)}, {@link Entry#title(Text)}, and
* {@link Entry#updated(Calendar)} attributes.
- *
+ *
* @param id The {@link Entry#id(Id)} attribute.
* @param title The {@link Entry#title(Text)} attribute.
* @param updated The {@link Entry#updated(Calendar)} attribute.
@@ -103,7 +103,7 @@ public class AtomBuilder {
/**
* Creates a {@link Feed} element with the specified {@link Feed#id(Id)}, {@link Entry#title(Text)}, and
* {@link Feed#updated(Calendar)} attributes.
- *
+ *
* @param id The {@link Feed#id(Id)} attribute.
* @param title The {@link Feed#title(Text)} attribute.
* @param updated The {@link Feed#updated(Calendar)} attribute.
@@ -116,7 +116,7 @@ public class AtomBuilder {
/**
* Creates a {@link Feed} element with the specified {@link Feed#id(Id)}, {@link Entry#title(Text)}, and
* {@link Feed#updated(Calendar)} attributes.
- *
+ *
* @param id The {@link Feed#id(Id)} attribute.
* @param title The {@link Feed#title(Text)} attribute.
* @param updated The {@link Feed#updated(Calendar)} attribute.
@@ -128,7 +128,7 @@ public class AtomBuilder {
/**
* Creates a {@link Generator} element with the specified {@link Generator#text(String)} child node.
- *
+ *
* @param text The {@link Generator#text(String)} child node.
* @return The new element.
*/
@@ -138,14 +138,14 @@ public class AtomBuilder {
/**
* Creates an {@link Icon} element with the specified {@link Icon#uri(Object)} attribute.
- *
+ *
* <p>
* The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.
* Strings must be valid URIs.
- *
+ *
* <p>
* URIs defined by {@link UriResolver} can be used for values.
- *
+ *
* @param uri The {@link Icon#uri(Object)} attribute.
* @return The new element.
*/
@@ -155,7 +155,7 @@ public class AtomBuilder {
/**
* Creates an {@link Id} element with the specified {@link Id#text(String)} child node.
- *
+ *
* @param text The {@link Id#text(String)} child node.
* @return The new element.
*/
@@ -166,7 +166,7 @@ public class AtomBuilder {
/**
* Creates a {@link Link} element with the specified {@link Link#rel(String)}, {@link Link#type(String)}, and
* {@link Link#href(String)} attributes.
- *
+ *
* @param rel The {@link Link#rel(String)} attribute.
* @param type The {@link Link#type(String)} attribute.
* @param href The {@link Link#href(String)} attribute.
@@ -178,14 +178,14 @@ public class AtomBuilder {
/**
* Creates a {@link Logo} element with the specified {@link Logo#uri(Object)} attribute.
- *
+ *
* <p>
* The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.
* Strings must be valid URIs.
- *
+ *
* <p>
* URIs defined by {@link UriResolver} can be used for values.
- *
+ *
* @param uri The {@link Logo#uri(Object)} attribute.
* @return The new element.
*/
@@ -195,7 +195,7 @@ public class AtomBuilder {
/**
* Creates a {@link Person} element with the specified {@link Person#name(String)} attribute.
- *
+ *
* @param name The {@link Person#name(String)} attribute.
* @return The new element.
*/
@@ -205,7 +205,7 @@ public class AtomBuilder {
/**
* Creates a {@link Source} element.
- *
+ *
* @return The new element.
*/
public static final Source source() {
@@ -214,7 +214,7 @@ public class AtomBuilder {
/**
* Creates a {@link Text} element.
- *
+ *
* @return The new element.
*/
public static final Text text() {
@@ -223,7 +223,7 @@ public class AtomBuilder {
/**
* Creates a {@link Text} element with the specified {@link Text#type(String)} attribute.
- *
+ *
* @param type The {@link Text#type(String)} attribute.
* @return The new element.
*/
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 2bf3acc..efc98f0 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
@@ -24,7 +24,7 @@ import org.apache.juneau.xml.annotation.*;
/**
* Represents an <code>atomCategory</code> construct in the RFC4287 specification.
- *
+ *
* <h5 class='figure'>Schema</h5>
* <p class='bcode'>
* atomCategory =
@@ -36,7 +36,7 @@ import org.apache.juneau.xml.annotation.*;
* undefinedContent
* }
* </p>
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.Atom'>Overview > juneau-dto > Atom</a>
@@ -52,7 +52,7 @@ public class Category extends Common {
/**
* Normal constructor.
- *
+ *
* @param term The category term.
*/
public Category(String term) {
@@ -77,7 +77,7 @@ public class Category extends Common {
/**
* Sets the category term.
- *
+ *
* @param term The category term.
* @return This object (for method chaining).
*/
@@ -89,7 +89,7 @@ public class Category extends Common {
/**
* Returns the category scheme.
- *
+ *
* @return The category scheme.
*/
@Xml(format=ATTR)
@@ -99,14 +99,14 @@ public class Category extends Common {
/**
* Sets the category scheme.
- *
+ *
* <p>
* The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.
* Strings must be valid URIs.
- *
+ *
* <p>
* URIs defined by {@link UriResolver} can be used for values.
- *
+ *
* @param scheme The category scheme.
* @return This object (for method chaining).
*/
@@ -118,7 +118,7 @@ public class Category extends Common {
/**
* Returns the category label.
- *
+ *
* @return The category label.
*/
@Xml(format=ATTR)
@@ -128,7 +128,7 @@ public class Category extends Common {
/**
* Sets the category label.
- *
+ *
* @param label The category label.
* @return This object (for method chaining).
*/
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 19d8c87..eaaedc2 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
@@ -25,7 +25,7 @@ import org.apache.juneau.xml.annotation.*;
/**
* Represents an <code>atomCommonAttributes</code> construct in the RFC4287 specification.
- *
+ *
* <h5 class='figure'>Schema</h5>
* <p class='bcode'>
* atomCommonAttributes =
@@ -33,7 +33,7 @@ import org.apache.juneau.xml.annotation.*;
* attribute xml:lang { atomLanguageTag }?,
* undefinedAttribute*
* </p>
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.Atom'>Overview > juneau-dto > Atom</a>
@@ -52,7 +52,7 @@ public abstract class Common {
/**
* Returns the uri base of this object.
- *
+ *
* @return The URI base of this object.
*/
@Xml(prefix="xml", format=ATTR)
@@ -62,14 +62,14 @@ public abstract class Common {
/**
* Sets the URI base of this object.
- *
+ *
* <p>
* The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.
* Strings must be valid URIs.
- *
+ *
* <p>
* URIs defined by {@link UriResolver} can be used for values.
- *
+ *
* @param base The URI base of this object.
* @return This object (for method chaining).
*/
@@ -81,7 +81,7 @@ public abstract class Common {
/**
* Returns the language of this object.
- *
+ *
* @return The language of this object.
*/
@Xml(prefix="xml", format=ATTR)
@@ -91,7 +91,7 @@ public abstract class Common {
/**
* Sets the language of this object.
- *
+ *
* @param lang The language of this object.
* @return This object (for method chaining).
*/
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/CommonEntry.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/CommonEntry.java
index 7741f76..2f0419b 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/CommonEntry.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/CommonEntry.java
@@ -23,7 +23,7 @@ import org.apache.juneau.xml.annotation.*;
/**
* Parent class of {@link Entry}, {@link Feed}, and {@link Source}.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.Atom'>Overview > juneau-dto > Atom</a>
@@ -44,7 +44,7 @@ public class CommonEntry extends Common {
/**
* Normal constructor.
- *
+ *
* @param id The ID of this object.
* @param title The title of this object.
* @param updated The updated timestamp of this object.
@@ -55,7 +55,7 @@ public class CommonEntry extends Common {
/**
* Normal constructor.
- *
+ *
* @param id The ID of this object.
* @param title The title of this object.
* @param updated The updated timestamp of this object.
@@ -74,7 +74,7 @@ public class CommonEntry extends Common {
/**
* Returns the list of authors for this object.
- *
+ *
* @return The list of authors for this object.
*/
@Xml(format=COLLAPSED, childName="author")
@@ -84,7 +84,7 @@ public class CommonEntry extends Common {
/**
* Sets the list of authors for this object.
- *
+ *
* @param authors The list of authors for this object.
* @return This object (for method chaining).
*/
@@ -96,7 +96,7 @@ public class CommonEntry extends Common {
/**
* Returns the list of categories of this object.
- *
+ *
* @return The list of categories of this object.
*/
@Xml(format=COLLAPSED, childName="category")
@@ -106,7 +106,7 @@ public class CommonEntry extends Common {
/**
* Sets the list of categories of this object.
- *
+ *
* @param categories The list of categories of this object.
* @return This object (for method chaining).
*/
@@ -118,7 +118,7 @@ public class CommonEntry extends Common {
/**
* Returns the list of contributors of this object.
- *
+ *
* @return The list of contributors of this object.
*/
@Xml(format=COLLAPSED, childName="contributor")
@@ -128,7 +128,7 @@ public class CommonEntry extends Common {
/**
* Sets the list of contributors of this object.
- *
+ *
* @param contributors The list of contributors of this object.
* @return This object (for method chaining).
*/
@@ -140,7 +140,7 @@ public class CommonEntry extends Common {
/**
* Returns the ID of this object.
- *
+ *
* @return The ID of this object.
*/
public Id getId() {
@@ -149,7 +149,7 @@ public class CommonEntry extends Common {
/**
* Sets the ID of this object.
- *
+ *
* @param id The ID of this object.
* @return This object (for method chaining).
*/
@@ -161,7 +161,7 @@ public class CommonEntry extends Common {
/**
* Sets the ID of this object.
- *
+ *
* @param id The ID of this object.
* @return This object (for method chaining).
*/
@@ -172,7 +172,7 @@ public class CommonEntry extends Common {
/**
* Returns the list of links of this object.
- *
+ *
* @return The list of links of this object.
*/
@Xml(format=COLLAPSED)
@@ -182,7 +182,7 @@ public class CommonEntry extends Common {
/**
* Sets the list of links of this object.
- *
+ *
* @param links The list of links of this object.
* @return This object (for method chaining).
*/
@@ -194,7 +194,7 @@ public class CommonEntry extends Common {
/**
* Returns the rights statement of this object.
- *
+ *
* @return The rights statement of this object.
*/
public Text getRights() {
@@ -203,7 +203,7 @@ public class CommonEntry extends Common {
/**
* Sets the rights statement of this object.
- *
+ *
* @param rights The rights statement of this object.
* @return This object (for method chaining).
*/
@@ -215,7 +215,7 @@ public class CommonEntry extends Common {
/**
* Sets the rights statement of this object.
- *
+ *
* @param rights The rights statement of this object.
* @return This object (for method chaining).
*/
@@ -226,7 +226,7 @@ public class CommonEntry extends Common {
/**
* Returns the title of this object.
- *
+ *
* @return The title of this object.
*/
public Text getTitle() {
@@ -235,7 +235,7 @@ public class CommonEntry extends Common {
/**
* Sets the title of this object.
- *
+ *
* @param title The title of this object.
* @return This object (for method chaining).
*/
@@ -247,7 +247,7 @@ public class CommonEntry extends Common {
/**
* Sets the title of this object.
- *
+ *
* @param title The title of this object.
* @return This object (for method chaining).
*/
@@ -258,7 +258,7 @@ public class CommonEntry extends Common {
/**
* Returns the update timestamp of this object.
- *
+ *
* @return The update timestamp of this object.
*/
@Swap(CalendarSwap.ISO8601DT.class)
@@ -268,7 +268,7 @@ public class CommonEntry extends Common {
/**
* Sets the update timestamp of this object.
- *
+ *
* @param updated The update timestamp of this object.
* @return This object (for method chaining).
*/
@@ -280,7 +280,7 @@ public class CommonEntry extends Common {
/**
* Sets the update timestamp of this object.
- *
+ *
* @param updated The update timestamp of this object in ISO8601 format.
* @return This object (for method chaining).
*/
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 0caeb60..7fbbd58 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
@@ -24,35 +24,35 @@ import org.apache.juneau.xml.annotation.*;
/**
* Represents an <code>atomContent</code> construct in the RFC4287 specification.
- *
+ *
* <h5 class='figure'>Schema</h5>
* <p class='bcode'>
* atomContent = atomInlineTextContent
* | atomInlineXHTMLContent
* | atomInlineOtherContent
* | atomOutOfLineContent
- *
+ *
* atomInlineTextContent =
* element atom:content {
* atomCommonAttributes,
* attribute type { "text" | "html" }?,
* (text)*
* }
- *
+ *
* atomInlineXHTMLContent =
* element atom:content {
* atomCommonAttributes,
* attribute type { "xhtml" },
* xhtmlDiv
* }
- *
+ *
* atomInlineOtherContent =
* element atom:content {
* atomCommonAttributes,
* attribute type { atomMediaType }?,
* (text|anyElement)*
* }
- *
+ *
* atomOutOfLineContent =
* element atom:content {
* atomCommonAttributes,
@@ -61,7 +61,7 @@ import org.apache.juneau.xml.annotation.*;
* empty
* }
* </p>
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.Atom'>Overview > juneau-dto > Atom</a>
@@ -75,7 +75,7 @@ public class Content extends Text {
/**
* Normal content.
- *
+ *
* @param type The content type of this content.
*/
public Content(String type) {
@@ -96,7 +96,7 @@ public class Content extends Text {
/**
* Returns the source URI.
- *
+ *
* @return the source URI.
*/
@Xml(format=ATTR)
@@ -106,14 +106,14 @@ public class Content extends Text {
/**
* Sets the source URI.
- *
+ *
* <p>
* The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.
* Strings must be valid URIs.
- *
+ *
* <p>
* URIs defined by {@link UriResolver} can be used for values.
- *
+ *
* @param src The source URI.
* @return This object (for method chaining).
*/
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 08aa156..a9bd760 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
@@ -21,7 +21,7 @@ import org.apache.juneau.transforms.*;
/**
* Represents an <code>atomEntry</code> construct in the RFC4287 specification.
- *
+ *
* <h5 class='figure'>Schema</h5>
* <p class='bcode'>
* atomEntry =
@@ -42,7 +42,7 @@ import org.apache.juneau.transforms.*;
* & extensionElement*)
* }
* </p>
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.Atom'>Overview > juneau-dto > Atom</a>
@@ -59,7 +59,7 @@ public class Entry extends CommonEntry {
/**
* Normal constructor.
- *
+ *
* @param id The ID of this entry.
* @param title The title of this entry.
* @param updated The updated timestamp of this entry.
@@ -70,7 +70,7 @@ public class Entry extends CommonEntry {
/**
* Normal constructor.
- *
+ *
* @param id The ID of this entry.
* @param title The title of this entry.
* @param updated The updated timestamp of this entry.
@@ -89,7 +89,7 @@ public class Entry extends CommonEntry {
/**
* Returns the content of this entry.
- *
+ *
* @return The content of this entry.
*/
public Content getContent() {
@@ -98,7 +98,7 @@ public class Entry extends CommonEntry {
/**
* Sets the content of this entry.
- *
+ *
* @param content The content of this entry.
* @return This object (for method chaining).
*/
@@ -110,7 +110,7 @@ public class Entry extends CommonEntry {
/**
* Returns the publish timestamp of this entry.
- *
+ *
* @return The publish timestamp of this entry.
*/
@Swap(CalendarSwap.ISO8601DT.class)
@@ -120,7 +120,7 @@ public class Entry extends CommonEntry {
/**
* Sets the publish timestamp of this entry.
- *
+ *
* @param published The publish timestamp of this entry.
* @return This object (for method chaining).
*/
@@ -132,7 +132,7 @@ public class Entry extends CommonEntry {
/**
* Sets the publish timestamp of this entry.
- *
+ *
* @param published The publish timestamp of this entry in ISO8601 format.
* @return This object (for method chaining).
*/
@@ -144,7 +144,7 @@ public class Entry extends CommonEntry {
/**
* Returns the source of this entry.
- *
+ *
* @return The source of this entry.
*/
public Source getSource() {
@@ -153,7 +153,7 @@ public class Entry extends CommonEntry {
/**
* Sets the source of this entry.
- *
+ *
* @param source The source of this entry.
* @return This object (for method chaining).
*/
@@ -165,7 +165,7 @@ public class Entry extends CommonEntry {
/**
* Returns the summary of this entry.
- *
+ *
* @return The summary of this entry.
*/
public Text getSummary() {
@@ -174,7 +174,7 @@ public class Entry extends CommonEntry {
/**
* Sets the summary of this entry.
- *
+ *
* @param summary The summary of this entry.
* @return This object (for method chaining).
*/
@@ -186,7 +186,7 @@ public class Entry extends CommonEntry {
/**
* Sets the summary of this entry.
- *
+ *
* @param summary The summary of this entry.
* @return This object (for method chaining).
*/
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 7d269d4..0285645 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
@@ -21,10 +21,10 @@ import org.apache.juneau.xml.annotation.*;
/**
* Top-level ATOM feed object.
- *
+ *
* <p>
* Represents an <code>atomFeed</code> construct in the RFC4287 specification.
- *
+ *
* <h5 class='figure'>Schema</h5>
* <p class='bcode'>
* atomFeed =
@@ -46,7 +46,7 @@ import org.apache.juneau.xml.annotation.*;
* atomEntry*
* }
* </p>
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.Atom'>Overview > juneau-dto > Atom</a>
@@ -64,7 +64,7 @@ public class Feed extends CommonEntry {
/**
* Normal constructor.
- *
+ *
* @param id The feed identifier.
* @param title The feed title.
* @param updated The feed updated timestamp.
@@ -75,7 +75,7 @@ public class Feed extends CommonEntry {
/**
* Normal constructor.
- *
+ *
* @param id The feed identifier.
* @param title The feed title.
* @param updated The feed updated timestamp.
@@ -94,7 +94,7 @@ public class Feed extends CommonEntry {
/**
* Returns generator information on this feed.
- *
+ *
* @return The generator information on this feed.
*/
public Generator getGenerator() {
@@ -103,7 +103,7 @@ public class Feed extends CommonEntry {
/**
* Sets the generator information on this feed.
- *
+ *
* @param generator The generator information on this feed.
* @return This object (for method chaining).
*/
@@ -115,7 +115,7 @@ public class Feed extends CommonEntry {
/**
* Returns the feed icon.
- *
+ *
* @return The feed icon.
*/
public Icon getIcon() {
@@ -124,7 +124,7 @@ public class Feed extends CommonEntry {
/**
* Sets the feed icon.
- *
+ *
* @param icon The feed icon.
* @return This object (for method chaining).
*/
@@ -136,7 +136,7 @@ public class Feed extends CommonEntry {
/**
* Returns the feed logo.
- *
+ *
* @return The feed logo.
*/
public Logo getLogo() {
@@ -145,7 +145,7 @@ public class Feed extends CommonEntry {
/**
* Sets the feed logo.
- *
+ *
* @param logo The feed logo.
* @return This object (for method chaining).
*/
@@ -157,7 +157,7 @@ public class Feed extends CommonEntry {
/**
* Returns the feed subtitle.
- *
+ *
* @return The feed subtitle.
*/
@BeanProperty("subtitle")
@@ -167,7 +167,7 @@ public class Feed extends CommonEntry {
/**
* Sets the feed subtitle.
- *
+ *
* @param subtitle The feed subtitle.
* @return This object (for method chaining).
*/
@@ -179,7 +179,7 @@ public class Feed extends CommonEntry {
/**
* Sets the feed subtitle.
- *
+ *
* @param subtitle The feed subtitle.
* @return This object (for method chaining).
*/
@@ -190,7 +190,7 @@ public class Feed extends CommonEntry {
/**
* Returns the entries in the feed.
- *
+ *
* @return The entries in the feed.
*/
@Xml(format=COLLAPSED)
@@ -200,7 +200,7 @@ public class Feed extends CommonEntry {
/**
* Sets the entries in the feed.
- *
+ *
* @param entries The entries in the feed.
* @return This object (for method chaining).
*/
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 9ee54ab..939bcdb 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
@@ -24,7 +24,7 @@ import org.apache.juneau.xml.annotation.*;
/**
* Represents an <code>atomGenerator</code> construct in the RFC4287 specification.
- *
+ *
* <h5 class='figure'>Schema</h5>
* <p class='bcode'>
* atomGenerator = element atom:generator {
@@ -34,7 +34,7 @@ import org.apache.juneau.xml.annotation.*;
* text
* }
* </p>
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.Atom'>Overview > juneau-dto > Atom</a>
@@ -51,7 +51,7 @@ public class Generator extends Common {
/**
* Normal constructor.
- *
+ *
* @param text The generator statement content.
*/
public Generator(String text) {
@@ -68,7 +68,7 @@ public class Generator extends Common {
/**
* Returns the URI of this generator statement.
- *
+ *
* @return The URI of this generator statement.
*/
@Xml(format=ATTR)
@@ -78,14 +78,14 @@ public class Generator extends Common {
/**
* Sets the URI of this generator statement.
- *
+ *
* <p>
* The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.
* Strings must be valid URIs.
- *
+ *
* <p>
* URIs defined by {@link UriResolver} can be used for values.
- *
+ *
* @param uri The URI of this generator statement.
* @return This object (for method chaining).
*/
@@ -97,7 +97,7 @@ public class Generator extends Common {
/**
* Returns the version of this generator statement.
- *
+ *
* @return The version of this generator statement.
*/
@Xml(format=ATTR)
@@ -107,7 +107,7 @@ public class Generator extends Common {
/**
* Sets the version of this generator statement.
- *
+ *
* @param version The version of this generator statement.
* @return This object (for method chaining).
*/
@@ -119,7 +119,7 @@ public class Generator extends Common {
/**
* Returns the content of this generator statement.
- *
+ *
* @return The content of this generator statement.
*/
@Xml(format=TEXT)
@@ -129,7 +129,7 @@ public class Generator extends Common {
/**
* Sets the content of this generator statement.
- *
+ *
* @param text The content of this generator statement.
* @return This object (for method chaining).
*/
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 52a7001..f3f5c58 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
@@ -24,7 +24,7 @@ import org.apache.juneau.xml.annotation.*;
/**
* Represents an <code>atomIcon</code> construct in the RFC4287 specification.
- *
+ *
* <h5 class='figure'>Schema</h5>
* <p class='bcode'>
* atomIcon = element atom:icon {
@@ -32,7 +32,7 @@ import org.apache.juneau.xml.annotation.*;
* (atomUri)
* }
* </p>
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.Atom'>Overview > juneau-dto > Atom</a>
@@ -47,14 +47,14 @@ public class Icon extends Common {
/**
* Normal constructor.
- *
+ *
* <p>
* The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.
* Strings must be valid URIs.
- *
+ *
* <p>
* URIs defined by {@link UriResolver} can be used for values.
- *
+ *
* @param uri The URI of the icon.
*/
public Icon(Object uri) {
@@ -71,7 +71,7 @@ public class Icon extends Common {
/**
* Returns the URI of this icon.
- *
+ *
* @return The URI of this icon.
*/
@Xml(format=ELEMENTS)
@@ -81,14 +81,14 @@ public class Icon extends Common {
/**
* Sets the URI of this icon.
- *
+ *
* <p>
* The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.
* Strings must be valid URIs.
- *
+ *
* <p>
* URIs defined by {@link UriResolver} can be used for values.
- *
+ *
* @param uri The URI of this icon.
* @return This object (for method chaining).
*/
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 c348881..efcc565 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
@@ -19,7 +19,7 @@ import org.apache.juneau.xml.annotation.*;
/**
* Represents an <code>atomId</code> construct in the RFC4287 specification.
- *
+ *
* <h5 class='figure'>Schema</h5>
* <p class='bcode'>
* atomId = element atom:id {
@@ -27,7 +27,7 @@ import org.apache.juneau.xml.annotation.*;
* (atomUri)
* }
* </p>
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.Atom'>Overview > juneau-dto > Atom</a>
@@ -41,7 +41,7 @@ public class Id extends Common {
/**
* Normal constructor.
- *
+ *
* @param text The id element contents.
*/
public Id(String text) {
@@ -58,7 +58,7 @@ public class Id extends Common {
/**
* Returns the content of this identifier.
- *
+ *
* @return The content of this identifier.
*/
@Xml(format=TEXT)
@@ -68,7 +68,7 @@ public class Id extends Common {
/**
* Sets the content of this identifier.
- *
+ *
* @param text The content of this identifier.
* @return This object (for method chaining).
*/
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 adee201..cbcac9b 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
@@ -19,7 +19,7 @@ import org.apache.juneau.xml.annotation.*;
/**
* Represents an <code>atomLink</code> construct in the RFC4287 specification.
- *
+ *
* <h5 class='figure'>Schema</h5>
* <p class='bcode'>
* atomLink =
@@ -34,7 +34,7 @@ import org.apache.juneau.xml.annotation.*;
* undefinedContent
* }
* </p>
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.Atom'>Overview > juneau-dto > Atom</a>
@@ -54,7 +54,7 @@ public class Link extends Common {
/**
* Normal constructor.
- *
+ *
* @param rel The rel of the link.
* @param type The type of the link.
* @param href The URI of the link.
@@ -73,7 +73,7 @@ public class Link extends Common {
/**
* Returns the href of the target of this link.
- *
+ *
* @return The href of the target of this link.
*/
@Xml(format=ATTR)
@@ -83,7 +83,7 @@ public class Link extends Common {
/**
* Sets the href of the target of this link.
- *
+ *
* @param href The href of the target of this link.
* @return This object (for method chaining).
*/
@@ -95,7 +95,7 @@ public class Link extends Common {
/**
* Returns the rel of this link.
- *
+ *
* @return The rel of this link.
*/
@Xml(format=ATTR)
@@ -105,7 +105,7 @@ public class Link extends Common {
/**
* Sets the rel of this link.
- *
+ *
* @param rel The rel of this link.
* @return This object (for method chaining).
*/
@@ -117,7 +117,7 @@ public class Link extends Common {
/**
* Returns the content type of the target of this link.
- *
+ *
* @return The content type of the target of this link.
*/
@Xml(format=ATTR)
@@ -127,7 +127,7 @@ public class Link extends Common {
/**
* Sets the content type of the target of this link.
- *
+ *
* <p>
* Must be one of the following:
* <ul>
@@ -136,7 +136,7 @@ public class Link extends Common {
* <li><js>"xhtml"</js>
* <li><jk>null</jk> (defaults to <js>"text"</js>)
* </ul>
- *
+ *
* @param type The content type of the target of this link.
* @return This object (for method chaining).
*/
@@ -148,7 +148,7 @@ public class Link extends Common {
/**
* Returns the language of the target of this link.
- *
+ *
* @return The language of the target of this link.
*/
@Xml(format=ATTR)
@@ -158,7 +158,7 @@ public class Link extends Common {
/**
* Sets the language of the target of this link.
- *
+ *
* @param hreflang The language of the target of this link.
* @return This object (for method chaining).
*/
@@ -170,7 +170,7 @@ public class Link extends Common {
/**
* Returns the title of the target of this link.
- *
+ *
* @return The title of the target of this link.
*/
@Xml(format=ATTR)
@@ -180,7 +180,7 @@ public class Link extends Common {
/**
* Sets the title of the target of this link.
- *
+ *
* @param title The title of the target of this link.
* @return This object (for method chaining).
*/
@@ -192,7 +192,7 @@ public class Link extends Common {
/**
* Returns the length of the contents of the target of this link.
- *
+ *
* @return The length of the contents of the target of this link.
*/
@Xml(format=ATTR)
@@ -202,7 +202,7 @@ public class Link extends Common {
/**
* Sets the length of the contents of the target of this link.
- *
+ *
* @param length The length of the contents of the target of this link.
* @return This object (for method chaining).
*/
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 3b6c5ac..54be984 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
@@ -24,7 +24,7 @@ import org.apache.juneau.xml.annotation.*;
/**
* Represents an <code>atomLogo</code> construct in the RFC4287 specification.
- *
+ *
* <h5 class='figure'>Schema</h5>
* <p class='bcode'>
* atomLogo = element atom:logo {
@@ -32,7 +32,7 @@ import org.apache.juneau.xml.annotation.*;
* (atomUri)
* }
* </p>
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.Atom'>Overview > juneau-dto > Atom</a>
@@ -47,14 +47,14 @@ public class Logo extends Common {
/**
* Normal constructor.
- *
+ *
* <p>
* The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.
* <br>Strings must be valid URIs.
- *
+ *
* <p>
* URIs defined by {@link UriResolver} can be used for values.
- *
+ *
* @param uri The URI of the logo.
*/
public Logo(Object uri) {
@@ -71,7 +71,7 @@ public class Logo extends Common {
/**
* Returns the URI of the logo.
- *
+ *
* @return The URI of the logo.
*/
@Xml(format=ELEMENTS)
@@ -81,14 +81,14 @@ public class Logo extends Common {
/**
* Sets the URI of the logo.
- *
+ *
* <p>
* The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.
* <br>Strings must be valid URIs.
- *
+ *
* <p>
* URIs defined by {@link UriResolver} can be used for values.
- *
+ *
* @param uri The URI of the logo.
* @return This object (for method chaining).
*/
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 d8a26f3..75f86af 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
@@ -23,7 +23,7 @@ import org.apache.juneau.annotation.*;
/**
* Represents an <code>atomPersonConstruct</code> construct in the RFC4287 specification.
- *
+ *
* <h5 class='figure'>Schema</h5>
* <p class='bcode'>
* atomPersonConstruct =
@@ -33,7 +33,7 @@ import org.apache.juneau.annotation.*;
* & element atom:email { atomEmailAddress }?
* & extensionElement*)
* </p>
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.Atom'>Overview > juneau-dto > Atom</a>
@@ -49,7 +49,7 @@ public class Person extends Common {
/**
* Normal constructor.
- *
+ *
* @param name The name of the person.
*/
public Person(String name) {
@@ -66,7 +66,7 @@ public class Person extends Common {
/**
* Returns the name of the person.
- *
+ *
* @return The name of the person.
*/
public String getName() {
@@ -75,7 +75,7 @@ public class Person extends Common {
/**
* Sets the name of the person.
- *
+ *
* @param name The name of the person.
* @return This object (for method chaining).
*/
@@ -87,7 +87,7 @@ public class Person extends Common {
/**
* Returns the URI of the person.
- *
+ *
* @return The URI of the person.
*/
public URI getUri() {
@@ -96,14 +96,14 @@ public class Person extends Common {
/**
* Sets the URI of the person.
- *
+ *
* <p>
* The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.
* Strings must be valid URIs.
- *
+ *
* <p>
* URIs defined by {@link UriResolver} can be used for values.
- *
+ *
* @param uri The URI of the person.
* @return This object (for method chaining).
*/
@@ -115,7 +115,7 @@ public class Person extends Common {
/**
* Returns the email address of the person.
- *
+ *
* @return The email address of the person.
*/
public String getEmail() {
@@ -124,7 +124,7 @@ public class Person extends Common {
/**
* Sets the email address of the person.
- *
+ *
* @param email The email address of the person.
* @return This object (for method chaining).
*/
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 8fb28aa..8b7c214 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 org.apache.juneau.annotation.*;
/**
* Represents an <code>atomSource</code> construct in the RFC4287 specification.
- *
+ *
* <h5 class='figure'>Schema</h5>
* <p class='bcode'>
* atomSource =
@@ -39,7 +39,7 @@ import org.apache.juneau.annotation.*;
* & extensionElement*)
* }
* </p>
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.Atom'>Overview > juneau-dto > Atom</a>
@@ -60,7 +60,7 @@ public class Source extends CommonEntry {
/**
* Returns the generator info of this source.
- *
+ *
* @return The generator info of this source.
*/
public Generator getGenerator() {
@@ -69,7 +69,7 @@ public class Source extends CommonEntry {
/**
* Sets the generator info of this source.
- *
+ *
* @param generator The generator info of this source.
* @return This object (for method chaining).
*/
@@ -81,7 +81,7 @@ public class Source extends CommonEntry {
/**
* Returns the icon of this source.
- *
+ *
* @return The icon of this source.
*/
public Icon getIcon() {
@@ -90,7 +90,7 @@ public class Source extends CommonEntry {
/**
* Sets the icon of this source.
- *
+ *
* @param icon The icon of this source.
* @return This object (for method chaining).
*/
@@ -102,7 +102,7 @@ public class Source extends CommonEntry {
/**
* Returns the logo of this source.
- *
+ *
* @return The logo of this source.
*/
public Logo getLogo() {
@@ -111,7 +111,7 @@ public class Source extends CommonEntry {
/**
* Sets the logo of this source.
- *
+ *
* @param logo The logo of this source.
* @return This object (for method chaining).
*/
@@ -123,7 +123,7 @@ public class Source extends CommonEntry {
/**
* Returns the subtitle of this source.
- *
+ *
* @return The subtitle of this source.
*/
public Text getSubtitle() {
@@ -132,7 +132,7 @@ public class Source extends CommonEntry {
/**
* Sets the subtitle of this source.
- *
+ *
* @param subtitle The subtitle of this source.
* @return This object (for method chaining).
*/
@@ -144,7 +144,7 @@ public class Source extends CommonEntry {
/**
* Sets the subtitle of this source.
- *
+ *
* @param subtitle The subtitle of this source.
* @return This object (for method chaining).
*/
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 75527a9..dceff3f 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
@@ -19,28 +19,28 @@ import org.apache.juneau.xml.annotation.*;
/**
* Represents an <code>atomTextConstruct</code> construct in the RFC4287 specification.
- *
+ *
* <h5 class='figure'>Schema</h5>
* <p class='bcode'>
* atomTextConstruct = atomPlainTextConstruct | atomXHTMLTextConstruct
- *
+ *
* atomPlainTextConstruct =
* atomCommonAttributes,
* attribute type { "text" | "html" }?,
* text
- *
+ *
* atomXHTMLTextConstruct =
* atomCommonAttributes,
* attribute type { "xhtml" },
* xhtmlDiv
- *
+ *
* xhtmlDiv = element xhtml:div {
* (attribute * { text }
* | text
* | anyXHTML)*
* }
* </p>
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.Atom'>Overview > juneau-dto > Atom</a>
@@ -54,7 +54,7 @@ public class Text extends Common {
/**
* Normal content.
- *
+ *
* @param type The content type of this content.
*/
public Text(String type) {
@@ -71,7 +71,7 @@ public class Text extends Common {
/**
* Returns the content type of this content.
- *
+ *
* @return The content type of this content.
*/
@Xml(format=ATTR)
@@ -81,7 +81,7 @@ public class Text extends Common {
/**
* Sets the content type of this content.
- *
+ *
* <p>
* Must be one of the following:
* <ul>
@@ -90,7 +90,7 @@ public class Text extends Common {
* <li><js>"xhtml"</js>
* <li><jk>null</jk> (defaults to <js>"text"</js>)
* </ul>
- *
+ *
* @param type The content type of this content.
* @return This object (for method chaining).
*/
@@ -102,7 +102,7 @@ public class Text extends Common {
/**
* Returns the content of this content.
- *
+ *
* @return The content of this content.
*/
@Xml(format=XMLTEXT)
@@ -112,7 +112,7 @@ public class Text extends Common {
/**
* Sets the content of this content.
- *
+ *
* @param text The content of this content.
* @return This object (for method chaining).
*/
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Utils.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Utils.java
index 96d981f..bbd1987 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Utils.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Utils.java
@@ -18,7 +18,7 @@ import javax.xml.bind.*;
/**
* Static utility methods for ATOM marshalling code.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.Atom'>Overview > juneau-dto > Atom</a>
@@ -29,7 +29,7 @@ class Utils {
/**
* Converts an ISO8601 date-time string to a {@link Calendar}.
- *
+ *
* @param lexicalXSDDateTime The ISO8601 date-time string.
* @return A new {@link Calendar} object.
*/
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/Column.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/Column.java
index a3fcee0..251bdb6 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/Column.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/Column.java
@@ -18,7 +18,7 @@ import org.apache.juneau.xml.annotation.*;
/**
* Represents a meta-data column in a Cognos dataset.
- *
+ *
* <p>
* When serialized to XML, creates the following construct:
* <p class='bcode'>
@@ -38,7 +38,7 @@ public class Column {
/**
* Constructor.
- *
+ *
* @param name The column name.
* @param type The column type (e.g. <js>"xs:String"</js>).
*/
@@ -48,7 +48,7 @@ public class Column {
/**
* Constructor.
- *
+ *
* @param name The column name.
* @param type The column type (e.g. <js>"xs:String"</js>).
* @param length The column length (e.g. <code>255</code>).
@@ -61,10 +61,10 @@ public class Column {
/**
* Associates a POJO swap with this column.
- *
+ *
* <p>
* Typically used to define columns that don't exist on the underlying beans being serialized.
- *
+ *
* <p>
* For example, the <code>AddressBookResource</code> sample defined the following POJO swap to define an additional
* <js>"numAddresses"</js> column even though no such property exists on the serialized beans.
@@ -79,7 +79,7 @@ public class Column {
* }
* );
* </p>
- *
+ *
* @param pojoSwap The POJO swap to associate with the column.
* @return This object (for method chaining).
*/
@@ -95,7 +95,7 @@ public class Column {
/**
* Bean property getter: <property>name</property>.
- *
+ *
* @return The value of the <property>name</property> property on this bean, or <jk>null</jk> if it is not set.
*/
@Xml(format=XmlFormat.ATTR)
@@ -105,7 +105,7 @@ public class Column {
/**
* Bean property setter: <property>name</property>.
- *
+ *
* @param name The new value for the <property>name</property> property on this bean.
* @return This object (for method chaining).
*/
@@ -116,7 +116,7 @@ public class Column {
/**
* Bean property getter: <property>type</property>.
- *
+ *
* @return The value of the <property>type</property> property on this bean, or <jk>null</jk> if it is not set.
*/
@Xml(format=XmlFormat.ATTR)
@@ -126,7 +126,7 @@ public class Column {
/**
* Bean property setter: <property>type</property>.
- *
+ *
* @param type The new value for the <property>type</property> property on this bean.
* @return This object (for method chaining).
*/
@@ -137,7 +137,7 @@ public class Column {
/**
* Bean property getter: <property>length</property>.
- *
+ *
* @return The value of the <property>length</property> property on this bean, or <jk>null</jk> if length is not
* applicable for the specified type.
*/
@@ -148,7 +148,7 @@ public class Column {
/**
* Bean property setter: <property>length</property>.
- *
+ *
* @param length The new value for the <property>length</property> property on this bean.
* Can be <jk>null</jk> if length is not applicable for the specified type.
* @return This object (for method chaining).
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/DataSet.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/DataSet.java
index a8ac1de..2be6781 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/DataSet.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/DataSet.java
@@ -20,7 +20,7 @@ import org.apache.juneau.xml.annotation.*;
/**
* Represents a Cognos dataset.
- *
+ *
* <p>
* When serialized to XML, creates the following construct (example pulled from <code>AddressBookResource</code>):
* <p class='bcode'>
@@ -46,12 +46,12 @@ import org.apache.juneau.xml.annotation.*;
* <xt></c:data></xt>
* <xt></c:dataset></xt>
* </p>
- *
+ *
* <p>
* Only 2-dimensional POJOs (arrays or collections of maps or beans) can be serialized to Cognos.
- *
+ *
* <h5 class='section'>Example:</h5>
- *
+ *
* The construct shown above is a serialized <code>AddressBook</code> object which is a subclass of
* <code>LinkedList<Person></code>.
* The code for generating the XML is as follows...
@@ -69,9 +69,9 @@ import org.apache.juneau.xml.annotation.*;
* }
* )
* };
- *
+ *
* DataSet ds = <jk>new</jk> DataSet(items, <jsf>addressBook</jsf>, BeanContext.<jsf>DEFAULT</jsf>);
- *
+ *
* String xml = XmlSerializer.<jsf>DEFAULT_SQ</jsf>.serialize(ds);
* </p>
*/
@@ -87,7 +87,7 @@ public class DataSet {
/**
* Constructor.
- *
+ *
* @param columns The meta-data that represents the columns in the dataset.
* @param o
* The POJO being serialized to Cognos.
@@ -126,7 +126,7 @@ public class DataSet {
/**
* Represents a row of data.
- *
+ *
* <p>
* When serialized to XML, creates the following construct (example pulled from <code>AddressBookResource</code>):
* <p class='bcode'>
@@ -147,7 +147,7 @@ public class DataSet {
/**
* Returns the values in this row.
- *
+ *
* @return The values in this row.
*/
@Xml(format=XmlFormat.COLLAPSED, childName="value")
@@ -163,7 +163,7 @@ public class DataSet {
/**
* Bean property getter: <property>metadata</property>.
- *
+ *
* @return The value of the <property>metadata</property> property on this bean, or <jk>null</jk> if it is not set.
*/
@BeanProperty("metadata")
@@ -173,7 +173,7 @@ public class DataSet {
/**
* Bean property setter: <property>metadata</property>.
- *
+ *
* @param metaData The new value for the <property>metadata</property> property on this bean.
* @return This object (for method chaining).
*/
@@ -185,7 +185,7 @@ public class DataSet {
/**
* Bean property getter: <property>data</property>.
- *
+ *
* @return The value of the <property>data</property> property on this bean, or <jk>null</jk> if it is not set.
*/
@BeanProperty("data")
@@ -195,7 +195,7 @@ public class DataSet {
/**
* Bean property setter: <property>data</property>.
- *
+ *
* @param data The new value for the <property>data</property> property on this bean.
* @return This object (for method chaining).
*/
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/A.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/A.java
index 9d8c8b5..c45302d 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/A.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/A.java
@@ -21,7 +21,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-a-element"><a></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
@@ -32,10 +32,10 @@ public class A extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-download">download</a> attribute.
- *
+ *
* <p>
* Whether to download the resource instead of navigating to it, and its file name if so.
- *
+ *
* @param download
* The new value for this attribute.
* Typically a {@link Boolean} or {@link String}.
@@ -48,17 +48,17 @@ public class A extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-href">href</a> attribute.
- *
+ *
* <p>
* Address of the hyperlink.
- *
+ *
* <p>
* The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.
* Strings must be valid URIs.
- *
+ *
* <p>
* URIs defined by {@link UriResolver} can be used for values.
- *
+ *
* @param href
* The new value for this attribute.
* Typically a {@link URL} or {@link String}.
@@ -71,10 +71,10 @@ public class A extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-hreflang">hreflang</a> attribute.
- *
+ *
* <p>
* Language of the linked resource.
- *
+ *
* @param hreflang The new value for this attribute.
* @return This object (for method chaining).
*/
@@ -85,10 +85,10 @@ public class A extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-rel">rel</a> attribute.
- *
+ *
* <p>
* Relationship between the document containing the hyperlink and the destination resource.
- *
+ *
* @param rel The new value for this attribute.
* @return This object (for method chaining).
*/
@@ -99,10 +99,10 @@ public class A extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-target">target</a> attribute.
- *
+ *
* <p>
* Default browsing context for hyperlink navigation and form submission.
- *
+ *
* @param target The new value for this attribute.
* @return This object (for method chaining).
*/
@@ -113,10 +113,10 @@ public class A extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-type">type</a> attribute.
- *
+ *
* <p>
* Hint for the type of the referenced resource.
- *
+ *
* @param type The new value for this attribute.
* @return This object (for method chaining).
*/
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Abbr.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Abbr.java
index 2aae71e..2d00331 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Abbr.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Abbr.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-abbr-element"><abbr></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Address.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Address.java
index 16a5cf1..7c85d09 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Address.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Address.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-address-element"><address></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Area.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Area.java
index 840c071..a2c4df2 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Area.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Area.java
@@ -21,7 +21,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#the-area-element"><area></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
@@ -32,10 +32,10 @@ public class Area extends HtmlElementVoid {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-area-alt">alt</a> attribute.
- *
+ *
* <p>
* Replacement text for use when images are not available.
- *
+ *
* @param alt The new value for this attribute.
* @return This object (for method chaining).
*/
@@ -47,10 +47,10 @@ public class Area extends HtmlElementVoid {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-area-coords">coords</a>
* attribute.
- *
+ *
* <p>
* Coordinates for the shape to be created in an image map.
- *
+ *
* @param coords The new value for this attribute.
* @return This object (for method chaining).
*/
@@ -61,10 +61,10 @@ public class Area extends HtmlElementVoid {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-download">download</a> attribute.
- *
+ *
* <p>
* Whether to download the resource instead of navigating to it, and its file name if so.
- *
+ *
* @param download
* The new value for this attribute.
* Typically a {@link Boolean} or {@link String}.
@@ -77,17 +77,17 @@ public class Area extends HtmlElementVoid {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-href">href</a> attribute.
- *
+ *
* <p>
* Address of the hyperlink.
- *
+ *
* <p>
* The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.
* Strings must be valid URIs.
- *
+ *
* <p>
* URIs defined by {@link UriResolver} can be used for values.
- *
+ *
* @param href
* The new value for this attribute.
* Typically a {@link URL} or {@link String}.
@@ -100,10 +100,10 @@ public class Area extends HtmlElementVoid {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-hreflang">hreflang</a> attribute.
- *
+ *
* <p>
* Language of the linked resource.
- *
+ *
* @param hreflang The new value for this attribute.
* @return This object (for method chaining).
*/
@@ -114,10 +114,10 @@ public class Area extends HtmlElementVoid {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-rel">rel</a> attribute.
- *
+ *
* <p>
* Relationship between the document containing the hyperlink and the destination resource.
- *
+ *
* @param rel The new value for this attribute.
* @return This object (for method chaining).
*/
@@ -128,10 +128,10 @@ public class Area extends HtmlElementVoid {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-area-shape">shape</a> attribute.
- *
+ *
* <p>
* The kind of shape to be created in an image map.
- *
+ *
* @param shape The new value for this attribute.
* @return This object (for method chaining).
*/
@@ -142,10 +142,10 @@ public class Area extends HtmlElementVoid {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-target">target</a> attribute.
- *
+ *
* <p>
* Browsing context for hyperlink navigation.
- *
+ *
* @param target The new value for this attribute.
* @return This object (for method chaining).
*/
@@ -156,10 +156,10 @@ public class Area extends HtmlElementVoid {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-type">type</a> attribute.
- *
+ *
* <p>
* Hint for the type of the referenced resource.
- *
+ *
* @param type The new value for this attribute.
* @return This object (for method chaining).
*/
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Article.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Article.java
index efca7cf..1f4ede7 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Article.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Article.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-article-element"><article></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
@@ -28,7 +28,7 @@ public class Article extends HtmlElementMixed {
/**
* Adds a header node to this element.
- *
+ *
* @param children The children inside the header node.
* @return This object (for method chaining).
*/
@@ -39,7 +39,7 @@ public class Article extends HtmlElementMixed {
/**
* Adds a footer node to this element.
- *
+ *
* @param children The children inside the footer node.
* @return This object (for method chaining).
*/
@@ -50,7 +50,7 @@ public class Article extends HtmlElementMixed {
/**
* Adds a link node to this element.
- *
+ *
* @param link The link node to add to this article.
* @return This object (for method chaining).
*/
@@ -61,7 +61,7 @@ public class Article extends HtmlElementMixed {
/**
* Adds a section node to this element.
- *
+ *
* @param section The section node to add to this article.
* @return This object (for method chaining).
*/
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Aside.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Aside.java
index 17cddc9..d7312f2 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Aside.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Aside.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-aside-element"><aside></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Audio.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Audio.java
index 0d661cc..f0327f7 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Audio.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Audio.java
@@ -21,7 +21,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#the-audio-element"><audio></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
@@ -33,10 +33,10 @@ public class Audio extends HtmlElementContainer {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-autoplay">autoplay</a>
* attribute.
- *
+ *
* <p>
* Hint that the media resource can be started automatically when the page is loaded.
- *
+ *
* @param autoplay
* The new value for this attribute.
* Typically a {@link Boolean} or {@link String}.
@@ -50,10 +50,10 @@ public class Audio extends HtmlElementContainer {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-controls">controls</a>
* attribute.
- *
+ *
* <p>
* Show user agent controls.
- *
+ *
* @param controls
* The new value for this attribute.
* Typically a {@link Boolean} or {@link String}.
@@ -67,10 +67,10 @@ public class Audio extends HtmlElementContainer {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-crossorigin">crossorigin</a>
* attribute.
- *
+ *
* <p>
* How the element handles cross-origin requests.
- *
+ *
* @param crossorigin The new value for this attribute.
* @return This object (for method chaining).
*/
@@ -81,10 +81,10 @@ public class Audio extends HtmlElementContainer {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-loop">loop</a> attribute.
- *
+ *
* <p>
* Whether to loop the media resource.
- *
+ *
* @param loop
* The new value for this attribute.
* Typically a {@link Boolean} or {@link String}.
@@ -98,10 +98,10 @@ public class Audio extends HtmlElementContainer {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-mediagroup">mediagroup</a>
* attribute.
- *
+ *
* <p>
* Groups media elements together with an implicit MediaController.
- *
+ *
* @param mediagroup The new value for this attribute.
* @return This object (for method chaining).
*/
@@ -113,10 +113,10 @@ public class Audio extends HtmlElementContainer {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-muted">muted</a>
* attribute.
- *
+ *
* <p>
* Whether to mute the media resource by default.
- *
+ *
* @param muted
* The new value for this attribute.
* Typically a {@link Boolean} or {@link String}.
@@ -130,10 +130,10 @@ public class Audio extends HtmlElementContainer {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-preload">preload</a>
* attribute.
- *
+ *
* <p>
* Hints how much buffering the media resource will likely need.
- *
+ *
* @param preload The new value for this attribute.
* @return This object (for method chaining).
*/
@@ -144,17 +144,17 @@ public class Audio extends HtmlElementContainer {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-src">src</a> attribute.
- *
+ *
* <p>
* Address of the resource.
- *
+ *
* <p>
* The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.
* Strings must be valid URIs.
- *
+ *
* <p>
* URIs defined by {@link UriResolver} can be used for values.
- *
+ *
* @param src
* The new value for this attribute.
* Typically a {@link URL} or {@link String}.
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/B.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/B.java
index adfe5fe..309310a 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/B.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/B.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-b-element"><b></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Base.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Base.java
index 8deb15f..7630c92 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Base.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Base.java
@@ -21,7 +21,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/document-metadata.html#the-base-element"><base></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
@@ -32,17 +32,17 @@ public class Base extends HtmlElementVoid {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/document-metadata.html#attr-base-href">href</a> attribute.
- *
+ *
* <p>
* Document base URL.
- *
+ *
* <p>
* The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.
* Strings must be valid URIs.
- *
+ *
* <p>
* URIs defined by {@link UriResolver} can be used for values.
- *
+ *
* @param href
* The new value for this attribute.
* Typically a {@link URL} or {@link String}.
@@ -56,10 +56,10 @@ public class Base extends HtmlElementVoid {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/document-metadata.html#attr-base-target">target</a>
* attribute.
- *
+ *
* <p>
* Default browsing context for hyperlink navigation and form submission.
- *
+ *
* @param target The new value for this attribute.
* @return This object (for method chaining).
*/
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Bdi.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Bdi.java
index 3cd18b4..0385516 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Bdi.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Bdi.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-bdi-element"><bdi></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Bdo.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Bdo.java
index a0ec075..828bb05 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Bdo.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Bdo.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-bdo-element"><bdo></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Blockquote.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Blockquote.java
index 0e31dbb..ef6cdce 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Blockquote.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Blockquote.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#the-blockquote-element"><blockquote></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
@@ -29,10 +29,10 @@ public class Blockquote extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#attr-blockquote-cite">cite</a>
* attribute.
- *
+ *
* <p>
* Link to the source of the quotation.
- *
+ *
* @param cite The new value for this attribute.
* @return This object (for method chaining).
*/
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Body.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Body.java
index fb0880a..0d7c66a 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Body.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Body.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-body-element"><body></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
@@ -29,7 +29,7 @@ public class Body extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-window-onafterprint">onafterprint</a>
* attribute.
- *
+ *
* @param onafterprint The new value for this attribute.
* @return This object (for method chaining).
*/
@@ -41,7 +41,7 @@ public class Body extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-window-onbeforeunload">onbeforeunload</a>
* attribute.
- *
+ *
* @param onbeforeunload The new value for this attribute.
* @return This object (for method chaining).
*/
@@ -53,7 +53,7 @@ public class Body extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-window-onmessage">onmessage</a>
* attribute.
- *
+ *
* @param onmessage The new value for this attribute.
* @return This object (for method chaining).
*/
@@ -65,7 +65,7 @@ public class Body extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-window-ononline">ononline</a>
* attribute.
- *
+ *
* @param ononline The new value for this attribute.
* @return This object (for method chaining).
*/
@@ -77,7 +77,7 @@ public class Body extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-window-onpageshow">onpageshow</a>
* attribute.
- *
+ *
* @param onpageshow The new value for this attribute.
* @return This object (for method chaining).
*/
@@ -89,7 +89,7 @@ public class Body extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-window-onstorage">onstorage</a>
* attribute.
- *
+ *
* @param onstorage The new value for this attribute.
* @return This object (for method chaining).
*/
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Br.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Br.java
index f2e2356..70d709a 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Br.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Br.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-br-element"><br></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Button.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Button.java
index 6c2ea93..ba6a68a 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Button.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Button.java
@@ -21,7 +21,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-button-element"><button></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
@@ -32,10 +32,10 @@ public class Button extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fe-autofocus">autofocus</a> attribute.
- *
+ *
* <p>
* Automatically focus the form control when the page is loaded.
- *
+ *
* @param autofocus
* The new value for this attribute.
* Typically a {@link Boolean} or {@link String}.
@@ -48,10 +48,10 @@ public class Button extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fe-disabled">disabled</a> attribute.
- *
+ *
* <p>
* Whether the form control is disabled.
- *
+ *
* @param disabled
* The new value for this attribute.
* Typically a {@link Boolean} or {@link String}.
@@ -64,10 +64,10 @@ public class Button extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fae-form">form</a> attribute.
- *
+ *
* <p>
* Associates the control with a form element.
- *
+ *
* @param form The new value for this attribute.
* @return This object (for method chaining).
*/
@@ -78,17 +78,17 @@ public class Button extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fs-formaction">formaction</a> attribute.
- *
+ *
* <p>
* URL to use for form submission.
- *
+ *
* <p>
* The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.
* Strings must be valid URIs.
- *
+ *
* <p>
* URIs defined by {@link UriResolver} can be used for values.
- *
+ *
* @param formaction The new value for this attribute.
* @return This object (for method chaining).
*/
@@ -99,10 +99,10 @@ public class Button extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fs-formenctype">formenctype</a> attribute.
- *
+ *
* <p>
* Form data set encoding type to use for form submission.
- *
+ *
* @param formenctype The new value for this attribute.
* @return This object (for method chaining).
*/
@@ -113,10 +113,10 @@ public class Button extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fs-formmethod">formmethod</a> attribute.
- *
+ *
* <p>
* HTTP method to use for form submission.
- *
+ *
* @param formmethod The new value for this attribute.
* @return This object (for method chaining).
*/
@@ -128,10 +128,10 @@ public class Button extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fs-formnovalidate">formnovalidate</a>
* attribute.
- *
+ *
* <p>
* Bypass form control validation for form submission.
- *
+ *
* @param formnovalidate The new value for this attribute.
* @return This object (for method chaining).
*/
@@ -142,10 +142,10 @@ public class Button extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fs-formtarget">formtarget</a> attribute.
- *
+ *
* <p>
* Browsing context for form submission.
- *
+ *
* @param formtarget The new value for this attribute.
* @return This object (for method chaining).
*/
@@ -156,10 +156,10 @@ public class Button extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fs-menu">menu</a> attribute.
- *
+ *
* <p>
* Specifies the element's designated pop-up menu.
- *
+ *
* @param menu The new value for this attribute.
* @return This object (for method chaining).
*/
@@ -170,10 +170,10 @@ public class Button extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fe-name">name</a> attribute.
- *
+ *
* <p>
* Name of form control to use for form submission and in the form.elements API.
- *
+ *
* @param name The new value for this attribute.
* @return This object (for method chaining).
*/
@@ -184,10 +184,10 @@ public class Button extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-button-type">type</a> attribute.
- *
+ *
* <p>
* Type of button.
- *
+ *
* @param type The new value for this attribute.
* @return This object (for method chaining).
*/
@@ -198,10 +198,10 @@ public class Button extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-button-value">value</a> attribute.
- *
+ *
* <p>
* Value to be used for form submission.
- *
+ *
* @param value
* The new value for this attribute.
* Typically a {@link Number} or {@link String}.
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Canvas.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Canvas.java
index da7b1a0..40dd7fc 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Canvas.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Canvas.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/scripting-1.html#the-canvas-element"><canvas></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
@@ -28,10 +28,10 @@ public class Canvas extends HtmlElementContainer {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/scripting-1.html#attr-canvas-height">height</a> attribute.
- *
+ *
* <p>
* Vertical dimension.
- *
+ *
* @param height
* The new value for this attribute.
* Typically a {@link Number} or {@link String}.
@@ -44,10 +44,10 @@ public class Canvas extends HtmlElementContainer {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/scripting-1.html#attr-canvas-width">width</a> attribute.
- *
+ *
* <p>
* Horizontal dimension.
- *
+ *
* @param width
* The new value for this attribute.
* Typically a {@link Number} or {@link String}.
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Caption.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Caption.java
index e0b39bf..60b4cad 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Caption.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Caption.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#the-caption-element"><caption></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Cite.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Cite.java
index 1497d5e..bf89459 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Cite.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Cite.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-cite-element"><cite></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Code.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Code.java
index a256dbf..27590f7 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Code.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Code.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-code-element"><code></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Col.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Col.java
index 822cde2..4448a01 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Col.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Col.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#the-col-element"><col></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
@@ -28,10 +28,10 @@ public class Col extends HtmlElementVoid {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#attr-col-span">span</a> attribute.
- *
+ *
* <p>
* Number of columns spanned by the element.
- *
+ *
* @param span
* The new value for this attribute.
* Typically a {@link Number} or {@link String}.
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Colgroup.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Colgroup.java
index 569292c..e9ff637 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Colgroup.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Colgroup.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#the-colgroup-element"><colgroup></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
@@ -28,10 +28,10 @@ public class Colgroup extends HtmlElementContainer {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#attr-colgroup-span">span</a> attribute.
- *
+ *
* <p>
* Number of columns spanned by the element.
- *
+ *
* @param span
* The new value for this attribute.
* Typically a {@link Number} or {@link String}.
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Data.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Data.java
index 2ae6606..3275c99 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Data.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Data.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-data-element"><data></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
@@ -29,10 +29,10 @@ public class Data extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#attr-data-value">value</a>
* attribute.
- *
+ *
* <p>
* Machine-readable value.
- *
+ *
* @param value
* The new value for this attribute.
* Typically a {@link Number} or {@link String}.
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Datalist.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Datalist.java
index 2852bf0..72b1730 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Datalist.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Datalist.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-datalist-element"><datalist></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dd.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dd.java
index 7d5714f..fc5ed3e 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dd.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dd.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#the-dd-element"><dd></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Del.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Del.java
index 96b772b..d0f98bc 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Del.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Del.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/edits.html#the-del-element"><del></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
@@ -28,10 +28,10 @@ public class Del extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/edits.html#attr-mod-cite">cite</a> attribute.
- *
+ *
* <p>
* Link to the source of the quotation or more information about the edit.
- *
+ *
* @param cite The new value for this attribute.
* @return This object (for method chaining).
*/
@@ -42,10 +42,10 @@ public class Del extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/edits.html#attr-mod-datetime">datetime</a> attribute.
- *
+ *
* <p>
* Date and (optionally) time of the change.
- *
+ *
* @param datetime The new value for this attribute.
* @return This object (for method chaining).
*/
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dfn.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dfn.java
index 891b765..4b7dcd1 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dfn.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dfn.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-dfn-element"><dfn></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Div.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Div.java
index af4b4dd..1fa10bd 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Div.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Div.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#the-div-element"><div></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dl.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dl.java
index 7602eb7..c419f1d 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dl.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dl.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#the-dl-element"><dl></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dt.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dt.java
index a2e114e..d6be689 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dt.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dt.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#the-dt-element"><dt></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Em.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Em.java
index c044ce0..7e2d8a9 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Em.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Em.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-em-element"><em></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Embed.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Embed.java
index a235891..f2c603f 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Embed.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Embed.java
@@ -21,7 +21,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#the-embed-element"><embed></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
@@ -33,10 +33,10 @@ public class Embed extends HtmlElementVoid {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-dim-height">height</a>
* attribute.
- *
+ *
* <p>
* Vertical dimension.
- *
+ *
* @param height
* The new value for this attribute.
* Typically a {@link Number} or {@link String}.
@@ -49,17 +49,17 @@ public class Embed extends HtmlElementVoid {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-embed-src">src</a> attribute.
- *
+ *
* <p>
* Address of the resource.
- *
+ *
* <p>
* The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.
* Strings must be valid URIs.
- *
+ *
* <p>
* URIs defined by {@link UriResolver} can be used for values.
- *
+ *
* @param src
* The new value for this attribute.
* Typically a {@link URL} or {@link String}.
@@ -72,10 +72,10 @@ public class Embed extends HtmlElementVoid {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-embed-type">type</a> attribute.
- *
+ *
* <p>
* Type of embedded resource.
- *
+ *
* @param type The new value for this attribute.
* @return This object (for method chaining).
*/
@@ -86,10 +86,10 @@ public class Embed extends HtmlElementVoid {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-dim-width">width</a> attribute.
- *
+ *
* <p>
* Horizontal dimension.
- *
+ *
* @param width
* The new value for this attribute.
* Typically a {@link Number} or {@link String}.
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Fieldset.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Fieldset.java
index 6294eba..b558dbd 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Fieldset.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Fieldset.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-fieldset-element"><fieldset></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
@@ -28,10 +28,10 @@ public class Fieldset extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fieldset-disabled">disabled</a> attribute.
- *
+ *
* <p>
* Whether the form control is disabled.
- *
+ *
* @param disabled
* The new value for this attribute.
* Typically a {@link Boolean} or {@link String}.
@@ -44,10 +44,10 @@ public class Fieldset extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fae-form">form</a> attribute.
- *
+ *
* <p>
* Associates the control with a form element.
- *
+ *
* @param form The new value for this attribute.
* @return This object (for method chaining).
*/
@@ -58,10 +58,10 @@ public class Fieldset extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fe-name">name</a> attribute.
- *
+ *
* <p>
* Name of form control to use for form submission and in the form.elements API.
- *
+ *
* @param name The new value for this attribute.
* @return This object (for method chaining).
*/
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Figcaption.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Figcaption.java
index 6c1491e..b2b9b06 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Figcaption.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Figcaption.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#the-figcaption-element"><figcaption></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Figure.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Figure.java
index 6fcc861..cf3e279 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Figure.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Figure.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#the-figure-element"><figure></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Footer.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Footer.java
index 52db064..98df37d 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Footer.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Footer.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-footer-element"><footer></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Form.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Form.java
index c0059f6..ca61c79 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Form.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Form.java
@@ -21,7 +21,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-form-element"><form></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
@@ -33,10 +33,10 @@ public class Form extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-form-accept-charset">accept-charset</a>
* attribute.
- *
+ *
* <p>
* Character encodings to use for form submission.
- *
+ *
* @param acceptcharset The new value for this attribute.
* @return This object (for method chaining).
*/
@@ -47,17 +47,17 @@ public class Form extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fs-action">action</a> attribute.
- *
+ *
* <p>
* URL to use for form submission.
- *
+ *
* <p>
* The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.
* Strings must be valid URIs.
- *
+ *
* <p>
* URIs defined by {@link UriResolver} can be used for values.
- *
+ *
* @param action The new value for this attribute.
* @return This object (for method chaining).
*/
@@ -69,10 +69,10 @@ public class Form extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-form-autocomplete">autocomplete</a>
* attribute.
- *
+ *
* <p>
* Default setting for auto-fill feature for controls in the form.
- *
+ *
* @param autocomplete The new value for this attribute.
* @return This object (for method chaining).
*/
@@ -83,10 +83,10 @@ public class Form extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fs-enctype">enctype</a> attribute.
- *
+ *
* <p>
* Form data set encoding type to use for form submission.
- *
+ *
* @param enctype The new value for this attribute.
* @return This object (for method chaining).
*/
@@ -97,10 +97,10 @@ public class Form extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fs-method">method</a> attribute.
- *
+ *
* <p>
* HTTP method to use for form submission.
- *
+ *
* @param method The new value for this attribute.
* @return This object (for method chaining).
*/
@@ -111,10 +111,10 @@ public class Form extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-form-name">name</a> attribute.
- *
+ *
* <p>
* Name of form to use in the document.forms API.
- *
+ *
* @param name The new value for this attribute.
* @return This object (for method chaining).
*/
@@ -125,10 +125,10 @@ public class Form extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fs-novalidate">novalidate</a> attribute.
- *
+ *
* <p>
* Bypass form control validation for form submission.
- *
+ *
* @param novalidate The new value for this attribute.
* Typically a {@link Boolean} or {@link String}.
* @return This object (for method chaining).
@@ -140,10 +140,10 @@ public class Form extends HtmlElementMixed {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fs-target">target</a> attribute.
- *
+ *
* <p>
* Browsing context for form submission.
- *
+ *
* @param target The new value for this attribute.
* @return This object (for method chaining).
*/
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H1.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H1.java
index d0d15f5..fbe39d0 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H1.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H1.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements"><h1></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H2.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H2.java
index 95454f7..2ce5045 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H2.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H2.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements"><h2></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H3.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H3.java
index 632c648..3179666 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H3.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H3.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements"><h3></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H4.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H4.java
index 99cac40..7918823 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H4.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H4.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements"><h4></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H5.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H5.java
index 85b4903..bd68ea4 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H5.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H5.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements"><h5></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H6.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H6.java
index eb82002..e7a076c 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H6.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H6.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements"><h6></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Head.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Head.java
index 033d3c2..f4946cd 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Head.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Head.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/document-metadata.html#the-head-element"><head></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Header.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Header.java
index 5d73abb..5e999a7 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Header.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Header.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-header-element"><header></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Hr.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Hr.java
index 0c7f0cc..4278a53 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Hr.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Hr.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#the-hr-element"><hr></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Html.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Html.java
index 39af231..fd88d6c 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Html.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Html.java
@@ -17,7 +17,7 @@ import org.apache.juneau.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/semantics.html#the-html-element"><html></a>
* element.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
@@ -28,10 +28,10 @@ public class Html extends HtmlElementContainer {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/semantics.html#attr-html-manifest">manifest</a> attribute.
- *
+ *
* <p>
* Application cache manifest.
- *
+ *
* @param manifest The new value for this attribute.
* @return This object (for method chaining).
*/
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlBeanDictionary.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlBeanDictionary.java
index 6c84067..5f808f1 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlBeanDictionary.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlBeanDictionary.java
@@ -16,7 +16,7 @@ import org.apache.juneau.*;
/**
* Defines the Java classes that make up the HTML DTO type dictionary.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlBuilder.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlBuilder.java
index 307ab0d..3d152f3 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlBuilder.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlBuilder.java
@@ -14,7 +14,7 @@ package org.apache.juneau.dto.html5;
/**
* Various useful static methods for creating HTML elements.
- *
+ *
* <h5 class='section'>See Also:</h5>
* <ul class='doctree'>
* <li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.HTML5'>Overview > juneau-dto > HTML5</a>
@@ -24,7 +24,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link A} element.
- *
+ *
* @return The new element.
*/
public static final A a() {
@@ -34,7 +34,7 @@ public class HtmlBuilder {
/**
* Creates an {@link A} element with the specified {@link A#href(Object)} attribute and {@link A#children(Object[])}
* nodes.
- *
+ *
* @param href The {@link A#href(Object)} attribute.
* @param children The {@link A#children(Object[])} nodes.
* @return The new element.
@@ -45,7 +45,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Abbr} element.
- *
+ *
* @return The new element.
*/
public static final Abbr abbr() {
@@ -55,7 +55,7 @@ public class HtmlBuilder {
/**
* Creates an {@link Abbr} element with the specified {@link Abbr#title(String)} attribute and
* {@link Abbr#children(Object[])} nodes.
- *
+ *
* @param title The {@link Abbr#title(String)} attribute.
* @param children The {@link Abbr#children(Object[])} nodes.
* @return The new element.
@@ -66,7 +66,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Address} element.
- *
+ *
* @return The new element.
*/
public static final Address address() {
@@ -75,7 +75,7 @@ public class HtmlBuilder {
/**
* Creates an {@link Address} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -85,7 +85,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Area} element.
- *
+ *
* @return The new element.
*/
public static final Area area() {
@@ -95,7 +95,7 @@ public class HtmlBuilder {
/**
* Creates an {@link Area} element with the specified {@link Area#shape(String)}, {@link Area#coords(String)},
* and {@link Area#href(Object)} attributes.
- *
+ *
* @param shape The {@link Area#shape(String)} attribute.
* @param coords The {@link Area#coords(String)} attribute.
* @param href The {@link Area#href(Object)} attribute.
@@ -107,7 +107,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Article} element.
- *
+ *
* @return The new element.
*/
public static final Article article() {
@@ -116,7 +116,7 @@ public class HtmlBuilder {
/**
* Creates an {@link Article} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -126,7 +126,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Aside} element.
- *
+ *
* @return The new element.
*/
public static final Aside aside() {
@@ -135,7 +135,7 @@ public class HtmlBuilder {
/**
* Creates an {@link Aside} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -145,7 +145,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Audio} element.
- *
+ *
* @return The new element.
*/
public static final Audio audio() {
@@ -154,7 +154,7 @@ public class HtmlBuilder {
/**
* Creates an {@link Audio} element with the specified {@link Audio#src(Object)} attribute.
- *
+ *
* @param src The {@link Audio#src(Object)} attribute.
* @return The new element.
*/
@@ -164,7 +164,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link B} element.
- *
+ *
* @return The new element.
*/
public static final B b() {
@@ -173,7 +173,7 @@ public class HtmlBuilder {
/**
* Creates a {@link B} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -183,7 +183,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Base} element.
- *
+ *
* @return The new element.
*/
public static final Base base() {
@@ -192,7 +192,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Base} element with the specified {@link Base#href(Object)} attribute.
- *
+ *
* @param href The {@link Base#href(Object)} attribute.
* @return The new element.
*/
@@ -202,7 +202,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Bdi} element.
- *
+ *
* @return The new element.
*/
public static final Bdi bdi() {
@@ -211,7 +211,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Bdi} element with the specified {@link Bdi#text(Object)} node.
- *
+ *
* @param text The {@link Bdi#text(Object)} node.
* @return The new element.
*/
@@ -221,7 +221,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Bdo} element.
- *
+ *
* @return The new element.
*/
public static final Bdo bdo() {
@@ -230,7 +230,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Bdo} element with the specified {@link Bdo#dir(String)} attribute and child nodes.
- *
+ *
* @param dir The {@link Bdo#dir(String)} attribute.
* @param children The child nodes.
* @return The new element.
@@ -241,7 +241,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Blockquote} element.
- *
+ *
* @return The new element.
*/
public static final Blockquote blockquote() {
@@ -250,7 +250,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Blockquote} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -260,7 +260,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Body} element.
- *
+ *
* @return The new element.
*/
public static final Body body() {
@@ -269,7 +269,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Body} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -279,7 +279,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Br} element.
- *
+ *
* @return The new element.
*/
public static final Br br() {
@@ -288,7 +288,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Button} element.
- *
+ *
* @return The new element.
*/
public static final Button button() {
@@ -297,7 +297,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Button} element with the specified {@link Button#type(String)} attribute.
- *
+ *
* @param type The {@link Button#type(String)} attribute.
* @return The new element.
*/
@@ -308,7 +308,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Button} element with the specified {@link Button#type(String)} attribute and
* {@link Button#children(Object[])} nodes.
- *
+ *
* @param type The {@link Button#type(String)} attribute.
* @param children The {@link Button#children(Object[])} nodes.
* @return The new element.
@@ -328,7 +328,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Canvas} element with the specified {@link Canvas#width(Object)} and
* {@link Canvas#height(Object)} attributes.
- *
+ *
* @param width The {@link Canvas#width(Object)} attribute.
* @param height The {@link Canvas#height(Object)} attribute.
* @return The new element.
@@ -339,7 +339,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Caption} element.
- *
+ *
* @return The new element.
*/
public static final Caption caption() {
@@ -348,7 +348,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Caption} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -358,7 +358,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Cite} element.
- *
+ *
* @return The new element.
*/
public static final Cite cite() {
@@ -367,7 +367,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Cite} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -377,7 +377,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Code} element.
- *
+ *
* @return The new element.
*/
public static final Code code() {
@@ -386,7 +386,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Code} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -396,9 +396,9 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Col} element.
- *
+ *
* @return The new element.
- *
+ *
*/
public static final Col col() {
return new Col();
@@ -406,7 +406,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Col} element with the specified {@link Col#span(Object)} attribute.
- *
+ *
* @param span The {@link Col#span(Object)} attribute.
* @return The new element.
*/
@@ -416,7 +416,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Colgroup} element.
- *
+ *
* @return The new element.
*/
public static final Colgroup colgroup() {
@@ -425,7 +425,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Colgroup} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -435,7 +435,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Data} element.
- *
+ *
* @return The new element.
*/
public static final Data data() {
@@ -444,7 +444,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Data} element with the specified {@link Data#value(Object)} attribute and child node.
- *
+ *
* @param value The {@link Data#value(Object)} attribute.
* @param child The child node.
* @return The new element.
@@ -455,7 +455,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Datalist} element.
- *
+ *
* @return The new element.
*/
public static final Datalist datalist() {
@@ -464,7 +464,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Datalist} element with the specified {@link Datalist#id(String)} attribute and child nodes.
- *
+ *
* @param id The {@link Datalist#id(String)} attribute.
* @param children The child nodes.
* @return The new element.
@@ -475,7 +475,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Dd} element.
- *
+ *
* @return The new element.
*/
public static final Dd dd() {
@@ -484,7 +484,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Dd} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -494,7 +494,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Del} element.
- *
+ *
* @return The new element.
*/
public static final Del del() {
@@ -503,7 +503,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Del} element with the specified {@link Del#children(Object[])} node.
- *
+ *
* @param children The {@link Del#children(Object[])} node.
* @return The new element.
*/
@@ -513,7 +513,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Dfn} element.
- *
+ *
* @return The new element.
*/
public static final Dfn dfn() {
@@ -522,7 +522,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Dfn} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -532,7 +532,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Div} element.
- *
+ *
* @return The new element.
*/
public static final Div div() {
@@ -541,7 +541,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Div} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -551,7 +551,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Dl} element.
- *
+ *
* @return The new element.
*/
public static final Dl dl() {
@@ -560,7 +560,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Dl} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -570,7 +570,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Dt} element.
- *
+ *
* @return The new element.
*/
public static final Dt dt() {
@@ -579,7 +579,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Dt} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -589,7 +589,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Em} element.
- *
+ *
* @return The new element.
*/
public static final Em em() {
@@ -598,7 +598,7 @@ public class HtmlBuilder {
/**
* Creates an {@link Em} element with the specified {@link Em#children(Object[])} nodes.
- *
+ *
* @param children The {@link Em#children(Object[])} nodes.
* @return The new element.
*/
@@ -608,7 +608,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Embed} element.
- *
+ *
* @return The new element.
*/
public static final Embed embed() {
@@ -617,7 +617,7 @@ public class HtmlBuilder {
/**
* Creates an {@link Embed} element with the specified {@link Embed#src(Object)} attribute.
- *
+ *
* @param src The {@link Embed#src(Object)} attribute.
* @return The new element.
*/
@@ -627,7 +627,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Fieldset} element.
- *
+ *
* @return The new element.
*/
public static final Fieldset fieldset() {
@@ -636,7 +636,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Fieldset} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -646,7 +646,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Figcaption} element.
- *
+ *
* @return The new element.
*/
public static final Figcaption figcaption() {
@@ -655,7 +655,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Figcaption} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -665,7 +665,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Figure} element.
- *
+ *
* @return The new element.
*/
public static final Figure figure() {
@@ -674,7 +674,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Figure} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -684,7 +684,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Footer} element.
- *
+ *
* @return The new element.
*/
public static final Footer footer() {
@@ -693,7 +693,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Footer} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -703,7 +703,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Form} element.
- *
+ *
* @return The new element.
*/
public static final Form form() {
@@ -712,7 +712,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Form} element with the specified {@link Form#action(String)} attribute.
- *
+ *
* @param action The {@link Form#action(String)} attribute.
* @return The new element.
*/
@@ -722,7 +722,7 @@ public class HtmlBuilder {
/**
* Creates an {@link Form} element with the specified {@link Form#action(String)} attribute and child nodes.
- *
+ *
* @param action The {@link Form#action(String)} attribute.
* @param children The child nodes.
* @return The new element.
@@ -733,7 +733,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link H1} element.
- *
+ *
* @return The new element.
*/
public static final H1 h1() {
@@ -742,7 +742,7 @@ public class HtmlBuilder {
/**
* Creates an {@link H1} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -752,7 +752,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link H2} element.
- *
+ *
* @return The new element.
*/
public static final H2 h2() {
@@ -761,7 +761,7 @@ public class HtmlBuilder {
/**
* Creates an {@link H2} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -771,7 +771,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link H3} element.
- *
+ *
* @return The new element.
*/
public static final H3 h3() {
@@ -780,7 +780,7 @@ public class HtmlBuilder {
/**
* Creates an {@link H3} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -790,7 +790,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link H4} element.
- *
+ *
* @return The new element.
*/
public static final H4 h4() {
@@ -799,7 +799,7 @@ public class HtmlBuilder {
/**
* Creates an {@link H4} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -809,7 +809,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link H5} element.
- *
+ *
* @return The new element.
*/
public static final H5 h5() {
@@ -818,7 +818,7 @@ public class HtmlBuilder {
/**
* Creates an {@link H5} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -836,7 +836,7 @@ public class HtmlBuilder {
/**
* Creates an {@link H6} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -846,7 +846,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Head} element.
- *
+ *
* @return The new element.
*/
public static final Head head() {
@@ -855,7 +855,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Head} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -865,7 +865,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Header} element.
- *
+ *
* @return The new element.
*/
public static final Header header() {
@@ -874,7 +874,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Header} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -884,7 +884,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Hr} element.
- *
+ *
* @return The new element.
*/
public static final Hr hr() {
@@ -893,7 +893,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Html} element.
- *
+ *
* @return The new element.
*/
public static final Html html() {
@@ -902,7 +902,7 @@ public class HtmlBuilder {
/**
* Creates an {@link Html} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -912,7 +912,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link I} element.
- *
+ *
* @return The new element.
*/
public static final I i() {
@@ -921,7 +921,7 @@ public class HtmlBuilder {
/**
* Creates an {@link I} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -931,7 +931,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Iframe} element.
- *
+ *
* @return The new element.
*/
public static final Iframe iframe() {
@@ -940,7 +940,7 @@ public class HtmlBuilder {
/**
* Creates an {@link Iframe} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -950,7 +950,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Img} element.
- *
+ *
* @return The new element.
*/
public static final Img img() {
@@ -959,7 +959,7 @@ public class HtmlBuilder {
/**
* Creates an {@link Img} element with the specified {@link Img#src(Object)} attribute.
- *
+ *
* @param src The {@link Img#src(Object)} attribute.
* @return The new element.
*/
@@ -969,7 +969,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Input} element.
- *
+ *
* @return The new element.
*/
public static final Input input() {
@@ -978,7 +978,7 @@ public class HtmlBuilder {
/**
* Creates an {@link Input} element with the specified {@link Input#type(String)} attribute.
- *
+ *
* @param type The {@link Input#type(String)} attribute.
* @return The new element.
*/
@@ -988,7 +988,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Ins} element.
- *
+ *
* @return The new element.
*/
public static final Ins ins() {
@@ -997,7 +997,7 @@ public class HtmlBuilder {
/**
* Creates an {@link Ins} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -1007,7 +1007,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Kbd} element.
- *
+ *
* @return The new element.
*/
public static final Kbd kbd() {
@@ -1016,7 +1016,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Kbd} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -1026,7 +1026,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Keygen} element.
- *
+ *
* @return The new element.
*/
public static final Keygen keygen() {
@@ -1035,7 +1035,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Label} element.
- *
+ *
* @return The new element.
*/
public static final Label label() {
@@ -1044,7 +1044,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Label} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -1054,7 +1054,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Legend} element.
- *
+ *
* @return The new element.
*/
public static final Legend legend() {
@@ -1063,7 +1063,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Legend} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -1073,7 +1073,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Li} element.
- *
+ *
* @return The new element.
*/
public static final Li li() {
@@ -1082,7 +1082,7 @@ public class HtmlBuilder {
/**
* Creates an {@link Li} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -1092,7 +1092,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Link} element.
- *
+ *
* @return The new element.
*/
public static final Link link() {
@@ -1101,7 +1101,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Link} element with the specified {@link Link#href(Object)} attribute.
- *
+ *
* @param href The {@link Link#href(Object)} attribute.
* @return The new element.
*/
@@ -1111,7 +1111,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Main} element.
- *
+ *
* @return The new element.
*/
public static final Main main() {
@@ -1120,7 +1120,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Main} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -1130,7 +1130,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Map} element.
- *
+ *
* @return The new element.
*/
public static final Map map() {
@@ -1139,7 +1139,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Map} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -1149,7 +1149,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Mark} element.
- *
+ *
* @return The new element.
*/
public static final Mark mark() {
@@ -1158,7 +1158,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Mark} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -1168,7 +1168,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Meta} element.
- *
+ *
* @return The new element.
*/
public static final Meta meta() {
@@ -1177,7 +1177,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Meter} element.
- *
+ *
* @return The new element.
*/
public static final Meter meter() {
@@ -1186,7 +1186,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Meter} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -1196,7 +1196,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Nav} element.
- *
+ *
* @return The new element.
*/
public static final Nav nav() {
@@ -1205,7 +1205,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Nav} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -1215,7 +1215,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Noscript} element.
- *
+ *
* @return The new element.
*/
public static final Noscript noscript() {
@@ -1224,7 +1224,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Noscript} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -1234,7 +1234,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Object2} element.
- *
+ *
* @return The new element.
*/
public static final Object2 object() {
@@ -1243,7 +1243,7 @@ public class HtmlBuilder {
/**
* Creates an {@link Object2} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -1253,7 +1253,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Ol} element.
- *
+ *
* @return The new element.
*/
public static final Ol ol() {
@@ -1262,7 +1262,7 @@ public class HtmlBuilder {
/**
* Creates an {@link Ol} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -1272,7 +1272,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Optgroup} element.
- *
+ *
* @return The new element.
*/
public static final Optgroup optgroup() {
@@ -1281,7 +1281,7 @@ public class HtmlBuilder {
/**
* Creates an {@link Optgroup} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -1291,7 +1291,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Option} element.
- *
+ *
* @return The new element.
*/
public static final Option option() {
@@ -1300,7 +1300,7 @@ public class HtmlBuilder {
/**
* Creates an {@link Option} element with the specified {@link Option#text(Object)} attribute.
- *
+ *
* @param text The {@link Option#text(Object)} attribute.
* @return The new element.
*/
@@ -1311,7 +1311,7 @@ public class HtmlBuilder {
/**
* Creates an {@link Option} element with the specified {@link Option#value(Object)} attribute and
* {@link Option#text(Object)} node.
- *
+ *
* @param value The {@link Option#value(Object)} attribute.
* @param text The {@link Option#text(Object)} node.
* @return The new element.
@@ -1322,7 +1322,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Output} element.
- *
+ *
* @return The new element.
*/
public static final Output output() {
@@ -1331,7 +1331,7 @@ public class HtmlBuilder {
/**
* Creates an {@link Output} element with the specified {@link Output#name(String)} attribute.
- *
+ *
* @param name The {@link Output#name(String)} attribute.
* @return The new element.
*/
@@ -1341,7 +1341,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link P} element.
- *
+ *
* @return The new element.
*/
public static final P p() {
@@ -1350,7 +1350,7 @@ public class HtmlBuilder {
/**
* Creates a {@link P} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -1360,7 +1360,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Param} element.
- *
+ *
* @return The new element.
*/
public static final Param param() {
@@ -1370,7 +1370,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Param} element with the specified {@link Param#name(String)} and {@link Param#value(Object)}
* attributes.
- *
+ *
* @param name The {@link Param#name(String)} attribute.
* @param value The {@link Param#value(Object)} attribute.
* @return The new element.
@@ -1381,7 +1381,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Pre} element.
- *
+ *
* @return The new element.
*/
public static final Pre pre() {
@@ -1390,7 +1390,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Pre} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -1400,7 +1400,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Progress} element.
- *
+ *
* @return The new element.
*/
public static final Progress progress() {
@@ -1409,7 +1409,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Progress} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -1419,7 +1419,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Q} element.
- *
+ *
* @return The new element.
*/
public static final Q q() {
@@ -1428,7 +1428,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Q} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -1438,7 +1438,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Rb} element.
- *
+ *
* @return The new element.
*/
public static final Rb rb() {
@@ -1447,7 +1447,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Rb} element with the specified {@link Rb#children(Object[])} nodes.
- *
+ *
* @param children The {@link Rb#children(Object[])} nodes.
* @return The new element.
*/
@@ -1457,7 +1457,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Rp} element.
- *
+ *
* @return The new element.
*/
public static final Rp rp() {
@@ -1466,7 +1466,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Rp} element with the specified {@link Rp#children(Object[])} nodes.
- *
+ *
* @param children The {@link Rp#children(Object[])} nodes.
* @return The new element.
*/
@@ -1476,7 +1476,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Rt} element.
- *
+ *
* @return The new element.
*/
public static final Rt rt() {
@@ -1485,7 +1485,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Rt} element with the specified {@link Rt#children(Object[])} nodes.
- *
+ *
* @param children The {@link Rt#children(Object[])} nodes.
* @return The new element.
*/
@@ -1495,7 +1495,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Rtc} element.
- *
+ *
* @return The new element.
*/
public static final Rtc rtc() {
@@ -1504,7 +1504,7 @@ public class HtmlBuilder {
/**
* Creates an {@link Rtc} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -1514,7 +1514,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Ruby} element.
- *
+ *
* @return The new element.
*/
public static final Ruby ruby() {
@@ -1523,7 +1523,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Ruby} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -1533,7 +1533,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link S} element.
- *
+ *
* @return The new element.
*/
public static final S s() {
@@ -1542,7 +1542,7 @@ public class HtmlBuilder {
/**
* Creates an {@link S} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -1552,7 +1552,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Samp} element.
- *
+ *
* @return The new element.
*/
public static final Samp samp() {
@@ -1561,7 +1561,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Samp} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -1571,7 +1571,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Script} element.
- *
+ *
* @return The new element.
*/
public static final Script script() {
@@ -1581,7 +1581,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Script} element with the specified {@link Script#type(String)} attribute and
* {@link Script#text(Object)} node.
- *
+ *
* @param type The {@link Script#type(String)} attribute.
* @param text The child text node.
* @return The new element.
@@ -1592,7 +1592,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Section} element.
- *
+ *
* @return The new element.
*/
public static final Section section() {
@@ -1601,7 +1601,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Section} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -1611,7 +1611,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Select} element.
- *
+ *
* @return The new element.
*/
public static final Select select() {
@@ -1620,7 +1620,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Select} element with the specified {@link Select#name(String)} attribute and child nodes.
- *
+ *
* @param name The {@link Select#name(String)} attribute.
* @param children The child nodes.
* @return The new element.
@@ -1631,7 +1631,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Small} element.
- *
+ *
* @return The new element.
*/
public static final Small small() {
@@ -1640,7 +1640,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Small} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -1650,7 +1650,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Source} element.
- *
+ *
* @return The new element.
*/
public static final Source source() {
@@ -1660,7 +1660,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Source} element with the specified {@link Source#src(Object)} and {@link Source#type(String)}
* attributes.
- *
+ *
* @param src The {@link Source#src(Object)} attribute.
* @param type The {@link Source#type(String)} attribute.
* @return The new element.
@@ -1671,7 +1671,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Span} element.
- *
+ *
* @return The new element.
*/
public static final Span span() {
@@ -1680,7 +1680,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Span} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -1690,7 +1690,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Strong} element.
- *
+ *
* @return The new element.
*/
public static final Strong strong() {
@@ -1699,7 +1699,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Strong} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -1709,7 +1709,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Style} element.
- *
+ *
* @return The new element.
*/
public static final Style style() {
@@ -1718,7 +1718,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Style} element with the specified {@link Style#text(Object)} node.
- *
+ *
* @param text The {@link Style#text(Object)} node.
* @return The new element.
*/
@@ -1728,7 +1728,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Sub} element.
- *
+ *
* @return The new element.
*/
public static final Sub sub() {
@@ -1737,7 +1737,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Sub} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -1747,7 +1747,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Sup} element.
- *
+ *
* @return The new element.
*/
public static final Sup sup() {
@@ -1756,7 +1756,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Sup} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -1766,7 +1766,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Table} element.
- *
+ *
* @return The new element.
*/
public static final Table table() {
@@ -1775,7 +1775,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Table} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -1785,7 +1785,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Tbody} element.
- *
+ *
* @return The new element.
*/
public static final Tbody tbody() {
@@ -1794,7 +1794,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Tbody} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -1804,7 +1804,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Td} element.
- *
+ *
* @return The new element.
*/
public static final Td td() {
@@ -1813,7 +1813,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Td} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -1823,7 +1823,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Template} element.
- *
+ *
* @return The new element.
*/
public static final Template template() {
@@ -1832,7 +1832,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Template} element with the specified {@link Template#id(String)} attribute and child nodes.
- *
+ *
* @param id The {@link Template#id(String)} attribute.
* @param children The child nodes.
* @return The new element.
@@ -1843,7 +1843,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Textarea} element.
- *
+ *
* @return The new element.
*/
public static final Textarea textarea() {
@@ -1853,7 +1853,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Textarea} element with the specified {@link Textarea#name(String)} attribute and
* {@link Textarea#text(Object)} node.
- *
+ *
* @param name The {@link Textarea#name(String)} attribute.
* @param text The {@link Textarea#text(Object)} node.
* @return The new element.
@@ -1864,7 +1864,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Tfoot} element.
- *
+ *
* @return The new element.
*/
public static final Tfoot tfoot() {
@@ -1873,7 +1873,7 @@ public class HtmlBuilder {
/**
* Creates a {@link Tfoot} element with the specified child nodes.
- *
+ *
* @param children The child nodes.
* @return The new element.
*/
@@ -1883,7 +1883,7 @@ public class HtmlBuilder {
/**
* Creates an empty {@link Th} element.
- *
+ *
* @return The new element.
... 113291 lines suppressed ...