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 01a8052 JUNEAU-102 Expanded REST annotations
01a8052 is described below
commit 01a80521b039811009d01ea8a55df8f9d5cd8806
Author: JamesBognar <[email protected]>
AuthorDate: Mon May 13 20:04:55 2019 -0400
JUNEAU-102 Expanded REST annotations
---
.../java/org/apache/juneau/jena/RdfSerializer.java | 2 +-
.../apache/juneau/jena/RdfSerializerBuilder.java | 15 ++-
.../apache/juneau/jena/RdfSerializerSession.java | 2 +-
.../java/org/apache/juneau/BeanContextBuilder.java | 14 ++-
.../org/apache/juneau/BeanTraverseBuilder.java | 15 ++-
.../java/org/apache/juneau/ContextBuilder.java | 101 +++++++++++++++++++++
.../org/apache/juneau/PropertyStoreBuilder.java | 99 ++++++++++++++++++++
.../org/apache/juneau/annotation/BeanConfig.java | 5 +-
.../apache/juneau/csv/CsvSerializerBuilder.java | 15 ++-
.../juneau/html/HtmlDocSerializerBuilder.java | 25 +++--
.../juneau/html/HtmlSchemaSerializerBuilder.java | 15 ++-
.../apache/juneau/html/HtmlSerializerBuilder.java | 15 ++-
.../html/HtmlStrippedDocSerializerBuilder.java | 15 ++-
.../apache/juneau/html/annotation/HtmlConfig.java | 12 +--
.../apache/juneau/jso/JsoSerializerBuilder.java | 15 ++-
.../juneau/json/JsonSchemaSerializerBuilder.java | 15 ++-
.../apache/juneau/json/annotation/JsonConfig.java | 4 +-
.../jsonschema/JsonSchemaGeneratorBuilder.java | 15 ++-
.../jsonschema/annotation/JsonSchemaConfig.java | 4 +-
.../juneau/msgpack/MsgPackSerializerBuilder.java | 15 ++-
.../juneau/msgpack/annotation/MsgPackConfig.java | 4 +-
.../juneau/oapi/OpenApiSerializerBuilder.java | 15 ++-
.../juneau/parser/InputStreamParserBuilder.java | 15 ++-
.../org/apache/juneau/parser/ParserBuilder.java | 15 ++-
.../apache/juneau/parser/ParserGroupBuilder.java | 15 ++-
.../apache/juneau/parser/ReaderParserBuilder.java | 15 ++-
.../plaintext/PlainTextSerializerBuilder.java | 15 ++-
.../java/org/apache/juneau/reflect/ClassInfo.java | 2 +-
.../java/org/apache/juneau/reflect/MethodInfo.java | 8 +-
.../serializer/OutputStreamSerializerBuilder.java | 15 ++-
.../juneau/serializer/SerializerBuilder.java | 15 ++-
.../juneau/serializer/SerializerGroupBuilder.java | 15 ++-
.../juneau/serializer/WriterSerializerBuilder.java | 15 ++-
.../serializer/annotation/SerializerConfig.java | 10 +-
.../juneau/soap/SoapXmlSerializerBuilder.java | 15 ++-
.../juneau/soap/SoapXmlSerializerSession.java | 2 +-
.../apache/juneau/uon/UonSerializerBuilder.java | 15 ++-
.../urlencoding/UrlEncodingSerializerBuilder.java | 15 ++-
.../apache/juneau/xml/XmlSerializerBuilder.java | 15 ++-
.../xmlschema/XmlSchemaSerializerBuilder.java | 15 ++-
.../juneau/rest/client/RestClientBuilder.java | 14 ++-
.../java/org/apache/juneau/rest/RestContext.java | 1 -
.../org/apache/juneau/rest/RestContextBuilder.java | 21 ++++-
43 files changed, 636 insertions(+), 69 deletions(-)
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 38ef48d..69c18ff 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
@@ -408,7 +408,7 @@ public class RdfSerializer extends WriterSerializer
implements RdfCommon {
/**
* 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.
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
index 1d68f71..599a2ae 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
@@ -15,6 +15,7 @@ package org.apache.juneau.jena;
import static org.apache.juneau.jena.RdfCommon.*;
import static org.apache.juneau.jena.RdfSerializer.*;
+import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.*;
@@ -1496,9 +1497,21 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
return this;
}
- @Override
+ @Override /* ContextBuilder */
public RdfSerializerBuilder applyAnnotations(AnnotationsMap m,
VarResolverSession sr) {
super.applyAnnotations(m, sr);
return this;
}
+
+ @Override /* ContextBuilder */
+ public RdfSerializerBuilder applyAnnotations(Class<?> fromClass) {
+ super.applyAnnotations(fromClass);
+ return this;
+ }
+
+ @Override /* ContextBuilder */
+ public RdfSerializerBuilder applyAnnotations(Method fromMethod) {
+ super.applyAnnotations(fromMethod);
+ return this;
+ }
}
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 0610a85..07ab6e6 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
@@ -529,7 +529,7 @@ public final class RdfSerializerSession extends
WriterSerializerSession {
/**
* Configuration property: Default namespaces.
*
- * @see #RDF_namespaces
+ * @see RdfSerializer#RDF_namespaces
* @return
* The default list of namespaces associated with this serializer.
*/
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextBuilder.java
index 343fe47..24ba155 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextBuilder.java
@@ -1706,9 +1706,21 @@ public class BeanContextBuilder extends ContextBuilder {
return this;
}
- @Override
+ @Override /* ContextBuilder */
public BeanContextBuilder applyAnnotations(AnnotationsMap m,
VarResolverSession sr) {
super.applyAnnotations(m, sr);
return this;
}
+
+ @Override /* ContextBuilder */
+ public BeanContextBuilder applyAnnotations(Class<?> fromClass) {
+ super.applyAnnotations(fromClass);
+ return this;
+ }
+
+ @Override /* ContextBuilder */
+ public BeanContextBuilder applyAnnotations(Method fromMethod) {
+ super.applyAnnotations(fromMethod);
+ return this;
+ }
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseBuilder.java
index 43d8b9b..14187e3 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseBuilder.java
@@ -14,6 +14,7 @@ package org.apache.juneau;
import static org.apache.juneau.BeanTraverseContext.*;
+import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.http.*;
@@ -619,12 +620,24 @@ public class BeanTraverseBuilder extends
BeanContextBuilder {
return this;
}
- @Override
+ @Override /* ContextBuilder */
public BeanTraverseBuilder applyAnnotations(AnnotationsMap m,
VarResolverSession sr) {
super.applyAnnotations(m, sr);
return this;
}
+ @Override /* ContextBuilder */
+ public BeanTraverseBuilder applyAnnotations(Class<?> fromClass) {
+ super.applyAnnotations(fromClass);
+ return this;
+ }
+
+ @Override /* ContextBuilder */
+ public BeanTraverseBuilder applyAnnotations(Method fromMethod) {
+ super.applyAnnotations(fromMethod);
+ return this;
+ }
+
@Override /* Context */
public BeanTraverseContext build() {
return null;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextBuilder.java
index 57c0e86..532b55b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextBuilder.java
@@ -12,10 +12,26 @@
//
***************************************************************************************************************************
package org.apache.juneau;
+import java.lang.reflect.*;
import java.util.*;
+import org.apache.juneau.annotation.*;
+import org.apache.juneau.csv.annotation.*;
+import org.apache.juneau.html.annotation.*;
+import org.apache.juneau.jso.annotation.*;
+import org.apache.juneau.json.annotation.*;
+import org.apache.juneau.jsonschema.annotation.*;
+import org.apache.juneau.msgpack.annotation.*;
+import org.apache.juneau.oapi.annotation.*;
+import org.apache.juneau.parser.annotation.*;
+import org.apache.juneau.plaintext.annotation.*;
import org.apache.juneau.reflect.*;
+import org.apache.juneau.serializer.annotation.*;
+import org.apache.juneau.soap.annotation.*;
import org.apache.juneau.svl.*;
+import org.apache.juneau.uon.annotation.*;
+import org.apache.juneau.urlencoding.annotation.*;
+import org.apache.juneau.xml.annotation.*;
/**
* Builder class for building instances of serializers and parsers.
@@ -101,6 +117,91 @@ public abstract class ContextBuilder {
}
/**
+ * Applies any of the various <ja>@XConfig</ja> annotations on the
specified class to this context.
+ *
+ * <p>
+ * Applies any of the following annotations:
+ * <ul class='doctree'>
+ * <li class ='ja'>{@link BeanConfig}
+ * <li class ='ja'>{@link CsvConfig}
+ * <li class ='ja'>{@link HtmlConfig}
+ * <li class ='ja'>{@link HtmlDocConfig}
+ * <li class ='ja'>{@link JsoConfig}
+ * <li class ='ja'>{@link JsonConfig}
+ * <li class ='ja'>{@link JsonSchemaConfig}
+ * <li class ='ja'>{@link MsgPackConfig}
+ * <li class ='ja'>{@link OpenApiConfig}
+ * <li class ='ja'>{@link ParserConfig}
+ * <li class ='ja'>{@link PlainTextConfig}
+ * <li class ='ja'>{@link SerializerConfig}
+ * <li class ='ja'>{@link SoapXmlConfig}
+ * <li class ='ja'>{@link UonConfig}
+ * <li class ='ja'>{@link UrlEncodingConfig}
+ * <li class ='ja'>{@link XmlConfig}
+ * <li class ='ja'><code>RdfConfig</code>
+ * </ul>
+ *
+ * <p>
+ * Annotations are appended in the following order:
+ * <ol>
+ * <li>On the package of this class.
+ * <li>On interfaces ordered parent-to-child.
+ * <li>On parent classes ordered parent-to-child.
+ * <li>On this class.
+ * </ol>
+ *
+ * @param fromClass The class on which the annotations are defined.
+ * @return This object (for method chaining).
+ */
+ public ContextBuilder applyAnnotations(Class<?> fromClass) {
+
applyAnnotations(ClassInfo.of(fromClass).getConfigAnnotationsMapParentFirst(),
VarResolver.DEFAULT.createSession());
+ return this;
+ }
+
+ /**
+ * Applies any of the various <ja>@XConfig</ja> annotations on the
specified method to this context.
+ *
+ * <p>
+ * Applies any of the following annotations:
+ * <ul class='doctree'>
+ * <li class ='ja'>{@link BeanConfig}
+ * <li class ='ja'>{@link CsvConfig}
+ * <li class ='ja'>{@link HtmlConfig}
+ * <li class ='ja'>{@link HtmlDocConfig}
+ * <li class ='ja'>{@link JsoConfig}
+ * <li class ='ja'>{@link JsonConfig}
+ * <li class ='ja'>{@link JsonSchemaConfig}
+ * <li class ='ja'>{@link MsgPackConfig}
+ * <li class ='ja'>{@link OpenApiConfig}
+ * <li class ='ja'>{@link ParserConfig}
+ * <li class ='ja'>{@link PlainTextConfig}
+ * <li class ='ja'>{@link SerializerConfig}
+ * <li class ='ja'>{@link SoapXmlConfig}
+ * <li class ='ja'>{@link UonConfig}
+ * <li class ='ja'>{@link UrlEncodingConfig}
+ * <li class ='ja'>{@link XmlConfig}
+ * <li class ='ja'><code>RdfConfig</code>
+ * </ul>
+ *
+ * <p>
+ * Annotations are appended in the following orders:
+ * <ol>
+ * <li>On the package of the method class.
+ * <li>On interfaces ordered parent-to-child.
+ * <li>On parent classes ordered parent-to-child.
+ * <li>On the method class.
+ * <li>On this method and matching methods ordered parent-to-child.
+ * </ol>
+ *
+ * @param fromMethod The method on which the annotations are defined.
+ * @return This object (for method chaining).
+ */
+ public ContextBuilder applyAnnotations(Method fromMethod) {
+
applyAnnotations(MethodInfo.of(fromMethod).getConfigAnnotationsMapParentFirst(),
VarResolver.DEFAULT.createSession());
+ return this;
+ }
+
+ /**
* Build a new instance of the specified object.
*
* @param c The subclass of {@link Context} to instantiate.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyStoreBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyStoreBuilder.java
index 8eeeec2..568fc58 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyStoreBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyStoreBuilder.java
@@ -22,11 +22,25 @@ import java.util.regex.*;
import org.apache.juneau.PropertyStore.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.csv.annotation.*;
+import org.apache.juneau.html.annotation.*;
import org.apache.juneau.internal.*;
+import org.apache.juneau.jso.annotation.*;
import org.apache.juneau.json.*;
+import org.apache.juneau.json.annotation.*;
+import org.apache.juneau.jsonschema.annotation.*;
import org.apache.juneau.marshall.*;
+import org.apache.juneau.msgpack.annotation.*;
+import org.apache.juneau.oapi.annotation.*;
+import org.apache.juneau.parser.annotation.*;
+import org.apache.juneau.plaintext.annotation.*;
import org.apache.juneau.reflect.*;
+import org.apache.juneau.serializer.annotation.*;
+import org.apache.juneau.soap.annotation.*;
import org.apache.juneau.svl.*;
+import org.apache.juneau.uon.annotation.*;
+import org.apache.juneau.urlencoding.annotation.*;
+import org.apache.juneau.xml.annotation.*;
/**
* A builder for {@link PropertyStore} objects.
@@ -129,6 +143,91 @@ public class PropertyStoreBuilder {
}
/**
+ * Applies any of the various <ja>@XConfig</ja> annotations on the
specified class to this property store.
+ *
+ * <p>
+ * Applies any of the following annotations:
+ * <ul class='doctree'>
+ * <li class ='ja'>{@link BeanConfig}
+ * <li class ='ja'>{@link CsvConfig}
+ * <li class ='ja'>{@link HtmlConfig}
+ * <li class ='ja'>{@link HtmlDocConfig}
+ * <li class ='ja'>{@link JsoConfig}
+ * <li class ='ja'>{@link JsonConfig}
+ * <li class ='ja'>{@link JsonSchemaConfig}
+ * <li class ='ja'>{@link MsgPackConfig}
+ * <li class ='ja'>{@link OpenApiConfig}
+ * <li class ='ja'>{@link ParserConfig}
+ * <li class ='ja'>{@link PlainTextConfig}
+ * <li class ='ja'>{@link SerializerConfig}
+ * <li class ='ja'>{@link SoapXmlConfig}
+ * <li class ='ja'>{@link UonConfig}
+ * <li class ='ja'>{@link UrlEncodingConfig}
+ * <li class ='ja'>{@link XmlConfig}
+ * <li class ='ja'><code>RdfConfig</code>
+ * </ul>
+ *
+ * <p>
+ * Annotations are appended in the following order:
+ * <ol>
+ * <li>On the package of this class.
+ * <li>On interfaces ordered parent-to-child.
+ * <li>On parent classes ordered parent-to-child.
+ * <li>On this class.
+ * </ol>
+ *
+ * @param fromClass The class on which the annotations are defined.
+ * @return This object (for method chaining).
+ */
+ public PropertyStoreBuilder applyAnnotations(Class<?> fromClass) {
+
applyAnnotations(ClassInfo.of(fromClass).getConfigAnnotationsMapParentFirst(),
VarResolver.DEFAULT.createSession());
+ return this;
+ }
+
+ /**
+ * Applies any of the various <ja>@XConfig</ja> annotations on the
specified method to this property store.
+ *
+ * <p>
+ * Applies any of the following annotations:
+ * <ul class='doctree'>
+ * <li class ='ja'>{@link BeanConfig}
+ * <li class ='ja'>{@link CsvConfig}
+ * <li class ='ja'>{@link HtmlConfig}
+ * <li class ='ja'>{@link HtmlDocConfig}
+ * <li class ='ja'>{@link JsoConfig}
+ * <li class ='ja'>{@link JsonConfig}
+ * <li class ='ja'>{@link JsonSchemaConfig}
+ * <li class ='ja'>{@link MsgPackConfig}
+ * <li class ='ja'>{@link OpenApiConfig}
+ * <li class ='ja'>{@link ParserConfig}
+ * <li class ='ja'>{@link PlainTextConfig}
+ * <li class ='ja'>{@link SerializerConfig}
+ * <li class ='ja'>{@link SoapXmlConfig}
+ * <li class ='ja'>{@link UonConfig}
+ * <li class ='ja'>{@link UrlEncodingConfig}
+ * <li class ='ja'>{@link XmlConfig}
+ * <li class ='ja'><code>RdfConfig</code>
+ * </ul>
+ *
+ * <p>
+ * Annotations are appended in the following orders:
+ * <ol>
+ * <li>On the package of the method class.
+ * <li>On interfaces ordered parent-to-child.
+ * <li>On parent classes ordered parent-to-child.
+ * <li>On the method class.
+ * <li>On this method and matching methods ordered parent-to-child.
+ * </ol>
+ *
+ * @param fromMethod The method on which the annotations are defined.
+ * @return This object (for method chaining).
+ */
+ public PropertyStoreBuilder applyAnnotations(Method fromMethod) {
+
applyAnnotations(MethodInfo.of(fromMethod).getConfigAnnotationsMapParentFirst(),
VarResolver.DEFAULT.createSession());
+ return this;
+ }
+
+ /**
* Sets a configuration property value on this object.
*
* @param key
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java
index a46b3ba..b3970b2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java
@@ -14,7 +14,6 @@ package org.apache.juneau.annotation;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;
-import static org.apache.juneau.BeanTraverseContext.*;
import java.io.*;
import java.lang.annotation.*;
@@ -1331,7 +1330,7 @@ public @interface BeanConfig {
* <br>These show up as {@link ParseException ParseExceptions} with the
message <js>"Depth too deep. Stack overflow occurred."</js>.
*
* <p>
- * The behavior when recursions are detected depends on the value for
{@link #BEANTRAVERSE_ignoreRecursions}.
+ * The behavior when recursions are detected depends on the value for
{@link BeanTraverseContext#BEANTRAVERSE_ignoreRecursions}.
*
* <p>
* For example, if a model contains the links A->B->C->A, then
the JSON generated will look like
@@ -1368,7 +1367,7 @@ public @interface BeanConfig {
* Configuration property: Ignore recursion errors.
*
* <p>
- * Used in conjunction with {@link #BEANTRAVERSE_detectRecursions}.
+ * Used in conjunction with {@link
BeanTraverseContext#BEANTRAVERSE_detectRecursions}.
* <br>Setting is ignored if <jsf>BEANTRAVERSE_detectRecursions</jsf>
is <js>"false"</js>.
*
* <p>
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerBuilder.java
index 580b972..0ddc86f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerBuilder.java
@@ -12,6 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.csv;
+import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.*;
@@ -679,9 +680,21 @@ public class CsvSerializerBuilder extends
WriterSerializerBuilder {
return this;
}
- @Override
+ @Override /* ContextBuilder */
public CsvSerializerBuilder applyAnnotations(AnnotationsMap m,
VarResolverSession sr) {
super.applyAnnotations(m, sr);
return this;
}
+
+ @Override /* ContextBuilder */
+ public CsvSerializerBuilder applyAnnotations(Class<?> fromClass) {
+ super.applyAnnotations(fromClass);
+ return this;
+ }
+
+ @Override /* ContextBuilder */
+ public CsvSerializerBuilder applyAnnotations(Method fromMethod) {
+ super.applyAnnotations(fromMethod);
+ return this;
+ }
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerBuilder.java
index 669dc4e..ef53892 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerBuilder.java
@@ -14,6 +14,7 @@ package org.apache.juneau.html;
import static org.apache.juneau.html.HtmlDocSerializer.*;
+import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.*;
@@ -179,7 +180,7 @@ public class HtmlDocSerializerBuilder extends
HtmlStrippedDocSerializerBuilder {
* </p>
*
* <p>
- * When this property is specified, the {@link #HTMLDOC_navlinks}
property is ignored.
+ * When this property is specified, the {@link
HtmlDocSerializer#HTMLDOC_navlinks} property is ignored.
*
* @param value
* The new value for this property.
@@ -236,7 +237,7 @@ public class HtmlDocSerializerBuilder extends
HtmlStrippedDocSerializerBuilder {
}
/**
- * Configuration property: Add to the {@link #HTMLDOC_navlinks}
property.
+ * Configuration property: Add to the {@link
HtmlDocSerializer#HTMLDOC_navlinks} property.
*
* @param value
* The value to add to this property.
@@ -312,7 +313,7 @@ public class HtmlDocSerializerBuilder extends
HtmlStrippedDocSerializerBuilder {
}
/**
- * Configuration property: Add to the {@link #HTMLDOC_script} property.
+ * Configuration property: Add to the {@link
HtmlDocSerializer#HTMLDOC_script} property.
*
* @param value
* The value to add to this property.
@@ -349,7 +350,7 @@ public class HtmlDocSerializerBuilder extends
HtmlStrippedDocSerializerBuilder {
}
/**
- * Configuration property: Add to the {@link #HTMLDOC_style} property.
+ * Configuration property: Add to the {@link
HtmlDocSerializer#HTMLDOC_style} property.
*
* @param value
* The value to add to this property.
@@ -379,7 +380,7 @@ public class HtmlDocSerializerBuilder extends
HtmlStrippedDocSerializerBuilder {
}
/**
- * Configuration property: Add to the {@link #HTMLDOC_stylesheet}
property.
+ * Configuration property: Add to the {@link
HtmlDocSerializer#HTMLDOC_stylesheet} property.
*
* @param value
* The value to add to this property.
@@ -1204,9 +1205,21 @@ public class HtmlDocSerializerBuilder extends
HtmlStrippedDocSerializerBuilder {
return this;
}
- @Override
+ @Override /* ContextBuilder */
public HtmlDocSerializerBuilder applyAnnotations(AnnotationsMap m,
VarResolverSession sr) {
super.applyAnnotations(m, sr);
return this;
}
+
+ @Override /* ContextBuilder */
+ public HtmlDocSerializerBuilder applyAnnotations(Class<?> fromClass) {
+ super.applyAnnotations(fromClass);
+ return this;
+ }
+
+ @Override /* ContextBuilder */
+ public HtmlDocSerializerBuilder applyAnnotations(Method fromMethod) {
+ super.applyAnnotations(fromMethod);
+ return this;
+ }
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerBuilder.java
index bae681a..09f1642 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerBuilder.java
@@ -14,6 +14,7 @@ package org.apache.juneau.html;
import static org.apache.juneau.jsonschema.JsonSchemaGenerator.*;
+import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.*;
@@ -819,9 +820,21 @@ public class HtmlSchemaSerializerBuilder extends
HtmlSerializerBuilder {
return this;
}
- @Override
+ @Override /* ContextBuilder */
public HtmlSchemaSerializerBuilder applyAnnotations(AnnotationsMap m,
VarResolverSession sr) {
super.applyAnnotations(m, sr);
return this;
}
+
+ @Override /* ContextBuilder */
+ public HtmlSchemaSerializerBuilder applyAnnotations(Class<?> fromClass)
{
+ super.applyAnnotations(fromClass);
+ return this;
+ }
+
+ @Override /* ContextBuilder */
+ public HtmlSchemaSerializerBuilder applyAnnotations(Method fromMethod) {
+ super.applyAnnotations(fromMethod);
+ return this;
+ }
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerBuilder.java
index 9dc6df6..4e96015 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerBuilder.java
@@ -14,6 +14,7 @@ package org.apache.juneau.html;
import static org.apache.juneau.html.HtmlSerializer.*;
+import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.*;
@@ -860,9 +861,21 @@ public class HtmlSerializerBuilder extends
XmlSerializerBuilder {
return this;
}
- @Override
+ @Override /* ContextBuilder */
public HtmlSerializerBuilder applyAnnotations(AnnotationsMap m,
VarResolverSession sr) {
super.applyAnnotations(m, sr);
return this;
}
+
+ @Override /* ContextBuilder */
+ public HtmlSerializerBuilder applyAnnotations(Class<?> fromClass) {
+ super.applyAnnotations(fromClass);
+ return this;
+ }
+
+ @Override /* ContextBuilder */
+ public HtmlSerializerBuilder applyAnnotations(Method fromMethod) {
+ super.applyAnnotations(fromMethod);
+ return this;
+ }
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerBuilder.java
index e73a72d..5fd4e71 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerBuilder.java
@@ -12,6 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.html;
+import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.*;
@@ -764,9 +765,21 @@ public class HtmlStrippedDocSerializerBuilder extends
HtmlSerializerBuilder {
return this;
}
- @Override
+ @Override /* ContextBuilder */
public HtmlStrippedDocSerializerBuilder applyAnnotations(AnnotationsMap
m, VarResolverSession sr) {
super.applyAnnotations(m, sr);
return this;
}
+
+ @Override /* ContextBuilder */
+ public HtmlStrippedDocSerializerBuilder applyAnnotations(Class<?>
fromClass) {
+ super.applyAnnotations(fromClass);
+ return this;
+ }
+
+ @Override /* ContextBuilder */
+ public HtmlStrippedDocSerializerBuilder applyAnnotations(Method
fromMethod) {
+ super.applyAnnotations(fromMethod);
+ return this;
+ }
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfig.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfig.java
index 5de8171..0d7181c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfig.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfig.java
@@ -12,8 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.html.annotation;
-import static org.apache.juneau.html.HtmlSerializer.*;
-
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;
@@ -48,7 +46,7 @@ public @interface HtmlConfig {
* through reflection.
*
* <p>
- * When present, this value overrides the {@link
#SERIALIZER_addBeanTypes} setting and is
+ * When present, this value overrides the {@link
Serializer#SERIALIZER_addBeanTypes} setting and is
* provided to customize the behavior of specific serializers in a
{@link SerializerGroup}.
*
* <h5 class='section'>Notes:</h5>
@@ -129,7 +127,7 @@ public @interface HtmlConfig {
*
* <p>
* If a string looks like a URL (i.e. starts with <js>"http://";</js> or
<js>"https://";</js>, then treat it like a URL
- * and make it into a hyperlink based on the rules specified by {@link
#HTML_uriAnchorText}.
+ * and make it into a hyperlink based on the rules specified by {@link
HtmlSerializer#HTML_uriAnchorText}.
*
* <p>
* The following shows the difference between the two generated outputs:
@@ -180,7 +178,7 @@ public @interface HtmlConfig {
* Configuration property: Link label parameter name.
*
* <p>
- * 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}.
*
* <h5 class='section'>Notes:</h5>
* <ul class='spaced-list'>
@@ -194,7 +192,7 @@ public @interface HtmlConfig {
*
* <h5 class=''>See Also:</h5>
* <ul>
- * <li class='jf'>{@link #HTML_labelParameter}
+ * <li class='jf'>{@link HtmlSerializer#HTML_labelParameter}
* </ul>
*/
String labelParameter() default "";
@@ -206,7 +204,7 @@ public @interface HtmlConfig {
* If the URL has a label parameter (e.g. <js>"?label=foobar"</js>),
then use that as the anchor text of the link.
*
* <p>
- * The parameter name can be changed via the {@link
#HTML_labelParameter} property.
+ * The parameter name can be changed via the {@link
HtmlSerializer#HTML_labelParameter} property.
*
* <p>
* The following shows the difference between the two generated outputs.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializerBuilder.java
index 8228059..d63118c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializerBuilder.java
@@ -12,6 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.jso;
+import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.*;
@@ -649,9 +650,21 @@ public class JsoSerializerBuilder extends
OutputStreamSerializerBuilder {
return this;
}
- @Override
+ @Override /* ContextBuilder */
public JsoSerializerBuilder applyAnnotations(AnnotationsMap m,
VarResolverSession sr) {
super.applyAnnotations(m, sr);
return this;
}
+
+ @Override /* ContextBuilder */
+ public JsoSerializerBuilder applyAnnotations(Class<?> fromClass) {
+ super.applyAnnotations(fromClass);
+ return this;
+ }
+
+ @Override /* ContextBuilder */
+ public JsoSerializerBuilder applyAnnotations(Method fromMethod) {
+ super.applyAnnotations(fromMethod);
+ return this;
+ }
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerBuilder.java
index 527b9d4..4e8628e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerBuilder.java
@@ -14,6 +14,7 @@ package org.apache.juneau.json;
import static org.apache.juneau.jsonschema.JsonSchemaGenerator.*;
+import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.*;
@@ -885,9 +886,21 @@ public class JsonSchemaSerializerBuilder extends
JsonSerializerBuilder {
return this;
}
- @Override
+ @Override /* ContextBuilder */
public JsonSchemaSerializerBuilder applyAnnotations(AnnotationsMap m,
VarResolverSession sr) {
super.applyAnnotations(m, sr);
return this;
}
+
+ @Override /* ContextBuilder */
+ public JsonSchemaSerializerBuilder applyAnnotations(Class<?> fromClass)
{
+ super.applyAnnotations(fromClass);
+ return this;
+ }
+
+ @Override /* ContextBuilder */
+ public JsonSchemaSerializerBuilder applyAnnotations(Method fromMethod) {
+ super.applyAnnotations(fromMethod);
+ return this;
+ }
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonConfig.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonConfig.java
index f5de401..41a9d3c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonConfig.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonConfig.java
@@ -12,8 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.json.annotation;
-import static org.apache.juneau.json.JsonSerializer.*;
-
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;
@@ -80,7 +78,7 @@ public @interface JsonConfig {
* through reflection.
*
* <p>
- * When present, this value overrides the {@link
#SERIALIZER_addBeanTypes} setting and is
+ * When present, this value overrides the {@link
Serializer#SERIALIZER_addBeanTypes} setting and is
* provided to customize the behavior of specific serializers in a
{@link SerializerGroup}.
*
* <h5 class='section'>Notes:</h5>
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorBuilder.java
index f07a38f..2aad901 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorBuilder.java
@@ -14,6 +14,7 @@ package org.apache.juneau.jsonschema;
import static org.apache.juneau.jsonschema.JsonSchemaGenerator.*;
+import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.*;
@@ -762,9 +763,21 @@ public class JsonSchemaGeneratorBuilder extends
BeanTraverseBuilder {
return this;
}
- @Override
+ @Override /* ContextBuilder */
public JsonSchemaGeneratorBuilder applyAnnotations(AnnotationsMap m,
VarResolverSession sr) {
super.applyAnnotations(m, sr);
return this;
}
+
+ @Override /* ContextBuilder */
+ public JsonSchemaGeneratorBuilder applyAnnotations(Class<?> fromClass) {
+ super.applyAnnotations(fromClass);
+ return this;
+ }
+
+ @Override /* ContextBuilder */
+ public JsonSchemaGeneratorBuilder applyAnnotations(Method fromMethod) {
+ super.applyAnnotations(fromMethod);
+ return this;
+ }
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/JsonSchemaConfig.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/JsonSchemaConfig.java
index bc597d9..a6881e4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/JsonSchemaConfig.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/JsonSchemaConfig.java
@@ -12,8 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.jsonschema.annotation;
-import static org.apache.juneau.jsonschema.JsonSchemaGenerator.*;
-
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;
@@ -184,7 +182,7 @@ public @interface JsonSchemaConfig {
* <h5 class='section'>Notes:</h5>
* <ul class='spaced-list'>
* <li>
- * This setting is ignored if {@link
#JSONSCHEMA_useBeanDefs} is not enabled.
+ * This setting is ignored if {@link
JsonSchemaGenerator#JSONSCHEMA_useBeanDefs} is not enabled.
* </ul>
*
* <h5 class='section'>See Also:</h5>
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerBuilder.java
index 5f53bf1..6ed0e8c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerBuilder.java
@@ -12,6 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.msgpack;
+import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.*;
@@ -649,9 +650,21 @@ public class MsgPackSerializerBuilder extends
OutputStreamSerializerBuilder {
return this;
}
- @Override
+ @Override /* ContextBuilder */
public MsgPackSerializerBuilder applyAnnotations(AnnotationsMap m,
VarResolverSession sr) {
super.applyAnnotations(m, sr);
return this;
}
+
+ @Override /* ContextBuilder */
+ public MsgPackSerializerBuilder applyAnnotations(Class<?> fromClass) {
+ super.applyAnnotations(fromClass);
+ return this;
+ }
+
+ @Override /* ContextBuilder */
+ public MsgPackSerializerBuilder applyAnnotations(Method fromMethod) {
+ super.applyAnnotations(fromMethod);
+ return this;
+ }
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackConfig.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackConfig.java
index a5ef596..9f1d670 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackConfig.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackConfig.java
@@ -12,8 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.msgpack.annotation;
-import static org.apache.juneau.msgpack.MsgPackSerializer.*;
-
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;
@@ -48,7 +46,7 @@ public @interface MsgPackConfig {
* through reflection.
*
* <p>
- * When present, this value overrides the {@link
#SERIALIZER_addBeanTypes} setting and is
+ * When present, this value overrides the {@link
Serializer#SERIALIZER_addBeanTypes} setting and is
* provided to customize the behavior of specific serializers in a
{@link SerializerGroup}.
*
* <h5 class='section'>Notes:</h5>
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerBuilder.java
index 5ff9856..715cc0a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerBuilder.java
@@ -12,6 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.oapi;
+import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.*;
@@ -680,9 +681,21 @@ public class OpenApiSerializerBuilder extends
UonSerializerBuilder {
return this;
}
- @Override
+ @Override /* ContextBuilder */
public OpenApiSerializerBuilder applyAnnotations(AnnotationsMap m,
VarResolverSession sr) {
super.applyAnnotations(m, sr);
return this;
}
+
+ @Override /* ContextBuilder */
+ public OpenApiSerializerBuilder applyAnnotations(Class<?> fromClass) {
+ super.applyAnnotations(fromClass);
+ return this;
+ }
+
+ @Override /* ContextBuilder */
+ public OpenApiSerializerBuilder applyAnnotations(Method fromMethod) {
+ super.applyAnnotations(fromMethod);
+ return this;
+ }
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserBuilder.java
index 596f013..de77f75 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserBuilder.java
@@ -14,6 +14,7 @@ package org.apache.juneau.parser;
import static org.apache.juneau.parser.InputStreamParser.*;
+import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.*;
@@ -592,12 +593,24 @@ public class InputStreamParserBuilder extends
ParserBuilder {
return this;
}
- @Override
+ @Override /* ContextBuilder */
public InputStreamParserBuilder applyAnnotations(AnnotationsMap m,
VarResolverSession sr) {
super.applyAnnotations(m, sr);
return this;
}
+ @Override /* ContextBuilder */
+ public InputStreamParserBuilder applyAnnotations(Class<?> fromClass) {
+ super.applyAnnotations(fromClass);
+ return this;
+ }
+
+ @Override /* ContextBuilder */
+ public InputStreamParserBuilder applyAnnotations(Method fromMethod) {
+ super.applyAnnotations(fromMethod);
+ return this;
+ }
+
@Override /* Context */
public InputStreamParser build() {
return null;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserBuilder.java
index e536c27..e84c108 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserBuilder.java
@@ -14,6 +14,7 @@ package org.apache.juneau.parser;
import static org.apache.juneau.parser.Parser.*;
+import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.*;
@@ -679,12 +680,24 @@ public class ParserBuilder extends BeanContextBuilder {
return this;
}
- @Override
+ @Override /* ContextBuilder */
public ParserBuilder applyAnnotations(AnnotationsMap m,
VarResolverSession sr) {
super.applyAnnotations(m, sr);
return this;
}
+ @Override /* ContextBuilder */
+ public ParserBuilder applyAnnotations(Class<?> fromClass) {
+ super.applyAnnotations(fromClass);
+ return this;
+ }
+
+ @Override /* ContextBuilder */
+ public ParserBuilder applyAnnotations(Method fromMethod) {
+ super.applyAnnotations(fromMethod);
+ return this;
+ }
+
@Override /* Context */
public Parser build() {
return null;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroupBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroupBuilder.java
index 2d2a956..7e45f8e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroupBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroupBuilder.java
@@ -16,6 +16,7 @@ import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.parser.InputStreamParser.*;
import static org.apache.juneau.parser.ReaderParser.*;
+import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.*;
@@ -825,9 +826,21 @@ public class ParserGroupBuilder extends BeanContextBuilder
{
return this;
}
- @Override
+ @Override /* ContextBuilder */
public ParserGroupBuilder applyAnnotations(AnnotationsMap m,
VarResolverSession sr) {
super.applyAnnotations(m, sr);
return this;
}
+
+ @Override /* ContextBuilder */
+ public ParserGroupBuilder applyAnnotations(Class<?> fromClass) {
+ super.applyAnnotations(fromClass);
+ return this;
+ }
+
+ @Override /* ContextBuilder */
+ public ParserGroupBuilder applyAnnotations(Method fromMethod) {
+ super.applyAnnotations(fromMethod);
+ return this;
+ }
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserBuilder.java
index 70d17f8..9882be5 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserBuilder.java
@@ -14,6 +14,7 @@ package org.apache.juneau.parser;
import static org.apache.juneau.parser.ReaderParser.*;
+import java.lang.reflect.*;
import java.nio.charset.*;
import java.util.*;
@@ -631,9 +632,21 @@ public abstract class ReaderParserBuilder extends
ParserBuilder {
return this;
}
- @Override
+ @Override /* ContextBuilder */
public ReaderParserBuilder applyAnnotations(AnnotationsMap m,
VarResolverSession sr) {
super.applyAnnotations(m, sr);
return this;
}
+
+ @Override /* ContextBuilder */
+ public ReaderParserBuilder applyAnnotations(Class<?> fromClass) {
+ super.applyAnnotations(fromClass);
+ return this;
+ }
+
+ @Override /* ContextBuilder */
+ public ReaderParserBuilder applyAnnotations(Method fromMethod) {
+ super.applyAnnotations(fromMethod);
+ return this;
+ }
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializerBuilder.java
index bc7c82f..162431f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializerBuilder.java
@@ -12,6 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.plaintext;
+import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.*;
@@ -679,9 +680,21 @@ public class PlainTextSerializerBuilder extends
WriterSerializerBuilder {
return this;
}
- @Override
+ @Override /* ContextBuilder */
public PlainTextSerializerBuilder applyAnnotations(AnnotationsMap m,
VarResolverSession sr) {
super.applyAnnotations(m, sr);
return this;
}
+
+ @Override /* ContextBuilder */
+ public PlainTextSerializerBuilder applyAnnotations(Class<?> fromClass) {
+ super.applyAnnotations(fromClass);
+ return this;
+ }
+
+ @Override /* ContextBuilder */
+ public PlainTextSerializerBuilder applyAnnotations(Method fromMethod) {
+ super.applyAnnotations(fromMethod);
+ return this;
+ }
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
index f7e4a64..7d426d0 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
@@ -984,7 +984,7 @@ public final class ClassInfo {
* Constructs an {@link ConfigAnnotationsMap} of all annotations found
on this class.
*
* <p>
- * Annotations are appended in the following orders:
+ * Annotations are appended in the following order:
* <ol>
* <li>On the package of this class.
* <li>On interfaces ordered parent-to-child.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java
index 9d55491..98fc2de 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java
@@ -255,10 +255,10 @@ public final class MethodInfo extends ExecutableInfo
implements Comparable<Metho
* Annotations are appended in the following orders:
* <ol>
* <li>On this method and matching methods ordered child-to-parent.
- * <li>On this class.
+ * <li>On the method class.
* <li>On parent classes ordered child-to-parent.
* <li>On interfaces ordered child-to-parent.
- * <li>On the package of this class.
+ * <li>On the package of the method class.
* </ol>
*
* @return A new {@link AnnotationsMap} object on every call.
@@ -273,10 +273,10 @@ public final class MethodInfo extends ExecutableInfo
implements Comparable<Metho
* <p>
* Annotations are appended in the following orders:
* <ol>
- * <li>On the package of this class.
+ * <li>On the package of the method class.
* <li>On interfaces ordered parent-to-child.
* <li>On parent classes ordered parent-to-child.
- * <li>On this class.
+ * <li>On the method class.
* <li>On this method and matching methods ordered parent-to-child.
* </ol>
*
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerBuilder.java
index e80fab7..9b1f8a0 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerBuilder.java
@@ -14,6 +14,7 @@ package org.apache.juneau.serializer;
import static org.apache.juneau.serializer.OutputStreamSerializer.*;
+import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.*;
@@ -530,12 +531,24 @@ public class OutputStreamSerializerBuilder extends
SerializerBuilder {
return this;
}
- @Override
+ @Override /* ContextBuilder */
public OutputStreamSerializerBuilder applyAnnotations(AnnotationsMap m,
VarResolverSession sr) {
super.applyAnnotations(m, sr);
return this;
}
+ @Override /* ContextBuilder */
+ public OutputStreamSerializerBuilder applyAnnotations(Class<?>
fromClass) {
+ super.applyAnnotations(fromClass);
+ return this;
+ }
+
+ @Override /* ContextBuilder */
+ public OutputStreamSerializerBuilder applyAnnotations(Method
fromMethod) {
+ super.applyAnnotations(fromMethod);
+ return this;
+ }
+
@Override /* Context */
public OutputStreamSerializer build() {
return null;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerBuilder.java
index 52a7e81..51537c6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerBuilder.java
@@ -14,6 +14,7 @@ package org.apache.juneau.serializer;
import static org.apache.juneau.serializer.Serializer.*;
+import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.*;
@@ -1019,12 +1020,24 @@ public class SerializerBuilder extends
BeanTraverseBuilder {
return this;
}
- @Override
+ @Override /* ContextBuilder */
public SerializerBuilder applyAnnotations(AnnotationsMap m,
VarResolverSession sr) {
super.applyAnnotations(m, sr);
return this;
}
+ @Override /* ContextBuilder */
+ public SerializerBuilder applyAnnotations(Class<?> fromClass) {
+ super.applyAnnotations(fromClass);
+ return this;
+ }
+
+ @Override /* ContextBuilder */
+ public SerializerBuilder applyAnnotations(Method fromMethod) {
+ super.applyAnnotations(fromMethod);
+ return this;
+ }
+
@Override /* Context */
public Serializer build() {
return null;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroupBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroupBuilder.java
index a62d60b..da85a79 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroupBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroupBuilder.java
@@ -16,6 +16,7 @@ import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.serializer.OutputStreamSerializer.*;
import static org.apache.juneau.serializer.WriterSerializer.*;
+import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.*;
@@ -1098,9 +1099,21 @@ public class SerializerGroupBuilder extends
BeanTraverseBuilder {
return this;
}
- @Override
+ @Override /* ContextBuilder */
public SerializerGroupBuilder applyAnnotations(AnnotationsMap m,
VarResolverSession sr) {
super.applyAnnotations(m, sr);
return this;
}
+
+ @Override /* ContextBuilder */
+ public SerializerGroupBuilder applyAnnotations(Class<?> fromClass) {
+ super.applyAnnotations(fromClass);
+ return this;
+ }
+
+ @Override /* ContextBuilder */
+ public SerializerGroupBuilder applyAnnotations(Method fromMethod) {
+ super.applyAnnotations(fromMethod);
+ return this;
+ }
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerBuilder.java
index 695848e..61805dd 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerBuilder.java
@@ -14,6 +14,7 @@ package org.apache.juneau.serializer;
import static org.apache.juneau.serializer.WriterSerializer.*;
+import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.*;
@@ -547,12 +548,24 @@ public class WriterSerializerBuilder extends
SerializerBuilder {
return this;
}
- @Override
+ @Override /* ContextBuilder */
public WriterSerializerBuilder applyAnnotations(AnnotationsMap m,
VarResolverSession sr) {
super.applyAnnotations(m, sr);
return this;
}
+ @Override /* ContextBuilder */
+ public WriterSerializerBuilder applyAnnotations(Class<?> fromClass) {
+ super.applyAnnotations(fromClass);
+ return this;
+ }
+
+ @Override /* ContextBuilder */
+ public WriterSerializerBuilder applyAnnotations(Method fromMethod) {
+ super.applyAnnotations(fromMethod);
+ return this;
+ }
+
@Override /* Context */
public WriterSerializer build() {
return null;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/annotation/SerializerConfig.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/annotation/SerializerConfig.java
index 591c87f..f1cd6a2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/annotation/SerializerConfig.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/annotation/SerializerConfig.java
@@ -12,8 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.serializer.annotation;
-import static org.apache.juneau.serializer.Serializer.*;
-
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;
@@ -88,8 +86,8 @@ public @interface SerializerConfig {
* <p>
* Note the differences between the following settings:
* <ul>
- * <li class='jf'>{@link #SERIALIZER_addRootType} - Affects
whether <js>'_type'</js> is added to root node.
- * <li class='jf'>{@link #SERIALIZER_addBeanTypes} - Affects
whether <js>'_type'</js> is added to any nodes.
+ * <li class='jf'>{@link Serializer#SERIALIZER_addRootType} -
Affects whether <js>'_type'</js> is added to root node.
+ * <li class='jf'>{@link Serializer#SERIALIZER_addBeanTypes} -
Affects whether <js>'_type'</js> is added to any nodes.
* </ul>
*
* <h5 class='section'>Notes:</h5>
@@ -127,8 +125,8 @@ public @interface SerializerConfig {
* <p>
* Note the differences between the following settings:
* <ul>
- * <li class='jf'>{@link #SERIALIZER_addRootType} - Affects
whether <js>'_type'</js> is added to root node.
- * <li class='jf'>{@link #SERIALIZER_addBeanTypes} - Affects
whether <js>'_type'</js> is added to any nodes.
+ * <li class='jf'>{@link Serializer#SERIALIZER_addRootType} -
Affects whether <js>'_type'</js> is added to root node.
+ * <li class='jf'>{@link Serializer#SERIALIZER_addBeanTypes} -
Affects whether <js>'_type'</js> is added to any nodes.
* </ul>
*
* <h5 class='section'>Notes:</h5>
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerBuilder.java
index 475a1b2..f082fe5 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerBuilder.java
@@ -14,6 +14,7 @@ package org.apache.juneau.soap;
import static org.apache.juneau.soap.SoapXmlSerializer.*;
+import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.*;
@@ -699,9 +700,21 @@ public class SoapXmlSerializerBuilder extends
XmlSerializerBuilder {
return this;
}
- @Override
+ @Override /* ContextBuilder */
public SoapXmlSerializerBuilder applyAnnotations(AnnotationsMap m,
VarResolverSession sr) {
super.applyAnnotations(m, sr);
return this;
}
+
+ @Override /* ContextBuilder */
+ public SoapXmlSerializerBuilder applyAnnotations(Class<?> fromClass) {
+ super.applyAnnotations(fromClass);
+ return this;
+ }
+
+ @Override /* ContextBuilder */
+ public SoapXmlSerializerBuilder applyAnnotations(Method fromMethod) {
+ super.applyAnnotations(fromMethod);
+ return this;
+ }
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerSession.java
index 3438c01..30a0140 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerSession.java
@@ -84,7 +84,7 @@ public class SoapXmlSerializerSession extends
XmlSerializerSession {
/**
* Configuration property: The SOAPAction HTTP header value to set on
responses.
*
- * @see #SOAPXML_SOAPAction
+ * @see SoapXmlSerializer#SOAPXML_SOAPAction
* @return
* The SOAPAction HTTP header value to set on responses.
*/
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerBuilder.java
index 1f979b2..9adf9ea 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerBuilder.java
@@ -14,6 +14,7 @@ package org.apache.juneau.uon;
import static org.apache.juneau.uon.UonSerializer.*;
+import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.*;
@@ -775,9 +776,21 @@ public class UonSerializerBuilder extends
WriterSerializerBuilder {
return this;
}
- @Override
+ @Override /* ContextBuilder */
public UonSerializerBuilder applyAnnotations(AnnotationsMap m,
VarResolverSession sr) {
super.applyAnnotations(m, sr);
return this;
}
+
+ @Override /* ContextBuilder */
+ public UonSerializerBuilder applyAnnotations(Class<?> fromClass) {
+ super.applyAnnotations(fromClass);
+ return this;
+ }
+
+ @Override /* ContextBuilder */
+ public UonSerializerBuilder applyAnnotations(Method fromMethod) {
+ super.applyAnnotations(fromMethod);
+ return this;
+ }
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.java
index e71a3dc..e29f32a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.java
@@ -14,6 +14,7 @@ package org.apache.juneau.urlencoding;
import static org.apache.juneau.urlencoding.UrlEncodingSerializer.*;
+import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.*;
@@ -744,9 +745,21 @@ public class UrlEncodingSerializerBuilder extends
UonSerializerBuilder {
return this;
}
- @Override
+ @Override /* ContextBuilder */
public UrlEncodingSerializerBuilder applyAnnotations(AnnotationsMap m,
VarResolverSession sr) {
super.applyAnnotations(m, sr);
return this;
}
+
+ @Override /* ContextBuilder */
+ public UrlEncodingSerializerBuilder applyAnnotations(Class<?>
fromClass) {
+ super.applyAnnotations(fromClass);
+ return this;
+ }
+
+ @Override /* ContextBuilder */
+ public UrlEncodingSerializerBuilder applyAnnotations(Method fromMethod)
{
+ super.applyAnnotations(fromMethod);
+ return this;
+ }
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerBuilder.java
index 9a71fc5..5cfe5a0 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerBuilder.java
@@ -14,6 +14,7 @@ package org.apache.juneau.xml;
import static org.apache.juneau.xml.XmlSerializer.*;
+import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.*;
@@ -890,9 +891,21 @@ public class XmlSerializerBuilder extends
WriterSerializerBuilder {
return this;
}
- @Override
+ @Override /* ContextBuilder */
public XmlSerializerBuilder applyAnnotations(AnnotationsMap m,
VarResolverSession sr) {
super.applyAnnotations(m, sr);
return this;
}
+
+ @Override /* ContextBuilder */
+ public XmlSerializerBuilder applyAnnotations(Class<?> fromClass) {
+ super.applyAnnotations(fromClass);
+ return this;
+ }
+
+ @Override /* ContextBuilder */
+ public XmlSerializerBuilder applyAnnotations(Method fromMethod) {
+ super.applyAnnotations(fromMethod);
+ return this;
+ }
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xmlschema/XmlSchemaSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xmlschema/XmlSchemaSerializerBuilder.java
index e91cb2e..fbfa0d1 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xmlschema/XmlSchemaSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xmlschema/XmlSchemaSerializerBuilder.java
@@ -12,6 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.xmlschema;
+import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.*;
@@ -722,9 +723,21 @@ public class XmlSchemaSerializerBuilder extends
XmlSerializerBuilder {
return this;
}
- @Override
+ @Override /* ContextBuilder */
public XmlSchemaSerializerBuilder applyAnnotations(AnnotationsMap m,
VarResolverSession sr) {
super.applyAnnotations(m, sr);
return this;
}
+
+ @Override /* ContextBuilder */
+ public XmlSchemaSerializerBuilder applyAnnotations(Class<?> fromClass) {
+ super.applyAnnotations(fromClass);
+ return this;
+ }
+
+ @Override /* ContextBuilder */
+ public XmlSchemaSerializerBuilder applyAnnotations(Method fromMethod) {
+ super.applyAnnotations(fromMethod);
+ return this;
+ }
}
\ No newline at end of file
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
index b1917c9..a62c59d 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
@@ -2690,12 +2690,24 @@ public class RestClientBuilder extends
BeanContextBuilder {
return this;
}
- @Override
+ @Override /* ContextBuilder */
public RestClientBuilder applyAnnotations(AnnotationsMap m,
VarResolverSession sr) {
super.applyAnnotations(m, sr);
return this;
}
+ @Override /* ContextBuilder */
+ public RestClientBuilder applyAnnotations(Class<?> fromClass) {
+ super.applyAnnotations(fromClass);
+ return this;
+ }
+
+ @Override /* ContextBuilder */
+ public RestClientBuilder applyAnnotations(Method fromMethod) {
+ super.applyAnnotations(fromMethod);
+ return this;
+ }
+
//------------------------------------------------------------------------------------------------
// Passthrough methods for HttpClientBuilder.
//------------------------------------------------------------------------------------------------
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
index cd62a79..3f7afaa 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
@@ -1632,7 +1632,6 @@ public final class RestContext extends BeanContext {
* <li class='jm'>{@link
RestContextBuilder#parsers(Object...)}
* <li class='jm'>{@link
RestContextBuilder#parsers(Class...)}
* <li class='jm'>{@link
RestContextBuilder#parsersReplace(Object...)}
- * <li class='jm'>{@link
RestContextBuilder#parsersReplace(Class...)}
* </ul>
* </ul>
*
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
index 8950e44..96f2324 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
@@ -2182,7 +2182,7 @@ public class RestContextBuilder extends
BeanContextBuilder implements ServletCon
* @param values The values to add to this setting.
* @return This object (for method chaining).
*
- * @deprecated Use {@link HtmlDocSerializerBuilder#widgets(Widget[])}
+ * @deprecated Use {@link
HtmlDocSerializerBuilder#widgets(HtmlWidget[])}
*/
@Deprecated
public RestContextBuilder widgets(Widget...values) {
@@ -2203,7 +2203,7 @@ public class RestContextBuilder extends
BeanContextBuilder implements ServletCon
* @param values The values to add to this setting.
* @return This object (for method chaining).
*
- * @deprecated Use {@link
HtmlDocSerializerBuilder#widgetsReplace(Widget[])}
+ * @deprecated Use {@link
HtmlDocSerializerBuilder#widgetsReplace(HtmlWidget[])}
*/
@Deprecated
public RestContextBuilder widgetsReplace(Widget...values) {
@@ -2657,6 +2657,23 @@ public class RestContextBuilder extends
BeanContextBuilder implements ServletCon
return this;
}
+ @Override /* ContextBuilder */
+ public RestContextBuilder applyAnnotations(AnnotationsMap m,
VarResolverSession sr) {
+ super.applyAnnotations(m, sr);
+ return this;
+ }
+
+ @Override /* ContextBuilder */
+ public RestContextBuilder applyAnnotations(Class<?> fromClass) {
+ super.applyAnnotations(fromClass);
+ return this;
+ }
+
+ @Override /* ContextBuilder */
+ public RestContextBuilder applyAnnotations(java.lang.reflect.Method
fromMethod) {
+ super.applyAnnotations(fromMethod);
+ return this;
+ }
//----------------------------------------------------------------------------------------------------
// Methods inherited from ServletConfig
