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 2dd7f14 Javadocs
2dd7f14 is described below
commit 2dd7f147a074503eaf0ae31b0a6c3b0a7faa653a
Author: JamesBognar <[email protected]>
AuthorDate: Sat Jul 4 15:24:32 2020 -0400
Javadocs
---
.../java/org/apache/juneau/annotation/Bean.java | 24 +-
.../java/org/apache/juneau/http/header/Allow.java | 7 +-
.../juneau/http/header/BasicCsvArrayHeader.java | 6 +-
.../apache/juneau/http/header/ContentLanguage.java | 7 +-
.../org/apache/juneau/http/header/Upgrade.java | 7 +-
.../java/org/apache/juneau/http/header/Via.java | 9 +-
.../apache/juneau/transform/PropertyFilter.java | 85 +++++++
juneau-doc/docs/ReleaseNotes/6.0.0.html | 2 +-
juneau-doc/docs/ReleaseNotes/6.1.0.html | 8 +-
juneau-doc/docs/ReleaseNotes/6.3.0.html | 58 ++---
juneau-doc/docs/ReleaseNotes/7.2.1.html | 2 +-
juneau-doc/docs/ReleaseNotes/8.1.3.html | 6 +-
juneau-doc/docs/ReleaseNotes/8.1.4.html | 2 +-
.../11.Transforms/09.BeanAnnotation.html | 4 +-
.../02.juneau-marshall/13.BeanDictionaries.html | 4 +-
.../06.RestMethod/01.MethodParameters.html | 56 ++---
.../09.juneau-rest-client/07.Interceptors.html | 2 +-
.../10.juneau-rest-mock/01.MockRestClient.html | 4 +-
juneau-doc/src/main/javadoc/overview.html | 271 +++++++++++++--------
juneau-doc/src/main/javadoc/resources/docs.txt | 22 +-
.../src/main/javadoc/resources/fragments/toc.html | 2 +-
.../juneau/rest/client2/RestCallInterceptor.java | 3 +-
.../org/apache/juneau/rest/client2/RestClient.java | 14 +-
.../apache/juneau/rest/mock2/MockRestRequest.java | 2 +-
.../apache/juneau/rest/mock2/MockRestResponse.java | 2 +-
.../juneau/rest/mock2/MockServletRequest.java | 2 +-
.../juneau/rest/mock2/MockServletResponse.java | 2 +-
27 files changed, 379 insertions(+), 234 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Bean.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Bean.java
index 19ecad0..bfd007a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Bean.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Bean.java
@@ -237,6 +237,18 @@ public @interface Bean {
Class<?> interfaceClass() default Object.class;
/**
+ * Bean property interceptor.
+ *
+ * <p>
+ * Bean interceptors can be used to intercept calls to getters and
setters and alter their values in transit.
+ *
+ * <ul class='seealso'>
+ * <li class='jc'>{@link BeanInterceptor}
+ * </ul>
+ */
+ Class<? extends BeanInterceptor<?>> interceptor() default
BeanInterceptor.Default.class;
+
+ /**
* Dynamically apply this annotation to the specified classes.
*
* <p>
@@ -305,18 +317,6 @@ public @interface Bean {
@Deprecated String properties() default "";
/**
- * Bean property interceptor.
- *
- * <p>
- * Bean interceptors can be used to intercept calls to getters and
setters and alter their values in transit.
- *
- * <ul class='seealso'>
- * <li class='jc'>{@link BeanInterceptor}
- * </ul>
- */
- Class<? extends BeanInterceptor<?>> interceptor() default
BeanInterceptor.Default.class;
-
- /**
* Associates a {@link PropertyNamer} with this bean to tailor the
names of the bean properties.
*
* <p>
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Allow.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Allow.java
index bef2662..5f0fbff 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Allow.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Allow.java
@@ -12,6 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import java.util.*;
import java.util.function.*;
import org.apache.juneau.http.annotation.*;
@@ -82,7 +83,7 @@ public class Allow extends BasicCsvArrayHeader {
* <li><c>String</c> - A comma-delimited string.
* <li><c>String[]</c> - A pre-parsed value.
* <li>Any other array type - Converted to <c>String[]</c>.
- * <li>Any {@Collection} - Converted to <c>String[]</c>.
+ * <li>Any {@link Collection} - Converted to
<c>String[]</c>.
* <li>Anything else - Converted to <c>String</c>.
* </ul>
* @return The parsed <c>Allow</c> header, or <jk>null</jk> if the
value was null.
@@ -106,7 +107,7 @@ public class Allow extends BasicCsvArrayHeader {
* <li><c>String</c> - A comma-delimited string.
* <li><c>String[]</c> - A pre-parsed value.
* <li>Any other array type - Converted to <c>String[]</c>.
- * <li>Any {@Collection} - Converted to <c>String[]</c>.
+ * <li>Any {@link Collection} - Converted to
<c>String[]</c>.
* <li>Anything else - Converted to <c>String</c>.
* </ul>
* @return The parsed <c>Allow</c> header, or <jk>null</jk> if the
value was null.
@@ -127,7 +128,7 @@ public class Allow extends BasicCsvArrayHeader {
* <li><c>String</c> - A comma-delimited string.
* <li><c>String[]</c> - A pre-parsed value.
* <li>Any other array type - Converted to <c>String[]</c>.
- * <li>Any {@Collection} - Converted to <c>String[]</c>.
+ * <li>Any {@link Collection} - Converted to
<c>String[]</c>.
* <li>Anything else - Converted to <c>String</c>.
* <li>A {@link Supplier} of anything on this list.
* </ul>
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicCsvArrayHeader.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicCsvArrayHeader.java
index 002454a..436a1b4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicCsvArrayHeader.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicCsvArrayHeader.java
@@ -48,7 +48,7 @@ public class BasicCsvArrayHeader extends BasicHeader {
* <li><c>String</c> - A comma-delimited string.
* <li><c>String[]</c> - A pre-parsed value.
* <li>Any other array type - Converted to <c>String[]</c>.
- * <li>Any {@Collection} - Converted to <c>String[]</c>.
+ * <li>Any {@link Collection} - Converted to
<c>String[]</c>.
* <li>Anything else - Converted to <c>String</c>.
* </ul>
* @return A new {@link BasicCsvArrayHeader} object.
@@ -71,7 +71,7 @@ public class BasicCsvArrayHeader extends BasicHeader {
* <li><c>String</c> - A comma-delimited string.
* <li><c>String[]</c> - A pre-parsed value.
* <li>Any other array type - Converted to <c>String[]</c>.
- * <li>Any {@Collection} - Converted to <c>String[]</c>.
+ * <li>Any {@link Collection} - Converted to
<c>String[]</c>.
* <li>Anything else - Converted to <c>String</c>.
* </ul>
* @return A new {@link BasicCsvArrayHeader} object.
@@ -93,7 +93,7 @@ public class BasicCsvArrayHeader extends BasicHeader {
* <li><c>String</c> - A comma-delimited string.
* <li><c>String[]</c> - A pre-parsed value.
* <li>Any other array type - Converted to <c>String[]</c>.
- * <li>Any {@Collection} - Converted to <c>String[]</c>.
+ * <li>Any {@link Collection} - Converted to
<c>String[]</c>.
* <li>Anything else - Converted to <c>String</c>.
* <li>A {@link Supplier} of anything on this list.
* </ul>
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentLanguage.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentLanguage.java
index 401e883..9fc3db4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentLanguage.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentLanguage.java
@@ -12,6 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import java.util.*;
import java.util.function.*;
import org.apache.juneau.http.annotation.*;
@@ -87,7 +88,7 @@ public class ContentLanguage extends BasicCsvArrayHeader {
* <li><c>String</c> - A comma-delimited string.
* <li><c>String[]</c> - A pre-parsed value.
* <li>Any other array type - Converted to <c>String[]</c>.
- * <li>Any {@Collection} - Converted to <c>String[]</c>.
+ * <li>Any {@link Collection} - Converted to
<c>String[]</c>.
* <li>Anything else - Converted to <c>String</c>.
* </ul>
* @return The parsed <c>Content-Language</c> header, or <jk>null</jk>
if the value was null.
@@ -111,7 +112,7 @@ public class ContentLanguage extends BasicCsvArrayHeader {
* <li><c>String</c> - A comma-delimited string.
* <li><c>String[]</c> - A pre-parsed value.
* <li>Any other array type - Converted to <c>String[]</c>.
- * <li>Any {@Collection} - Converted to <c>String[]</c>.
+ * <li>Any {@link Collection} - Converted to
<c>String[]</c>.
* <li>Anything else - Converted to <c>String</c>.
* </ul>
* @return The parsed <c>Content-Language</c> header, or <jk>null</jk>
if the value was null.
@@ -132,7 +133,7 @@ public class ContentLanguage extends BasicCsvArrayHeader {
* <li><c>String</c> - A comma-delimited string.
* <li><c>String[]</c> - A pre-parsed value.
* <li>Any other array type - Converted to <c>String[]</c>.
- * <li>Any {@Collection} - Converted to <c>String[]</c>.
+ * <li>Any {@link Collection} - Converted to
<c>String[]</c>.
* <li>Anything else - Converted to <c>String</c>.
* <li>A {@link Supplier} of anything on this list.
* </ul>
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Upgrade.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Upgrade.java
index 8c81aab..afba4dc 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Upgrade.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Upgrade.java
@@ -12,6 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import java.util.*;
import java.util.function.*;
import org.apache.juneau.http.annotation.*;
@@ -96,7 +97,7 @@ public class Upgrade extends BasicCsvArrayHeader {
* <li><c>String</c> - A comma-delimited string.
* <li><c>String[]</c> - A pre-parsed value.
* <li>Any other array type - Converted to <c>String[]</c>.
- * <li>Any {@Collection} - Converted to <c>String[]</c>.
+ * <li>Any {@link Collection} - Converted to
<c>String[]</c>.
* <li>Anything else - Converted to <c>String</c>.
* </ul>
* @return The parsed <c>Upgrade</c> header, or <jk>null</jk> if the
value was null.
@@ -120,7 +121,7 @@ public class Upgrade extends BasicCsvArrayHeader {
* <li><c>String</c> - A comma-delimited string.
* <li><c>String[]</c> - A pre-parsed value.
* <li>Any other array type - Converted to <c>String[]</c>.
- * <li>Any {@Collection} - Converted to <c>String[]</c>.
+ * <li>Any {@link Collection} - Converted to
<c>String[]</c>.
* <li>Anything else - Converted to <c>String</c>.
* </ul>
* @return The parsed <c>Upgrade</c> header, or <jk>null</jk> if the
value was null.
@@ -141,7 +142,7 @@ public class Upgrade extends BasicCsvArrayHeader {
* <li><c>String</c> - A comma-delimited string.
* <li><c>String[]</c> - A pre-parsed value.
* <li>Any other array type - Converted to <c>String[]</c>.
- * <li>Any {@Collection} - Converted to <c>String[]</c>.
+ * <li>Any {@link Collection} - Converted to
<c>String[]</c>.
* <li>Anything else - Converted to <c>String</c>.
* <li>A {@link Supplier} of anything on this list.
* </ul>
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Via.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Via.java
index eaac68c..957b56b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Via.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Via.java
@@ -12,6 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
+import java.util.*;
import java.util.function.*;
import org.apache.juneau.http.annotation.*;
@@ -132,7 +133,7 @@ public class Via extends BasicCsvArrayHeader {
* <li><c>String</c> - A comma-delimited string.
* <li><c>String[]</c> - A pre-parsed value.
* <li>Any other array type - Converted to <c>String[]</c>.
- * <li>Any {@Collection} - Converted to <c>String[]</c>.
+ * <li>Any {@link Collection} - Converted to
<c>String[]</c>.
* <li>Anything else - Converted to <c>String</c>.
* </ul>
* @return The parsed <c>Via</c> header, or <jk>null</jk> if the value
was null.
@@ -156,7 +157,7 @@ public class Via extends BasicCsvArrayHeader {
* <li><c>String</c> - A comma-delimited string.
* <li><c>String[]</c> - A pre-parsed value.
* <li>Any other array type - Converted to <c>String[]</c>.
- * <li>Any {@Collection} - Converted to <c>String[]</c>.
+ * <li>Any {@link Collection} - Converted to
<c>String[]</c>.
* <li>Anything else - Converted to <c>String</c>.
* </ul>
* @return The parsed <c>Via</c> header, or <jk>null</jk> if the value
was null.
@@ -177,7 +178,7 @@ public class Via extends BasicCsvArrayHeader {
* <li><c>String</c> - A comma-delimited string.
* <li><c>String[]</c> - A pre-parsed value.
* <li>Any other array type - Converted to <c>String[]</c>.
- * <li>Any {@Collection} - Converted to <c>String[]</c>.
+ * <li>Any {@link Collection} - Converted to
<c>String[]</c>.
* <li>Anything else - Converted to <c>String</c>.
* <li>A {@link Supplier} of anything on this list.
* </ul>
@@ -196,7 +197,7 @@ public class Via extends BasicCsvArrayHeader {
* <li><c>String</c> - A comma-delimited string.
* <li><c>String[]</c> - A pre-parsed value.
* <li>Any other array type - Converted to <c>String[]</c>.
- * <li>Any {@Collection} - Converted to <c>String[]</c>.
+ * <li>Any {@link Collection} - Converted to
<c>String[]</c>.
* <li>Anything else - Converted to <c>String</c>.
* <li>A {@link Supplier} of anything on this list.
* </ul>
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/PropertyFilter.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/PropertyFilter.java
new file mode 100644
index 0000000..ddbd4af
--- /dev/null
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/PropertyFilter.java
@@ -0,0 +1,85 @@
+//
***************************************************************************************************************************
+// * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file *
+// * distributed with this work for additional information regarding copyright
ownership. The ASF licenses this file *
+// * to you under the Apache License, Version 2.0 (the "License"); you may not
use this file except in compliance *
+// * with the License. You may obtain a copy of the License at
*
+// *
*
+// * http://www.apache.org/licenses/LICENSE-2.0
*
+// *
*
+// * Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an *
+// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
+// * specific language governing permissions and limitations under the
License. *
+//
***************************************************************************************************************************
+package org.apache.juneau.transform;
+
+/**
+ * Bean property filter.
+ *
+ * @deprecated Use {@link BeanInterceptor}.
+ */
+@Deprecated
+public class PropertyFilter {
+
+ /**
+ * Default reusable property filter instance.
+ */
+ public static final PropertyFilter DEFAULT = new PropertyFilter();
+
+ /**
+ * Property read interceptor.
+ *
+ * <p>
+ * Subclasses can override this property to convert property values to
some other object just before serialization.
+ *
+ * <h5 class='section'>Example:</h5>
+ * <p class='bcode w800'>
+ * <jc>// Address filter that strips out sensitive
information.</jc>
+ * <jk>public class</jk> AddressPropertyFilter <jk>extends</jk>
PropertyFilter {
+ *
+ * <jk>public</jk> Object readProperty(Object bean, String
name, Object value) {
+ * <jk>if</jk> (<js>"taxInfo"</js>.equals(name))
+ * <jk>return</jk> <js>"redacted"</js>;
+ * <jk>return</jk> value;
+ * }
+ * }
+ * </p>
+ *
+ * @param bean The bean from which the property was read.
+ * @param name The property name.
+ * @param value The value just extracted from calling the bean getter.
+ * @return The value to serialize. Default is just to return the
existing value.
+ */
+ public Object readProperty(Object bean, String name, Object value) {
+ return value;
+ }
+
+ /**
+ * Property write interceptor.
+ *
+ * <p>
+ * Subclasses can override this property to convert property values to
some other object just before calling the
+ * bean setter.
+ *
+ * <h5 class='section'>Example:</h5>
+ * <p class='bcode w800'>
+ * <jc>// Address filter that strips out sensitive
information.</jc>
+ * <jk>public class</jk> AddressPropertyFilter <jk>extends</jk>
PropertyFilter {
+ *
+ * <jk>public</jk> Object writeProperty(Object bean,
String name, Object value) {
+ * AddressBook a = (Address)bean;
+ * <jk>if</jk> (<js>"taxInfo"</js>.equals(name)
&& <js>"redacted"</js>.equals(value))
+ * <jk>return</jk>
TaxInfoUtils.<jsm>lookup</jsm>(a.getStreet(), a.getCity(), a.getState());
+ * <jk>return</jk> value;
+ * }
+ * }
+ * </p>
+ *
+ * @param bean The bean from which the property was read.
+ * @param name The property name.
+ * @param value The value just parsed.
+ * @return The value to serialize. Default is just to return the
existing value.
+ */
+ public Object writeProperty(Object bean, String name, Object value) {
+ return value;
+ }
+}
diff --git a/juneau-doc/docs/ReleaseNotes/6.0.0.html
b/juneau-doc/docs/ReleaseNotes/6.0.0.html
index 98184a5..60c626a 100644
--- a/juneau-doc/docs/ReleaseNotes/6.0.0.html
+++ b/juneau-doc/docs/ReleaseNotes/6.0.0.html
@@ -55,7 +55,7 @@
<li>{@link
oaj.transform.BeanFilterBuilder#typeName(String)} - Programmatic equivalent to
annotation above.
<li>{@link oaj.BeanContext#BEAN_beanDictionary} - List
of bean classes that make up the bean dictionary for lookup
during parsing.
- <li>{@link oaj.BeanContext#BEAN_beanTypePropertyName} -
The overridable type property name. Default is <js>"_type"</js>.
+ <li><dc>BEAN_beanTypePropertyName</dc> - The
overridable type property name. Default is <js>"_type"</js>.
<li><dc>@BeanProperty(beanDictionary)</dc> - Define a
type dictionary
for a particular bean property value. This
overrides the value specified using {@link oaj.BeanContext#BEAN_beanDictionary}.
<li><dc>SerializerContext.SERIALIZER_addBeanTypeProperties</dc> - Controls
whether type properties are serialized.
diff --git a/juneau-doc/docs/ReleaseNotes/6.1.0.html
b/juneau-doc/docs/ReleaseNotes/6.1.0.html
index 1b34a57..f0ae356 100644
--- a/juneau-doc/docs/ReleaseNotes/6.1.0.html
+++ b/juneau-doc/docs/ReleaseNotes/6.1.0.html
@@ -70,10 +70,10 @@
now extend directly from {@link oaj.BeanSession}.
<li>New settings in {@link oaj.BeanContext}:
<ul>
- <li>{@link oaj.BeanContext#BEAN_debug} - Debug setting.
Replaces individual debug properties in the serializer and parser contexts.
- <li>{@link oaj.BeanContext#BEAN_locale} - Specifies a default
locale at the context level.
- <li>{@link oaj.BeanContext#BEAN_timeZone} - Specifies a default
timezone at the context level.
- <li>{@link oaj.BeanContext#BEAN_mediaType} - Specifies a
default media type at the context level.
+ <li><dc>BEAN_debug</dc> - Debug setting. Replaces individual
debug properties in the serializer and parser contexts.
+ <li><dc>BEAN_locale</dc> - Specifies a default locale at the
context level.
+ <li><dc>BEAN_timeZone</dc> - Specifies a default timezone at
the context level.
+ <li><dc>BEAN_mediaType</dc> - Specifies a default media type at
the context level.
</ul>
<li>Improvements to Parser class:
<ul>
diff --git a/juneau-doc/docs/ReleaseNotes/6.3.0.html
b/juneau-doc/docs/ReleaseNotes/6.3.0.html
index 98e8184..204d70b 100644
--- a/juneau-doc/docs/ReleaseNotes/6.3.0.html
+++ b/juneau-doc/docs/ReleaseNotes/6.3.0.html
@@ -136,7 +136,7 @@
<li><dc>RestConfig.parserListener(Class)</dc>
<li><dc>RestClientBuilder.listeners(Class,Class)</dc>
</ul>juneau-examples-core.import1.pngjuneau-examples-core.import1.png
- <li>The {@link oaj.BeanContext#BEAN_debug} flag will now capture parser
input and make it
+ <li>The <dc>BEAN_debug</dc> flag will now capture parser input and make
it
available through the <dc>ParserSession.getInputAsString()</dc>
method so that it can be used
in the listeners.
<li>Significant new functionality introduced to the HTML serializer.
@@ -207,34 +207,34 @@
</ul>
The new supported types are:
<ul>
- <li>{@link oaj.http.Accept}
- <li>{@link oaj.http.AcceptCharset}
- <li>{@link oaj.http.AcceptEncoding}
- <li>{@link oaj.http.AcceptLanguage}
- <li>{@link oaj.http.Authorization}
- <li>{@link oaj.http.CacheControl}
- <li>{@link oaj.http.Connection}
- <li>{@link oaj.http.ContentLength}
- <li>{@link oaj.http.ContentType}
- <li>{@link oaj.http.Date}
- <li>{@link oaj.http.Expect}
- <li>{@link oaj.http.From}
- <li>{@link oaj.http.Host}
- <li>{@link oaj.http.IfMatch}
- <li>{@link oaj.http.IfModifiedSince}
- <li>{@link oaj.http.IfNoneMatch}
- <li>{@link oaj.http.IfRange}
- <li>{@link oaj.http.IfUnmodifiedSince}
- <li>{@link oaj.http.MaxForwards}
- <li>{@link oaj.http.Pragma}
- <li>{@link oaj.http.ProxyAuthorization}
- <li>{@link oaj.http.Range}
- <li>{@link oaj.http.Referer}
- <li>{@link oaj.http.TE}
- <li>{@link oaj.http.UserAgent}
- <li>{@link oaj.http.Upgrade}
- <li>{@link oaj.http.Via}
- <li>{@link oaj.http.Warning}
+ <li><dc>Accept</dc>
+ <li><dc>AcceptCharset</dc>
+ <li><dc>AcceptEncoding</dc>
+ <li><dc>AcceptLanguage</dc>
+ <li><dc>Authorization</dc>
+ <li><dc>CacheControl</dc>
+ <li><dc>Connection</dc>
+ <li><dc>ContentLength</dc>
+ <li><dc>ContentType</dc>
+ <li><dc>Date</dc>
+ <li><dc>Expect</dc>
+ <li><dc>From</dc>
+ <li><dc>Host</dc>
+ <li><dc>IfMatch</dc>
+ <li><dc>IfModifiedSince</dc>
+ <li><dc>IfNoneMatch</dc>
+ <li><dc>IfRange</dc>
+ <li><dc>IfUnmodifiedSince</dc>
+ <li><dc>MaxForwards</dc>
+ <li><dc>Pragma</dc>
+ <li><dc>ProxyAuthorization</dc>
+ <li><dc>Range</dc>
+ <li><dc>Referer</dc>
+ <li><dc>TE</dc>
+ <li><dc>UserAgent</dc>
+ <li><dc>Upgrade</dc>
+ <li><dc>Via</dc>
+ <li><dc>Warning</dc>
<li>{@link java.util.TimeZone}
<li>{@link java.io.InputStream}
<li>{@link javax.servlet.ServletInputStream}
diff --git a/juneau-doc/docs/ReleaseNotes/7.2.1.html
b/juneau-doc/docs/ReleaseNotes/7.2.1.html
index 6db4c18..25dd707 100644
--- a/juneau-doc/docs/ReleaseNotes/7.2.1.html
+++ b/juneau-doc/docs/ReleaseNotes/7.2.1.html
@@ -39,7 +39,7 @@
<li>
The <c>ReaderResource</c> and <c>StreamResource</c> classes
have been moved to the <c>org.apache.juneau.http</c>
package in <c>juneau-marshall</c>. This allows them to be used
as return types in remote REST interfaces.
- <br>A new {@link oajr.helper.ResolvingReaderResource} class has
been added that includes the variable-resolving support since
+ <br>A new <dc>ResolvingReaderResource</dc> class has been added
that includes the variable-resolving support since
this relies on the <c>juneau-svl</c> package.
<li>
The <c>RemoteInterfaceServlet</c> class has been renamed to
{@link oajr.remote.RrpcServlet}.
diff --git a/juneau-doc/docs/ReleaseNotes/8.1.3.html
b/juneau-doc/docs/ReleaseNotes/8.1.3.html
index b478575..e837572 100644
--- a/juneau-doc/docs/ReleaseNotes/8.1.3.html
+++ b/juneau-doc/docs/ReleaseNotes/8.1.3.html
@@ -28,10 +28,10 @@
<br>Old: <js>"<myBean><null></myBean>"</js>
<br>New: <js>"<myBean nil='true'></myBean>"</js>
<li>
- Configurable properties such as {@link
oaj.BeanContext#BEAN_debug} can now be set globally by either
+ Configurable properties such as {@link
oaj.Context#CONTEXT_debug} can now be set globally by either
system properties or environment variables.
- <br>For <jsf>BEAN_debug</jsf> you can use either the system
- property <js>"BeanContext.debug"</js> or environment variables
<js>"BEANCONTEXT_DEBUG"</js>.
+ <br>For <jsf>CONTEXT_debug</jsf> you can use either the system
+ property <js>"Context.debug"</js> or environment variables
<js>"CONTEXT_DEBUG"</js>.
<li>
Fixed an initialization time race condition that can cause
initial parse errors when concurrently parsing into
array types like so:
diff --git a/juneau-doc/docs/ReleaseNotes/8.1.4.html
b/juneau-doc/docs/ReleaseNotes/8.1.4.html
index a43d901..cc72ad5 100644
--- a/juneau-doc/docs/ReleaseNotes/8.1.4.html
+++ b/juneau-doc/docs/ReleaseNotes/8.1.4.html
@@ -244,7 +244,7 @@
<li>
New Bean Property Interceptor API for intercepting calls to
bean getters/setters.
<ul>
- <li class='jac'>{@link oaj.BeanInterceptor}
+ <li class='jac'>{@link oaj.transform.BeanInterceptor}
<li class='ja'>{@link oaj.annotation.Bean#interceptor
Bean(interceptor)}
<li class='jm'>{@link
oaj.BeanContextBuilder#beanInterceptor(Class,Class)}
</ul>
diff --git
a/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/09.BeanAnnotation.html
b/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/09.BeanAnnotation.html
index feb079d..d4773fb 100644
---
a/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/09.BeanAnnotation.html
+++
b/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/09.BeanAnnotation.html
@@ -116,8 +116,8 @@
}
</p>
<p>
- The {@link oaj.annotation.Bean#propertyFilter() @Bean(propertyFilter)}
annotation
- and {@link oaj.transform.PropertyFilter} class can be used to perform
interception
+ The {@link oaj.annotation.Bean#interceptor() @Bean(interceptor)}
annotation
+ and {@link oaj.transform.BeanInterceptor} class can be used to perform
interception
and inline handling of bean getter and setter calls.
</p>
<p class='bpcode w800'>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/13.BeanDictionaries.html
b/juneau-doc/docs/Topics/02.juneau-marshall/13.BeanDictionaries.html
index 56e5281..0d57e44 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/13.BeanDictionaries.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/13.BeanDictionaries.html
@@ -130,9 +130,9 @@ Bean Names and Dictionaries
<ul class='javatree'>
<li class='ja'>{@link oaj.annotation.Bean#typePropertyName()
Bean(typePropertyName)}
- On individual beans through the annotation.
- <li class='jf'>{@link oaj.BeanContext#BEAN_beanTypePropertyName}
+ <li class='jf'>{@link oaj.BeanContext#BEAN_typePropertyName}
- Configuration property on serializers and parsers.
- <li class='jm'>{@link
oaj.BeanContextBuilder#beanTypePropertyName(String)}
+ <li class='jm'>{@link oaj.BeanContextBuilder#typePropertyName(String)}
- Builder method on serializers and parsers.
</ul>
<p>
diff --git
a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/01.MethodParameters.html
b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/01.MethodParameters.html
index 884c9cd..d680075 100644
---
a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/01.MethodParameters.html
+++
b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/01.MethodParameters.html
@@ -31,34 +31,34 @@ Java Method Parameters
</ul>
<li><b>Parsed request header values:</b>
<ul>
- <li class='jc'>{@link oaj.http.Accept}
- <li class='jc'>{@link
oaj.http.AcceptCharset}
- <li class='jc'>{@link
oaj.http.AcceptEncoding}
- <li class='jc'>{@link
oaj.http.AcceptLanguage}
- <li class='jc'>{@link
oaj.http.Authorization}
- <li class='jc'>{@link
oaj.http.CacheControl}
- <li class='jc'>{@link
oaj.http.Connection}
- <li class='jc'>{@link
oaj.http.ContentLength}
- <li class='jc'>{@link
oaj.http.ContentType}
- <li class='jc'>{@link oaj.http.Date}
- <li class='jc'>{@link oaj.http.Expect}
- <li class='jc'>{@link oaj.http.From}
- <li class='jc'>{@link oaj.http.Host}
- <li class='jc'>{@link oaj.http.IfMatch}
- <li class='jc'>{@link
oaj.http.IfModifiedSince}
- <li class='jc'>{@link
oaj.http.IfNoneMatch}
- <li class='jc'>{@link oaj.http.IfRange}
- <li class='jc'>{@link
oaj.http.IfUnmodifiedSince}
- <li class='jc'>{@link
oaj.http.MaxForwards}
- <li class='jc'>{@link oaj.http.Pragma}
- <li class='jc'>{@link
oaj.http.ProxyAuthorization}
- <li class='jc'>{@link oaj.http.Range}
- <li class='jc'>{@link oaj.http.Referer}
- <li class='jc'>{@link oaj.http.TE}
- <li class='jc'>{@link
oaj.http.UserAgent}
- <li class='jc'>{@link oaj.http.Upgrade}
- <li class='jc'>{@link oaj.http.Via}
- <li class='jc'>{@link oaj.http.Warning}
+ <li class='jc'>{@link
oaj.http.header.Accept}
+ <li class='jc'>{@link
oaj.http.header.AcceptCharset}
+ <li class='jc'>{@link
oaj.http.header.AcceptEncoding}
+ <li class='jc'>{@link
oaj.http.header.AcceptLanguage}
+ <li class='jc'>{@link
oaj.http.header.Authorization}
+ <li class='jc'>{@link
oaj.http.header.CacheControl}
+ <li class='jc'>{@link
oaj.http.header.Connection}
+ <li class='jc'>{@link
oaj.http.header.ContentLength}
+ <li class='jc'>{@link
oaj.http.header.ContentType}
+ <li class='jc'>{@link
oaj.http.header.Date}
+ <li class='jc'>{@link
oaj.http.header.Expect}
+ <li class='jc'>{@link
oaj.http.header.From}
+ <li class='jc'>{@link
oaj.http.header.Host}
+ <li class='jc'>{@link
oaj.http.header.IfMatch}
+ <li class='jc'>{@link
oaj.http.header.IfModifiedSince}
+ <li class='jc'>{@link
oaj.http.header.IfNoneMatch}
+ <li class='jc'>{@link
oaj.http.header.IfRange}
+ <li class='jc'>{@link
oaj.http.header.IfUnmodifiedSince}
+ <li class='jc'>{@link
oaj.http.header.MaxForwards}
+ <li class='jc'>{@link
oaj.http.header.Pragma}
+ <li class='jc'>{@link
oaj.http.header.ProxyAuthorization}
+ <li class='jc'>{@link
oaj.http.header.Range}
+ <li class='jc'>{@link
oaj.http.header.Referer}
+ <li class='jc'>{@link
oaj.http.header.TE}
+ <li class='jc'>{@link
oaj.http.header.UserAgent}
+ <li class='jc'>{@link
oaj.http.header.Upgrade}
+ <li class='jc'>{@link
oaj.http.header.Via}
+ <li class='jc'>{@link
oaj.http.header.Warning}
<li class='jc'>{@link
java.util.TimeZone}
</ul>
<li><b>Direct streams on request/response:</b>
diff --git a/juneau-doc/docs/Topics/09.juneau-rest-client/07.Interceptors.html
b/juneau-doc/docs/Topics/09.juneau-rest-client/07.Interceptors.html
index 8c60346..2effcee 100644
--- a/juneau-doc/docs/Topics/09.juneau-rest-client/07.Interceptors.html
+++ b/juneau-doc/docs/Topics/09.juneau-rest-client/07.Interceptors.html
@@ -16,7 +16,7 @@
Interceptors
<p>
- The {@link
oajr.client2.RestClientBuilder#interceptors(RestCallInterceptor...)} method can
be used to
+ The {@link oajr.client2.RestClientBuilder#interceptors(Object...)}
method can be used to
intercept responses during specific connection lifecycle events.
</p>
<p>
diff --git a/juneau-doc/docs/Topics/10.juneau-rest-mock/01.MockRestClient.html
b/juneau-doc/docs/Topics/10.juneau-rest-mock/01.MockRestClient.html
index de43681..ea8c419 100644
--- a/juneau-doc/docs/Topics/10.juneau-rest-mock/01.MockRestClient.html
+++ b/juneau-doc/docs/Topics/10.juneau-rest-mock/01.MockRestClient.html
@@ -18,7 +18,7 @@ MockRestClient
<p>
The {@link oajr.mock2.MockRestClient} class is used for performing
serverless unit testing of {@link oajr.annotation.Rest @Rest}-annotated
- and {@link aoj.http.remote.Remote @Remote}-annotated classes.
+ and {@link oaj.http.remote.Remote @Remote}-annotated classes.
</p>
<p>
The {@link oajr.mock2.MockRestClient} itself extends from {@link
oajr.client.RestClient} providing it with the rich
@@ -149,7 +149,7 @@ MockRestClient
</p>
<hr>
<p>
- The {@link oajr.mock2.MockRestClient} class can also be used for
testing of {@link oaj.http.annotation.Remote}-annotated
+ The {@link oajr.mock2.MockRestClient} class can also be used for
testing of {@link oaj.http.remote.Remote}-annotated
interfaces against {@link oajr.annotation.Rest @Rest}-annotated
resources.
</p>
<h5 class='figure'>Example:</h5>
diff --git a/juneau-doc/src/main/javadoc/overview.html
b/juneau-doc/src/main/javadoc/overview.html
index c12ab8f..37d7bb6 100644
--- a/juneau-doc/src/main/javadoc/overview.html
+++ b/juneau-doc/src/main/javadoc/overview.html
@@ -460,7 +460,7 @@
</ol>
<li><p class='toc2'><a class='doclink'
href='#juneau-rest-client'>juneau-rest-client</a><span
class='update'><b>8.1.4-updated</b></span></p>
<ol>
- <li><p><a class='doclink'
href='#juneau-rest-client.RestProxies'>REST Proxies</a></p>
+ <li><p><a class='doclink'
href='#juneau-rest-client.RestProxies'>Remote REST Proxies</a><span
class='update'><b>8.1.4-updated</b></span></p>
<ol>
<li><p><a class='doclink'
href='#juneau-rest-client.RestProxies.Remote'>@Remote</a><span
class='update'>8.1.2-updated</span></p>
<li><p><a class='doclink'
href='#juneau-rest-client.RestProxies.RemoteMethod'>@RemoteMethod</a><span
class='update'><b>8.1.4-updated</b></span></p>
@@ -2744,8 +2744,8 @@
}
</p>
<p>
- The {@link org.apache.juneau.annotation.Bean#propertyFilter()
@Bean(propertyFilter)} annotation
- and {@link org.apache.juneau.transform.PropertyFilter} class can be
used to perform interception
+ The {@link org.apache.juneau.annotation.Bean#interceptor()
@Bean(interceptor)} annotation
+ and {@link org.apache.juneau.transform.BeanInterceptor} class can be
used to perform interception
and inline handling of bean getter and setter calls.
</p>
<p class='bpcode w800'>
@@ -3828,9 +3828,9 @@
<ul class='javatree'>
<li class='ja'>{@link
org.apache.juneau.annotation.Bean#typePropertyName() Bean(typePropertyName)}
- On individual beans through the annotation.
- <li class='jf'>{@link
org.apache.juneau.BeanContext#BEAN_beanTypePropertyName}
+ <li class='jf'>{@link
org.apache.juneau.BeanContext#BEAN_typePropertyName}
- Configuration property on serializers and parsers.
- <li class='jm'>{@link
org.apache.juneau.BeanContextBuilder#beanTypePropertyName(String)}
+ <li class='jm'>{@link
org.apache.juneau.BeanContextBuilder#typePropertyName(String)}
- Builder method on serializers and parsers.
</ul>
<p>
@@ -14554,34 +14554,34 @@
</ul>
<li><b>Parsed request header values:</b>
<ul>
- <li class='jc'>{@link
org.apache.juneau.http.Accept}
- <li class='jc'>{@link
org.apache.juneau.http.AcceptCharset}
- <li class='jc'>{@link
org.apache.juneau.http.AcceptEncoding}
- <li class='jc'>{@link
org.apache.juneau.http.AcceptLanguage}
- <li class='jc'>{@link
org.apache.juneau.http.Authorization}
- <li class='jc'>{@link
org.apache.juneau.http.CacheControl}
- <li class='jc'>{@link
org.apache.juneau.http.Connection}
- <li class='jc'>{@link
org.apache.juneau.http.ContentLength}
- <li class='jc'>{@link
org.apache.juneau.http.ContentType}
- <li class='jc'>{@link
org.apache.juneau.http.Date}
- <li class='jc'>{@link
org.apache.juneau.http.Expect}
- <li class='jc'>{@link
org.apache.juneau.http.From}
- <li class='jc'>{@link
org.apache.juneau.http.Host}
- <li class='jc'>{@link
org.apache.juneau.http.IfMatch}
- <li class='jc'>{@link
org.apache.juneau.http.IfModifiedSince}
- <li class='jc'>{@link
org.apache.juneau.http.IfNoneMatch}
- <li class='jc'>{@link
org.apache.juneau.http.IfRange}
- <li class='jc'>{@link
org.apache.juneau.http.IfUnmodifiedSince}
- <li class='jc'>{@link
org.apache.juneau.http.MaxForwards}
- <li class='jc'>{@link
org.apache.juneau.http.Pragma}
- <li class='jc'>{@link
org.apache.juneau.http.ProxyAuthorization}
- <li class='jc'>{@link
org.apache.juneau.http.Range}
- <li class='jc'>{@link
org.apache.juneau.http.Referer}
- <li class='jc'>{@link
org.apache.juneau.http.TE}
- <li class='jc'>{@link
org.apache.juneau.http.UserAgent}
- <li class='jc'>{@link
org.apache.juneau.http.Upgrade}
- <li class='jc'>{@link
org.apache.juneau.http.Via}
- <li class='jc'>{@link
org.apache.juneau.http.Warning}
+ <li class='jc'>{@link
org.apache.juneau.http.header.Accept}
+ <li class='jc'>{@link
org.apache.juneau.http.header.AcceptCharset}
+ <li class='jc'>{@link
org.apache.juneau.http.header.AcceptEncoding}
+ <li class='jc'>{@link
org.apache.juneau.http.header.AcceptLanguage}
+ <li class='jc'>{@link
org.apache.juneau.http.header.Authorization}
+ <li class='jc'>{@link
org.apache.juneau.http.header.CacheControl}
+ <li class='jc'>{@link
org.apache.juneau.http.header.Connection}
+ <li class='jc'>{@link
org.apache.juneau.http.header.ContentLength}
+ <li class='jc'>{@link
org.apache.juneau.http.header.ContentType}
+ <li class='jc'>{@link
org.apache.juneau.http.header.Date}
+ <li class='jc'>{@link
org.apache.juneau.http.header.Expect}
+ <li class='jc'>{@link
org.apache.juneau.http.header.From}
+ <li class='jc'>{@link
org.apache.juneau.http.header.Host}
+ <li class='jc'>{@link
org.apache.juneau.http.header.IfMatch}
+ <li class='jc'>{@link
org.apache.juneau.http.header.IfModifiedSince}
+ <li class='jc'>{@link
org.apache.juneau.http.header.IfNoneMatch}
+ <li class='jc'>{@link
org.apache.juneau.http.header.IfRange}
+ <li class='jc'>{@link
org.apache.juneau.http.header.IfUnmodifiedSince}
+ <li class='jc'>{@link
org.apache.juneau.http.header.MaxForwards}
+ <li class='jc'>{@link
org.apache.juneau.http.header.Pragma}
+ <li class='jc'>{@link
org.apache.juneau.http.header.ProxyAuthorization}
+ <li class='jc'>{@link
org.apache.juneau.http.header.Range}
+ <li class='jc'>{@link
org.apache.juneau.http.header.Referer}
+ <li class='jc'>{@link
org.apache.juneau.http.header.TE}
+ <li class='jc'>{@link
org.apache.juneau.http.header.UserAgent}
+ <li class='jc'>{@link
org.apache.juneau.http.header.Upgrade}
+ <li class='jc'>{@link
org.apache.juneau.http.header.Via}
+ <li class='jc'>{@link
org.apache.juneau.http.header.Warning}
<li class='jc'>{@link
java.util.TimeZone}
</ul>
<li><b>Direct streams on request/response:</b>
@@ -22753,7 +22753,7 @@
<!--
====================================================================================================
-->
-<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-rest-client.RestProxies' id='juneau-rest-client.RestProxies'>9.1
- REST Proxies</a></h3>
+<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-rest-client.RestProxies' id='juneau-rest-client.RestProxies'>9.1
- Remote REST Proxies</a><span class='update'><b>8.1.4-updated</b></span></h3>
<div class='topic'><!-- START: 9.1 - juneau-rest-client.RestProxies -->
<p>
The <c>juneau-rest-client</c> library can also be used to define
interface proxies against 3rd-party REST interfaces.
@@ -22778,8 +22778,8 @@
<ul class='javatree'>
<li class='jp'>{@link org.apache.juneau.http.remote}
<ul>
- <li class='ja'>{@link org.apache.juneau.http.remote.Remote}
- <li class='ja'>{@link
org.apache.juneau.http.remote.RemoteMethod}
+ <li class='ja'>{@link org.apache.juneau.http.remote.Remote} -
Applied to interface class.
+ <li class='ja'>{@link
org.apache.juneau.http.remote.RemoteMethod} - Applied to interface methods.
</ul>
<li class='jp'>{@link org.apache.juneau.http.annotation}
<ul>
@@ -22798,7 +22798,7 @@
<ja>@Remote</ja>(path=<js>"/petstore"</js>)
<jk>public interface</jk> PetStore {
- <ja>@RemoteMethod</ja>(httpMethod=<jsf>POST</jsf>,
path=<js>"/pets"</js>)
+ <ja>@RemoteMethod</ja>(method=<jsf>POST</jsf>,
path=<js>"/pets"</js>)
String addPet(
<ja>@Body</ja> CreatePet pet,
<ja>@Header</ja>(<js>"E-Tag"</js>) UUID etag,
@@ -22829,6 +22829,21 @@
}
</p>
+<p>
+ The <ja>@RemoteMethod</ja> annotations can be eliminated if you use
specific naming conventions on your
+ method names to identify the HTTP method and path.
+</p>
+
+<h5 class='figure'>Example:</h5>
+<p class='bpcode w800'>
+ <ja>@Remote</ja>(path=<js>"/petstore"</js>)
+ <jk>public interface</jk> PetStore {
+
+ <jc>// @RemoteMethod optional since method and path is inferred
from method name.</jc>
+ String postPets(<ja>@Body</ja> CreatePet pet);
+ }
+</p>
+
<!--
====================================================================================================
-->
<h4 class='topic' onclick='toggle(this)'><a
href='#juneau-rest-client.RestProxies.Remote'
id='juneau-rest-client.RestProxies.Remote'>9.1.1 - @Remote</a><span
class='update'>8.1.2-updated</span></h4>
@@ -24295,7 +24310,7 @@
<h3 class='topic' onclick='toggle(this)'><a
href='#juneau-rest-client.Interceptors'
id='juneau-rest-client.Interceptors'>9.7 - Interceptors</a></h3>
<div class='topic'><!-- START: 9.7 - juneau-rest-client.Interceptors -->
<p>
- The {@link
org.apache.juneau.rest.client2.RestClientBuilder#interceptors(RestCallInterceptor...)}
method can be used to
+ The {@link
org.apache.juneau.rest.client2.RestClientBuilder#interceptors(Object...)}
method can be used to
intercept responses during specific connection lifecycle events.
</p>
<p>
@@ -24459,7 +24474,7 @@
<div class='topic'><!-- START: 10.1 - juneau-rest-mock.MockRestClient -->
<p>
The {@link org.apache.juneau.rest.mock2.MockRestClient} class is used
for performing serverless unit testing of {@link
org.apache.juneau.rest.annotation.Rest @Rest}-annotated
- and {@link aoj.http.remote.Remote @Remote}-annotated classes.
+ and {@link org.apache.juneau.http.remote.Remote @Remote}-annotated
classes.
</p>
<p>
The {@link org.apache.juneau.rest.mock2.MockRestClient} itself extends
from {@link org.apache.juneau.rest.client.RestClient} providing it with the rich
@@ -24553,6 +24568,31 @@
</p>
<hr>
<p>
+ The {@link org.apache.juneau.rest.mock2.MockRestRequest} object has
convenience methods provided to allow you to set properties
+ directly on the underlying {@link javax.servlet.HttpServletRequest}
object. The following example shows how
+ this can be used to directly set roles on the request object to perform
security testing.
+</p>
+<h5 class='figure'>Example:</h5>
+<p class='bpcode w800'>
+ <ja>@Rest</ja>(roleGuard=<js>"ADMIN"</js>)
+ public class A {
+ <ja>@RestMethod</ja>
+ <jk>public</jk> String get() {
+ <jk>return</jk> <js>"OK"</js>;
+ }
+ }
+
+ <ja>@Test</ja>
+ <jk>public void</jk> mytest() <jk>throws</jk> Exception {
+ MockRestClient a =
MockRestClient.<jsm>build</jsm>(A.<jk>class</jk>);
+
+ <jc>// Admin user should get 200, but anyone else should get
403-Unauthorized.</jc>
+ a.get().roles(<js>"ADMIN"</js>).run().assertStatus().is(200);
+ a.get().roles(<js>"USER"</js>).run().assertStatus().is(403);
+ }
+</p>
+<hr>
+<p>
The {@link org.apache.juneau.rest.mock2.MockRestClient} class has a
debug mode that will cause your HTTP requests and responses to
be sent to the console:
</p>
@@ -24565,7 +24605,7 @@
</p>
<hr>
<p>
- The {@link org.apache.juneau.rest.mock2.MockRestclient} class can also
be used for testing of {@link
org.apache.juneau.http.annotation.Remote}-annotated
+ The {@link org.apache.juneau.rest.mock2.MockRestClient} class can also
be used for testing of {@link org.apache.juneau.http.Remote}-annotated
interfaces against {@link org.apache.juneau.rest.annotation.Rest
@Rest}-annotated resources.
</p>
<h5 class='figure'>Example:</h5>
@@ -24582,7 +24622,7 @@
<ja>@Rest</ja>
<jk>public class</jk> MyRest {
- <ja>@RestMethod</ja>(name=GET, path=<js>"/echoQuery"</js>)
+ <ja>@RestMethod</ja>(name=<jsf>GET</jsf>,
path=<js>"/echoQuery"</js>)
<jk>public int</jk> echoQuery(<ja>@Query</ja>(<js>"id"</js>)
String id) {
<jk>return</jk> id;
}
@@ -29071,12 +29111,6 @@
</tr>
<tr>
<td></td>
- <td>{@link org.apache.juneau.BeanContext#BEAN_debug
BEAN_debug}</td>
- <td>Debug mode.</td>
- <td
style='max-width:250px;overflow:hidden'><jk>boolean</jk></td>
- </tr>
- <tr>
- <td></td>
<td>{@link org.apache.juneau.BeanContext#BEAN_examples
BEAN_examples}</td>
<td>POJO examples.</td>
<td
style='max-width:250px;overflow:hidden'><c>Map<String,Object></c></td>
@@ -29131,18 +29165,6 @@
</tr>
<tr>
<td></td>
- <td>{@link org.apache.juneau.BeanContext#BEAN_locale
BEAN_locale}</td>
- <td>Locale.</td>
- <td style='max-width:250px;overflow:hidden'>{@link
java.util.Locale}</td>
- </tr>
- <tr>
- <td></td>
- <td>{@link org.apache.juneau.BeanContext#BEAN_mediaType
BEAN_mediaType}</td>
- <td>Media type.</td>
- <td style='max-width:250px;overflow:hidden'>{@link
org.apache.juneau.http.MediaType}</td>
- </tr>
- <tr>
- <td></td>
<td>{@link org.apache.juneau.BeanContext#BEAN_notBeanClasses
BEAN_notBeanClasses}</td>
<td>Bean class exclusions.</td>
<td
style='max-width:250px;overflow:hidden'><c>Set<Class></c></td>
@@ -29173,12 +29195,6 @@
</tr>
<tr>
<td></td>
- <td>{@link org.apache.juneau.BeanContext#BEAN_timeZone
BEAN_timeZone}</td>
- <td>Time zone.</td>
- <td style='max-width:250px;overflow:hidden'>{@link
java.util.TimeZone}</td>
- </tr>
- <tr>
- <td></td>
<td>{@link org.apache.juneau.BeanContext#BEAN_typePropertyName
BEAN_typePropertyName}</td>
<td>Bean type property name.</td>
<td style='max-width:250px;overflow:hidden'><c>String</c></td>
@@ -29322,6 +29338,30 @@
<td style='max-width:250px;overflow:hidden'>{@link
org.apache.juneau.config.store.WatcherSensitivity}</td>
</tr>
<tr>
+ <td>{@link org.apache.juneau.Context}</td>
+ <td>{@link org.apache.juneau.Context#CONTEXT_debug
CONTEXT_debug}</td>
+ <td>Debug mode.</td>
+ <td
style='max-width:250px;overflow:hidden'><jk>boolean</jk></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>{@link org.apache.juneau.Context#CONTEXT_locale
CONTEXT_locale}</td>
+ <td>Locale.</td>
+ <td style='max-width:250px;overflow:hidden'>{@link
java.util.Locale}</td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>{@link org.apache.juneau.Context#CONTEXT_mediaType
CONTEXT_mediaType}</td>
+ <td>Media type.</td>
+ <td style='max-width:250px;overflow:hidden'>{@link
org.apache.juneau.http.MediaType}</td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>{@link org.apache.juneau.Context#CONTEXT_timeZone
CONTEXT_timeZone}</td>
+ <td>Time zone.</td>
+ <td style='max-width:250px;overflow:hidden'>{@link
java.util.TimeZone}</td>
+ </tr>
+ <tr>
<td>{@link org.apache.juneau.html.HtmlDocSerializer}</td>
<td>{@link
org.apache.juneau.html.HtmlDocSerializer#HTMLDOC_aside HTMLDOC_aside}</td>
<td>Aside section contents.</td>
@@ -29821,6 +29861,12 @@
</tr>
<tr>
<td></td>
+ <td>{@link
org.apache.juneau.rest.client2.RestClient#RESTCLIENT_console
RESTCLIENT_console}</td>
+ <td>Console print stream</td>
+ <td style='max-width:250px;overflow:hidden'><ul><c>Class<?
<jk>extends</jk> {@link java.io.PrintStream}> | {@link
java.io.PrintStream}</c></ul></td>
+ </tr>
+ <tr>
+ <td></td>
<td>{@link
org.apache.juneau.rest.client.RestClient#RESTCLIENT_debug RESTCLIENT_debug}</td>
<td>Debug.</td>
<td
style='max-width:250px;overflow:hidden'><jk>boolean</jk></td>
@@ -33711,7 +33757,7 @@
<li>{@link
org.apache.juneau.transform.BeanFilterBuilder#typeName(String)} - Programmatic
equivalent to annotation above.
<li>{@link
org.apache.juneau.BeanContext#BEAN_beanDictionary} - List of bean classes that
make up the bean dictionary for lookup
during parsing.
- <li>{@link
org.apache.juneau.BeanContext#BEAN_beanTypePropertyName} - The overridable type
property name. Default is <js>"_type"</js>.
+ <li><dc>BEAN_beanTypePropertyName</dc> - The
overridable type property name. Default is <js>"_type"</js>.
<li><dc>@BeanProperty(beanDictionary)</dc> - Define a
type dictionary
for a particular bean property value. This
overrides the value specified using {@link
org.apache.juneau.BeanContext#BEAN_beanDictionary}.
<li><dc>SerializerContext.SERIALIZER_addBeanTypeProperties</dc> - Controls
whether type properties are serialized.
@@ -33914,10 +33960,10 @@
now extend directly from {@link org.apache.juneau.BeanSession}.
<li>New settings in {@link org.apache.juneau.BeanContext}:
<ul>
- <li>{@link org.apache.juneau.BeanContext#BEAN_debug} - Debug
setting. Replaces individual debug properties in the serializer and parser
contexts.
- <li>{@link org.apache.juneau.BeanContext#BEAN_locale} -
Specifies a default locale at the context level.
- <li>{@link org.apache.juneau.BeanContext#BEAN_timeZone} -
Specifies a default timezone at the context level.
- <li>{@link org.apache.juneau.BeanContext#BEAN_mediaType} -
Specifies a default media type at the context level.
+ <li><dc>BEAN_debug</dc> - Debug setting. Replaces individual
debug properties in the serializer and parser contexts.
+ <li><dc>BEAN_locale</dc> - Specifies a default locale at the
context level.
+ <li><dc>BEAN_timeZone</dc> - Specifies a default timezone at
the context level.
+ <li><dc>BEAN_mediaType</dc> - Specifies a default media type at
the context level.
</ul>
<li>Improvements to Parser class:
<ul>
@@ -34505,7 +34551,7 @@
<li><dc>RestConfig.parserListener(Class)</dc>
<li><dc>RestClientBuilder.listeners(Class,Class)</dc>
</ul>juneau-examples-core.import1.pngjuneau-examples-core.import1.png
- <li>The {@link org.apache.juneau.BeanContext#BEAN_debug} flag will now
capture parser input and make it
+ <li>The <dc>BEAN_debug</dc> flag will now capture parser input and make
it
available through the <dc>ParserSession.getInputAsString()</dc>
method so that it can be used
in the listeners.
<li>Significant new functionality introduced to the HTML serializer.
@@ -34576,34 +34622,34 @@
</ul>
The new supported types are:
<ul>
- <li>{@link org.apache.juneau.http.Accept}
- <li>{@link org.apache.juneau.http.AcceptCharset}
- <li>{@link org.apache.juneau.http.AcceptEncoding}
- <li>{@link org.apache.juneau.http.AcceptLanguage}
- <li>{@link org.apache.juneau.http.Authorization}
- <li>{@link org.apache.juneau.http.CacheControl}
- <li>{@link org.apache.juneau.http.Connection}
- <li>{@link org.apache.juneau.http.ContentLength}
- <li>{@link org.apache.juneau.http.ContentType}
- <li>{@link org.apache.juneau.http.Date}
- <li>{@link org.apache.juneau.http.Expect}
- <li>{@link org.apache.juneau.http.From}
- <li>{@link org.apache.juneau.http.Host}
- <li>{@link org.apache.juneau.http.IfMatch}
- <li>{@link org.apache.juneau.http.IfModifiedSince}
- <li>{@link org.apache.juneau.http.IfNoneMatch}
- <li>{@link org.apache.juneau.http.IfRange}
- <li>{@link org.apache.juneau.http.IfUnmodifiedSince}
- <li>{@link org.apache.juneau.http.MaxForwards}
- <li>{@link org.apache.juneau.http.Pragma}
- <li>{@link org.apache.juneau.http.ProxyAuthorization}
- <li>{@link org.apache.juneau.http.Range}
- <li>{@link org.apache.juneau.http.Referer}
- <li>{@link org.apache.juneau.http.TE}
- <li>{@link org.apache.juneau.http.UserAgent}
- <li>{@link org.apache.juneau.http.Upgrade}
- <li>{@link org.apache.juneau.http.Via}
- <li>{@link org.apache.juneau.http.Warning}
+ <li><dc>Accept</dc>
+ <li><dc>AcceptCharset</dc>
+ <li><dc>AcceptEncoding</dc>
+ <li><dc>AcceptLanguage</dc>
+ <li><dc>Authorization</dc>
+ <li><dc>CacheControl</dc>
+ <li><dc>Connection</dc>
+ <li><dc>ContentLength</dc>
+ <li><dc>ContentType</dc>
+ <li><dc>Date</dc>
+ <li><dc>Expect</dc>
+ <li><dc>From</dc>
+ <li><dc>Host</dc>
+ <li><dc>IfMatch</dc>
+ <li><dc>IfModifiedSince</dc>
+ <li><dc>IfNoneMatch</dc>
+ <li><dc>IfRange</dc>
+ <li><dc>IfUnmodifiedSince</dc>
+ <li><dc>MaxForwards</dc>
+ <li><dc>Pragma</dc>
+ <li><dc>ProxyAuthorization</dc>
+ <li><dc>Range</dc>
+ <li><dc>Referer</dc>
+ <li><dc>TE</dc>
+ <li><dc>UserAgent</dc>
+ <li><dc>Upgrade</dc>
+ <li><dc>Via</dc>
+ <li><dc>Warning</dc>
<li>{@link java.util.TimeZone}
<li>{@link java.io.InputStream}
<li>{@link javax.servlet.ServletInputStream}
@@ -36777,7 +36823,7 @@
<li>
The <c>ReaderResource</c> and <c>StreamResource</c> classes
have been moved to the <c>org.apache.juneau.http</c>
package in <c>juneau-marshall</c>. This allows them to be used
as return types in remote REST interfaces.
- <br>A new {@link
org.apache.juneau.rest.helper.ResolvingReaderResource} class has been added
that includes the variable-resolving support since
+ <br>A new <dc>ResolvingReaderResource</dc> class has been added
that includes the variable-resolving support since
this relies on the <c>juneau-svl</c> package.
<li>
The <c>RemoteInterfaceServlet</c> class has been renamed to
{@link org.apache.juneau.rest.remote.RrpcServlet}.
@@ -37460,10 +37506,10 @@
<br>Old: <js>"<myBean><null></myBean>"</js>
<br>New: <js>"<myBean nil='true'></myBean>"</js>
<li>
- Configurable properties such as {@link
org.apache.juneau.BeanContext#BEAN_debug} can now be set globally by either
+ Configurable properties such as {@link
org.apache.juneau.Context#CONTEXT_debug} can now be set globally by either
system properties or environment variables.
- <br>For <jsf>BEAN_debug</jsf> you can use either the system
- property <js>"BeanContext.debug"</js> or environment variables
<js>"BEANCONTEXT_DEBUG"</js>.
+ <br>For <jsf>CONTEXT_debug</jsf> you can use either the system
+ property <js>"Context.debug"</js> or environment variables
<js>"CONTEXT_DEBUG"</js>.
<li>
Fixed an initialization time race condition that can cause
initial parse errors when concurrently parsing into
array types like so:
@@ -37753,7 +37799,7 @@
<li>
New Bean Property Interceptor API for intercepting calls to
bean getters/setters.
<ul>
- <li class='jac'>{@link
org.apache.juneau.BeanInterceptor}
+ <li class='jac'>{@link
org.apache.juneau.transform.BeanInterceptor}
<li class='ja'>{@link
org.apache.juneau.annotation.Bean#interceptor Bean(interceptor)}
<li class='jm'>{@link
org.apache.juneau.BeanContextBuilder#beanInterceptor(Class,Class)}
</ul>
@@ -37946,6 +37992,15 @@
)
<jk>public</jk> String
doGet(<ja>@Path</ja>(name=<js>"foo"</js>,required=<jk>false</jk>) String foo)
{...}
</p>
+ <li>
+ The {@link org.apache.juneau.rest.annotation.RestMethod
@RestMethod} annotation is now implied on all unannotated methods of a {@link
org.apache.juneau.rest.annotation.Rest @Rest}-annotated
+ interface.
+ <p class='bpcode w800'>
+ <ja>@Rest
+ <jk>public interface</jk> MyRest {
+ String getFoo(); <jc>// @RestMethod(name=GET,path="/foo") is
implied.</jc>
+ }
+ </p>
</ul>
<h5 class='topic w800'>juneau-rest-server-springboot</h5>
@@ -37983,7 +38038,13 @@
Future<String> f = i.doGet();
<jc>// Do other stuff.</jc>
String result = f.get();
- </li>p>
+ </p>
+ <li>Additions to {@link org.apache.juneau.http.remote.Remote}
annotation:
+ <ul>
+ <li>{@link org.apache.juneau.http.remote.Remote#version
version} - Adds a client version header to all requests.
+ <li>{@link org.apache.juneau.http.remote.Remote#headers
headers} - Adds a set of headers to all requests.
+ <li>{@link org.apache.juneau.http.remote.Remote#headerSupplier
headerSupplier} - Adds a dynamic supplier of headers to all requests.
+ </ul>
</ul>
<h5 class='topic w800'>juneau-rest-mock</h5>
diff --git a/juneau-doc/src/main/javadoc/resources/docs.txt
b/juneau-doc/src/main/javadoc/resources/docs.txt
index 44f8226..76cadd7 100644
--- a/juneau-doc/src/main/javadoc/resources/docs.txt
+++ b/juneau-doc/src/main/javadoc/resources/docs.txt
@@ -254,17 +254,17 @@ juneau-rest-client.Logging = #juneau-rest-client.Logging,
Overview > juneau-rest
juneau-rest-client.Other = #juneau-rest-client.Other, Overview >
juneau-rest-client >
juneau-rest-client.PipingOutput = #juneau-rest-client.PipingOutput, Overview >
juneau-rest-client > Piping Response Output
juneau-rest-client.ResponsePatterns = #juneau-rest-client.ResponsePatterns,
Overview > juneau-rest-client >
-juneau-rest-client.RestProxies = #juneau-rest-client.RestProxies, Overview >
juneau-rest-client > REST Proxies
-juneau-rest-client.RestProxies.Body = #juneau-rest-client.RestProxies.Body,
Overview > juneau-rest-client > REST Proxies > @Body
-juneau-rest-client.RestProxies.DualPurposeInterfaces =
#juneau-rest-client.RestProxies.DualPurposeInterfaces, Overview >
juneau-rest-client > REST Proxies > Dual-purpose (end-to-end) interfaces
-juneau-rest-client.RestProxies.FormData =
#juneau-rest-client.RestProxies.FormData, Overview > juneau-rest-client > REST
Proxies > @FormData
-juneau-rest-client.RestProxies.Header =
#juneau-rest-client.RestProxies.Header, Overview > juneau-rest-client > REST
Proxies > @Header
-juneau-rest-client.RestProxies.Path = #juneau-rest-client.RestProxies.Path,
Overview > juneau-rest-client > REST Proxies > @Path
-juneau-rest-client.RestProxies.Query = #juneau-rest-client.RestProxies.Query,
Overview > juneau-rest-client > REST Proxies > @Query
-juneau-rest-client.RestProxies.Remote =
#juneau-rest-client.RestProxies.Remote, Overview > juneau-rest-client > REST
Proxies > @Remote
-juneau-rest-client.RestProxies.RemoteMethod =
#juneau-rest-client.RestProxies.RemoteMethod, Overview > juneau-rest-client >
REST Proxies > @RemoteMethod
-juneau-rest-client.RestProxies.Request =
#juneau-rest-client.RestProxies.Request, Overview > juneau-rest-client > REST
Proxies > @Request
-juneau-rest-client.RestProxies.Response =
#juneau-rest-client.RestProxies.Response, Overview > juneau-rest-client > REST
Proxies > @Response
+juneau-rest-client.RestProxies = #juneau-rest-client.RestProxies, Overview >
juneau-rest-client > Remote REST Proxies
+juneau-rest-client.RestProxies.Body = #juneau-rest-client.RestProxies.Body,
Overview > juneau-rest-client > Remote REST Proxies > @Body
+juneau-rest-client.RestProxies.DualPurposeInterfaces =
#juneau-rest-client.RestProxies.DualPurposeInterfaces, Overview >
juneau-rest-client > Remote REST Proxies > Dual-purpose (end-to-end) interfaces
+juneau-rest-client.RestProxies.FormData =
#juneau-rest-client.RestProxies.FormData, Overview > juneau-rest-client >
Remote REST Proxies > @FormData
+juneau-rest-client.RestProxies.Header =
#juneau-rest-client.RestProxies.Header, Overview > juneau-rest-client > Remote
REST Proxies > @Header
+juneau-rest-client.RestProxies.Path = #juneau-rest-client.RestProxies.Path,
Overview > juneau-rest-client > Remote REST Proxies > @Path
+juneau-rest-client.RestProxies.Query = #juneau-rest-client.RestProxies.Query,
Overview > juneau-rest-client > Remote REST Proxies > @Query
+juneau-rest-client.RestProxies.Remote =
#juneau-rest-client.RestProxies.Remote, Overview > juneau-rest-client > Remote
REST Proxies > @Remote
+juneau-rest-client.RestProxies.RemoteMethod =
#juneau-rest-client.RestProxies.RemoteMethod, Overview > juneau-rest-client >
Remote REST Proxies > @RemoteMethod
+juneau-rest-client.RestProxies.Request =
#juneau-rest-client.RestProxies.Request, Overview > juneau-rest-client > Remote
REST Proxies > @Request
+juneau-rest-client.RestProxies.Response =
#juneau-rest-client.RestProxies.Response, Overview > juneau-rest-client >
Remote REST Proxies > @Response
juneau-rest-mock = #juneau-rest-mock, Overview > juneau-rest-mock
juneau-rest-mock.MockRestClient = #juneau-rest-mock.MockRestClient, Overview >
juneau-rest-mock > MockRestClient
juneau-rest-server = #juneau-rest-server, Overview > juneau-rest-server
diff --git a/juneau-doc/src/main/javadoc/resources/fragments/toc.html
b/juneau-doc/src/main/javadoc/resources/fragments/toc.html
index d7c9e62..75bf6ad 100644
--- a/juneau-doc/src/main/javadoc/resources/fragments/toc.html
+++ b/juneau-doc/src/main/javadoc/resources/fragments/toc.html
@@ -314,7 +314,7 @@
</ol>
<li><p class='toc2'><a class='doclink'
href='{OVERVIEW_URL}#juneau-rest-client'>juneau-rest-client</a><span
class='update'><b>8.1.4-updated</b></span></p>
<ol>
- <li><p><a class='doclink'
href='{OVERVIEW_URL}#juneau-rest-client.RestProxies'>REST Proxies</a></p>
+ <li><p><a class='doclink'
href='{OVERVIEW_URL}#juneau-rest-client.RestProxies'>Remote REST
Proxies</a><span class='update'><b>8.1.4-updated</b></span></p>
<ol>
<li><p><a class='doclink'
href='{OVERVIEW_URL}#juneau-rest-client.RestProxies.Remote'>@Remote</a><span
class='update'>8.1.2-updated</span></p>
<li><p><a class='doclink'
href='{OVERVIEW_URL}#juneau-rest-client.RestProxies.RemoteMethod'>@RemoteMethod</a><span
class='update'><b>8.1.4-updated</b></span></p>
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestCallInterceptor.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestCallInterceptor.java
index dbaa1fa..b3f058a 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestCallInterceptor.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestCallInterceptor.java
@@ -42,8 +42,7 @@ package org.apache.juneau.rest.client2;
*
* <ul class='seealso'>
* <li class='jf'>{@link RestClient#RESTCLIENT_interceptors}
- * <li class='jm'>{@link RestClientBuilder#interceptors(Class...)}
- * <li class='jm'>{@link
RestClientBuilder#interceptors(RestCallInterceptor...)}
+ * <li class='jm'>{@link RestClientBuilder#interceptors(Object...)}
* </ul>
*/
public interface RestCallInterceptor {
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestClient.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestClient.java
index 2007375..73cf02c 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestClient.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestClient.java
@@ -861,7 +861,7 @@ import org.apache.http.client.CookieStore;
* <ul class='javatree'>
* <li class='jc'>{@link RestClientBuilder}
* <ul>
- * <li class='jm'>{@link
RestClientBuilder#interceptors(RestCallInterceptor...)
interceptors(RestCallInterceptor...)}
+ * <li class='jm'>{@link RestClientBuilder#interceptors(Object...)
interceptors(Object...)}
* </ul>
* <li class='jc'>{@link RestRequest}
* <ul>
@@ -1326,8 +1326,7 @@ public class RestClient extends BeanContext implements
HttpClient, Closeable, Re
* <li><b>Default:</b> empty list.
* <li><b>Methods:</b>
* <ul>
- * <li class='jm'>{@link
org.apache.juneau.rest.client2.RestClientBuilder#interceptors(Class...)}
- * <li class='jm'>{@link
org.apache.juneau.rest.client2.RestClientBuilder#interceptors(RestCallInterceptor...)}
+ * <li class='jm'>{@link
org.apache.juneau.rest.client2.RestClientBuilder#interceptors(Object...)}
* </ul>
* </ul>
*
@@ -3298,8 +3297,7 @@ public class RestClient extends BeanContext implements
HttpClient, Closeable, Re
*
* <ul class='seealso'>
* <li class='jf'>{@link RestClient#RESTCLIENT_interceptors}
- * <li class='jm'>{@link RestClientBuilder#interceptors(Class...)}
- * <li class='jm'>{@link
RestClientBuilder#interceptors(RestCallInterceptor...)}
+ * <li class='jm'>{@link RestClientBuilder#interceptors(Object...)}
* </ul>
*
* @param req The HTTP request.
@@ -3325,8 +3323,7 @@ public class RestClient extends BeanContext implements
HttpClient, Closeable, Re
*
* <ul class='seealso'>
* <li class='jf'>{@link RestClient#RESTCLIENT_interceptors}
- * <li class='jm'>{@link RestClientBuilder#interceptors(Class...)}
- * <li class='jm'>{@link
RestClientBuilder#interceptors(RestCallInterceptor...)}
+ * <li class='jm'>{@link RestClientBuilder#interceptors(Object...)}
* </ul>
*
* @param req The HTTP request.
@@ -3353,8 +3350,7 @@ public class RestClient extends BeanContext implements
HttpClient, Closeable, Re
*
* <ul class='seealso'>
* <li class='jf'>{@link RestClient#RESTCLIENT_interceptors}
- * <li class='jm'>{@link RestClientBuilder#interceptors(Class...)}
- * <li class='jm'>{@link
RestClientBuilder#interceptors(RestCallInterceptor...)}
+ * <li class='jm'>{@link RestClientBuilder#interceptors(Object...)}
* </ul>
*
* @param req The HTTP request.
diff --git
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRestRequest.java
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRestRequest.java
index 43d5ca3..da53432 100644
---
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRestRequest.java
+++
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRestRequest.java
@@ -29,7 +29,7 @@ import org.apache.juneau.rest.client2.*;
* Instances of this class are instantiated through methods on {@link
MockRestClient} such as {@link MockRestClient#post(Object,Object)}
*
* <ul class='seealso'>
- * <li class='link'>{@doc juneau-rest-mock.MockRest}
+ * <li class='link'>{@doc juneau-rest-mock}
* </ul>
*/
public class MockRestRequest extends
org.apache.juneau.rest.client2.RestRequest {
diff --git
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRestResponse.java
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRestResponse.java
index 157da65..5977a4e 100644
---
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRestResponse.java
+++
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRestResponse.java
@@ -20,7 +20,7 @@ import org.apache.juneau.rest.client2.*;
* A subclass of {@link RestResponse} with additional features for mocked
testing.
*
* <ul class='seealso'>
- * <li class='link'>{@doc juneau-rest-mock.MockRest}
+ * <li class='link'>{@doc juneau-rest-mock}
* </ul>
*/
public class MockRestResponse extends
org.apache.juneau.rest.client2.RestResponse {
diff --git
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockServletRequest.java
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockServletRequest.java
index 6a9eb2c..04c2e0f 100644
---
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockServletRequest.java
+++
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockServletRequest.java
@@ -32,7 +32,7 @@ import org.apache.juneau.urlencoding.*;
* A mutable implementation of {@link HttpServletRequest} for mocking purposes.
*
* <ul class='seealso'>
- * <li class='link'>{@doc juneau-rest-mock.MockRest}
+ * <li class='link'>{@doc juneau-rest-mock}
* </ul>
*/
public class MockServletRequest implements HttpServletRequest {
diff --git
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockServletResponse.java
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockServletResponse.java
index 1978cf0..f07b55f 100644
---
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockServletResponse.java
+++
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockServletResponse.java
@@ -25,7 +25,7 @@ import org.apache.juneau.rest.util.*;
* An implementation of {@link HttpServletResponse} for mocking purposes.
*
* <ul class='seealso'>
- * <li class='link'>{@doc juneau-rest-mock.MockRest}
+ * <li class='link'>{@doc juneau-rest-mock}
* </ul>
*/
public class MockServletResponse implements HttpServletResponse {
