New simplified @Rest annotation
diff --git a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocAsideTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocAsideTest.java
index 320e7a8..a31552e 100644
--- a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocAsideTest.java
+++ b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocAsideTest.java
@@ -30,7 +30,7 @@
// Basic tests
//=================================================================================================================
- @Rest(htmldoc=@HtmlDoc(aside={"a01a","a01b","INHERIT"}))
+ @RestResource(htmldoc=@HtmlDoc(aside={"a01a","a01b","INHERIT"}))
public static class A extends BasicRestServlet {
@RestMethod(path="/a01")
public Object a01() {
@@ -80,7 +80,7 @@
// Inheritance
//=================================================================================================================
- @Rest(htmldoc=@HtmlDoc(aside={"INHERIT","b01a","b01b"}))
+ @RestResource(htmldoc=@HtmlDoc(aside={"INHERIT","b01a","b01b"}))
public static class B extends A {
@RestMethod(path="/b01")
public Object b01() {
diff --git a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocFooterTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocFooterTest.java
index e8ababa..16e1a8c 100644
--- a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocFooterTest.java
+++ b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocFooterTest.java
@@ -30,7 +30,7 @@
// Basic tests
//=================================================================================================================
- @Rest(htmldoc=@HtmlDoc(footer={"a01a","a01b"}))
+ @RestResource(htmldoc=@HtmlDoc(footer={"a01a","a01b"}))
public static class A extends BasicRestServlet {
@RestMethod(path="/a01")
public Object a01() {
@@ -80,7 +80,7 @@
// Inheritance
//=================================================================================================================
- @Rest(htmldoc=@HtmlDoc(footer={"b01a","INHERIT","b01b"}))
+ @RestResource(htmldoc=@HtmlDoc(footer={"b01a","INHERIT","b01b"}))
public static class B extends A {
@RestMethod(path="/b01")
public Object b01() {
diff --git a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocHeaderTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocHeaderTest.java
index 1e9f2dd..e602b45 100644
--- a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocHeaderTest.java
+++ b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocHeaderTest.java
@@ -30,7 +30,7 @@
// Basic tests
//=================================================================================================================
- @Rest(htmldoc=@HtmlDoc(header={"a01a","a01b"}))
+ @RestResource(htmldoc=@HtmlDoc(header={"a01a","a01b"}))
public static class A extends BasicRestServlet {
@RestMethod(path="/a01")
public Object a01() {
@@ -80,7 +80,7 @@
// Inheritance
//=================================================================================================================
- @Rest(htmldoc=@HtmlDoc(header={"b01a","b01b","INHERIT"}))
+ @RestResource(htmldoc=@HtmlDoc(header={"b01a","b01b","INHERIT"}))
public static class B extends A {
@RestMethod(path="/b01")
public Object b01() {
diff --git a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocNavTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocNavTest.java
index 2a972a5..473b65f 100644
--- a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocNavTest.java
+++ b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocNavTest.java
@@ -30,7 +30,7 @@
// Basic tests
//=================================================================================================================
- @Rest(htmldoc=@HtmlDoc(navlinks={"NONE"},nav={"a01a","a01b"}))
+ @RestResource(htmldoc=@HtmlDoc(navlinks={"NONE"},nav={"a01a","a01b"}))
public static class A extends BasicRestServlet {
@RestMethod(path="/a01")
public Object a01() {
@@ -80,7 +80,7 @@
// Inheritance
//=================================================================================================================
- @Rest(htmldoc=@HtmlDoc(nav={"INHERIT","b01a","b01b"}))
+ @RestResource(htmldoc=@HtmlDoc(nav={"INHERIT","b01a","b01b"}))
public static class B extends A {
@RestMethod(path="/b01")
public Object b01() {
diff --git a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocNavlinksTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocNavlinksTest.java
index 668967c..4c3da6c 100644
--- a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocNavlinksTest.java
+++ b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocNavlinksTest.java
@@ -31,7 +31,7 @@
// Basic tests
//=================================================================================================================
- @Rest(htmldoc=@HtmlDoc(navlinks={"a01a","a01b"}))
+ @RestResource(htmldoc=@HtmlDoc(navlinks={"a01a","a01b"}))
public static class A extends BasicRestServlet {
@RestMethod(path="/a01")
public Object a01() {
@@ -129,7 +129,7 @@
// Inheritance
//=================================================================================================================
- @Rest(htmldoc=@HtmlDoc(navlinks={"INHERIT","b01a","b01b"}))
+ @RestResource(htmldoc=@HtmlDoc(navlinks={"INHERIT","b01a","b01b"}))
public static class B extends A {
@RestMethod(path="/b01")
public Object b01() {
diff --git a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocScriptTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocScriptTest.java
index 939d50a..c57d250 100644
--- a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocScriptTest.java
+++ b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocScriptTest.java
@@ -30,7 +30,7 @@
// Basic tests
//=================================================================================================================
- @Rest(htmldoc=@HtmlDoc(script={"a01a","a01b"}))
+ @RestResource(htmldoc=@HtmlDoc(script={"a01a","a01b"}))
public static class A extends BasicRestServlet {
@RestMethod(path="/a01")
public Object a01() {
@@ -80,7 +80,7 @@
// Inheritance
//=================================================================================================================
- @Rest(htmldoc=@HtmlDoc(script={"b01a","b01b"}))
+ @RestResource(htmldoc=@HtmlDoc(script={"b01a","b01b"}))
public static class B extends A {
@RestMethod(path="/b01")
public Object b01() {
diff --git a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocStyleTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocStyleTest.java
index adba5b6..82a8be9 100644
--- a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocStyleTest.java
+++ b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/HtmlDocStyleTest.java
@@ -30,7 +30,7 @@
// Basic tests
//=================================================================================================================
- @Rest(htmldoc=@HtmlDoc(style={"a01a","a01b"},stylesheet="a01s",nowrap="false"))
+ @RestResource(htmldoc=@HtmlDoc(style={"a01a","a01b"},stylesheet="a01s",nowrap="false"))
public static class A extends BasicRestServlet {
@RestMethod(path="/a01")
public Object a01() {
@@ -80,7 +80,7 @@
// Inheritance
//=================================================================================================================
- @Rest(htmldoc=@HtmlDoc(style={"b01a","b01b"},stylesheet="b01s"))
+ @RestResource(htmldoc=@HtmlDoc(style={"b01a","b01b"},stylesheet="b01s"))
public static class B extends A {
@RestMethod(path="/b01")
public Object b01() {
diff --git a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RestMethodInheritTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RestMethodInheritTest.java
index 756ab5e..3869c71 100644
--- a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RestMethodInheritTest.java
+++ b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RestMethodInheritTest.java
@@ -16,6 +16,7 @@
import java.util.*;
import org.apache.juneau.*;
+import org.apache.juneau.annotation.*;
import org.apache.juneau.encoders.*;
import org.apache.juneau.http.annotation.HasQuery;
import org.apache.juneau.json.*;
@@ -215,10 +216,12 @@
// Test filter inheritance.
//=================================================================================================================
- @Rest(pojoSwaps={F1Swap.class})
+ @Rest
+ @BeanConfig(pojoSwaps={F1Swap.class})
public static class D {}
- @Rest(pojoSwaps={F2Swap.class,Inherit.class})
+ @Rest
+ @BeanConfig(pojoSwaps={F2Swap.class})
public static class D01 extends D {}
@Rest(serializers=SimpleJsonSerializer.class)
diff --git a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RestResourcePojoSwapsTest.java b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RestResourcePojoSwapsTest.java
index 4c1f01c..e9a8864 100644
--- a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RestResourcePojoSwapsTest.java
+++ b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RestResourcePojoSwapsTest.java
@@ -15,6 +15,7 @@
import static org.apache.juneau.http.HttpMethodName.*;
import org.apache.juneau.*;
+import org.apache.juneau.annotation.*;
import org.apache.juneau.http.annotation.Body;
import org.apache.juneau.http.annotation.Path;
import org.apache.juneau.json.*;
@@ -86,10 +87,12 @@
}
}
- @Rest(pojoSwaps={SwapA1.class}, serializers=SimpleJsonSerializer.class, parsers=JsonParser.class)
+ @Rest(serializers=SimpleJsonSerializer.class, parsers=JsonParser.class)
+ @BeanConfig(pojoSwaps={SwapA1.class})
public static class A01_Parent {}
- @Rest(pojoSwaps={SwapA2.class})
+ @Rest
+ @BeanConfig(pojoSwaps={SwapA2.class})
public static class A01 extends A01_Parent {
@RestMethod(name=GET, path="/classTransformOverridesParentClassTransform")
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 9415272..b02df69 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
@@ -369,7 +369,7 @@
* <li><b>Session property:</b> <jk>false</jk>
* <li><b>Annotations:</b>
* <ul>
- * <li class='ja'>{@link Rest#allowHeaderParams()}
+ * <li class='ja'>{@link RestResource#allowHeaderParams()}
* </ul>
* <li><b>Methods:</b>
* <ul>
@@ -1562,7 +1562,7 @@
* <li><b>Session property:</b> <jk>false</jk>
* <li><b>Annotations:</b>
* <ul>
- * <li class='ja'>{@link Rest#logger()}
+ * <li class='ja'>{@link RestResource#logger()}
* </ul>
* <li><b>Methods:</b>
* <ul>
@@ -3127,7 +3127,7 @@
* <li><b>Session property:</b> <jk>false</jk>
* <li><b>Annotations:</b>
* <ul>
- * <li class='ja'>{@link Rest#useStackTraceHashes()}
+ * <li class='ja'>{@link RestResource#useStackTraceHashes()}
* </ul>
* <li><b>Methods:</b>
* <ul>
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestException.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestException.java
index ddb8c45..795e19d 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestException.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestException.java
@@ -181,7 +181,7 @@
* Returns the number of times this exception occurred on this servlet.
*
* @return
- * The occurrence number if {@link Rest#useStackTraceHashes() @Rest(useStackTraceHashes)} is enabled, or <c>0</c> otherwise.
+ * The occurrence number if {@link RestResource#useStackTraceHashes() @RestResource(useStackTraceHashes)} is enabled, or <c>0</c> otherwise.
* @deprecated Not used by new logging API.
*/
@Deprecated
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HtmlDoc.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HtmlDoc.java
index 1a260b5..8be7be4 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HtmlDoc.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HtmlDoc.java
@@ -21,7 +21,7 @@
* Contains all the configurable annotations for the {@link HtmlDocSerializer}.
*
* <p>
- * Used with {@link Rest#htmldoc() @Rest(htmldoc)} and {@link RestMethod#htmldoc() @RestMethod(htmldoc)}
+ * Used with {@link RestResource#htmldoc() @RestResource(htmldoc)} and {@link RestMethod#htmldoc() @RestMethod(htmldoc)}
* to customize the HTML view of serialized POJOs.
*
* <p>
@@ -32,14 +32,14 @@
* For example, the following two methods for defining the HTML nav links are considered equivalent:
* <p class='bcode w800'>
* <jc>// Defined via properties.</jc>
- * <ja>@Rest</ja>(
+ * <ja>@RestResource</ja>(
* properties={
* <ja>@Property</ja>(name=HtmlDocSerializer.<jsf>HTMLDOC_navlinks</jsf>, value=<js>"{options:'?method=OPTIONS',doc:'doc'}"</js>)
* }
* )
*
* <jc>// Defined via annotation.</jc>
- * <ja>@Rest</ja>(
+ * <ja>@RestResource</ja>(
* htmldoc=<ja>@HtmlDoc</ja>(
* navlinks={
* <js>"options: ?method=OPTIONS"</js>,
@@ -96,7 +96,7 @@
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@Rest</ja>(
+ * <ja>@RestResource</ja>(
* htmldoc=<ja>@HtmlDoc</ja>(
* aside={
* <js>"<p>Custom aside content</p>"</js>
@@ -139,7 +139,7 @@
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@Rest</ja>(
+ * <ja>@RestResource</ja>(
* htmldoc=<ja>@HtmlDoc</ja>(
* footer={
* <js>"<p>Custom footer content</p>"</js>
@@ -179,7 +179,7 @@
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@Rest</ja>(
+ * <ja>@RestResource</ja>(
* htmldoc=<ja>@HtmlDoc</ja>(
* head={
* <jc>// Add a shortcut link in the browser tab</jc>
@@ -225,7 +225,7 @@
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@Rest</ja>(
+ * <ja>@RestResource</ja>(
* htmldoc=<ja>@HtmlDoc</ja>(
* header={
* <js>"<p>This is my REST interface</p>"</js>
@@ -268,7 +268,7 @@
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@Rest</ja>(
+ * <ja>@RestResource</ja>(
* htmldoc=<ja>@HtmlDoc</ja>(
* nav={
* <js>"<h5>Custom nav content</h5>"</js>
@@ -321,7 +321,7 @@
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@Rest</ja>(
+ * <ja>@RestResource</ja>(
* htmldoc=<ja>@HtmlDoc</ja>(
* navlinks={
* <js>"up: request:/.."</js>,
@@ -391,7 +391,7 @@
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@Rest</ja>(
+ * <ja>@RestResource</ja>(
* htmldoc=<ja>@HtmlDoc</ja>(
* script={
* <js>"alert('Hello!')"</js>
@@ -431,7 +431,7 @@
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@Rest</ja>(
+ * <ja>@RestResource</ja>(
* htmldoc=<ja>@HtmlDoc</ja>(
* style={
* <js>".red{color:red;}"</js>,
@@ -475,7 +475,7 @@
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@Rest</ja>(
+ * <ja>@RestResource</ja>(
* htmldoc=<ja>@HtmlDoc</ja>(
* stylesheet=<js>"http://someOtherHost/stealTheir.css"</js>
* )
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Rest.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Rest.java
index 804da06..44186de 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Rest.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Rest.java
@@ -21,13 +21,8 @@
import org.apache.juneau.annotation.*;
import org.apache.juneau.config.*;
import org.apache.juneau.encoders.*;
-import org.apache.juneau.html.annotation.*;
import org.apache.juneau.httppart.*;
-import org.apache.juneau.parser.*;
-import org.apache.juneau.parser.annotation.*;
import org.apache.juneau.rest.*;
-import org.apache.juneau.serializer.*;
-import org.apache.juneau.serializer.annotation.*;
import org.apache.juneau.utils.*;
/**
@@ -155,32 +150,6 @@
String allowedMethodParams() default "";
/**
- * Allow header URL parameters.
- *
- * <p>
- * When enabled, headers such as <js>"Accept"</js> and <js>"Content-Type"</js> to be passed in as URL query
- * parameters.
- * <br>
- * For example:
- * <p class='bcode w800'>
- * ?Accept=text/json&Content-Type=text/json
- * </p>
- *
- * <ul class='notes'>
- * <li>
- * Supports {@doc DefaultRestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
- * </ul>
- *
- * <ul class='seealso'>
- * <li class='jf'>{@link RestContext#REST_allowHeaderParams}
- * </ul>
- * @deprecated Use {@link #allowedHeaderParams()}
- */
- @Deprecated
- String allowHeaderParams() default "";
-
- /**
* Default request attributes.
*
* <p>
@@ -199,21 +168,6 @@
String[] attrs() default {};
/**
- * Class-level bean filters.
- *
- * <p>
- * Shortcut to add bean filters to the bean contexts of all serializers and parsers on all methods in the class.
- *
- * <ul class='seealso'>
- * <li class='jf'>{@link BeanContext#BEAN_beanFilters}
- * </ul>
- *
- * @deprecated Use {@link BeanConfig#beanFilters()}
- */
- @Deprecated
- Class<?>[] beanFilters() default {};
-
- /**
* REST call handler.
*
* <p>
@@ -448,57 +402,6 @@
Class<? extends RestGuard>[] guards() default {};
/**
- * Provides HTML-doc-specific metadata on this method.
- *
- * <p>
- * Used to customize the output from the HTML Doc serializer.
- * <p class='bcode w800'>
- * <ja>@Rest</ja>(
- * path=<js>"/addressBook"</js>,
- *
- * <jc>// Links on the HTML rendition page.
- * // "request:/..." URIs are relative to the request URI.
- * // "servlet:/..." URIs are relative to the servlet URI.
- * // "$C{...}" variables are pulled from the config file.</jc>
- * htmldoc=<ja>@HtmlDoc</ja>(
- * <jc>// Widgets for $W variables.</jc>
- * widgets={
- * PoweredByJuneau.<jk>class</jk>,
- * ContentTypeLinks.<jk>class</jk>
- * }
- * navlinks={
- * <js>"up: request:/.."</js>,
- * <js>"options: servlet:/?method=OPTIONS"</js>,
- * <js>"source: $C{Source/gitHub}/org/apache/juneau/examples/rest/addressbook/AddressBookResource.java"</js>,
- * },
- * aside={
- * <js>"<div style='max-width:400px;min-width:200px'>"</js>,
- * <js>" <p>Proof-of-concept resource that shows off the capabilities of working with POJO resources.</p>"</js>,
- * <js>" <p>Provides examples of: </p>"</js>,
- * <js>" <ul>"</js>,
- * <js>" <li>XML and RDF namespaces"</js>,
- * <js>" <li>Swagger documentation"</js>,
- * <js>" <li>Widgets"</js>,
- * <js>" </ul>"</js>,
- * <js>" <p style='text-weight:bold;text-decoration:underline;'>Available Content Types</p>"</js>,
- * <js>" $W{ContentTypeLinks}"</js>,
- * <js>"</div>"</js>
- * },
- * footer=<js>"$W{PoweredByJuneau}"</js>
- * )
- * )
- * </p>
- *
- * <ul class='seealso'>
- * <li class='link'>{@doc juneau-rest-server.HtmlDocAnnotation}
- * </ul>
- *
- * @deprecated Use {@link HtmlDocConfig}
- */
- @Deprecated
- HtmlDoc htmldoc() default @HtmlDoc;
-
- /**
* Configuration property: REST info provider.
*
* <p>
@@ -511,20 +414,6 @@
Class<? extends RestInfoProvider> infoProvider() default RestInfoProvider.Null.class;
/**
- * REST logger.
- *
- * <p>
- * Specifies the logger to use for logging.
- *
- * <ul class='seealso'>
- * <li class='jf'>{@link RestContext#REST_logger}
- * </ul>
- * @deprecated Use {@link #callLogger()}
- */
- @SuppressWarnings("dep-ann")
- Class<? extends RestLogger> logger() default RestLogger.Null.class;
-
- /**
* Specifies the logger to use for logging of HTTP requests and responses.
*
* <ul class='seealso'>
@@ -613,21 +502,6 @@
Class<? extends RestMethodParam>[] paramResolvers() default {};
/**
- * Parser listener.
- *
- * <p>
- * Specifies the parser listener class to use for listening to non-fatal parsing errors.
- *
- * <ul class='seealso'>
- * <li class='jf'>{@link Parser#PARSER_listener}
- * </ul>
- *
- * @deprecated Use {@link ParserConfig#listener()}
- */
- @Deprecated
- Class<? extends ParserListener> parserListener() default ParserListener.Null.class;
-
- /**
* Parsers.
*
* <p>
@@ -802,21 +676,6 @@
String path() default "";
/**
- * Class-level POJO swaps.
- *
- * <p>
- * Shortcut to add POJO swaps to the bean contexts of all serializers and parsers on all methods in the class.
- *
- * <ul class='seealso'>
- * <li class='jf'>{@link BeanContext#BEAN_pojoSwaps}
- * </ul>
- *
- * @deprecated {@link BeanConfig#pojoSwaps()}
- */
- @Deprecated
- Class<?>[] pojoSwaps() default {};
-
- /**
* Class-level properties.
*
* <p>
@@ -960,21 +819,6 @@
String roleGuard() default "";
/**
- * Serializer listener.
- *
- * <p>
- * Specifies the serializer listener class to use for listening to non-fatal serialization errors.
- *
- * <ul class='seealso'>
- * <li class='jf'>{@link Serializer#SERIALIZER_listener}
- * </ul>
- *
- * @deprecated Use {@link SerializerConfig#listener()}
- */
- @Deprecated
- Class<? extends SerializerListener> serializerListener() default SerializerListener.Null.class;
-
- /**
* Serializers.
*
* <p>
@@ -1370,28 +1214,6 @@
String useClasspathResourceCaching() default "";
/**
- * Use stack trace hashes.
- *
- * <p>
- * When enabled, the number of times an exception has occurred will be determined based on stack trace hashsums,
- * made available through the {@link RestException#getOccurrence()} method.
- *
- * <ul class='notes'>
- * <li>
- * Supports {@doc DefaultRestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
- * </ul>
- *
- * <ul class='seealso'>
- * <li class='jf'>{@link RestContext#REST_useStackTraceHashes}
- * </ul>
- *
- * @deprecated Use {@link Logging#useStackTraceHashing()}
- */
- @Deprecated
- String useStackTraceHashes() default "";
-
- /**
* Enable debug mode.
*
* <p>
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestConfigApply.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestConfigApply.java
index 8609545..cdcf9e6 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestConfigApply.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestConfigApply.java
@@ -19,10 +19,7 @@
import java.util.logging.*;
import static org.apache.juneau.internal.StringUtils.*;
-import static org.apache.juneau.html.HtmlDocSerializer.*;
import static org.apache.juneau.internal.ArrayUtils.*;
-import static org.apache.juneau.internal.ClassUtils.*;
-import static org.apache.juneau.parser.Parser.*;
import org.apache.juneau.*;
import org.apache.juneau.httppart.*;
@@ -33,8 +30,6 @@
import org.apache.juneau.rest.annotation.AnnotationUtils;
import org.apache.juneau.rest.annotation.Logging;
import org.apache.juneau.rest.util.*;
-import org.apache.juneau.rest.widget.*;
-import org.apache.juneau.serializer.*;
import org.apache.juneau.svl.*;
import org.apache.juneau.utils.*;
@@ -53,7 +48,6 @@
super(c, r);
}
- @SuppressWarnings("deprecation")
@Override
public void apply(AnnotationInfo<Rest> ai, PropertyStoreBuilder psb) {
Rest a = ai.getAnnotation();
@@ -135,18 +129,8 @@
psb.addTo(REST_children, a.children());
- psb.set(BEAN_beanFilters, merge(ObjectUtils.toType(psb.peek(BEAN_beanFilters), Object[].class), a.beanFilters()));
-
- psb.set(BEAN_pojoSwaps, merge(ObjectUtils.toType(psb.peek(BEAN_pojoSwaps), Object[].class), a.pojoSwaps()));
-
psb.addTo(REST_paramResolvers, a.paramResolvers());
- if (a.serializerListener() != SerializerListener.Null.class)
- psb.set(SERIALIZER_listener, a.serializerListener());
-
- if (a.parserListener() != ParserListener.Null.class)
- psb.set(PARSER_listener, a.parserListener());
-
s = string(a.uriContext());
if (isNotEmpty(s))
psb.set(REST_uriContext, s);
@@ -198,9 +182,6 @@
if (a.resourceResolver() != RestResourceResolver.Null.class)
psb.set(REST_resourceResolver, a.resourceResolver());
- if (a.logger() != RestLogger.Null.class)
- psb.set(REST_logger, a.logger());
-
if (a.callLogger() != RestCallLogger.Null.class)
psb.set(REST_callLogger, a.callLogger());
@@ -275,15 +256,9 @@
if (! a.allowedMethodParams().isEmpty())
psb.set(REST_allowedMethodParams, string(a.allowedMethodParams()));
- if (! a.allowHeaderParams().isEmpty())
- psb.set(REST_allowHeaderParams, bool(a.allowHeaderParams()));
-
if (! a.renderResponseStackTraces().isEmpty())
psb.set(REST_renderResponseStackTraces, bool(a.renderResponseStackTraces()));
- if (! a.useStackTraceHashes().isEmpty())
- psb.set(REST_useStackTraceHashes, bool(a.useStackTraceHashes()));
-
if (! a.defaultCharset().isEmpty())
psb.set(REST_defaultCharset, string(a.defaultCharset()));
@@ -301,15 +276,6 @@
if (! a.roleGuard().isEmpty())
psb.addTo(REST_roleGuard, string(a.roleGuard()));
-
- HtmlDoc hd = a.htmldoc();
- new HtmlDocBuilder(psb).process(hd);
- for (Class<? extends Widget> wc : hd.widgets()) {
- Widget w = castOrCreate(Widget.class, wc);
- psb.addTo(REST_widgets, w);
- psb.addTo(HTMLDOC_script, "$W{"+w.getName()+".script}");
- psb.addTo(HTMLDOC_script, "$W{"+w.getName()+".style}");
- }
}
private String trimLeadingSlash(String value) {
