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 98d2b38 Fix broken links in Javadocs. 98d2b38 is described below commit 98d2b381945813af1da862a137a0141a56b32bc5 Author: JamesBognar <jamesbog...@apache.org> AuthorDate: Thu Jul 12 21:43:38 2018 -0400 Fix broken links in Javadocs. --- .../org/apache/juneau/jena/RdfParserSession.java | 13 +- .../java/org/apache/juneau/jena/RdfSerializer.java | 2 +- .../apache/juneau/jena/RdfSerializerSession.java | 27 ++-- .../main/java/org/apache/juneau/BeanSession.java | 54 ++++--- .../juneau/html/HtmlDocSerializerSession.java | 24 +-- .../apache/juneau/html/HtmlSerializerSession.java | 15 +- .../org/apache/juneau/json/JsonParserSession.java | 3 +- .../apache/juneau/json/JsonSerializerSession.java | 8 +- .../jsonschema/JsonSchemaSerializerSession.java | 15 +- .../juneau/parser/InputStreamParserSession.java | 4 +- .../org/apache/juneau/parser/ParserSession.java | 12 +- .../apache/juneau/parser/ReaderParserSession.java | 5 +- .../serializer/OutputStreamSerializerSession.java | 4 +- .../juneau/serializer/SerializerSession.java | 34 ++--- .../juneau/serializer/WriterSerializerSession.java | 6 +- .../org/apache/juneau/uon/UonParserSession.java | 4 +- .../apache/juneau/uon/UonSerializerSession.java | 8 +- .../urlencoding/UrlEncodingParserSession.java | 4 +- .../urlencoding/UrlEncodingSerializerSession.java | 3 +- .../org/apache/juneau/xml/XmlParserSession.java | 11 +- .../apache/juneau/xml/XmlSerializerSession.java | 14 +- juneau-doc/src/main/javadoc/overview.html | 167 ++++++++++----------- 22 files changed, 203 insertions(+), 234 deletions(-) diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java index 7f97878..1f35951 100644 --- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java +++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java @@ -12,7 +12,6 @@ // *************************************************************************************************************************** package org.apache.juneau.jena; -import static org.apache.juneau.jena.RdfParser.*; import static org.apache.juneau.internal.StringUtils.*; import static org.apache.juneau.jena.Constants.*; @@ -438,7 +437,7 @@ public class RdfParserSession extends ReaderParserSession { /** * Configuration property: Trim whitespace from text elements. * - * @see #RDF_trimWhitespace + * @see RdfParser#RDF_trimWhitespace * @return * <jk>true</jk> if whitespace in text elements will be automatically trimmed. */ @@ -449,7 +448,7 @@ public class RdfParserSession extends ReaderParserSession { /** * Configuration property: Collections should be serialized and parsed as loose collections. * - * @see #RDF_looseCollections + * @see RdfParser#RDF_looseCollections * @return * <jk>true</jk> if collections of resources are handled as loose collections of resources in RDF instead of * resources that are children of an RDF collection (e.g. Sequence, Bag). @@ -461,7 +460,7 @@ public class RdfParserSession extends ReaderParserSession { /** * Configuration property: RDF language. * - * @see #RDF_language + * @see RdfParser#RDF_language * @return * The RDF language to use. */ @@ -472,7 +471,7 @@ public class RdfParserSession extends ReaderParserSession { /** * Configuration property: XML namespace for Juneau properties. * - * @see #RDF_juneauNs + * @see RdfParser#RDF_juneauNs * @return * XML namespace for Juneau properties. */ @@ -483,7 +482,7 @@ public class RdfParserSession extends ReaderParserSession { /** * Configuration property: Default XML namespace for bean properties. * - * @see #RDF_juneauBpNs + * @see RdfParser#RDF_juneauBpNs * @return * Default XML namespace for bean properties. */ @@ -494,7 +493,7 @@ public class RdfParserSession extends ReaderParserSession { /** * Configuration property: RDF format for representing collections and arrays. * - * @see #RDF_collectionFormat + * @see RdfParser#RDF_collectionFormat * @return * RDF format for representing collections and arrays. */ diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java index b66b0cb..fca3b75 100644 --- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java +++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java @@ -418,7 +418,7 @@ public class RdfSerializer extends WriterSerializer implements RdfCommon { * <jk>true</jk> if RDF property <code>http://www.apache.org/juneau/root</code> is added with a value of <js>"true"</js> * to identify the root node in the graph. */ - protected final boolean isAddRootProperty() { + protected final boolean isAddRootProp() { return addRootProperty; } diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java index 96a8118..ca91ba1 100644 --- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java +++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java @@ -13,7 +13,6 @@ package org.apache.juneau.jena; import static org.apache.juneau.jena.Constants.*; -import static org.apache.juneau.jena.RdfCommon.*; import static org.apache.juneau.jena.RdfSerializer.*; import java.util.*; @@ -140,7 +139,7 @@ public final class RdfSerializerSession extends WriterSerializerSession { r = n.asResource(); } - if (isAddRootProperty()) + if (isAddRootProp()) r.addProperty(pRoot, "true"); } @@ -410,7 +409,7 @@ public final class RdfSerializerSession extends WriterSerializerSession { /** * Configuration property: Add XSI data types to non-<code>String</code> literals. * - * @see #RDF_addLiteralTypes + * @see RdfSerializer#RDF_addLiteralTypes * @return * <jk>true</jk> if XSI data types should be added to string literals. */ @@ -421,19 +420,19 @@ public final class RdfSerializerSession extends WriterSerializerSession { /** * Configuration property: Add RDF root identifier property to root node. * - * @see #RDF_addRootProperty + * @see RdfSerializer#RDF_addRootProperty * @return * <jk>true</jk> if RDF property <code>http://www.apache.org/juneau/root</code> is added with a value of <js>"true"</js> * to identify the root node in the graph. */ - protected final boolean isAddRootProperty() { - return ctx.isAddRootProperty(); + protected final boolean isAddRootProp() { + return ctx.isAddRootProp(); } /** * Configuration property: Reuse XML namespaces when RDF namespaces not specified. * - * @see #RDF_useXmlNamespaces + * @see RdfSerializer#RDF_useXmlNamespaces * @return * <jk>true</jk> if namespaces defined using {@link XmlNs @XmlNs} and {@link org.apache.juneau.xml.annotation.Xml @Xml} will be inherited by the RDF serializers. * <br>Otherwise, namespaces will be defined using {@link RdfNs @RdfNs} and {@link Rdf @Rdf}. @@ -445,7 +444,7 @@ public final class RdfSerializerSession extends WriterSerializerSession { /** * Configuration property: Collections should be serialized and parsed as loose collections. * - * @see #RDF_looseCollections + * @see RdfSerializer#RDF_looseCollections * @return * <jk>true</jk> if collections of resources are handled as loose collections of resources in RDF instead of * resources that are children of an RDF collection (e.g. Sequence, Bag). @@ -457,7 +456,7 @@ public final class RdfSerializerSession extends WriterSerializerSession { /** * Configuration property: Auto-detect namespace usage. * - * @see #RDF_autoDetectNamespaces + * @see RdfSerializer#RDF_autoDetectNamespaces * @return * <jk>true</jk> if namespaces usage should be detected before serialization. */ @@ -468,7 +467,7 @@ public final class RdfSerializerSession extends WriterSerializerSession { /** * Configuration property: Add <js>"_type"</js> properties when needed. * - * @see #RDF_addBeanTypes + * @see RdfSerializer#RDF_addBeanTypes * @return * <jk>true</jk> if <js>"_type"</js> properties will be added to beans if their type cannot be inferred * through reflection. @@ -481,7 +480,7 @@ public final class RdfSerializerSession extends WriterSerializerSession { /** * Configuration property: RDF language. * - * @see #RDF_language + * @see RdfSerializer#RDF_language * @return * The RDF language to use. */ @@ -492,7 +491,7 @@ public final class RdfSerializerSession extends WriterSerializerSession { /** * Configuration property: XML namespace for Juneau properties. * - * @see #RDF_juneauNs + * @see RdfSerializer#RDF_juneauNs * @return * The XML namespace to use for Juneau properties. */ @@ -503,7 +502,7 @@ public final class RdfSerializerSession extends WriterSerializerSession { /** * Configuration property: Default XML namespace for bean properties. * - * @see #RDF_juneauBpNs + * @see RdfSerializer#RDF_juneauBpNs * @return * The XML namespace to use for bean properties. */ @@ -514,7 +513,7 @@ public final class RdfSerializerSession extends WriterSerializerSession { /** * Configuration property: RDF format for representing collections and arrays. * - * @see #RDF_collectionFormat + * @see RdfSerializer#RDF_collectionFormat * @return * RDF format for representing collections and arrays. */ diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java index bb15230..ce05f84 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java @@ -12,7 +12,6 @@ // *************************************************************************************************************************** package org.apache.juneau; -import static org.apache.juneau.BeanContext.*; import static org.apache.juneau.internal.ClassUtils.*; import static org.apache.juneau.internal.StringUtils.*; import static org.apache.juneau.internal.ThrowableUtils.*; @@ -1183,7 +1182,7 @@ public class BeanSession extends Session { /** * Configuration property: Beans require no-arg constructors. * - * @see #BEAN_beansRequireDefaultConstructor + * @see BeanContext#BEAN_beansRequireDefaultConstructor * @return * <jk>true</jk> if a Java class must implement a default no-arg constructor to be considered a bean. * <br>Otherwise, the bean will be serialized as a string using the {@link Object#toString()} method. @@ -1195,7 +1194,7 @@ public class BeanSession extends Session { /** * Configuration property: Beans require Serializable interface. * - * @see #BEAN_beansRequireSerializable + * @see BeanContext#BEAN_beansRequireSerializable * @return * <jk>true</jk> if a Java class must implement the {@link Serializable} interface to be considered a bean. * <br>Otherwise, the bean will be serialized as a string using the {@link Object#toString()} method. @@ -1207,7 +1206,7 @@ public class BeanSession extends Session { /** * Configuration property: Beans require setters for getters. * - * @see #BEAN_beansRequireSettersForGetters + * @see BeanContext#BEAN_beansRequireSettersForGetters * @return * <jk>true</jk> if only getters that have equivalent setters will be considered as properties on a bean. * <br>Otherwise, they are ignored. @@ -1219,7 +1218,7 @@ public class BeanSession extends Session { /** * Configuration property: Beans require at least one property. * - * @see #BEAN_beansRequireSomeProperties + * @see BeanContext#BEAN_beansRequireSomeProperties * @return * <jk>true</jk> if a Java class must contain at least 1 property to be considered a bean. * <br>Otherwise, the bean is serialized as a string using the {@link Object#toString()} method. @@ -1231,7 +1230,7 @@ public class BeanSession extends Session { /** * Configuration property: BeanMap.put() returns old property value. * - * @see #BEAN_beanMapPutReturnsOldValue + * @see BeanContext#BEAN_beanMapPutReturnsOldValue * @return * <jk>true</jk> if the {@link BeanMap#put(String,Object) BeanMap.put()} method will return old property values. * <br>Otherwise, it returns <jk>null</jk>. @@ -1243,7 +1242,7 @@ public class BeanSession extends Session { /** * Configuration property: Use interface proxies. * - * @see #BEAN_useInterfaceProxies + * @see BeanContext#BEAN_useInterfaceProxies * @return * <jk>true</jk> if interfaces will be instantiated as proxy classes through the use of an * {@link InvocationHandler} if there is no other way of instantiating them. @@ -1255,7 +1254,7 @@ public class BeanSession extends Session { /** * Configuration property: Ignore unknown properties. * - * @see #BEAN_ignoreUnknownBeanProperties + * @see BeanContext#BEAN_ignoreUnknownBeanProperties * @return * <jk>true</jk> if trying to set a value on a non-existent bean property is silently ignored. * <br>Otherwise, a {@code RuntimeException} is thrown. @@ -1267,7 +1266,7 @@ public class BeanSession extends Session { /** * Configuration property: Ignore unknown properties with null values. * - * @see #BEAN_ignoreUnknownNullBeanProperties + * @see BeanContext#BEAN_ignoreUnknownNullBeanProperties * @return * <jk>true</jk> if trying to set a <jk>null</jk> value on a non-existent bean property is silently ignored. */ @@ -1280,7 +1279,7 @@ public class BeanSession extends Session { * * <br>Otherwise, a {@code RuntimeException} is thrown. * - * @see #BEAN_ignorePropertiesWithoutSetters + * @see BeanContext#BEAN_ignorePropertiesWithoutSetters * @return * <jk>true</jk> if trying to set a value on a bean property without a setter is silently ignored. */ @@ -1291,7 +1290,7 @@ public class BeanSession extends Session { /** * Configuration property: Ignore invocation errors on getters. * - * @see #BEAN_ignoreInvocationExceptionsOnGetters + * @see BeanContext#BEAN_ignoreInvocationExceptionsOnGetters * @return * <jk>true</jk> if errors thrown when calling bean getter methods are silently ignored. */ @@ -1302,7 +1301,7 @@ public class BeanSession extends Session { /** * Configuration property: Ignore invocation errors on setters. * - * @see #BEAN_ignoreInvocationExceptionsOnSetters + * @see BeanContext#BEAN_ignoreInvocationExceptionsOnSetters * @return * <jk>true</jk> if errors thrown when calling bean setter methods are silently ignored. */ @@ -1313,7 +1312,7 @@ public class BeanSession extends Session { /** * Configuration property: Use Java Introspector. * - * @see #BEAN_useJavaBeanIntrospector + * @see BeanContext#BEAN_useJavaBeanIntrospector * @return * <jk>true</jk> if the built-in Java bean introspector should be used for bean introspection. */ @@ -1324,7 +1323,7 @@ public class BeanSession extends Session { /** * Configuration property: Use enum names. * - * @see #BEAN_useEnumNames + * @see BeanContext#BEAN_useEnumNames * @return * <jk>true</jk> if enums are always serialized by name, not using {@link Object#toString()}. */ @@ -1335,7 +1334,7 @@ public class BeanSession extends Session { /** * Configuration property: Sort bean properties. * - * @see #BEAN_sortProperties + * @see BeanContext#BEAN_sortProperties * @return * <jk>true</jk> if all bean properties will be serialized and access in alphabetical order. */ @@ -1349,7 +1348,7 @@ public class BeanSession extends Session { * <h5 class='section'>Description:</h5> * <p> * - * @see #BEAN_fluentSetters + * @see BeanContext#BEAN_fluentSetters * @return * <jk>true</jk> if fluent setters are detected on beans. */ @@ -1360,7 +1359,7 @@ public class BeanSession extends Session { /** * Configuration property: Minimum bean constructor visibility. * - * @see #BEAN_beanConstructorVisibility + * @see BeanContext#BEAN_beanConstructorVisibility * @return * Only look for constructors with this specified minimum visibility. */ @@ -1371,7 +1370,7 @@ public class BeanSession extends Session { /** * Configuration property: Minimum bean class visibility. * - * @see #BEAN_beanClassVisibility + * @see BeanContext#BEAN_beanClassVisibility * @return * Classes are not considered beans unless they meet the minimum visibility requirements. */ @@ -1382,7 +1381,7 @@ public class BeanSession extends Session { /** * Configuration property: Minimum bean method visibility. * - * @see #BEAN_beanMethodVisibility + * @see BeanContext#BEAN_beanMethodVisibility * @return * Only look for bean methods with this specified minimum visibility. */ @@ -1394,7 +1393,7 @@ public class BeanSession extends Session { * Configuration property: Minimum bean field visibility. * * - * @see #BEAN_beanFieldVisibility + * @see BeanContext#BEAN_beanFieldVisibility * @return * Only look for bean fields with this specified minimum visibility. */ @@ -1405,7 +1404,7 @@ public class BeanSession extends Session { /** * Configuration property: Bean dictionary. * - * @see #BEAN_beanDictionary + * @see BeanContext#BEAN_beanDictionary * @return * The list of classes that make up the bean dictionary in this bean context. */ @@ -1416,7 +1415,7 @@ public class BeanSession extends Session { /** * Configuration property: Bean property namer. * - * @see #BEAN_propertyNamer + * @see BeanContext#BEAN_propertyNamer * @return * The interface used to calculate bean property names. */ @@ -1427,7 +1426,7 @@ public class BeanSession extends Session { /** * Configuration property: Bean type property name. * - * @see #BEAN_beanTypePropertyName + * @see BeanContext#BEAN_beanTypePropertyName * @return * The name of the bean property used to store the dictionary name of a bean type so that the parser knows the data type to reconstruct. */ @@ -1435,11 +1434,10 @@ public class BeanSession extends Session { return ctx.getBeanTypePropertyName(); } - /** * Configuration property: Debug mode. * - * @see #BEAN_debug + * @see BeanContext#BEAN_debug * @return * <jk>true</jk> if debug mode is enabled. */ @@ -1459,7 +1457,7 @@ public class BeanSession extends Session { * <li>Locale returned by {@link Locale#getDefault()}. * </ol> * - * @see #BEAN_locale + * @see BeanContext#BEAN_locale * @return The session locale. */ public final Locale getLocale() { @@ -1477,7 +1475,7 @@ public class BeanSession extends Session { * <li>{@link BeanContext#BEAN_timeZone} setting on bean context. * </ol> * - * @see #BEAN_timeZone + * @see BeanContext#BEAN_timeZone * @return The session timezone, or <jk>null</jk> if timezone not specified. */ public final TimeZone getTimeZone() { @@ -1490,7 +1488,7 @@ public class BeanSession extends Session { * <p> * For example, <js>"application/json"</js>. * - * @see #BEAN_mediaType + * @see BeanContext#BEAN_mediaType * @return The media type for this session, or <jk>null</jk> if not specified. */ public final MediaType getMediaType() { diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java index a7c5af3..67b33cc 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java @@ -126,7 +126,7 @@ public class HtmlDocSerializerSession extends HtmlStrippedDocSerializerSession { /** * Configuration property: CSS style code. * - * @see #HTMLDOC_style + * @see HtmlDocSerializer#HTMLDOC_style * @return * The CSS instructions to add to the HTML page. */ @@ -137,7 +137,7 @@ public class HtmlDocSerializerSession extends HtmlStrippedDocSerializerSession { /** * Configuration property: Stylesheet import URLs. * - * @see #HTMLDOC_stylesheet + * @see HtmlDocSerializer#HTMLDOC_stylesheet * @return * The link to the stylesheet of the HTML page. */ @@ -148,7 +148,7 @@ public class HtmlDocSerializerSession extends HtmlStrippedDocSerializerSession { /** * Configuration property: Javascript code. * - * @see #HTMLDOC_script + * @see HtmlDocSerializer#HTMLDOC_script * @return * Arbitrary Javascript to add to the HTML page. */ @@ -159,7 +159,7 @@ public class HtmlDocSerializerSession extends HtmlStrippedDocSerializerSession { /** * Configuration property: Page navigation links. * - * @see #HTMLDOC_navlinks + * @see HtmlDocSerializer#HTMLDOC_navlinks * @return * Navigation links to add to the HTML page. */ @@ -170,7 +170,7 @@ public class HtmlDocSerializerSession extends HtmlStrippedDocSerializerSession { /** * Configuration property: Additional head section content. * - * @see #HTMLDOC_head + * @see HtmlDocSerializer#HTMLDOC_head * @return * HTML content to add to the head section of the HTML page. */ @@ -181,7 +181,7 @@ public class HtmlDocSerializerSession extends HtmlStrippedDocSerializerSession { /** * Configuration property: Header section contents. * - * @see #HTMLDOC_header + * @see HtmlDocSerializer#HTMLDOC_header * @return * The overridden contents of the header section on the HTML page. */ @@ -192,7 +192,7 @@ public class HtmlDocSerializerSession extends HtmlStrippedDocSerializerSession { /** * Configuration property: Nav section contents. * - * @see #HTMLDOC_nav + * @see HtmlDocSerializer#HTMLDOC_nav * @return * The overridden contents of the nav section on the HTML page. */ @@ -203,7 +203,7 @@ public class HtmlDocSerializerSession extends HtmlStrippedDocSerializerSession { /** * Configuration property: Aside section contents. * - * @see #HTMLDOC_aside + * @see HtmlDocSerializer#HTMLDOC_aside * @return * The overridden contents of the aside section on the HTML page. */ @@ -214,7 +214,7 @@ public class HtmlDocSerializerSession extends HtmlStrippedDocSerializerSession { /** * Configuration property: Footer section contents. * - * @see #HTMLDOC_footer + * @see HtmlDocSerializer#HTMLDOC_footer * @return * The overridden contents of the footer section on the HTML page. */ @@ -225,7 +225,7 @@ public class HtmlDocSerializerSession extends HtmlStrippedDocSerializerSession { /** * Configuration property: No-results message. * - * @see #HTMLDOC_noResultsMessage + * @see HtmlDocSerializer#HTMLDOC_noResultsMessage * @return * The message used when serializing an empty array or empty list. */ @@ -236,7 +236,7 @@ public class HtmlDocSerializerSession extends HtmlStrippedDocSerializerSession { /** * Configuration property: Prevent word wrap on page. * - * @see #HTMLDOC_nowrap + * @see HtmlDocSerializer#HTMLDOC_nowrap * @return * <jk>true</jk> if <js>"* {white-space:nowrap}"</js> shoudl be added to the CSS instructions on the page to prevent word wrapping. */ @@ -247,7 +247,7 @@ public class HtmlDocSerializerSession extends HtmlStrippedDocSerializerSession { /** * Configuration property: HTML document template. * - * @see #HTMLDOC_template + * @see HtmlDocSerializer#HTMLDOC_template * @return * The template to use for serializing the page. */ diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java index 4021a98..2f96943 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java @@ -12,7 +12,6 @@ // *************************************************************************************************************************** package org.apache.juneau.html; -import static org.apache.juneau.html.HtmlSerializer.*; import static org.apache.juneau.internal.StringUtils.*; import static org.apache.juneau.internal.ObjectUtils.*; import static org.apache.juneau.xml.XmlSerializerSession.ContentResult.*; @@ -826,7 +825,7 @@ public class HtmlSerializerSession extends XmlSerializerSession { /** * Configuration property: Look for link labels in URIs. * - * @see #HTML_detectLabelParameters + * @see HtmlSerializer#HTML_detectLabelParameters * @return * <jk>true</jk> if we should look for URL label parameters (e.g. <js>"?label=foobar"</js>). */ @@ -837,7 +836,7 @@ public class HtmlSerializerSession extends XmlSerializerSession { /** * Configuration property: Look for URLs in {@link String Strings}. * - * @see #HTML_detectLinksInStrings + * @see HtmlSerializer#HTML_detectLinksInStrings * @return * <jk>true</jk> if we should automatically convert strings to URLs if they look like a URL. */ @@ -848,7 +847,7 @@ public class HtmlSerializerSession extends XmlSerializerSession { /** * Configuration property: Add key/value headers on bean/map tables. * - * @see #HTML_addKeyValueTableHeaders + * @see HtmlSerializer#HTML_addKeyValueTableHeaders * @return * <jk>true</jk> if <code><b>key</b></code> and <code><b>value</b></code> column headers are added to tables. */ @@ -859,7 +858,7 @@ public class HtmlSerializerSession extends XmlSerializerSession { /** * Configuration property: Add <js>"_type"</js> properties when needed. * - * @see #HTML_addBeanTypes + * @see HtmlSerializer#HTML_addBeanTypes * @return * <jk>true</jk> if <js>"_type"</js> properties will be added to beans if their type cannot be inferred * through reflection. @@ -872,9 +871,9 @@ public class HtmlSerializerSession extends XmlSerializerSession { /** * Configuration property: Link label parameter name. * - * @see #HTML_labelParameter + * @see HtmlSerializer#HTML_labelParameter * @return - * The parameter name to look for when resolving link labels via {@link #HTML_detectLabelParameters}. + * The parameter name to look for when resolving link labels via {@link HtmlSerializer#HTML_detectLabelParameters}. */ protected final String getLabelParameter() { return ctx.getLabelParameter(); @@ -883,7 +882,7 @@ public class HtmlSerializerSession extends XmlSerializerSession { /** * Configuration property: Anchor text source. * - * @see #HTML_uriAnchorText + * @see HtmlSerializer#HTML_uriAnchorText * @return * When creating anchor tags (e.g. <code><xt><a</xt> <xa>href</xa>=<xs>'...'</xs> * <xt>></xt>text<xt></a></xt></code>) in HTML, this setting defines what to set the inner text to. diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java index fe8a720..e1fa547 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java @@ -12,7 +12,6 @@ // *************************************************************************************************************************** package org.apache.juneau.json; -import static org.apache.juneau.json.JsonParser.*; import static org.apache.juneau.internal.StringUtils.*; import java.io.*; @@ -790,7 +789,7 @@ public final class JsonParserSession extends ReaderParserSession { /** * Configuration property: Validate end. * - * @see #JSON_validateEnd + * @see JsonParser#JSON_validateEnd * @return * <jk>true</jk> if after parsing a POJO from the input, verifies that the remaining input in * the stream consists of only comments or whitespace. diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java index bb3d399..2aab6b9 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java @@ -12,8 +12,6 @@ // *************************************************************************************************************************** package org.apache.juneau.json; -import static org.apache.juneau.json.JsonSerializer.*; - import java.io.*; import java.util.*; @@ -276,7 +274,7 @@ public class JsonSerializerSession extends WriterSerializerSession { /** * Configuration property: Simple JSON mode. * - * @see #JSON_simpleMode + * @see JsonSerializer#JSON_simpleMode * @return * <jk>true</jk> if JSON attribute names will only be quoted when necessary. * <br>Otherwise, they are always quoted. @@ -288,7 +286,7 @@ public class JsonSerializerSession extends WriterSerializerSession { /** * Configuration property: Prefix solidus <js>'/'</js> characters with escapes. * - * @see #JSON_escapeSolidus + * @see JsonSerializer#JSON_escapeSolidus * @return * <jk>true</jk> if solidus (e.g. slash) characters should be escaped. */ @@ -299,7 +297,7 @@ public class JsonSerializerSession extends WriterSerializerSession { /** * Configuration property: Add <js>"_type"</js> properties when needed. * - * @see #JSON_addBeanTypes + * @see JsonSerializer#JSON_addBeanTypes * @return * <jk>true</jk> if <js>"_type"</js> properties will be added to beans if their type cannot be inferred * through reflection. diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaSerializerSession.java index 837fc73..c6f19db 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaSerializerSession.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaSerializerSession.java @@ -14,7 +14,6 @@ package org.apache.juneau.jsonschema; import static org.apache.juneau.internal.ClassUtils.*; import static org.apache.juneau.internal.ObjectUtils.*; -import static org.apache.juneau.jsonschema.JsonSchemaSerializer.*; import static org.apache.juneau.jsonschema.TypeCategory.*; import java.lang.reflect.*; @@ -340,7 +339,7 @@ public class JsonSchemaSerializerSession extends JsonSerializerSession { /** * Configuration property: Use bean definitions. * - * @see #JSONSCHEMA_useBeanDefs + * @see JsonSchemaSerializer#JSONSCHEMA_useBeanDefs * @return * <jk>true</jk> if schemas on beans will be serialized with <js>'$ref'</js> tags. */ @@ -351,7 +350,7 @@ public class JsonSchemaSerializerSession extends JsonSerializerSession { /** * Configuration property: Allow nested examples. * - * @see #JSONSCHEMA_allowNestedExamples + * @see JsonSchemaSerializer#JSONSCHEMA_allowNestedExamples * @return * <jk>true</jk> if nested examples are allowed in schema definitions. */ @@ -362,7 +361,7 @@ public class JsonSchemaSerializerSession extends JsonSerializerSession { /** * Configuration property: Allow nested descriptions. * - * @see #JSONSCHEMA_allowNestedDescriptions + * @see JsonSchemaSerializer#JSONSCHEMA_allowNestedDescriptions * @return * <jk>true</jk> if nested descriptions are allowed in schema definitions. */ @@ -373,7 +372,7 @@ public class JsonSchemaSerializerSession extends JsonSerializerSession { /** * Configuration property: Bean schema definition mapper. * - * @see #JSONSCHEMA_beanDefMapper + * @see JsonSchemaSerializer#JSONSCHEMA_beanDefMapper * @return * Interface to use for converting Bean classes to definition IDs and URIs. */ @@ -384,7 +383,7 @@ public class JsonSchemaSerializerSession extends JsonSerializerSession { /** * Configuration property: Add examples. * - * @see #JSONSCHEMA_addExamplesTo + * @see JsonSchemaSerializer#JSONSCHEMA_addExamplesTo * @return * Set of categories of types that examples should be automatically added to generated schemas. */ @@ -395,7 +394,7 @@ public class JsonSchemaSerializerSession extends JsonSerializerSession { /** * Configuration property: Add descriptions to types. * - * @see #JSONSCHEMA_addDescriptionsTo + * @see JsonSchemaSerializer#JSONSCHEMA_addDescriptionsTo * @return * Set of categories of types that descriptions should be automatically added to generated schemas. */ @@ -406,7 +405,7 @@ public class JsonSchemaSerializerSession extends JsonSerializerSession { /** * Configuration property: Default schemas. * - * @see #JSONSCHEMA_defaultSchemas + * @see JsonSchemaSerializer#JSONSCHEMA_defaultSchemas * @return * Custom schema information for particular class types. */ diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserSession.java index 40950a2..0be1887 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserSession.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserSession.java @@ -12,8 +12,6 @@ // *************************************************************************************************************************** package org.apache.juneau.parser; -import static org.apache.juneau.parser.InputStreamParser.*; - import java.io.*; import org.apache.juneau.*; @@ -88,7 +86,7 @@ public abstract class InputStreamParserSession extends ParserSession { /** * Configuration property: Binary input format. * - * @see #ISPARSER_binaryFormat + * @see InputStreamParser#ISPARSER_binaryFormat * @return * The format to use when converting strings to byte arrays. */ diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java index 1b8f912..830da7b 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java @@ -809,7 +809,7 @@ public abstract class ParserSession extends BeanSession { /** * Configuration property: Trim parsed strings. * - * @see #PARSER_trimStrings + * @see Parser#PARSER_trimStrings * @return * <jk>true</jk> if string values will be trimmed of whitespace using {@link String#trim()} before being added to * the POJO. @@ -821,7 +821,7 @@ public abstract class ParserSession extends BeanSession { /** * Configuration property: Strict mode. * - * @see #PARSER_strict + * @see Parser#PARSER_strict * @return * <jk>true</jk> if strict mode for the parser is enabled. */ @@ -832,7 +832,7 @@ public abstract class ParserSession extends BeanSession { /** * Configuration property: Auto-close streams. * - * @see #PARSER_autoCloseStreams + * @see Parser#PARSER_autoCloseStreams * @return * <jk>true</jk> if <l>InputStreams</l> and <l>Readers</l> passed into parsers will be closed * after parsing is complete. @@ -844,7 +844,7 @@ public abstract class ParserSession extends BeanSession { /** * Configuration property: Unbuffered. * - * @see #PARSER_unbuffered + * @see Parser#PARSER_unbuffered * @return * <jk>true</jk> if parsers don't use internal buffering during parsing. */ @@ -855,7 +855,7 @@ public abstract class ParserSession extends BeanSession { /** * Configuration property: Debug output lines. * - * @see #PARSER_debugOutputLines + * @see Parser#PARSER_debugOutputLines * @return * The number of lines of input before and after the error location to be printed as part of the exception message. */ @@ -866,7 +866,7 @@ public abstract class ParserSession extends BeanSession { /** * Configuration property: Parser listener. * - * @see #PARSER_listener + * @see Parser#PARSER_listener * @return * Class used to listen for errors and warnings that occur during parsing. */ diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserSession.java index 7b543c5..382de81 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserSession.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserSession.java @@ -12,7 +12,6 @@ // *************************************************************************************************************************** package org.apache.juneau.parser; -import static org.apache.juneau.parser.ReaderParser.*; import java.io.*; @@ -92,7 +91,7 @@ public abstract class ReaderParserSession extends ParserSession { /** * Configuration property: Input stream charset. * - * @see #RPARSER_inputStreamCharset + * @see ReaderParser#RPARSER_inputStreamCharset * @return * The character set to use for converting <code>InputStreams</code> and byte arrays to readers. */ @@ -103,7 +102,7 @@ public abstract class ReaderParserSession extends ParserSession { /** * Configuration property: File charset. * - * @see #RPARSER_fileCharset + * @see ReaderParser#RPARSER_fileCharset * @return * The character set to use for reading <code>Files</code> from the file system. */ diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerSession.java index 355cff0..ea0755f 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerSession.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerSession.java @@ -12,8 +12,6 @@ // *************************************************************************************************************************** package org.apache.juneau.serializer; -import static org.apache.juneau.serializer.OutputStreamSerializer.*; - import java.io.*; import org.apache.juneau.*; @@ -98,7 +96,7 @@ public abstract class OutputStreamSerializerSession extends SerializerSession { /** * Configuration property: Binary output format. * - * @see #OSSERIALIZER_binaryFormat + * @see OutputStreamSerializer#OSSERIALIZER_binaryFormat * @return * The format to use for the {@link #serializeToString(Object)} method on stream-based serializers when converting byte arrays to strings. */ diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java index 8627561..e4a6bfc 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java @@ -14,7 +14,6 @@ package org.apache.juneau.serializer; import static org.apache.juneau.internal.ClassUtils.*; import static org.apache.juneau.internal.StringUtils.*; -import static org.apache.juneau.serializer.Serializer.*; import java.io.*; import java.lang.reflect.*; @@ -766,7 +765,7 @@ public abstract class SerializerSession extends BeanSession { /** * Configuration property: Use whitespace. * - * @see #SERIALIZER_useWhitespace + * @see Serializer#SERIALIZER_useWhitespace * @return * <jk>true</jk> if whitespace is added to the output to improve readability. */ @@ -777,7 +776,7 @@ public abstract class SerializerSession extends BeanSession { /** * Configuration property: Initial depth. * - * @see #SERIALIZER_initialDepth + * @see Serializer#SERIALIZER_initialDepth * @return * The initial indentation level at the root. */ @@ -788,7 +787,7 @@ public abstract class SerializerSession extends BeanSession { /** * Configuration property: Max serialization depth. * - * @see #SERIALIZER_maxDepth + * @see Serializer#SERIALIZER_maxDepth * @return * The depth at which serialization is aborted if depth is reached in the POJO tree. * <br>If this depth is exceeded, an exception is thrown. @@ -799,7 +798,8 @@ public abstract class SerializerSession extends BeanSession { /** * Configuration property: Automatically detect POJO recursions. - * @see #SERIALIZER_detectRecursions + * + * @see Serializer#SERIALIZER_detectRecursions * @return * <jk>true</jk> if recursions should be checked for during serialization. */ @@ -810,7 +810,7 @@ public abstract class SerializerSession extends BeanSession { /** * Configuration property: Ignore recursion errors. * - * @see #SERIALIZER_ignoreRecursions + * @see Serializer#SERIALIZER_ignoreRecursions * @return * <jk>true</jk> if when we encounter the same object when serializing a tree, we set the value to <jk>null</jk>. * <br>Otherwise, a {@link SerializeException} is thrown with the message <js>"Recursion occurred, stack=..."</js>. @@ -822,7 +822,7 @@ public abstract class SerializerSession extends BeanSession { /** * Configuration property: Add <js>"_type"</js> properties when needed. * - * @see #SERIALIZER_addBeanTypes + * @see Serializer#SERIALIZER_addBeanTypes * @return * <jk>true</jk> if <js>"_type"</js> properties added to beans if their type cannot be inferred * through reflection. @@ -834,7 +834,7 @@ public abstract class SerializerSession extends BeanSession { /** * Configuration property: Trim null bean property values. * - * @see #SERIALIZER_trimNullProperties + * @see Serializer#SERIALIZER_trimNullProperties * @return * <jk>true</jk> if null bean values are not serialized to the output. */ @@ -845,7 +845,7 @@ public abstract class SerializerSession extends BeanSession { /** * Configuration property: Trim empty lists and arrays. * - * @see #SERIALIZER_trimEmptyCollections + * @see Serializer#SERIALIZER_trimEmptyCollections * @return * <jk>true</jk> if empty lists and arrays are not serialized to the output. */ @@ -856,7 +856,7 @@ public abstract class SerializerSession extends BeanSession { /** * Configuration property: Trim empty maps. * - * @see #SERIALIZER_trimEmptyMaps + * @see Serializer#SERIALIZER_trimEmptyMaps * @return * <jk>true</jk> if empty map values are not serialized to the output. */ @@ -867,7 +867,7 @@ public abstract class SerializerSession extends BeanSession { /** * Configuration property: Trim strings. * - * @see #SERIALIZER_trimStrings + * @see Serializer#SERIALIZER_trimStrings * @return * <jk>true</jk> if string values will be trimmed of whitespace using {@link String#trim()} before being serialized. */ @@ -878,7 +878,7 @@ public abstract class SerializerSession extends BeanSession { /** * Configuration property: Sort arrays and collections alphabetically. * - * @see #SERIALIZER_sortCollections + * @see Serializer#SERIALIZER_sortCollections * @return * <jk>true</jk> if arrays and collections are copied and sorted before serialization. */ @@ -889,7 +889,7 @@ public abstract class SerializerSession extends BeanSession { /** * Configuration property: Sort maps alphabetically. * - * @see #SERIALIZER_sortMaps + * @see Serializer#SERIALIZER_sortMaps * @return * <jk>true</jk> if maps are copied and sorted before serialization. */ @@ -900,7 +900,7 @@ public abstract class SerializerSession extends BeanSession { /** * Configuration property: Add type attribute to root nodes. * - * @see #SERIALIZER_addRootType + * @see Serializer#SERIALIZER_addRootType * @return * <jk>true</jk> if type property should be added to root node. */ @@ -911,7 +911,7 @@ public abstract class SerializerSession extends BeanSession { /** * Configuration property: URI context bean. * - * @see #SERIALIZER_uriContext + * @see Serializer#SERIALIZER_uriContext * @return * Bean used for resolution of URIs to absolute or root-relative form. */ @@ -922,7 +922,7 @@ public abstract class SerializerSession extends BeanSession { /** * Configuration property: URI resolution. * - * @see #SERIALIZER_uriResolution + * @see Serializer#SERIALIZER_uriResolution * @return * Defines the resolution level for URIs when serializing URIs. */ @@ -933,7 +933,7 @@ public abstract class SerializerSession extends BeanSession { /** * Configuration property: URI relativity. * - * @see #SERIALIZER_uriRelativity + * @see Serializer#SERIALIZER_uriRelativity * @return * Defines what relative URIs are relative to when serializing any of the following: */ diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerSession.java index 2302804..c83381b 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerSession.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerSession.java @@ -12,8 +12,6 @@ // *************************************************************************************************************************** package org.apache.juneau.serializer; -import static org.apache.juneau.serializer.WriterSerializer.*; - import java.io.*; import org.apache.juneau.*; @@ -96,7 +94,7 @@ public abstract class WriterSerializerSession extends SerializerSession { /** * Configuration property: Maximum indentation. * - * @see #WSERIALIZER_maxIndent + * @see WriterSerializer#WSERIALIZER_maxIndent * @return * The maximum indentation level in the serialized document. */ @@ -107,7 +105,7 @@ public abstract class WriterSerializerSession extends SerializerSession { /** * Configuration property: Quote character. * - * @see #WSERIALIZER_quoteChar + * @see WriterSerializer#WSERIALIZER_quoteChar * @return * The character used for quoting attributes and values. */ diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java index 517e825..ecc6bf9 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java @@ -793,7 +793,7 @@ public class UonParserSession extends ReaderParserSession { /** * Configuration property: Decode <js>"%xx"</js> sequences. * - * @see #UON_decoding + * @see UonParser#UON_decoding * @return * <jk>true</jk> if URI encoded characters should be decoded, <jk>false</jk> if they've already been decoded * before being passed to this parser. @@ -805,7 +805,7 @@ public class UonParserSession extends ReaderParserSession { /** * Configuration property: Validate end. * - * @see #UON_validateEnd + * @see UonParser#UON_validateEnd * @return * <jk>true</jk> if after parsing a POJO from the input, verifies that the remaining input in * the stream consists of only comments or whitespace. diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java index 602ee9f..b1670b0 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java @@ -12,8 +12,6 @@ // *************************************************************************************************************************** package org.apache.juneau.uon; -import static org.apache.juneau.uon.UonSerializer.*; - import java.util.*; import org.apache.juneau.*; @@ -268,7 +266,7 @@ public class UonSerializerSession extends WriterSerializerSession { /** * Configuration property: Encode non-valid URI characters. * - * @see #UON_encoding + * @see UonSerializer#UON_encoding * @return * <jk>true</jk> if non-valid URI characters should be encoded with <js>"%xx"</js> constructs. */ @@ -279,7 +277,7 @@ public class UonSerializerSession extends WriterSerializerSession { /** * Configuration property: Add <js>"_type"</js> properties when needed. * - * @see #UON_addBeanTypes + * @see UonSerializer#UON_addBeanTypes * @return * <jk>true</jk> if <js>"_type"</js> properties will be added to beans if their type cannot be inferred * through reflection. @@ -292,7 +290,7 @@ public class UonSerializerSession extends WriterSerializerSession { /** * Configuration property: Format to use for query/form-data/header values. * - * @see #UON_paramFormat + * @see UonSerializer#UON_paramFormat * @return * Specifies the format to use for URL GET parameter keys and values. */ diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java index 625c626..20efb60 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java @@ -12,8 +12,6 @@ // *************************************************************************************************************************** package org.apache.juneau.urlencoding; -import static org.apache.juneau.urlencoding.UrlEncodingParser.*; - import java.lang.reflect.*; import java.util.*; @@ -367,7 +365,7 @@ public class UrlEncodingParserSession extends UonParserSession { /** * Configuration property: Parser bean property collections/arrays as separate key/value pairs. * - * @see #URLENC_expandedParams + * @see UrlEncodingParser#URLENC_expandedParams * @return * <jk>false</jk> if serializing the array <code>[1,2,3]</code> results in <code>?key=$a(1,2,3)</code>. * <br><jk>true</jk> if serializing the same array results in <code>?key=1&key=2&key=3</code>. diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java index 1578b6a..a1374c8 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java @@ -13,7 +13,6 @@ package org.apache.juneau.urlencoding; import static org.apache.juneau.internal.ArrayUtils.*; -import static org.apache.juneau.urlencoding.UrlEncodingSerializer.*; import java.lang.reflect.*; import java.util.*; @@ -272,7 +271,7 @@ public class UrlEncodingSerializerSession extends UonSerializerSession { /** * Configuration property: Serialize bean property collections/arrays as separate key/value pairs. * - * @see #URLENC_expandedParams + * @see UrlEncodingSerializer#URLENC_expandedParams * @return * <jk>false</jk> if serializing the array <code>[1,2,3]</code> results in <code>?key=$a(1,2,3)</code>. * <br><jk>true</jk> if serializing the same array results in <code>?key=1&key=2&key=3</code>. diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserSession.java index 7b97286..dfecc65 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserSession.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserSession.java @@ -12,7 +12,6 @@ // *************************************************************************************************************************** package org.apache.juneau.xml; -import static org.apache.juneau.xml.XmlParser.*; import static javax.xml.stream.XMLStreamConstants.*; import static org.apache.juneau.internal.StringUtils.*; import static org.apache.juneau.xml.annotation.XmlFormat.*; @@ -689,7 +688,7 @@ public class XmlParserSession extends ReaderParserSession { /** * Configuration property: Enable validation. * - * @see #XML_validating + * @see XmlParser#XML_validating * @return * <jk>true</jk> if XML document will be validated. */ @@ -700,7 +699,7 @@ public class XmlParserSession extends ReaderParserSession { /** * Configuration property: Preserve root element during generalized parsing. * - * @see #XML_preserveRootElement + * @see XmlParser#XML_preserveRootElement * @return * <jk>true</jk> if when parsing into a generic {@link ObjectMap}, the map will contain a single entry whose key * is the root element name. @@ -712,7 +711,7 @@ public class XmlParserSession extends ReaderParserSession { /** * Configuration property: XML reporter. * - * @see #XML_reporter + * @see XmlParser#XML_reporter * @return * The {@link XMLReporter} associated with this parser, or <jk>null</jk> if there isn't one. */ @@ -723,7 +722,7 @@ public class XmlParserSession extends ReaderParserSession { /** * Configuration property: XML resolver. * - * @see #XML_resolver + * @see XmlParser#XML_resolver * @return * The {@link XMLResolver} associated with this parser, or <jk>null</jk> if there isn't one. */ @@ -734,7 +733,7 @@ public class XmlParserSession extends ReaderParserSession { /** * Configuration property: XML event allocator. * - * @see #XML_eventAllocator + * @see XmlParser#XML_eventAllocator * @return * The {@link XMLEventAllocator} associated with this parser, or <jk>null</jk> if there isn't one. */ diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java index 7d6f8af..8af3a0a 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java @@ -733,7 +733,7 @@ public class XmlSerializerSession extends WriterSerializerSession { /** * Configuration property: Auto-detect namespace usage. * - * @see #XML_autoDetectNamespaces + * @see XmlSerializer#XML_autoDetectNamespaces * @return * <jk>true</jk> if namespace usage is detected before serialization. */ @@ -744,7 +744,7 @@ public class XmlSerializerSession extends WriterSerializerSession { /** * Configuration property: Enable support for XML namespaces. * - * @see #XML_enableNamespaces + * @see XmlSerializer#XML_enableNamespaces * @return * <jk>false</jk> if XML output will not contain any namespaces regardless of any other settings. */ @@ -755,7 +755,7 @@ public class XmlSerializerSession extends WriterSerializerSession { /** * Configuration property: Add namespace URLs to the root element. * - * @see #XML_addNamespaceUrisToRoot + * @see XmlSerializer#XML_addNamespaceUrisToRoot * @return * <jk>true</jk> if {@code xmlns:x} attributes are added to the root element for the default and all mapped namespaces. */ @@ -766,7 +766,7 @@ public class XmlSerializerSession extends WriterSerializerSession { /** * Configuration property: Add <js>"_type"</js> properties when needed. * - * @see #XML_addBeanTypes + * @see XmlSerializer#XML_addBeanTypes * @return * <jk>true</jk> if<js>"_type"</js> properties will be added to beans if their type cannot be inferred * through reflection. @@ -779,7 +779,7 @@ public class XmlSerializerSession extends WriterSerializerSession { /** * Configuration property: Default namespace. * - * @see #XML_defaultNamespace + * @see XmlSerializer#XML_defaultNamespace * @return * The default namespace URI for this document. */ @@ -790,7 +790,7 @@ public class XmlSerializerSession extends WriterSerializerSession { /** * Configuration property: XMLSchema namespace. * - * @see #XML_xsNamespace + * @see XmlSerializer#XML_xsNamespace * @return * The namespace for the <code>XMLSchema</code> namespace, used by the schema generated by the * {@link XmlSchemaSerializer} class. @@ -802,7 +802,7 @@ public class XmlSerializerSession extends WriterSerializerSession { /** * Configuration property: Default namespaces. * - * @see #XML_namespaces + * @see XmlSerializer#XML_namespaces * @return * The default list of namespaces associated with this serializer. */ diff --git a/juneau-doc/src/main/javadoc/overview.html b/juneau-doc/src/main/javadoc/overview.html index f0975fb..f048e17 100644 --- a/juneau-doc/src/main/javadoc/overview.html +++ b/juneau-doc/src/main/javadoc/overview.html @@ -1146,11 +1146,11 @@ <li class='jf'>{@link org.apache.juneau.serializer.Serializer#SERIALIZER_uriContext SERIALIZER_uriContext} <li class='jf'>{@link org.apache.juneau.serializer.Serializer#SERIALIZER_uriRelativity SERIALIZER_uriRelativity} <li class='jf'>{@link org.apache.juneau.serializer.Serializer#SERIALIZER_uriResolution SERIALIZER_uriResolution} + <li class='jf'>{@link org.apache.juneau.serializer.Serializer#SERIALIZER_useWhitespace SERIALIZER_useWhitespace} <li class='jc'>{@link org.apache.juneau.serializer.WriterSerializer} <ul> <li class='jf'>{@link org.apache.juneau.serializer.WriterSerializer#WSERIALIZER_maxIndent WSERIALIZER_maxIndent} <li class='jf'>{@link org.apache.juneau.serializer.WriterSerializer#WSERIALIZER_quoteChar WSERIALIZER_quoteChar} - <li class='jf'>{@link org.apache.juneau.serializer.WriterSerializer#WSERIALIZER_useWhitespace WSERIALIZER_useWhitespace} </ul> <li class='jc'>{@link org.apache.juneau.serializer.OutputStreamSerializer} <ul> @@ -1240,7 +1240,7 @@ </ul> <p> Each context object in the hierarchy define properties that can be stored in a <code>PropertyStore</code> - such as <jsf>WSERIALIZER_useWhitespace</jsf> or <jsf>JSON_simpleMode</jsf>. + such as <jsf>SERIALIZER_useWhitespace</jsf> or <jsf>JSON_simpleMode</jsf>. </p> <p> The class hierarchy for <code>JsonSerializerBuilder</code> is: @@ -11545,15 +11545,15 @@ </ul> <li><b>Annotated parameters:</b> <ul> - <li class='ja'>{@link org.apache.juneau.rest.annotation.Path} - Variables in matched URL path patterns. - <li class='ja'>{@link org.apache.juneau.rest.annotation.FormData} - Multipart form post parameter values. - <li class='ja'>{@link org.apache.juneau.rest.annotation.HasFormData} - Denotes whether the form data parameter exists. - <li class='ja'>{@link org.apache.juneau.rest.annotation.Query} - Query parameters. Using this prevents the HTTP body from being processed as a URL-Encoded form post. - <li class='ja'>{@link org.apache.juneau.rest.annotation.HasQuery} - Denotes whether the query parameter exists. - <li class='ja'>{@link org.apache.juneau.rest.annotation.Header} - A header value. - <li class='ja'>{@link org.apache.juneau.rest.annotation.Method} - The HTTP method name. - <li class='ja'>{@link org.apache.juneau.rest.annotation.PathRemainder} - The remainder value after path pattern match. - <li class='ja'>{@link org.apache.juneau.rest.annotation.Body} - The HTTP content parsed as a POJO. + <li class='ja'><code><del>org.apache.juneau.rest.annotation.Path</del></code> - Variables in matched URL path patterns. + <li class='ja'><code><del>org.apache.juneau.rest.annotation.FormData</del></code> - Multipart form post parameter values. + <li class='ja'><code><del>org.apache.juneau.rest.annotation.HasFormData</del></code> - Denotes whether the form data parameter exists. + <li class='ja'><code><del>org.apache.juneau.rest.annotation.Query</del></code> - Query parameters. Using this prevents the HTTP body from being processed as a URL-Encoded form post. + <li class='ja'><code><del>org.apache.juneau.rest.annotation.HasQuery</del></code> - Denotes whether the query parameter exists. + <li class='ja'><code><del>org.apache.juneau.rest.annotation.Header</del></code> - A header value. + <li class='ja'><code><del>org.apache.juneau.rest.annotation.Method</del></code> - The HTTP method name. + <li class='ja'><code><del>org.apache.juneau.rest.annotation.PathRemainder</del></code> - The remainder value after path pattern match. + <li class='ja'><code><del>org.apache.juneau.rest.annotation.Body</del></code> - The HTTP content parsed as a POJO. </ul> </ul> <h5 class='figure'>Example:</h5> @@ -11896,7 +11896,7 @@ Paths that end with <js>"/*"</js> will do a prefix match on the incoming URL. <br>Any remainder after the match can be accessed through {@link org.apache.juneau.rest.RequestPathMatch#getRemainder()} or parameters with the - {@link org.apache.juneau.rest.annotation.PathRemainder @PathRemainder} annotation. + {@link org.apache.juneau.http.annotation.PathRemainder @PathRemainder} annotation. <br>On the other hand, paths that don't end with <js>"/*"</js> (e.g. <js>"/"</js> or <js>"/foo"</js>) will require an exact URL match, and if any remainder exists, a 404 (not found) error will be thrown. </p> @@ -11928,8 +11928,8 @@ <h5 class='section'>See Also:</h5> <ul> <li class='jf'>{@link org.apache.juneau.rest.RestContext#REST_path} - <li class='ja'>{@link org.apache.juneau.rest.annotation.Path} - <li class='ja'>{@link org.apache.juneau.rest.annotation.PathRemainder} + <li class='ja'>{@link org.apache.juneau.http.annotation.Path} + <li class='ja'>{@link org.apache.juneau.http.annotation.PathRemainder} <li class='jc'>{@link org.apache.juneau.rest.RequestPathMatch} </ul> </div> @@ -12280,7 +12280,7 @@ <h3 class='topic' onclick='toggle(this)'>7.7 - @Body</h3> <div class='topic'> <p> - The {@link org.apache.juneau.rest.annotation.Body @Body} annotation is used to identify POJOs to be used as the body of an HTTP request. + The {@link org.apache.juneau.http.annotation.Body @Body} annotation is used to identify POJOs to be used as the body of an HTTP request. </p> <h5 class='figure'>Example:</h5> <p class='bcode w800'> @@ -12447,13 +12447,13 @@ <br>These do not have any affects on the running code except for the generated Swagger: </p> <ul class='doctree'> - <li class='ja'>{@link org.apache.juneau.rest.annotation.Body} + <li class='ja'>{@link org.apache.juneau.http.annotation.Body} <ul> - <li class='jf'>{@link org.apache.juneau.rest.annotation.Body#description() description()} - <li class='jf'>{@link org.apache.juneau.rest.annotation.Body#required() required()} - <li class='jf'>{@link org.apache.juneau.rest.annotation.Body#schema() schema()} - <li class='jf'>{@link org.apache.juneau.rest.annotation.Body#example() example()} - <li class='jf'>{@link org.apache.juneau.rest.annotation.Body#examples() examples()} + <li class='jf'>{@link org.apache.juneau.http.annotation.Body#description() description()} + <li class='jf'>{@link org.apache.juneau.http.annotation.Body#required() required()} + <li class='jf'>{@link org.apache.juneau.http.annotation.Body#schema() schema()} + <li class='jf'>{@link org.apache.juneau.http.annotation.Body#example() example()} + <li class='jf'>{@link org.apache.juneau.http.annotation.Body#examples() examples()} </ul> </ul> @@ -12471,7 +12471,7 @@ <h5 class='section'>See Also:</h5> <ul> - <li class='ja'>{@link org.apache.juneau.rest.annotation.Body} + <li class='ja'>{@link org.apache.juneau.http.annotation.Body} <li class='jc'>{@link org.apache.juneau.rest.RequestBody} </ul> @@ -12587,7 +12587,7 @@ <h3 class='topic' onclick='toggle(this)'>7.8 - @FormData</h3> <div class='topic'> <p> - The {@link org.apache.juneau.rest.annotation.FormData @FormData} annotation is used to retrieve request form post entries. + The {@link org.apache.juneau.http.annotation.FormData @FormData} annotation is used to retrieve request form post entries. </p> <h5 class='figure'>Example:</h5> <p class='bcode w800'> @@ -12616,16 +12616,16 @@ </p> <ul class='doctree'> <li class='warn'> - This annotation should not be combined with the {@link org.apache.juneau.rest.annotation.Body @Body} annotation or {@link org.apache.juneau.rest.RestRequest#getBody()} method + This annotation should not be combined with the {@link org.apache.juneau.http.annotation.Body @Body} annotation or {@link org.apache.juneau.rest.RestRequest#getBody()} method for <code>application/x-www-form-urlencoded POST</code> posts, since it will trigger the underlying servlet API to parse the body content as key-value pairs resulting in empty content. - <br>The {@link org.apache.juneau.rest.annotation.Query @Query} annotation can be used to retrieve a URL parameter in the URL string without triggering the + <br>The {@link org.apache.juneau.http.annotation.Query @Query} annotation can be used to retrieve a URL parameter in the URL string without triggering the servlet to drain the body content. </ul> <h5 class='section'>See Also:</h5> <ul> - <li class='ja'>{@link org.apache.juneau.rest.annotation.FormData} - <li class='ja'>{@link org.apache.juneau.rest.annotation.HasFormData} + <li class='ja'>{@link org.apache.juneau.http.annotation.FormData} + <li class='ja'>{@link org.apache.juneau.http.annotation.HasFormData} <li class='jc'>{@link org.apache.juneau.rest.RequestFormData} </ul> </div> @@ -12635,13 +12635,13 @@ <h3 class='topic' onclick='toggle(this)'>7.9 - @Query</h3> <div class='topic'> <p> - The {@link org.apache.juneau.rest.annotation.Query @Query} annotation is used to retrieve request URL query parameters. - <br>It's identical to {@link org.apache.juneau.rest.annotation.FormData @FormData}, but only retrieves the parameter from the URL string, not URL-encoded form posts. + The {@link org.apache.juneau.http.annotation.Query @Query} annotation is used to retrieve request URL query parameters. + <br>It's identical to {@link org.apache.juneau.http.annotation.FormData @FormData}, but only retrieves the parameter from the URL string, not URL-encoded form posts. </p> <p> - Unlike {@link org.apache.juneau.rest.annotation.FormData @FormData}, using this annotation does not result in the servlet reading the contents of + Unlike {@link org.apache.juneau.http.annotation.FormData @FormData}, using this annotation does not result in the servlet reading the contents of URL-encoded form posts. - <br>Therefore, this annotation can be used in conjunction with the {@link org.apache.juneau.rest.annotation.Body @Body} annotation or + <br>Therefore, this annotation can be used in conjunction with the {@link org.apache.juneau.http.annotation.Body @Body} annotation or {@link org.apache.juneau.rest.RestRequest#getBody()} method for <code>application/x-www-form-urlencoded POST</code> calls. </p> <h5 class='figure'>Example:</h5> @@ -12671,8 +12671,8 @@ </p> <h5 class='section'>See Also:</h5> <ul> - <li class='ja'>{@link org.apache.juneau.rest.annotation.Query} - <li class='ja'>{@link org.apache.juneau.rest.annotation.HasQuery} + <li class='ja'>{@link org.apache.juneau.http.annotation.Query} + <li class='ja'>{@link org.apache.juneau.http.annotation.HasQuery} <li class='jc'>{@link org.apache.juneau.rest.RequestQuery} </ul> </div> @@ -12682,7 +12682,7 @@ <h3 class='topic' onclick='toggle(this)'>7.10 - @Header</h3> <div class='topic'> <p> - The {@link org.apache.juneau.rest.annotation.Header @Header} annotation is used to retrieve request headers. + The {@link org.apache.juneau.http.annotation.Header @Header} annotation is used to retrieve request headers. </p> <h5 class='figure'>Example:</h5> <p class='bcode w800'> @@ -12706,7 +12706,7 @@ </p> <h5 class='section'>See Also:</h5> <ul> - <li class='ja'>{@link org.apache.juneau.rest.annotation.Header} + <li class='ja'>{@link org.apache.juneau.http.annotation.Header} <li class='jc'>{@link org.apache.juneau.rest.RequestHeaders} </ul> </div> @@ -14696,7 +14696,7 @@ <td class='code'>&plainText=true</td> <td> Response will always be <l>Content-Type: text/plain</l> and the returned text will be human-readable - ({@link org.apache.juneau.serializer.WriterSerializer#WSERIALIZER_useWhitespace WSERIALIZER_useWhitespace} enabled). + ({@link org.apache.juneau.serializer.WriterSerializer#SERIALIZER_useWhitespace SERIALIZER_useWhitespace} enabled). <br>Useful for debugging. </td> </tr> @@ -16158,53 +16158,44 @@ </p> <ul class='spaced-list'> <li class='ja'> - {@link org.apache.juneau.remoteable.Query} - A URL query parameter. + {@link org.apache.juneau.http.annotation.Query} - A URL query parameter. <br>The argument can be any of the following types: <ul> <li class='normal'>Any serializable POJO - - Converted to text using {@link org.apache.juneau.httppart.SimpleUonPartSerializer#serialize(HttpPartType,Object)}. + - Converted to text using {@link org.apache.juneau.httppart.SimpleUonPartSerializerSession#serialize(HttpPartType,HttpPartSchema,Object)}. <li class='normal'><code>Map<String,Object></code> - Individual name-value pairs. - <br>Values are converted to text using {@link org.apache.juneau.httppart.SimpleUonPartSerializer#serialize(HttpPartType,Object)}. + <br>Values are converted to text using {@link org.apache.juneau.httppart.SimpleUonPartSerializerSession#serialize(HttpPartType,HttpPartSchema,Object)}. <li class='normal'><code>String</code> - Treated as a query string. </ul> <li class='ja'> - {@link org.apache.juneau.remoteable.QueryIfNE} - - Same as <ja>@Query</ja> except skips the value if it's null/empty. - <li class='ja'> - {@link org.apache.juneau.remoteable.FormData} + {@link org.apache.juneau.http.annotation.FormData} - A form-data parameter. <br>Note that this is only available if the HTTP method is <code>POST</code>. <br>The argument can be any of the following types: <ul> <li class='normal'>Any serializable POJO - - Converted to text using {@link org.apache.juneau.httppart.SimpleUonPartSerializer#serialize(HttpPartType,Object)}. + - Converted to text using {@link org.apache.juneau.httppart.SimpleUonPartSerializerSession#serialize(HttpPartType,HttpPartSchema,Object)}. <li class='normal'>{@link org.apache.juneau.rest.client.NameValuePairs} - Individual name-value pairs. <li class='normal'><code>Map<String,Object></code> - Individual name-value pairs. - <br>Values are converted to text using {@link org.apache.juneau.httppart.SimpleUonPartSerializer#serialize(HttpPartType,Object)}. + <br>Values are converted to text using {@link org.apache.juneau.httppart.SimpleUonPartSerializerSession#serialize(HttpPartType,HttpPartSchema,Object)}. </ul> <li class='ja'> - {@link org.apache.juneau.remoteable.FormDataIfNE} - - Same as <ja>@FormData</ja> except skips the value if it's null/empty. - <li class='ja'> - {@link org.apache.juneau.remoteable.Header} + {@link org.apache.juneau.http.annotation.Header} - A request header. <br>The argument can be any of the following types: <ul> <li class='normal'>Any serializable POJO - - Converted to text using {@link org.apache.juneau.httppart.SimpleUonPartSerializer#serialize(HttpPartType,Object)}. + - Converted to text using {@link org.apache.juneau.httppart.SimpleUonPartSerializerSession#serialize(HttpPartType,HttpPartSchema,Object)}. <li class='normal'><code>Map<String,Object></code> - Individual name-value pairs. - <br>Values are converted to text using {@link org.apache.juneau.httppart.SimpleUonPartSerializer#serialize(HttpPartType,Object)}. + <br>Values are converted to text using {@link org.apache.juneau.httppart.SimpleUonPartSerializerSession#serialize(HttpPartType,HttpPartSchema,Object)}. </ul> <li class='ja'> - {@link org.apache.juneau.remoteable.HeaderIfNE} - - Same as <ja>@Header</ja> except skips the value if it's null/empty. - <li class='ja'> - {@link org.apache.juneau.remoteable.Body} + {@link org.apache.juneau.http.annotation.Body} - The HTTP request body. <br>The argument can be any of the following types: <ul> @@ -18393,11 +18384,11 @@ <l>example1()</l> <br>Shows how to use the following annotations: <ul> - <li class='ja'>{@link org.apache.juneau.rest.annotation.Path @Path} - <li class='ja'>{@link org.apache.juneau.rest.annotation.Query @Query} - <li class='ja'>{@link org.apache.juneau.rest.annotation.Header @Header} + <li class='ja'>{@link org.apache.juneau.http.annotation.Path @Path} + <li class='ja'>{@link org.apache.juneau.http.annotation.Query @Query} + <li class='ja'>{@link org.apache.juneau.http.annotation.Header @Header} <li class='ja'>{@link org.apache.juneau.rest.annotation.Method @Method} - <li class='ja'>{@link org.apache.juneau.rest.annotation.PathRemainder @PathRemainder} + <li class='ja'>{@link org.apache.juneau.http.annotation.PathRemainder @PathRemainder} </ul> Method returns a POJO to be serialized as the output. <li class='jm'> @@ -21656,16 +21647,16 @@ <li> Newlines were being stripped from <code><ja>@HtmlDoc</ja>(script)</code> when serialized which could cause script lines to become commented out. <li> - New {@link org.apache.juneau.rest.annotation.Response @Response} and {@link org.apache.juneau.rest.annotation.Responses @Responses} annotations that can be applied to + New {@link org.apache.juneau.http.annotation.Response @Response} and {@link org.apache.juneau.http.annotation.Responses @Responses} annotations that can be applied to throwables thrown from REST methods and POJOs returned by REST methods to specify non-200 status return codes and descriptions in Swagger documentation. <li> Swagger fields added to the following annotations: <ul class='doctree'> - <li class='ja'>{@link org.apache.juneau.rest.annotation.Body} - <li class='ja'>{@link org.apache.juneau.rest.annotation.FormData} - <li class='ja'>{@link org.apache.juneau.rest.annotation.Header} - <li class='ja'>{@link org.apache.juneau.rest.annotation.Path} - <li class='ja'>{@link org.apache.juneau.rest.annotation.Query} + <li class='ja'>{@link org.apache.juneau.http.annotation.Body} + <li class='ja'>{@link org.apache.juneau.http.annotation.FormData} + <li class='ja'>{@link org.apache.juneau.http.annotation.Header} + <li class='ja'>{@link org.apache.juneau.http.annotation.Path} + <li class='ja'>{@link org.apache.juneau.http.annotation.Query} </ul> <li> "Helper" classes (i.e. reusable beans that can be returned by REST methods) have been moved to the following package with some new additions: @@ -21754,7 +21745,7 @@ The <code><del>RestResource.nowrap()</del></code> annotation has been changed to a string with a default value of <js>"true"</js>. <br>Having it as a string allows us to differentiate between a set and unset value so that it can be overridden in subclasses. <li> - The {@link org.apache.juneau.rest.annotation.Path#name()} annotation parameter is now required. + The {@link org.apache.juneau.http.annotation.Path#name()} annotation parameter is now required. <li> New class for mock unit testing of REST resources: <ul> @@ -21826,7 +21817,7 @@ New methods added to {@link org.apache.juneau.rest.widget.MenuItemWidget} to allow population of menu item content using Javascript and Ajax calls: <li class='jc'>{@link org.apache.juneau.rest.widget.MenuItemWidget} <ul> - <li class='jm'>{@link org.apache.juneau.rest.widget.MenuItemWidget#getBeforShowScript(RestRequest) getBeforShowScript(RestRequest)} + <li class='jm'>{@link org.apache.juneau.rest.widget.MenuItemWidget#getBeforeShowScript(RestRequest) getBeforeShowScript(RestRequest)} <li class='jm'>{@link org.apache.juneau.rest.widget.MenuItemWidget#getAfterShowScript(RestRequest) getAfterShowScript(RestRequest)} </ul> </ul> @@ -23300,14 +23291,14 @@ <br>Allows easy user-defined serialization of these objects. <br>The interface can be used in the following locations: <ul> - <li>{@link org.apache.juneau.rest.client.RestClientBuilder#partSerializer(Class)} - <li>{@link org.apache.juneau.remoteable.Path#serializer} - <li>{@link org.apache.juneau.remoteable.Query#serializer} - <li>{@link org.apache.juneau.remoteable.QueryIfNE#serializer} - <li>{@link org.apache.juneau.remoteable.FormData#serializer} - <li>{@link org.apache.juneau.remoteable.FormDataIfNE#serializer} - <li>{@link org.apache.juneau.remoteable.Header#serializer} - <li>{@link org.apache.juneau.remoteable.HeaderIfNE#serializer} + <li><code><del>org.apache.juneau.rest.client.RestClientBuilder#partSerializer(Class)} + <li><code><del>org.apache.juneau.remoteable.Path.serializer</del></code> + <li><code><del>org.apache.juneau.remoteable.Query.serializer</del></code> + <li><code><del>org.apache.juneau.remoteable.QueryIfNE.serializer</del></code> + <li><code><del>org.apache.juneau.remoteable.FormData.serializer</del></code> + <li><code><del>org.apache.juneau.remoteable.FormDataIfNE.serializer</del></code> + <li><code><del>org.apache.juneau.remoteable.Header.serializer</del></code> + <li><code><del>org.apache.juneau.remoteable.HeaderIfNE.serializer</del></code> </ul> <li>Across-the-board improvements to the URI-resolution support (i.e. how URIs get serialized). <ul> @@ -23613,12 +23604,12 @@ <li> New annotation attributes: <ul> - <li>{@link org.apache.juneau.rest.annotation.Query#name() @Query.name()} - <li>{@link org.apache.juneau.rest.annotation.FormData#name() @FormData.name()} - <li>{@link org.apache.juneau.rest.annotation.Header#name() @Header.name()} - <li>{@link org.apache.juneau.rest.annotation.Path#name() @Path.name()} - <li>{@link org.apache.juneau.rest.annotation.HasQuery#name() @HasQuery.name()} - <li>{@link org.apache.juneau.rest.annotation.HasFormData#name() @HasFormData.name()} + <li>{@link org.apache.juneau.http.annotation.Query#name() @Query.name()} + <li>{@link org.apache.juneau.http.annotation.FormData#name() @FormData.name()} + <li>{@link org.apache.juneau.http.annotation.Header#name() @Header.name()} + <li>{@link org.apache.juneau.http.annotation.Path#name() @Path.name()} + <li>{@link org.apache.juneau.http.annotation.HasQuery#name() @HasQuery.name()} + <li>{@link org.apache.juneau.http.annotation.HasFormData#name() @HasFormData.name()} </ul> </li> </ul> @@ -23626,16 +23617,16 @@ <h5 class='topic w800'>org.apache.juneau.rest.client</h5> <ul class='spaced-list'> <li> - New {@link org.apache.juneau.remoteable.Path @Path} annotation for specifying path variables on remoteable interfaces. + New <code><del>org.apache.juneau.remoteable.Path</del></code> annotation for specifying path variables on remoteable interfaces. <li> New {@link org.apache.juneau.remoteable.RequestBean @RequestBean} annotation for specifying beans with remoteable annotations defined on properties. <li> The following annotations (and related methods on RestCall) can now take <code>NameValuePairs</code> and beans as input when using <js>"*"</js> as the name. - <br>{@link org.apache.juneau.remoteable.FormData @FormData},{@link org.apache.juneau.remoteable.FormDataIfNE @FormDataIfNE}, - {@link org.apache.juneau.remoteable.Query @Query},{@link org.apache.juneau.remoteable.QueryIfNE @QueryIfNE}, - {@link org.apache.juneau.remoteable.Header @Header},{@link org.apache.juneau.remoteable.HeaderIfNE @HeaderIfNE}, + <br><code><del>org.apache.juneau.remoteable.FormData</del></code>,<code><del>org.apache.juneau.remoteable.FormDataIfNE</del></code>, + <code><del>org.apache.juneau.remoteable.Query</del></code>,<code><del>org.apache.juneau.remoteable.QueryIfNE</del></code>, + <code><del>org.apache.juneau.remoteable.Header</del></code>,<code><del>org.apache.juneau.remoteable.HeaderIfNE</del></code> </ul> <h5 class='topic w800'>org.apache.juneau.microservice</h5> @@ -25738,7 +25729,7 @@ <li>Fixed bug involving incorrect resolution of overlapping URL match patterns. <li>Overall improvements in HTTP request parameter and header value resolution. <li>Made workspace changes so as not to be dependent on the WAS test environment being loaded. - <li>Renamed <ja>@Remainder</ja> annotation to {@link org.apache.juneau.rest.annotation.PathRemainder @PathRemainder}. + <li>Renamed <ja>@Remainder</ja> annotation to <code><del>@PathRemainder</del></code>. <li>Fixed bug involving incorrect calculation of <code>pathInfo</code> on child resources. </ul> </div> @@ -26947,8 +26938,8 @@ <ul> <li><del><code>@Attr</code></del> - A parameter or URL variable value as a parsed POJO.</li> <li><del><code>@Param</code></del> - A query parameter value as a parsed POJO.</li> - <li>{@link org.apache.juneau.rest.annotation.PathRemainder @PathRemainder} - The remainder after a URL pattern match as a String.</li> - <li>{@link org.apache.juneau.rest.annotation.Header @Header} - An HTTP header value as a parsed POJO.</li> + <li><del><code>@PathRemainder</code></del>- The remainder after a URL pattern match as a String.</li> + <li><del><code>@Header</code></del> - An HTTP header value as a parsed POJO.</li> <li><del><code>@Content</code></del> - The HTTP content as a parsed POJO.</li> <li>{@link org.apache.juneau.rest.annotation.Method @Method} - The HTTP method name as a String.</li> </ul>