New simplified @Rest annotation
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/package.html b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/package.html
index 1e37ab7..2b28860 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/package.html
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/package.html
@@ -418,7 +418,7 @@
<jd>/**
* Sample resource that shows how to serialize JSON-Schema documents.
*/</jd>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/jsonSchema"</js>,
messages=<js>"nls/JsonSchemaResource"</js>,
title=<js>"Sample JSON-Schema document"</js>,
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ui/SwaggerUI.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ui/SwaggerUI.java
index 6c5a25f..37716d2 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ui/SwaggerUI.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ui/SwaggerUI.java
@@ -56,7 +56,7 @@
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Resolve schema references up to 5 levels deep.
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* properties={
* <ja>@Property</ja>(name=<jsf>SWAGGERUI_resolveRefsMaxDepth</jsf>, value=<js>"5"</js>)
* }
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/Encoder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/Encoder.java
index 256f620..c7e6913 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/Encoder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/Encoder.java
@@ -22,7 +22,7 @@
* Used to wrap input and output streams within compression/decompression streams.
*
* <p>
- * Encoders are registered with <c>RestServlets</c> through the <ja>@RestResource(encoders)</ja> annotation.
+ * Encoders are registered with <c>RestServlets</c> through the <ja>@Rest(encoders)</ja> annotation.
*/
public abstract class Encoder {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
index cc674c5..2fe6520 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
@@ -35,12 +35,12 @@
* <code><xt><head></code>, and <code><xt><body></code> tags so that it can be rendered in a browser.
*
* <p>
- * Configurable properties are typically specified via <ja>@RestResource(properties)</ja> and <ja>@RestMethod(properties)</ja>
+ * Configurable properties are typically specified via <ja>@Rest(properties)</ja> and <ja>@RestMethod(properties)</ja>
* annotations, although they can also be set programmatically via the <c>RestResponse.setProperty()</c> method.
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* messages=<js>"nls/AddressBookResource"</js>,
* properties={
* <ja>@Property</ja>(name=HtmlDocSerializer.<jsf>HTMLDOC_title</jsf>, value=<js>"$L{title}"</js>),
@@ -54,7 +54,7 @@
* <p>
* Note that shortcut annotations are also provided for these particular settings:
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* messages=<js>"nls/AddressBookResource"</js>,
* title=<js>"$L{title}"</js>,
* description=<js>"$L{description}"</js>,
@@ -104,7 +104,7 @@
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* htmldoc=<ja>@HtmlDoc</ja>(
* aside={
* <js>"<ul>"</js>,
@@ -139,7 +139,7 @@
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* htmldoc=<ja>@HtmlDoc</ja>(
* footer={
* <js>"<b>This interface is great!</b>"</js>
@@ -167,7 +167,7 @@
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* properties={
* <ja>@Property</ja>(name=HtmlDocSerializer.<jsf>HTMLDOC_links</jsf>,
* value=<js>"['<link rel=\"icon\" href=\"htdocs/mypageicon.ico\">']"</js>)
@@ -176,9 +176,9 @@
* </p>
*
* <p>
- * A shortcut on <ja>@RestResource</ja> is also provided for this setting:
+ * A shortcut on <ja>@Rest</ja> is also provided for this setting:
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* htmldoc=@HtmlDoc(
* head={
* <js>"<link rel='icon' href='$U{servlet:/htdocs/mypageicon.ico}'>"</js>
@@ -207,7 +207,7 @@
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* htmldoc=<ja>@HtmlDoc</ja>(
* header={
* <js>"<h1>My own header</h1>"</js>
@@ -236,7 +236,7 @@
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* htmldoc=<ja>@HtmlDoc</ja>(
* nav={
* <js>"<p class='special-navigation'>This is my special navigation content</p>"</js>
@@ -288,7 +288,7 @@
* <p>
* The <c>AddressBookResource</c> sample class uses this property...
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* properties={
* <ja>@Property</ja>(name=HtmlDocSerializer.<jsf>HTMLDOC_navlinks</jsf>,
* value=<js>"['options: ?method=OPTIONS', 'doc: doc']"</js>)
@@ -298,9 +298,9 @@
* </p>
*
* <p>
- * A shortcut on <ja>@RestResource</ja> is also provided for this setting:
+ * A shortcut on <ja>@Rest</ja> is also provided for this setting:
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* htmldoc=@HtmlDoc(
* navlinks={
* <js>"options: ?method=OPTIONS"</js>,
@@ -335,7 +335,7 @@
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* htmldoc=<ja>@HtmlDoc</ja>(
* noResultsMessage=<js>"<b>This interface is great!</b>"</js>
* )
@@ -381,7 +381,7 @@
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* properties={
* <ja>@Property</ja>(name=HtmlDocSerializer.<jsf>HTMLDOC_script</jsf>,
* value=<js>"alert('hello!');"</js>)
@@ -390,9 +390,9 @@
* </p>
*
* <p>
- * A shortcut on <ja>@RestResource</ja> is also provided for this setting:
+ * A shortcut on <ja>@Rest</ja> is also provided for this setting:
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* htmldoc=@HtmlDoc(
* script={
* <js>"alert('hello!');"</js>
@@ -425,7 +425,7 @@
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* properties={
* <ja>@Property</ja>(name=HtmlDocSerializer.<jsf>HTMLDOC_style</jsf>,
* value=<js>"h3 { color: red; }\nh5 { font-weight: bold; }"</js>)
@@ -434,9 +434,9 @@
* </p>
*
* <p>
- * A shortcut on <ja>@RestResource</ja> is also provided for this setting:
+ * A shortcut on <ja>@Rest</ja> is also provided for this setting:
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* htmldoc=@HtmlDoc(
* style={
* <js>"h3 { color: red; }"</js>,
@@ -469,7 +469,7 @@
* Adds a link to the specified stylesheet URL.
*
* <p>
- * Note that this stylesheet is controlled by the <code><ja>@RestResource</ja>.stylesheet()</code> annotation.
+ * Note that this stylesheet is controlled by the <code><ja>@Rest</ja>.stylesheet()</code> annotation.
*/
public static final String HTMLDOC_stylesheet = PREFIX + ".stylesheet.ls";
@@ -499,7 +499,7 @@
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* htmldoc=@HtmlDoc(
* template=MySpecialDocTemplate.<jk>class</jk>
* )
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 d5815f4..46b182b 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
@@ -369,7 +369,7 @@
* Adds a link to the specified stylesheet URL.
*
* <p>
- * Note that this stylesheet is controlled by the <code><ja>@RestResource</ja>.stylesheet()</code> annotation.
+ * Note that this stylesheet is controlled by the <code><ja>@Rest</ja>.stylesheet()</code> annotation.
*
* @param value
* The new value for this property.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfig.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfig.java
index b3ae95f..beee09a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfig.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfig.java
@@ -477,7 +477,7 @@
* Adds a link to the specified stylesheet URL.
*
* <p>
- * Note that this stylesheet is controlled by the <code><ja>@RestResource</ja>.stylesheet()</code> annotation.
+ * Note that this stylesheet is controlled by the <code><ja>@Rest</ja>.stylesheet()</code> annotation.
*
* <ul class='notes'>
* <li>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Body.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Body.java
index 040502d..a610412 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Body.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Body.java
@@ -339,7 +339,7 @@
* Examples can also be specified via generic properties as well using the {@link BeanContext#BEAN_examples} property at either the class or method level.
* <p class='bcode w800'>
* <jc>// Examples defined at class level.</jc>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* properties={
* <ja>@Property</ja>(
* name=<jsf>BEAN_examples</jsf>,
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Contact.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Contact.java
index 8835243..5ebc38b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Contact.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Contact.java
@@ -23,12 +23,12 @@
* The contact information for the exposed API.
*
* <p>
- * Used to populate the auto-generated Swagger documentation and UI for server-side <ja>@RestResource</ja>-annotated classes.
+ * Used to populate the auto-generated Swagger documentation and UI for server-side <ja>@Rest</ja>-annotated classes.
*
* <h5 class='section'>Examples:</h5>
* <p class='bcode w800'>
* <jc>// Normal</jc>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* swagger=<ja>@ResourceSwagger</ja>(
* contact=<ja>@Contact</ja>(
* name=<js>"Juneau Development Team"</js>,
@@ -40,7 +40,7 @@
* </p>
* <p class='bcode w800'>
* <jc>// Free-form</jc>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* swagger=<ja>@ResourceSwagger</ja>(
* contact=<ja>@Contact</ja>({
* <js>"name:'Juneau Development Team',"</js>,
@@ -119,7 +119,7 @@
* The following are completely equivalent ways of defining the swagger description of the contact information:
* <p class='bcode w800'>
* <jc>// Normal</jc>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* swagger=<ja>@ResourceSwagger</ja>(
* contact=<ja>@Contact</ja>(
* name=<js>"Juneau Development Team"</js>,
@@ -131,7 +131,7 @@
* </p>
* <p class='bcode w800'>
* <jc>// Free-form</jc>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* swagger=<ja>@ResourceSwagger</ja>(
* contact=<ja>@Contact</ja>({
* <js>"name: 'Juneau Development Team',"</js>,
@@ -143,7 +143,7 @@
* </p>
* <p class='bcode w800'>
* <jc>// Free-form with variables</jc>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* swagger=<ja>@ResourceSwagger</ja>(
* contact=<ja>@Contact</ja>(<js>"$L{contactSwagger}"</js>)
* )
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/License.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/License.java
index fb9650e..3e3d634 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/License.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/License.java
@@ -23,12 +23,12 @@
* License information for the exposed API.
*
* <p>
- * Used to populate the auto-generated Swagger documentation and UI for server-side <ja>@RestResource</ja>-annotated classes.
+ * Used to populate the auto-generated Swagger documentation and UI for server-side <ja>@Rest</ja>-annotated classes.
*
* <h5 class='section'>Examples:</h5>
* <p class='bcode w800'>
* <jc>// Normal</jc>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* swagger=<ja>@ResourceSwagger</ja>(
* license=<ja>@License</ja>(
* name=<js>"Apache 2.0"</js>,
@@ -39,7 +39,7 @@
* </p>
* <p class='bcode w800'>
* <jc>// Free-form</jc>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* swagger=<ja>@ResourceSwagger</ja>(
* license=<ja>@License</ja>({
* <js>"name:'Apache 2.0',"</js>,
@@ -94,7 +94,7 @@
* The following are completely equivalent ways of defining the swagger description of the license information:
* <p class='bcode w800'>
* <jc>// Normal</jc>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* swagger=<ja>@ResourceSwagger</ja>(
* license=<ja>@License</ja>(
* name=<js>"Apache 2.0"</js>,
@@ -105,7 +105,7 @@
* </p>
* <p class='bcode w800'>
* <jc>// Free-form</jc>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* swagger=<ja>@ResourceSwagger</ja>(
* license=<ja>@License</ja>({
* <js>"name: 'Apache 2.0',"</js>,
@@ -116,7 +116,7 @@
* </p>
* <p class='bcode w800'>
* <jc>// Free-form with variables</jc>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* swagger=<ja>@ResourceSwagger</ja>(<js>"$L{licenseSwagger}"</js>)
* )
* </p>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Response.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Response.java
index 41f9550..cf06ff0 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Response.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Response.java
@@ -217,7 +217,7 @@
* Examples can also be specified via generic properties as well using the {@link BeanContext#BEAN_examples} property at either the class or method level.
* <p class='bcode w800'>
* <jc>// Examples defined at class level.</jc>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* properties={
* <ja>@Property</ja>(
* name=<jsf>BEAN_examples</jsf>,
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Tag.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Tag.java
index 8a3207a..0a0eb51 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Tag.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Tag.java
@@ -26,12 +26,12 @@
* It is not mandatory to have a Tag Object per tag used there.
*
* <p>
- * Used to populate the auto-generated Swagger documentation and UI for server-side <ja>@RestResource</ja>-annotated classes.
+ * Used to populate the auto-generated Swagger documentation and UI for server-side <ja>@Rest</ja>-annotated classes.
*
* <h5 class='section'>Examples:</h5>
* <p class='bcode w800'>
* <jc>// A response object thats a hex-encoded string</jc>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* swagger={
* tags={
* <ja>@Tag</ja>(
@@ -44,7 +44,7 @@
* </p>
* <p class='bcode w800'>
* <jc>// Free-form</jc>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* swagger={
* tags={
* <ja>@Tag</ja>({
@@ -113,7 +113,7 @@
* The following are completely equivalent ways of defining the swagger description of the resource tags:
* <p class='bcode w800'>
* <jc>// Normal</jc>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* tags={
* <ja>@Tag</ja>(
* name=<js>"pet"</js>,
@@ -128,7 +128,7 @@
* </p>
* <p class='bcode w800'>
* <jc>// Free-form</jc>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* tags={
* <ja>@Tag</ja>(
* name=<js>"pet"</js>,
@@ -146,7 +146,7 @@
* </p>
* <p class='bcode w800'>
* <jc>// Free-form with variables</jc>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* tags={
* <ja>@Tag</ja>(
* name=<js>"pet"</js>,
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
index f0b7eee..3e34f7a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
@@ -223,7 +223,7 @@
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Don't generate schema for any prototype packages or the class named 'Swagger'.
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* properties={
* <ja>@Property</ja>(name=<jsf>JSONSCHEMA_ignoreTypes</jsf>, value=<js>"Swagger,*.proto.*"</js>)
* }
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 696e5ed..1c0764e 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
@@ -246,7 +246,7 @@
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Don't generate schema for any prototype packages or the class named 'Swagger'.
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* properties={
* <ja>@Property</ja>(name=<jsf>JSONSCHEMA_ignoreTypes</jsf>, value=<js>"Swagger,*.proto.*"</js>)
* }
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/ExternalDocs.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/ExternalDocs.java
index f43fb7e..643fd07 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/ExternalDocs.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/ExternalDocs.java
@@ -23,12 +23,12 @@
* Allows referencing an external resource for extended documentation.
*
* <p>
- * Used to populate the auto-generated Swagger documentation and UI for server-side <ja>@RestResource</ja>-annotated classes.
+ * Used to populate the auto-generated Swagger documentation and UI for server-side <ja>@Rest</ja>-annotated classes.
*
* <h5 class='section'>Examples:</h5>
* <p class='bcode w800'>
* <jc>// Normal</jc>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* swagger=<ja>@ResourceSwagger</ja>(
* externalDocs=<ja>@ExternalDocs</ja>(
* description=<js>"Apache Juneau"</js>,
@@ -39,7 +39,7 @@
* </p>
* <p class='bcode w800'>
* <jc>// Free-form</jc>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* swagger=<ja>@ResourceSwagger</ja>(
* contact=<ja>@ExternalDocs</ja>({
* <js>"description:'Apache Juneau',"</js>,
@@ -103,7 +103,7 @@
* The following are completely equivalent ways of defining the swagger description of documentation:
* <p class='bcode w800'>
* <jc>// Normal</jc>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* swagger=<ja>@ResourceSwagger</ja>(
* externalDocs=<ja>@ExternalDocs</ja>(
* description=<js>"Find out more about Juneau"</js>,
@@ -114,7 +114,7 @@
* </p>
* <p class='bcode w800'>
* <jc>// Free-form</jc>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* swagger=<ja>@ResourceSwagger</ja>(
* externalDocs=<ja>@ExternalDocs</ja>({
* <js>"description: 'Find out more about Juneau',"</js>,
@@ -125,7 +125,7 @@
* </p>
* <p class='bcode w800'>
* <jc>// Free-form with variables</jc>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* swagger=<ja>@ResourceSwagger</ja>(
* externalDocs=<ja>@ExternalDocs</ja>(<js>"$L{externalDocsSwagger}"</js>)
* )
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/Items.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/Items.java
index dab267e..64fcc56 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/Items.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/Items.java
@@ -25,7 +25,7 @@
* A limited subset of JSON-Schema's items object.
*
* <p>
- * Used to populate the auto-generated Swagger documentation and UI for server-side <ja>@RestResource</ja>-annotated classes.
+ * Used to populate the auto-generated Swagger documentation and UI for server-side <ja>@Rest</ja>-annotated classes.
* <br>Also used to define OpenAPI schema information for POJOs serialized through {@link OpenApiSerializer} and parsed through {@link OpenApiParser}.
*
* <h5 class='section'>Examples:</h5>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/Schema.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/Schema.java
index b219d4f..e5944f8 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/Schema.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/Schema.java
@@ -29,7 +29,7 @@
* On top of this subset, there are extensions provided by this specification to allow for more complete documentation.
*
* <p>
- * Used to populate the auto-generated Swagger documentation and UI for server-side <ja>@RestResource</ja>-annotated classes.
+ * Used to populate the auto-generated Swagger documentation and UI for server-side <ja>@Rest</ja>-annotated classes.
* <br>Also used to define OpenAPI schema information for POJOs serialized through {@link OpenApiSerializer} and parsed through {@link OpenApiParser}.
*
* <h5 class='section'>Examples:</h5>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.05.html b/juneau-doc/docs/ReleaseNotes/5.0.0.05.html
index 2b37c61..b19f07a 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.05.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.05.html
@@ -22,7 +22,7 @@
<li>New <c><ja>@RestChild</ja></c> annotation for identifying child resources.</li>
<li>
New <c>traversable</c> and <c>filterable</c> attributes added to {@link oajr.annotation.RestMethod @RestMethod} annotation.<br>
- Eliminates the need for <c>PojoResource</c> and <c>FilteredRestResource</c> classes.
+ Eliminates the need for <dc>PojoResource</dc> and <dc>FilteredRestResource</dc> classes.
</li>
<li>Simplified client API. Easier to use when making multiple connections to the same server.</li>
<li>Support for pluggable authentication in the client API.</li>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.07.html b/juneau-doc/docs/ReleaseNotes/5.0.0.07.html
index 2da379c..43e890f 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.07.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.07.html
@@ -128,10 +128,10 @@
<li>
Several new annotations on REST servlets:
<ul>
- <li><c>@RestResource(filters)</c> - Associate post-formatting filters on a resource level.</li>
- <li>{@link oajr.annotation.RestResource#guards() @RestResource.guards} - Associate resource-level guards.</li>
- <li>{@link oajr.annotation.RestResource#messages() @RestResource.messages} - Associate a resource bundle with a REST servlet. Comes with several convenience methods for looking up messages for the client locale.</li>
- <li>{@link oajr.annotation.RestResource#properties() @RestResource.properties} - Override default bean context, serializer, and parser properties though an annotation.</li>
+ <li><dc>@RestResource(filters)</cc> - Associate post-formatting filters on a resource level.</li>
+ <li><dc>@RestResource.guards</dc> - Associate resource-level guards.</li>
+ <li><dc>@RestResource.messages</dc> - Associate a resource bundle with a REST servlet. Comes with several convenience methods for looking up messages for the client locale.</li>
+ <li><dc>@RestResource.properties</dc> - Override default bean context, serializer, and parser properties though an annotation.</li>
</ul>
</li>
<li>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.09.html b/juneau-doc/docs/ReleaseNotes/5.0.0.09.html
index 12aff30..fbfb4d8 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.09.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.09.html
@@ -36,7 +36,7 @@
<h5 class='topic w800'>REST server API changes</h5>
<ul class='spaced-list'>
<li>Build-in default <c>OPTIONS</c> pages.</li>
- <li>New {@link oajr.annotation.RestResource#defaultRequestHeaders() @RestResource.defaultRequestHeaders} and {@link oajr.annotation.RestResource#defaultResponseHeaders() @RestResource.defaultResponseHeaders} annotations.</li>
+ <li>New <dc>@RestResource.defaultRequestHeaders</dc> and <dc>@RestResource.defaultResponseHeaders</dc> annotations.</li>
<li>New {@link oajr.annotation.RestMethod#serializers() @RestMethod(serializers)} and {@link oajr.annotation.RestMethod#parsers() @RestMethod(parsers)} annotations.</li>
<li>New {@link oajr.annotation.RestMethod#properties() @RestMethod(properties)} annotation.</li>
<li>New {@link oajr.annotation.RestMethod#defaultRequestHeaders() @RestMethod(defaultRequestHeaders)} annotation.</li>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.10.html b/juneau-doc/docs/ReleaseNotes/5.0.0.10.html
index 67554e5..7617695 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.10.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.10.html
@@ -26,7 +26,7 @@
<h5 class='topic w800'>REST server API changes</h5>
<ul class='spaced-list'>
<li>New <c>RestServletProperties</c> class that defines all the class-level properties that can be set on the servlet.</li>
- <li>Properties can be set through {@link oajr.annotation.RestResource#properties() @RestResource.properties} annotation, or new <dc>RestServlet.setProperty(String,Object)</dc> method.</li>
+ <li>Properties can be set through <dc>@RestResource.propertie</dc> annotation, or new <dc>RestServlet.setProperty(String,Object)</dc> method.</li>
<li>New <js>"?noTrace"</js> URL parameter to prevent stack traces from being logged (for JUnit testing of error conditions).</li>
<li>New <c>RestServletProperties.REST_useStackTraceHashes</c> property to prevent the same stack trace from being logged multiple times.</li>
<li>New <c>RestServletProperties.REST_renderResponseStackTraces</c> property for preventing stack traces in responses for security reasons.</li>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.20.html b/juneau-doc/docs/ReleaseNotes/5.0.0.20.html
index f88a7b8..0528882 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.20.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.20.html
@@ -37,7 +37,7 @@
<h5 class='topic w800'>REST server API changes</h5>
<ul class='spaced-list'>
<li>
- Allow inheritance of {@link oajr.annotation.RestResource @RestResource} annotation.<br>
+ Allow inheritance of <dc>@RestResource</dc> annotation.<br>
Serializers, parsers, filters, properties , guards, and converters definitions are automatically inherited from parent classes and interfaces.
</li>
<li>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.26.html b/juneau-doc/docs/ReleaseNotes/5.0.0.26.html
index 8f7c781..c38e07d 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.26.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.26.html
@@ -24,8 +24,8 @@
</li>
<li>
Changed the way child REST resources are defined.<br>
- Eliminated the <ja>@RestChild</ja> annotation on getter methods and replaced it with {@link oajr.annotation.RestResource#children() @RestResource(children)} defined on the resource class itself.<br>
- Child resource paths are specified through {@link oajr.annotation.RestResource#path() @RestResource(path)}.
+ Eliminated the <ja>@RestChild</ja> annotation on getter methods and replaced it with <dc>@RestResource(children)</dc> defined on the resource class itself.<br>
+ Child resource paths are specified through <dc>@RestResource(path)</dc>.
</li>
<li>
New <dc>ChildResourceDescriptions</dc> bean for automatically generating the contents of router resource pages.
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.05.html b/juneau-doc/docs/ReleaseNotes/5.1.0.05.html
index f2bf551..cdbac9b 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.05.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.05.html
@@ -20,7 +20,7 @@
</p>
<ul class='spaced-list'>
<li>New <dc>Redirect</dc> class that simplifies performing redirections in REST methods.
- <li>New pluggable {@link oajr.ResponseHandler} class and {@link oajr.annotation.RestResource#responseHandlers() @RestResource(responseHandlers)} annotation
+ <li>New pluggable {@link oajr.ResponseHandler} class and <dc>@RestResource(responseHandlers)</dc> annotation
for defining customer response handlers for special kinds of POJOs.
<li>New method <dc>UrlEncodingSerializer.serializeUrlPart(Object)</dc> method.
<li>New method <dc>RestRequest.getServletURIBuilder()</dc> for construcing servlet-based URLs more efficiently.
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.13.html b/juneau-doc/docs/ReleaseNotes/5.1.0.13.html
index 8b6ea81..5b42e7c 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.13.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.13.html
@@ -35,7 +35,7 @@
<ul class='spaced-list'>
<li>{@link oajr.RestConverter} API fixed to handle the existence of POJO filters.
{@link oajr.converters.Introspectable}/{@link oajr.converters.Queryable}/{@link oajr.converters.Traversable} classes can now work with filtered POJOs.
- <li>{@link oajr.annotation.RestResource#messages() @RestResource(messages)} annotation can now be defined on super and subclasses so that NLS messages can be defined in multiple resource bundles.
+ <li><dc>@RestResource(messages)</dc> annotation can now be defined on super and subclasses so that NLS messages can be defined in multiple resource bundles.
<li>Performance improvements in <c>RestServletNls</c> class.
<li>Fixed bug where two REST java methods mapped to the same path pattern wasn't triggering an exception when it was supposed to.
</ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.17.html b/juneau-doc/docs/ReleaseNotes/5.1.0.17.html
index bdb8197..dca2cc1 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.17.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.17.html
@@ -40,7 +40,7 @@
<li><dc>StringVarResolver</dc> now has support for chained resolvers.
<li><dc>StringVarResolver</dc> now resolves variables inside resolved values.
i.e. if a resolved variable value itself contains a variable, it now resolves that variable too.
- <li>Fixed bug where inner interface classes being used in <c>RestResource.filters()</c> were being
+ <li>Fixed bug where inner interface classes being used in <dc>RestResource.filters()</dc> were being
interpreted as surrogate classes because they have hidden 1-arg constructors due to being inner classes.
<li>Fixed bug in {@link oaj.internal.MultiSet} where exception was being thrown if last set was empty.
<li>New {@link oaj.utils.ZipFileList} class for providing efficiently zipped directories through the REST interface.
@@ -107,7 +107,7 @@
want to provide labels in resource bundles.
<ul>
<li><dc>RestResource.label()</dc>
- <li>{@link oajr.annotation.RestResource#description() @RestResource(description)}
+ <li><dc>@RestResource(description)</dc>
<li>{@link oajr.annotation.RestMethod#description() @RestMethod(description)}
<li><dc>RestMethod#responses()</dc>
<li><dc>Attr.description()</dc>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.20.html b/juneau-doc/docs/ReleaseNotes/5.1.0.20.html
index 62dd99d..4e2f049 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.20.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.20.html
@@ -86,7 +86,7 @@
<li>New {@link oajr.annotation.RestMethod#encoders() @RestMethod(encoders)} and
<dc>RestMethod.inheritEncoders()</dc> annotations.
Allows encoders to be fine-tuned at the method level.
- <li>New {@link oajr.annotation.RestResource#config() @RestResource(config)} annotation for associating external <dc>ConfigFile</dc> config files with servlets.
+ <li>New <dc>@RestResource(config)</dc> annotation for associating external <dc>ConfigFile</dc> config files with servlets.
<li><dc>ResourceLink</dc>.
<li>New <c>org.apache.juneau.rest.matchers</c> package for commonly-used {@link oajr.RestMatcher RestMatchers}:
<ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.2.0.0.html b/juneau-doc/docs/ReleaseNotes/5.2.0.0.html
index e01ac1f..9e17dc5 100644
--- a/juneau-doc/docs/ReleaseNotes/5.2.0.0.html
+++ b/juneau-doc/docs/ReleaseNotes/5.2.0.0.html
@@ -341,7 +341,7 @@
</ul>
<li>New methods in {@link oajr.RestServlet}:
<ul>
- <li><dc>RestServlet.getChildClasses()</dc> - Programmatic equivalent to {@link oajr.annotation.RestResource#children() @RestResource(children)} annotation.
+ <li><dc>RestServlet.getChildClasses()</dc> - Programmatic equivalent to <dc>@RestResource(children)</dc> annotation.
<li><dc>RestServlet.shouldLog(HttpServletRequest,HttpServletResponse,RestException)</dc>
<li><dc>RestServlet.shouldLogStackTrace(HttpServletRequest,HttpServletResponse,RestException)</dc>
<li><dc>RestServlet.logObjects(Level,String,Object[])</dc>
@@ -355,12 +355,12 @@
from {@link oajr.BasicRestServlet} and <dc>RestServletJenaDefault</dc>.
These may represent a security risk if not handled correctly, so removed
them as a precaution.
- <li>Removed <c>RestServletProperties.REST_htDocsFolder</c>. Replaced with {@link oajr.annotation.RestResource#staticFiles() @RestResource(staticFiles)}.
- <li>New annotations on {@link oajr.annotation.RestResource @RestResource}.
+ <li>Removed <c>RestServletProperties.REST_htDocsFolder</c>. Replaced with <dc>@RestResource(staticFiles)</dc>}.
+ <li>New annotations on <dc>@RestResource</dc>.
<ul>
<li><dc>RestResource.stylesheet()</dc>
<li><dc>RestResource.favicon()</dc>
- <li>{@link oajr.annotation.RestResource#staticFiles() @RestResource(staticFiles)}
+ <li><dc>@RestResource(staticFiles)</dc>
</ul>
<li>Eliminated <c>org.apache.juneau.rest.jaxrs.JsonProvider</c> class.
Some JAX-RS implementations use code scanning to find providers, so if you were using <c>DefaultJenaProvider</c>, it would
diff --git a/juneau-doc/docs/ReleaseNotes/6.0.0.html b/juneau-doc/docs/ReleaseNotes/6.0.0.html
index bc8b9cc..6425a4d 100644
--- a/juneau-doc/docs/ReleaseNotes/6.0.0.html
+++ b/juneau-doc/docs/ReleaseNotes/6.0.0.html
@@ -122,8 +122,8 @@
<li>Eliminated <c>ResourceOptions</c> and related code.
<li>New annotations and related methods:
<ul>
- <li>{@link oajr.annotation.RestResource#title() @RestResource(title)} / {@link oajr.RestInfoProvider#getTitle(RestRequest)}
- <li>{@link oajr.annotation.RestResource#description() @RestResource(description)} / {@link oajr.RestInfoProvider#getDescription(RestRequest)}
+ <li><dc>@RestResource(title)</dc> / {@link oajr.RestInfoProvider#getTitle(RestRequest)}
+ <li><dc>@RestResource(description)</dc> / {@link oajr.RestInfoProvider#getDescription(RestRequest)}
<li><dc>@RestResource(termsOfService)</dc> / <dc>RestInfoProvider.getTermsOfService(RestRequest)</dc>
<li><dc>@RestResource(contact)</dc> / <dc>RestInfoProvider.getContact(RestRequest)</dc>
<li><dc>@RestResource(license)</dc> / <dc>RestInfoProvider.getLicense(RestRequest)</dc>
@@ -161,7 +161,7 @@
</li>
<li>New client-version annotations:
<ul>
- <li>{@link oajr.annotation.RestResource#clientVersionHeader} - The name of the header used to identify the client version.
+ <li><dc>RestResource.clientVersionHeader</dc> - The name of the header used to identify the client version.
<li>{@link oajr.annotation.RestMethod#clientVersion} - The client version range applied to a Java method.
</ul>
</li>
diff --git a/juneau-doc/docs/ReleaseNotes/6.2.0.html b/juneau-doc/docs/ReleaseNotes/6.2.0.html
index a495957..73e303c 100644
--- a/juneau-doc/docs/ReleaseNotes/6.2.0.html
+++ b/juneau-doc/docs/ReleaseNotes/6.2.0.html
@@ -113,7 +113,7 @@
<h5 class='topic w800'>org.apache.juneau.rest</h5>
<ul class='spaced-list'>
- <li>{@link oajr.annotation.RestResource @RestResource} annotation can now be applied to
+ <li><dc>@RestResource</dc> annotation can now be applied to
any class! You're no longer restricted to subclassing your resources from {@link oajr.RestServlet}.
<br>This is a major enhancement in the API. Anything you could do by subclassing from <c>RestServlet</c>
should have an equivalent for non-<c>RestServlet</c> classes.
@@ -143,19 +143,19 @@
<li><dc><jk>public</jk> init(RestConfig)</dc>
<li><dc><jk>public</jk> init(RestContext)</dc>
</ul>
- <li>New annotations added to {@link oajr.annotation.RestResource @RestResource} to allow non-<c>RestServlet</c>
+ <li>New annotations added to <dc>@RestResource</dc> to allow non-<c>RestServlet</c>
resources to do the same as subclassing directly from <c>RestServlet</c>:
<ul>
- <li>{@link oajr.annotation.RestResource#resourceResolver() resourceResolver()}
+ <li><dc>RestResource.resourceResolver()</dc>
- Specify a {@link oajr.RestResourceResolver} class for resolving child resources.
- <li>{@link oajr.annotation.RestResource#callHandler() callHandler()}
+ <li><dc>RestResource.callHandler()</dc>
- Specify a {@link oajr.RestCallHandler} class for handling the lifecycle of a REST call.
- <li>{@link oajr.annotation.RestResource#infoProvider() infoProvider()}
+ <li><dc>RestResource.infoProvider()</dc>
- Specify a {@link oajr.RestInfoProvider} class for customizing title/description/Swagger information on a REST resource.
- <li>{@link oajr.annotation.RestResource#logger() logger()}
+ <li><dc>RestResource.logger()</dc>
- Specify a {@link oajr.RestLogger} class for handling logging.
</ul>
- <li>New annotations added to {@link oajr.annotation.RestResource @RestResource} and {@link oajr.annotation.RestMethod @RestMethod}
+ <li>New annotations added to <dc>@RestResource</dc> and {@link oajr.annotation.RestMethod @RestMethod}
to simplify defining page title, text, and links on HTML views:
<ul>
<li><dc>@RestResource(pageTitle)</dc>
diff --git a/juneau-doc/docs/ReleaseNotes/6.3.0.html b/juneau-doc/docs/ReleaseNotes/6.3.0.html
index 63f7871..98e8184 100644
--- a/juneau-doc/docs/ReleaseNotes/6.3.0.html
+++ b/juneau-doc/docs/ReleaseNotes/6.3.0.html
@@ -128,11 +128,11 @@
<ul>
<li>{@link oaj.serializer.SerializerListener}
<li>{@link oaj.serializer.SerializerBuilder#listener(Class)}
- <li>{@link oajr.annotation.RestResource#serializerListener() @RestResource(serializerListener)}
+ <li><dc>@RestResource(serializerListener)</dc>
<li><dc>RestConfig.serializerListener(Class)</dc>
<li>{@link oaj.parser.ParserListener}
<li>{@link oaj.parser.ParserBuilder#listener(Class)}
- <li>{@link oajr.annotation.RestResource#parserListener() @RestResource(parserListener)}
+ <li><dc> @RestResource(parserListener)</dc>
<li><dc>RestConfig.parserListener(Class)</dc>
<li><dc>RestClientBuilder.listeners(Class,Class)</dc>
</ul>juneau-examples-core.import1.pngjuneau-examples-core.import1.png
@@ -285,7 +285,7 @@
)
</p>
<li>
- A new annotation {@link oajr.annotation.RestResource#paramResolvers() @RestResource(paramResolvers)}
+ A new annotation <dc>@RestResource(paramResolvers)</dc>}
that allows you to define your own custom Java method parameter resolvers.
<li>
Fixed bug where Writer returned by {@link oajr.RestResponse#getWriter()} was not being flushed automatically
@@ -306,13 +306,13 @@
<li><dc>@FormData(def)</dc> - Default form data parameter value.
</ul>
<li>
- New attributes on {@link oajr.annotation.RestResource @RestResource}:
+ New attributes on <dc>@RestResource</dc>:
<ul>
- <li>{@link oajr.annotation.RestResource#serializerListener() serializerListener()}
- <li>{@link oajr.annotation.RestResource#parserListener() parserListener()}
+ <li><dc>serializerListener()</dc>
+ <li><dc>parserListener()</dc>
<li><dc>widgets()</dc>
- <li>{@link oajr.annotation.RestResource#swagger() swagger()}
- <li>{@link oajr.annotation.RestResource#htmldoc() htmldoc()}
+ <li><dc>swagger()</dc>
+ <li><dc>htmldoc()</dc>
</ul>
<li>
New attributes on {@link oajr.annotation.RestMethod @RestMethod}:
diff --git a/juneau-doc/docs/ReleaseNotes/6.3.1.html b/juneau-doc/docs/ReleaseNotes/6.3.1.html
index 043c597..d35439a 100644
--- a/juneau-doc/docs/ReleaseNotes/6.3.1.html
+++ b/juneau-doc/docs/ReleaseNotes/6.3.1.html
@@ -117,7 +117,7 @@
</li>
<li>
Declaration of widgets moved to {@link oajr.annotation.HtmlDoc#widgets() @HtmlDoc(widgets)}
- instead of separately on <ja>@RestResource</ja> and <ja>@RestMethod</ja> annotations.
+ instead of separately on <dc>@RestResource</dc> and <ja>@RestMethod</ja> annotations.
<li>
{@link oajr.widget.Widget#getName()} now defaults to the simple class name.
<br>So now you can just refer to the class name: <js>"$W{ContentTypeMenuItem}"</js>.
@@ -165,13 +165,13 @@
<li>
Annotations added:
<ul>
- <li>{@link oajr.annotation.RestResource#siteName() @RestResource(siteName)}
- <li>{@link oajr.annotation.RestResource#flags() @RestResource(flags)}
+ <li><dc>@RestResource(siteName)</dc>
+ <li><dc>@RestResource(flags)</dc>
<li>{@link oajr.annotation.RestMethod#flags() @RestMethod(flags)}
</ul>
</li>
<li>
- Eliminated the <c>@RestResource(stylesheet)</c> annotation.
+ Eliminated the <dc>@RestResource(stylesheet)</dc> annotation.
It's no longer needed now that you can easily specify styles via <ja>@Htmldoc</ja>.
<li>
Eliminated the following annotations since they are now redundant with {@link oajr.annotation.HtmlDoc#header() @HtmlDoc(header)}:
diff --git a/juneau-doc/docs/ReleaseNotes/6.4.0.html b/juneau-doc/docs/ReleaseNotes/6.4.0.html
index 0c830e9..fa2708e 100644
--- a/juneau-doc/docs/ReleaseNotes/6.4.0.html
+++ b/juneau-doc/docs/ReleaseNotes/6.4.0.html
@@ -407,26 +407,26 @@
{@link oajr.RestResourceResolver} instances are now inherited from parent resources to child resources
unless explicitly overridden at the child level.
<br>It's also been changed to an interface.
- <li>New annotations on {@link oajr.annotation.RestResource @RestResource}:
+ <li>New annotations on <dc>@RestResource</dc>:
<ul>
- <li>{@link oajr.annotation.RestResource#resourceResolver() resourceResolver()}
+ <li><dc>resourceResolver()</dc>
<br>Allows you to specify a resource resolver on the servlet context to make it easier to work with
dependency injection frameworks.
- <li><dc>RestResource.contextPath()</dc> -
+ <li><dc>contextPath()</dc> -
<br>Allows you to override the context path value inherited from the servlet container.
- <li>{@link oajr.annotation.RestResource#allowHeaderParams() allowHeaderParams()} -
+ <li><dc>allowHeaderParams()</dc> -
<br>Replaces the <c>RestContext.REST_allowHeaderParams</c> setting.
- <li><dc>RestResource.allowMethodParam()</dc> -
+ <li><dc>allowMethodParam()</dc> -
<br>Replaces the <c>RestContext.REST_allowMethodParam</c> setting.
- <li>{@link oajr.annotation.RestResource#allowBodyParam() allowBodyParam()} -
+ <li><dc>allowBodyParam()</dc> -
<br>Replaces the <c>RestContext.REST_allowBodyParam</c> setting.
- <li>{@link oajr.annotation.RestResource#renderResponseStackTraces() renderResponseStackTraces()} -
+ <li><dc>renderResponseStackTraces()</dc> -
<br>Replaces the <c>RestContext.REST_xxx</c> setting.
- <li>{@link oajr.annotation.RestResource#useStackTraceHashes() useStackTraceHashes()} -
+ <li><dc>useStackTraceHashes()</dc> -
<br>Replaces the <c>RestContext.REST_useStackTraceHashes</c> setting.
- <li>{@link oajr.annotation.RestResource#defaultCharset() defaultCharset()} -
+ <li><dc>defaultCharset()</dc> -
<br>Replaces the <c>RestContext.REST_defaultCharset</c> setting.
- <li><dc>RestResource.paramFormat()</dc> -
+ <li><dc>paramFormat()</dc> -
<br>Replaces the <c>RestContext.REST_paramFormat</c> setting.
</ul>
<li>New annotations on {@link oajr.annotation.RestMethod @RestMethod}:
diff --git a/juneau-doc/docs/ReleaseNotes/7.0.1.html b/juneau-doc/docs/ReleaseNotes/7.0.1.html
index 16fe7df..4811591 100644
--- a/juneau-doc/docs/ReleaseNotes/7.0.1.html
+++ b/juneau-doc/docs/ReleaseNotes/7.0.1.html
@@ -63,7 +63,7 @@
<h5 class='topic w800'>juneau-rest-server</h5>
<ul class='spaced-list'>
<li>
- New {@link oajr.annotation.RestResource#maxInput() @RestResource(maxInput)} and
+ New <dc>@RestResource(maxInput)</dc> and
{@link oajr.annotation.RestMethod#maxInput() @RestMethod(maxInput)} for alleviating
potential DoS attacks.
</ul>
diff --git a/juneau-doc/docs/ReleaseNotes/7.1.0.html b/juneau-doc/docs/ReleaseNotes/7.1.0.html
index e6ccc9c..86918b4 100644
--- a/juneau-doc/docs/ReleaseNotes/7.1.0.html
+++ b/juneau-doc/docs/ReleaseNotes/7.1.0.html
@@ -294,7 +294,7 @@
<li>
Support for static files has been simplified and improved.
<ul>
- <li>Syntax on {@link oajr.annotation.RestResource#staticFiles() @RestResource(staticFiles)} has been simplified, and
+ <li>Syntax on <dc>@RestResource(staticFiles)</dc> has been simplified, and
now allows you to specify response headers in the strings.
<li>Response headers for static files can also be configured through
{@link oajr.RestContext#REST_staticFileResponseHeaders REST_staticFileResponseHeaders}.
@@ -308,7 +308,7 @@
<br>You can now simply create a {@link oajr.RestMatcher} that has a public constructor that
takes in the server and method arguments.
<li>
- <c>@RestResource.allowMethodParam</c> renamed to {@link oajr.annotation.RestResource#allowedMethodParams}.
+ <dc>@RestResource.allowMethodParam</dc> renamed to <dc>RestResource.allowedMethodParams</dc>.
<li>
<c>@RestMethod.serializersInherit</c> and <c>@RestMethod.parsersInherit</c> replaced with
simplified <dc>@RestMethod(inherit)</dc>.
@@ -358,9 +358,9 @@
{@link oajr.RestRequest#getClasspathReaderResource(String) getClasspathReaderResource(String)}
</ul>
<li>
- Changes to {@link oajr.annotation.RestResource @RestResource}:
+ Changes to <dc>@RestResource</dc>
<ul>
- <li>New {@link oajr.annotation.RestResource#mimeTypes() mimeTypes()} annotation.
+ <li>New <dc>mimeTypes()</dc> annotation.
</ul>
<li>
Changes to {@link oajr.annotation.RestMethod @RestMethod}:
diff --git a/juneau-doc/docs/ReleaseNotes/7.2.0.html b/juneau-doc/docs/ReleaseNotes/7.2.0.html
index fdebc44..7e88bf6 100644
--- a/juneau-doc/docs/ReleaseNotes/7.2.0.html
+++ b/juneau-doc/docs/ReleaseNotes/7.2.0.html
@@ -258,7 +258,7 @@
<li>
Auto-generated {@doc juneau-rest-server.Swagger Swagger UI}.
<li>
- Simplified {@link oajr.annotation.RestResource#swagger() @RestResource(swagger)}
+ Simplified <dc>@RestResource(swagger)</dc>
and {@link oajr.annotation.RestMethod#swagger() @RestMethod(swagger)} annotations.
<li>
Fixed bug in <c>UriResolver</c> when request path info had special characters.
@@ -413,10 +413,10 @@
</ul>
<br>These can be used in the following locations:
<ul class='doctree'>
- <li class='ja'>{@link oajr.annotation.RestResource#serializers()}
- <li class='ja'>{@link oajr.annotation.RestResource#parsers()}
- <li class='ja'>{@link oajr.annotation.RestResource#beanFilters()}
- <li class='ja'>{@link oajr.annotation.RestResource#pojoSwaps()}
+ <li class='ja'><dc>RestResource.serializers()</dc>
+ <li class='ja'><dc>RestResource.parsers()</dc>
+ <li class='ja'><dc>RestResource.beanFilters()</dc>
+ <li class='ja'><dc>RestResource.pojoSwaps()</dc>
<li class='ja'>{@link oajr.annotation.RestMethod#serializers()}
<li class='ja'>{@link oajr.annotation.RestMethod#parsers()}
<li class='ja'>{@link oajr.annotation.RestMethod#beanFilters()}
@@ -475,10 +475,10 @@
<li>
New convenience annotations for specifying default <c>Accept</c> and <c>Content-Type</c> headers:
<ul class='doctree'>
- <li class='jc'>{@link oajr.annotation.RestResource}
+ <li class='jc'><dc>RestResource</dc>
<ul>
- <li class='jf'>{@link oajr.annotation.RestResource#defaultAccept defaultAccept}
- <li class='jf'>{@link oajr.annotation.RestResource#defaultContentType defaultContentType}
+ <li class='jf'><dc>defaultAccept</dc>
+ <li class='jf'><dc>defaultContentType</dc>
</ul>
<li class='jc'>{@link oajr.annotation.RestMethod}
<ul>
diff --git a/juneau-doc/docs/ReleaseNotes/8.0.0.html b/juneau-doc/docs/ReleaseNotes/8.0.0.html
index c49a382..dbc4d7a 100644
--- a/juneau-doc/docs/ReleaseNotes/8.0.0.html
+++ b/juneau-doc/docs/ReleaseNotes/8.0.0.html
@@ -97,7 +97,7 @@
<li class='jm'>{@link oajr.RestServlet#getPath() getPath()}
</ul>
<li>
- The registered resource resolver is now used to instantiate objects of classes defined via <ja>@RestResource</ja>.
+ The registered resource resolver is now used to instantiate objects of classes defined via <dc>@RestResource</dc>.
<br>This allows for any of those instance to be injectable beans.
</ul>
diff --git a/juneau-doc/docs/ReleaseNotes/8.1.0.html b/juneau-doc/docs/ReleaseNotes/8.1.0.html
index f6acfeb..dcda35f 100644
--- a/juneau-doc/docs/ReleaseNotes/8.1.0.html
+++ b/juneau-doc/docs/ReleaseNotes/8.1.0.html
@@ -28,7 +28,7 @@
<li>
<a href='#juneau-rest-server.Instantiation.BasicRest'>BasicRest</a>, <a href='#juneau-rest-server.Instantiation.BasicRestGroup'>BasicRestGroup</a> classes
<li>
- <a href='#juneau-rest-server.RestResource.RestResourcePath'>Path variables on resource paths</a>
+ <a href='#juneau-rest-server.Rest.RestPath'>Path variables on resource paths</a>
<li>
<a href='#juneau-rest-server.RestMethod.RequestAttributes'>Request Attributes API</a>
<li>
@@ -233,7 +233,7 @@
</ul>
<li class='ja'>{@link oajr.annotation.Attr}
<li class='ja'>{@link oajr.annotation.RestMethod#attrs()}
- <li class='ja'>{@link oajr.annotation.RestResource#attrs()}
+ <li class='ja'><dc>RestResource.attrs()</dc>
</ul>
<br>This deprecates the following APIs:
<ul class='javatree'>
@@ -260,10 +260,10 @@
<li>
New annotations for simplified role-based guards on classes and methods:
<ul class='javatree'>
- <li class='ja'>{@link oajr.annotation.RestResource}
+ <li class='ja'><dc>RestResource</dc>
<ul>
- <li class='jm'>{@link oajr.annotation.RestResource#roleGuard roleGuard()}
- <li class='jm'>{@link oajr.annotation.RestResource#rolesDeclared rolesDeclared()}
+ <li class='jm'><dc>roleGuard()</dc>
+ <li class='jm'><dc>rolesDeclared()</dc>
</ul>
<li class='ja'>{@link oajr.annotation.RestMethod}
<ul>
@@ -274,15 +274,15 @@
<li>
New annotations for fine-tuned handling of http-methods/http-headers as query parameters and others:
<ul class='javatree'>
- <li class='ja'>{@link oajr.annotation.RestResource}
+ <li class='ja'><dc>RestResource</dc>
<ul>
- <li class='jm'>{@link oajr.annotation.RestResource#allowedHeaderParams() allowedHeaderParams()}
- <li class='jm'>{@link oajr.annotation.RestResource#allowedMethodHeaders() allowedMethodHeaders()}
- <li class='jm'>{@link oajr.annotation.RestResource#allowedMethodParams() allowedMethodParams()}
+ <li class='jm'><dc>allowedHeaderParams()</dc>
+ <li class='jm'><dc>allowedMethodHeaders()}</dc>
+ <li class='jm'><dc>allowedMethodParams()</dc>
</ul>
</ul>
<li>
- The {@link oajr.annotation.RestResource#path() @RestResource(path)} annotation can now use variables:
+ The <dc>@RestResource(path)</dc> annotation can now use variables:
<p class='bcode'>
<ja>@RestResource</ja>(
path=<js>"/myResource/{foo}/{bar}"</js>
diff --git a/juneau-doc/docs/ReleaseNotes/8.1.1.html b/juneau-doc/docs/ReleaseNotes/8.1.1.html
index e7adc86..3eca936 100644
--- a/juneau-doc/docs/ReleaseNotes/8.1.1.html
+++ b/juneau-doc/docs/ReleaseNotes/8.1.1.html
@@ -81,13 +81,13 @@
</ul>
</ul>
<li>
- The <c>@RestResource(staticFiles)</c> annotation now supports absolute path locations and multiple mappings:
+ The <dc>@RestResource(staticFiles)</dc> annotation now supports absolute path locations and multiple mappings:
<p class='bpcode w800'>
<jc>// Resolves static files in root package "htdocs" or working directory "htdocs", and then relative package "htdocs".</jc>
<ja>@RestResource</ja>(staticFiles=<js>"htdocs:/htdocsfolder,htdocs:htdocs.package"</js>)
</p>
<li>
- Fixed a bug in <c>@RestResource(staticFiles)</c> where the order of lookup between parent and child resources
+ Fixed a bug in <dc>@RestResource(staticFiles)</dc> where the order of lookup between parent and child resources
was wrong.
</ul>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/07.ConfigurableAnnotations.html b/juneau-doc/docs/Topics/02.juneau-marshall/07.ConfigurableAnnotations.html
index c1f15a9..bf26c9b 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/07.ConfigurableAnnotations.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/07.ConfigurableAnnotations.html
@@ -25,7 +25,7 @@
</p>
<p class='bpcode w800'>
<jc>// Configuring serializers/parsers using @Property annotations.</jc>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/atom"</js>,
title=<js>"Sample ATOM feed resource"</js>,
properties={
@@ -46,7 +46,7 @@
</p>
<p class='bpcode w800'>
<jc>// Same as above but using specialized annotations.</jc>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/atom"</js>,
title=<js>"Sample ATOM feed resource"</js>
...
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/22.HtmlDetails/06.HtmlDocSerializer.html b/juneau-doc/docs/Topics/02.juneau-marshall/22.HtmlDetails/06.HtmlDocSerializer.html
index 8a887f3..b0dc46e 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/22.HtmlDetails/06.HtmlDocSerializer.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/22.HtmlDetails/06.HtmlDocSerializer.html
@@ -44,7 +44,7 @@
<jd>/**
* Sample REST resource that prints out a simple "Hello world!" message.
*/</jd>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/helloWorld"</js>,
htmldoc=<ja>@HtmlDoc</ja>(
navlinks={
diff --git a/juneau-doc/docs/Topics/04.juneau-dto/04.SwaggerUI.html b/juneau-doc/docs/Topics/04.juneau-dto/04.SwaggerUI.html
index 2b1bb2f..76c418a 100644
--- a/juneau-doc/docs/Topics/04.juneau-dto/04.SwaggerUI.html
+++ b/juneau-doc/docs/Topics/04.juneau-dto/04.SwaggerUI.html
@@ -53,7 +53,7 @@
generate the Swagger UI shown above:
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
<jc>// Allow OPTIONS requests to be simulated using ?method=OPTIONS query parameter.</jc>
allowedMethodParams=<js>"OPTIONS"</js>,
diff --git a/juneau-doc/docs/Topics/05.juneau-config/15.SystemDefaultConfig.html b/juneau-doc/docs/Topics/05.juneau-config/15.SystemDefaultConfig.html
index fb7b78e..880eb25 100644
--- a/juneau-doc/docs/Topics/05.juneau-config/15.SystemDefaultConfig.html
+++ b/juneau-doc/docs/Topics/05.juneau-config/15.SystemDefaultConfig.html
@@ -54,15 +54,15 @@
</ol>
<p>
Later in the section on REST resources, we describe how to associate configurations with REST resources
- using the {@link oajr.annotation.RestResource#config() @RestResource(config)} annotation.
+ using the {@link oajr.annotation.Rest#config() @Rest(config)} annotation.
The system default configuration can be referenced with the keyword <c>SYSTEM_DEFAULT</c> like so:
</p>
<p class='bpcode w800'>
<jc>// Always use system default.</jc>
- <ja>@RestResource</ja>(config=<js>"SYSTEM_DEFAULT"</js>)
+ <ja>@Rest</ja>(config=<js>"SYSTEM_DEFAULT"</js>)
<jc>// Use system property if set or the system default if not.</jc>
- <ja>@RestResource</ja>(config=<js>"$S{juneau.configFile,SYSTEM_DEFAULT}"</js>)
+ <ja>@Rest</ja>(config=<js>"$S{juneau.configFile,SYSTEM_DEFAULT}"</js>)
</p>
<p>
By default, all properties in the system default configuration are automatically set as system properties.
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/01.HelloWorldExample.html b/juneau-doc/docs/Topics/06.juneau-rest-server/01.HelloWorldExample.html
index 8617e77..796bb3d 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/01.HelloWorldExample.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/01.HelloWorldExample.html
@@ -16,7 +16,7 @@
Hello World Example
<p>
- A REST resource is simply a Java class annotated with {@link oajr.annotation.RestResource}.
+ A REST resource is simply a Java class annotated with {@link oajr.annotation.Rest}.
The most common case is a class that extends {@link oajr.RestServlet}, which itself is simply an
extension of {@link javax.servlet.http.HttpServlet} which allows it to be deployed as a servlet.
</p>
@@ -46,7 +46,7 @@
</p>
<p class='bpcode w800'>
<jc>// Sample REST resource that prints out a simple "Hello world!" message.</jc>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/helloWorld"</js>,
title=<js>"Hello World"</js>,
description=<js>"An example of the simplest-possible resource"</js>,
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/03.Instantiation.html b/juneau-doc/docs/Topics/06.juneau-rest-server/03.Instantiation.html
index e6ed925..5292299 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/03.Instantiation.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/03.Instantiation.html
@@ -28,7 +28,7 @@
<p>
<b>When deployed as a child of another resource, you MAY extend from one of the servlet classes but it's
not necessary.</b>
- The only requirement is that the class be annotated with <ja>@RestResource</ja> and have one of the following constructors:
+ The only requirement is that the class be annotated with <ja>@Rest</ja> and have one of the following constructors:
</p>
<ul class='javatree'>
<li class='jm'><c><jk>public</jk> T()</c>
@@ -42,7 +42,7 @@
</p>
<p class='bpcode w800'>
<jc>// Top level resource is deployed like any other servlet and must subclass from RestServlet.</jc>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/top"</js>,
children={
ChildResource.<jk>class</jk> <jc>// Accessed via URI "/top/child"</jc>
@@ -52,7 +52,7 @@
</p>
<p class='bpcode w800'>
<jc>// Child resources can inherit from RestServlet but it's not a requirement.</jc>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/child"</js>
)
<jk>public class</jk> ChildResource <jk>extends</jk> WhateverYouWant {...}
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/03.Instantiation/01.RestServlet.html b/juneau-doc/docs/Topics/06.juneau-rest-server/03.Instantiation/01.RestServlet.html
index b2e9a9b..1dea817 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/03.Instantiation/01.RestServlet.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/03.Instantiation/01.RestServlet.html
@@ -20,7 +20,7 @@
It extends directly from <l>HttpServlet</l> and is deployed like any other servlet.
</p>
<p>
- When the servlet <l>init()</l> method is called, it triggers the code to find and process the <l>@RestResource</l>
+ When the servlet <l>init()</l> method is called, it triggers the code to find and process the <l>@Rest</l>
annotations on that class and all child classes.
These get constructed into a {@link oajr.RestContext} object that holds all the configuration
information about your resource in a read-only object.
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/03.Instantiation/02.BasicRestServlet.html b/juneau-doc/docs/Topics/06.juneau-rest-server/03.Instantiation/02.BasicRestServlet.html
index ac30ce4..fa7b1d9 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/03.Instantiation/02.BasicRestServlet.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/03.Instantiation/02.BasicRestServlet.html
@@ -32,7 +32,7 @@
annotations:
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
<jc>// Allow OPTIONS requests to be simulated using ?method=OPTIONS query parameter. </jc>
allowedMethodParams=<js>"OPTIONS"</js>,
@@ -101,7 +101,7 @@
Notice that it has no code at all.
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
<jc>// Default serializers for all Java methods in the class.</jc>
serializers={
@@ -137,8 +137,8 @@
<jc>// Default page header contents.</jc>
header={
- <js>"<h1>$R{resourceTitle}</h1>"</js>, <jc>// Use @RestResource(title)</jc>
- <js>"<h2>$R{methodSummary,resourceDescription}</h2>"</js>, <jc>// Use either @RestMethod(summary) or @RestResource(description)</jc>
+ <js>"<h1>$R{resourceTitle}</h1>"</js>, <jc>// Use @Rest(title)</jc>
+ <js>"<h2>$R{methodSummary,resourceDescription}</h2>"</js>, <jc>// Use either @RestMethod(summary) or @Rest(description)</jc>
<js>"$C{REST/header}"</js> <jc>// Extra header HTML defined in external config file.</jc>
},
@@ -185,7 +185,7 @@
from a couple sections back.
</p>
<p>
- It's important to notice that the <ja>@RestResource</ja> annotation is inheritable and overridable from parent
+ It's important to notice that the <ja>@Rest</ja> annotation is inheritable and overridable from parent
class and interfaces.
They'll all get merged into a single set of annotation values for the resource class.
</p>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/03.Instantiation/03.BasicRest.html b/juneau-doc/docs/Topics/06.juneau-rest-server/03.Instantiation/03.BasicRest.html
index 2c2b6dc..e068b73 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/03.Instantiation/03.BasicRest.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/03.Instantiation/03.BasicRest.html
@@ -19,14 +19,14 @@
The {@link oajr.BasicRest} class is identical to the {@link oajr.BasicRestServlet} class except that
it does not extend from <c>HttpServlet</c>.
It defines the exact same set of serializers, parsers, etc., but it cannot be deployed as a top-level
- servlet. It can however be used for child resources registered via the {@link oajr.annotation.RestResource#children() @RestResource(children)}
+ servlet. It can however be used for child resources registered via the {@link oajr.annotation.Rest#children() @Rest(children)}
annotation.
</p>
<p>
The code for this class is virtually identical to {@link oajr.BasicRestServlet} but lacks a parent class:
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
<jc>// Allow OPTIONS requests to be simulated using ?method=OPTIONS query parameter. </jc>
allowedMethodParams=<js>"OPTIONS"</js>,
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/03.Instantiation/04.Children.html b/juneau-doc/docs/Topics/06.juneau-rest-server/03.Instantiation/04.Children.html
index 2b87929..7a83f1e 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/03.Instantiation/04.Children.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/03.Instantiation/04.Children.html
@@ -17,12 +17,12 @@
<p>
Child Resources are REST servlets or objects that are linked to parent resources through the
- {@link oajr.annotation.RestResource#children() @RestResource(children)} annotation.
+ {@link oajr.annotation.Rest#children() @Rest(children)} annotation.
</p>
<h5 class='figure'>Example:</h5>
<p class='bpcode w800'>
<jd>/** Parent Resource */</jd>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/parent"</js>,
children={FooResource.<jk>class</jk>}
)
@@ -30,7 +30,7 @@
</p>
<p class='bpcode w800'>
<jd>/** Child Resource */</jd>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/foo"</js> <jc>// Path relative to parent resource.</jc>
)
<jk>public</jk> FooResource {...} <jc>// Note that we don't need to extend from RestServlet.</jc>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/03.Instantiation/05.BasicRestServletGroup.html b/juneau-doc/docs/Topics/06.juneau-rest-server/03.Instantiation/05.BasicRestServletGroup.html
index ed382b4..beb4c5c 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/03.Instantiation/05.BasicRestServletGroup.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/03.Instantiation/05.BasicRestServletGroup.html
@@ -26,7 +26,7 @@
<jd>/**
* Sample REST resource showing how to implement a "router" resource page.
*/</jd>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/"</js>,
title=<js>"Root resources"</js>,
description=<js>"Example of a router resource page."</js>,
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/03.Instantiation/06.BasicRestGroup.html b/juneau-doc/docs/Topics/06.juneau-rest-server/03.Instantiation/06.BasicRestGroup.html
index d6bb44c..dbea6ab 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/03.Instantiation/06.BasicRestGroup.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/03.Instantiation/06.BasicRestGroup.html
@@ -19,7 +19,7 @@
The {@link oajr.BasicRestGroup} class is identical to the {@link oajr.BasicRestServletGroup} class except that
it does not extend from <c>HttpServlet</c>.
It defines the exact same set of serializers, parsers, etc., but it cannot be deployed as a top-level
- servlet. It can however be used for child resources registered via the {@link oajr.annotation.RestResource#children() @RestResource(children)}
+ servlet. It can however be used for child resources registered via the {@link oajr.annotation.Rest#children() @Rest(children)}
annotation.
</p>
<p class='bpcode w800'>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/03.Instantiation/07.ResourceResolvers.html b/juneau-doc/docs/Topics/06.juneau-rest-server/03.Instantiation/07.ResourceResolvers.html
index ff5f99f..457eb32 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/03.Instantiation/07.ResourceResolvers.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/03.Instantiation/07.ResourceResolvers.html
@@ -16,7 +16,7 @@
Resource Resolvers
<p>
- By default, you can add the {@link oajr.annotation.RestResource @RestResource}
+ By default, you can add the {@link oajr.annotation.Rest @Rest}
to any class as long as it has one of the following constructors:
</p>
<ul class='javatree'>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/03.Instantiation/08.LifecycleHooks.html b/juneau-doc/docs/Topics/06.juneau-rest-server/03.Instantiation/08.LifecycleHooks.html
index 0408dd6..6971931 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/03.Instantiation/08.LifecycleHooks.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/03.Instantiation/08.LifecycleHooks.html
@@ -22,7 +22,7 @@
For example, if you want to add an initialization method to your resource:
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(...)
+ <ja>@Rest</ja>(...)
<jk>public class</jk> MyResource {
<jc>// Our database.</jc>
@@ -38,7 +38,7 @@
Or if you want to intercept REST calls:
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(...)
+ <ja>@Rest</ja>(...)
<jk>public class</jk> MyResource {
<jc>// Add a request attribute to all incoming requests.</jc>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/04.RestResource.html b/juneau-doc/docs/Topics/06.juneau-rest-server/04.Rest.html
similarity index 91%
rename from juneau-doc/docs/Topics/06.juneau-rest-server/04.RestResource.html
rename to juneau-doc/docs/Topics/06.juneau-rest-server/04.Rest.html
index 6a6c871..b37a60d 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/04.RestResource.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/04.Rest.html
@@ -13,10 +13,10 @@
***************************************************************************************************************************/
-->
-@RestResource
+{updated} @Rest
<p>
- The {@link oajr.annotation.RestResource @RestResource} annotation is the primary way of defining
+ The {@link oajr.annotation.Rest @Rest} annotation is the primary way of defining
and configuring REST resource classes.
The functionality of the class itself is covered in detail in the topics below.
</p>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/04.RestResource/01.AnnotationInheritance.html b/juneau-doc/docs/Topics/06.juneau-rest-server/04.Rest/01.AnnotationInheritance.html
similarity index 77%
rename from juneau-doc/docs/Topics/06.juneau-rest-server/04.RestResource/01.AnnotationInheritance.html
rename to juneau-doc/docs/Topics/06.juneau-rest-server/04.Rest/01.AnnotationInheritance.html
index 154ce9a..422e3f9 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/04.RestResource/01.AnnotationInheritance.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/04.Rest/01.AnnotationInheritance.html
@@ -16,7 +16,7 @@
Annotation Inheritance
<p>
- The {@link oajr.annotation.RestResource @RestResource} annotation can also be used on parents and interfaces of resource classes.
+ The {@link oajr.annotation.Rest @Rest} annotation can also be used on parents and interfaces of resource classes.
When multiple annotations are defined at different levels, the annotation values are combined.
</p>
<p>
@@ -31,7 +31,7 @@
<th><l>Inheritence Rules</l></th>
</tr>
<tr>
- <td>{@link oajr.annotation.RestResource#guards() guards()}</td>
+ <td>{@link oajr.annotation.Rest#guards() guards()}</td>
<td>
Guards on child are combined with those on parent class.
<br>Guards are executed child-to-parent in the order they appear in the annotation.
@@ -39,7 +39,7 @@
</td>
</tr>
<tr>
- <td>{@link oajr.annotation.RestResource#converters() converters()}</td>
+ <td>{@link oajr.annotation.Rest#converters() converters()}</td>
<td>
Converters on child are combined with those on parent class.
<br>Converters are executed child-to-parent in the order they appear in the annotation.
@@ -47,7 +47,7 @@
</td>
</tr>
<tr>
- <td>{@link oajr.annotation.RestResource#beanFilters() beanFilters()}</td>
+ <td>{@link oajr.annotation.Rest#beanFilters() beanFilters()}</td>
<td>
Bean filters on child override those on parent class.
<br>{@link oajr.Inherit} class can be used to inherit and augment values from parent.
@@ -55,7 +55,7 @@
</td>
</tr>
<tr>
- <td>{@link oajr.annotation.RestResource#pojoSwaps() pojoSwaps()}</td>
+ <td>{@link oajr.annotation.Rest#pojoSwaps() pojoSwaps()}</td>
<td>
POJO swaps on child override those on parent class.
<br>{@link oajr.Inherit} class can be used to inherit and augment values from parent.
@@ -63,7 +63,7 @@
</td>
</tr>
<tr>
- <td>{@link oajr.annotation.RestResource#properties() properties()}</td>
+ <td>{@link oajr.annotation.Rest#properties() properties()}</td>
<td>
Properties on child are combined with those on parent class.
<br>Properties are applied parent-to-child in the order they appear in the annotation.
@@ -71,7 +71,7 @@
</td>
</tr>
<tr>
- <td>{@link oajr.annotation.RestResource#serializers() serializers()}</td>
+ <td>{@link oajr.annotation.Rest#serializers() serializers()}</td>
<td>
Serializers on child override those on parent class.
<br>{@link oajr.Inherit} class can be used to inherit and augment values from parent.
@@ -80,7 +80,7 @@
</td>
</tr>
<tr>
- <td>{@link oajr.annotation.RestResource#parsers() parsers()}</td>
+ <td>{@link oajr.annotation.Rest#parsers() parsers()}</td>
<td>
Parsers on child override those on parent class.
<br>{@link oajr.Inherit} class can be used to inherit and augment values from parent.
@@ -89,19 +89,19 @@
</td>
</tr>
<tr>
- <td>{@link oajr.annotation.RestResource#responseHandlers() responseHandlers()}</td>
+ <td>{@link oajr.annotation.Rest#responseHandlers() responseHandlers()}</td>
<td>
Response handlers on child are combined with those on parent class.
</td>
</tr>
<tr>
- <td>{@link oajr.annotation.RestResource#encoders() encoders()}</td>
+ <td>{@link oajr.annotation.Rest#encoders() encoders()}</td>
<td>
Encoders on child are combined with those on parent class.
</td>
</tr>
<tr>
- <td>{@link oajr.annotation.RestResource#defaultRequestHeaders() defaultRequestHeaders()}</td>
+ <td>{@link oajr.annotation.Rest#defaultRequestHeaders() defaultRequestHeaders()}</td>
<td>
Headers on child are combined with those on parent class.
<br>Headers are applied parent-to-child in the order they appear in the annotation.
@@ -109,45 +109,45 @@
</td>
</tr>
<tr>
- <td>{@link oajr.annotation.RestResource#defaultResponseHeaders() defaultResponseHeaders()}</td>
+ <td>{@link oajr.annotation.Rest#defaultResponseHeaders() defaultResponseHeaders()}</td>
<td>
Headers on child are combined with those on parent class.
<br>Headers are applied parent-to-child in the order they appear in the annotation.
</td>
</tr>
<tr>
- <td>{@link oajr.annotation.RestResource#children() children()}</td>
+ <td>{@link oajr.annotation.Rest#children() children()}</td>
<td>
Children on child are combined with those on parent class.
<br>Children are list parent-to-child in the order they appear in the annotation.
</td>
</tr>
<tr>
- <td>{@link oajr.annotation.RestResource#path() path()}</td>
+ <td>{@link oajr.annotation.Rest#path() path()}</td>
<td>
Path is searched for in child-to-parent order.
</td>
</tr>
<tr>
- <td>{@link oajr.annotation.RestResource#title() title()}</td>
+ <td>{@link oajr.annotation.Rest#title() title()}</td>
<td>
Label is searched for in child-to-parent order.
</td>
</tr>
<tr>
- <td>{@link oajr.annotation.RestResource#description() description()}</td>
+ <td>{@link oajr.annotation.Rest#description() description()}</td>
<td>
Description is searched for in child-to-parent order.
</td>
</tr>
<tr>
- <td>{@link oajr.annotation.RestResource#config() config()}</td>
+ <td>{@link oajr.annotation.Rest#config() config()}</td>
<td>
Config file is searched for in child-to-parent order.
</td>
</tr>
<tr>
- <td>{@link oajr.annotation.RestResource#staticFiles() staticFiles()}</td>
+ <td>{@link oajr.annotation.Rest#staticFiles() staticFiles()}</td>
<td>
Static files on child are combined with those on parent class.
<br>Static files are are executed child-to-parent in the order they appear in the annotation.
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/04.RestResource/02.RestResourcePath.html b/juneau-doc/docs/Topics/06.juneau-rest-server/04.Rest/02.RestPath.html
similarity index 98%
rename from juneau-doc/docs/Topics/06.juneau-rest-server/04.RestResource/02.RestResourcePath.html
rename to juneau-doc/docs/Topics/06.juneau-rest-server/04.Rest/02.RestPath.html
index 0f419d3..06e306f 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/04.RestResource/02.RestResourcePath.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/04.Rest/02.RestPath.html
@@ -13,7 +13,7 @@
***************************************************************************************************************************/
-->
-@RestResource(path)
+{updated} @Rest(path)
<p>
The {@link oajr.annotation.RestResource#path() @RestResource(path)} annotation is used in the following situations:
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/05.RestContext.html b/juneau-doc/docs/Topics/06.juneau-rest-server/05.RestContext.html
index a0d44be..0dfd03b 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/05.RestContext.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/05.RestContext.html
@@ -21,12 +21,12 @@
It's by-far the most important class in the REST API.
</p>
<p>
- Every class annotated with <l>@RestResource</l> ends up with an instance of this object.
+ Every class annotated with <l>@Rest</l> ends up with an instance of this object.
The object itself is read-only and unchangeable.
It is populated through the following:
</p>
<ul class='javatree'>
- <li class='ja'>{@link oajr.annotation.RestResource} - Settings copied from the annotation during servlet initialization.
+ <li class='ja'>{@link oajr.annotation.Rest} - Settings copied from the annotation during servlet initialization.
<li class='jm'>{@link oajr.RestContextBuilder} - Builder used during servlet initialization.
</ul>
<p>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/17.PredefinedHelperBeans.html b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/17.PredefinedHelperBeans.html
index fd56b2b..31a1f26 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/17.PredefinedHelperBeans.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/17.PredefinedHelperBeans.html
@@ -157,7 +157,7 @@
The {@link oajr.BasicRestServletGroup} class uses this to generate router pages:
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>
+ <ja>@Rest</ja>
<jk>public abstract class</jk> BasicRestServletGroup <jk>extends</jk> BasicRestServlet {
<ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/"</js>, summary=<js>"Navigation page"</js>)
@@ -178,7 +178,7 @@
The <c>RootResources</c> page consists of the following and extends from the {@link oajr.BasicRestServletGroup} class:
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
...
children={
HelloWorldResource.<jk>class</jk>,
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/07.restRPC.html b/juneau-doc/docs/Topics/06.juneau-rest-server/07.restRPC.html
index 480f775..30a1b5b 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/07.restRPC.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/07.restRPC.html
@@ -158,7 +158,7 @@
<c>getServiceMap()</c> method to define the server-side POJOs:
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/remote"</js>
)
<jk>public class</jk> SampleRrpcServlet <jk>extends</jk> RrpcServlet {
@@ -293,7 +293,7 @@
browser...
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/remote"</js>,
<jc>// Allow us to use method=POST from a browser.</jc>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/10.HttpPartAnnotations/09.Response.html b/juneau-doc/docs/Topics/06.juneau-rest-server/10.HttpPartAnnotations/09.Response.html
index 028156e..075c366 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/10.HttpPartAnnotations/09.Response.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/10.HttpPartAnnotations/09.Response.html
@@ -312,7 +312,7 @@
The following examples show part-schema-based serialization of response bodies:
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>
+ <ja>@Rest</ja>
<jk>public class</jk> ExampleResource {
<jc>// Example 1 - String[] should be serialized using part serializer.</jc>
@@ -343,7 +343,7 @@
The <c><ja>@Response</ja>(schema)</c> annotation can be used to define the format of the output using OpenAPI-based rules.
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>
+ <ja>@Rest</ja>
<jk>public class</jk> ExampleResource {
<ja>@Response</ja>(
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/11.HandlingFormPosts.html b/juneau-doc/docs/Topics/06.juneau-rest-server/11.HandlingFormPosts.html
index 15bfc5f..0509d07 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/11.HandlingFormPosts.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/11.HandlingFormPosts.html
@@ -21,7 +21,7 @@
form <l>"aString=foo&aNumber=123&aDate=2001-07-04T15:30:45Z"</l>.
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/urlEncodedForm"</js>
)
<jk>public class</jk> UrlEncodedFormResource <jk>extends</jk> BasicRestServlet {
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/12.HandlingMultiPartFormPosts.html b/juneau-doc/docs/Topics/06.juneau-rest-server/12.HandlingMultiPartFormPosts.html
index 0308e11..5d423cb 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/12.HandlingMultiPartFormPosts.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/12.HandlingMultiPartFormPosts.html
@@ -24,7 +24,7 @@
</p>
<h5 class='figure'>Example:</h5>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/tempDir"</js>
)
<jk>public class</jk> TempDirResource <jk>extends</jk> DirectoryResource {
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/13.Serializers.html b/juneau-doc/docs/Topics/06.juneau-rest-server/13.Serializers.html
index 3252c2c..90109e4 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/13.Serializers.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/13.Serializers.html
@@ -28,7 +28,7 @@
</p>
<ul class='javatree'>
<li class='ja'>
- {@link oajr.annotation.RestResource#serializers() RestResource(serializers)}
+ {@link oajr.annotation.Rest#serializers() Rest(serializers)}
- Annotation on resource Java class.
<li class='ja'>
{@link oajr.annotation.RestMethod#serializers() RestMethod(serializers)}
@@ -42,7 +42,7 @@
</p>
<p class='bpcode w800'>
<jc>// Option #1 - Defined via annotation.</jc>
- <ja>@RestResource</ja>(serializers={JsonSerializer.<jk>class</jk>, XmlSerializer.<jk>class</jk>})
+ <ja>@Rest</ja>(serializers={JsonSerializer.<jk>class</jk>, XmlSerializer.<jk>class</jk>})
<jk>public class</jk> MyResource {
<jc>// Option #2 - Defined via builder passed in through resource constructor.</jc>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/14.Parsers.html b/juneau-doc/docs/Topics/06.juneau-rest-server/14.Parsers.html
index f6c4936..a7e9d5a 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/14.Parsers.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/14.Parsers.html
@@ -28,7 +28,7 @@
</p>
<ul class='javatree'>
<li class='ja'>
- {@link oajr.annotation.RestResource#parsers() RestResource(parsers)}
+ {@link oajr.annotation.Rest#parsers() Rest(parsers)}
- Annotation on resource Java class.
<li class='ja'>
{@link oajr.annotation.RestMethod#parsers() RestMethod(parsers)}
@@ -42,7 +42,7 @@
</p>
<p class='bpcode w800'>
<jc>// Option #1 - Defined via annotation.</jc>
- <ja>@RestResource</ja>(parsers={JsonParser.<jk>class</jk>, XmlParser.<jk>class</jk>})
+ <ja>@Rest</ja>(parsers={JsonParser.<jk>class</jk>, XmlParser.<jk>class</jk>})
<jk>public class</jk> MyResource {
<jc>// Option #2 - Defined via builder passed in through resource constructor.</jc>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/15.ConfigurableProperties.html b/juneau-doc/docs/Topics/06.juneau-rest-server/15.ConfigurableProperties.html
index 23e6f1a..6ce0dda 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/15.ConfigurableProperties.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/15.ConfigurableProperties.html
@@ -23,7 +23,7 @@
These properties can be defined for serializers and parsers registered on a REST resource via the following:
</p>
<ul class='javatree'>
- <li class='ja'>{@link oajr.annotation.RestResource#properties() RestResource(properties)}
+ <li class='ja'>{@link oajr.annotation.Rest#properties() Rest(properties)}
<li class='jc'>{@link oajr.RestContextBuilder} - Various methods on the context builder.
</ul>
<h5 class='figure'>Example:</h5>
@@ -33,7 +33,7 @@
<jk>import static</jk> org.apache.juneau.json.JsonSerializer.*;
<jc>// Servlet with properties applied</jc>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
properties={
<jc>// Bean properties should be sorted alphabetically.</jc>
<ja>@Property</ja>(name=<jsf>BEAN_sortProperties</jsf>, value=<js>"true"</js>),
@@ -52,7 +52,7 @@
</p>
<p class='bpcode w800'>
<jc>// Servlet with properties applied</jc>
- <ja>@RestResource</ja>(...)
+ <ja>@Rest</ja>(...)
<jk>public</jk> MyRestServlet <jk>extends</jk> BasicRestServlet {
<jk>public</jk> MyRestServlet(RestContextBuilder builder) {
@@ -90,7 +90,7 @@
}
</p>
<ul class='seealso'>
- <li class='ja'>{@link oajr.annotation.RestResource#flags() RestResource(flags)} - Shorthand for boolean properties.
+ <li class='ja'>{@link oajr.annotation.Rest#flags() Rest(flags)} - Shorthand for boolean properties.
<li class='ja'>{@link oajr.annotation.RestMethod#flags() RestMethod(flags)} - Shorthand for boolean properties.
<li class='jc'>{@link oajr.RestContextProperties}
<li class='jc'>{@link oajr.RestMethodProperties}
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/16.ConfigurableAnnotations.html b/juneau-doc/docs/Topics/06.juneau-rest-server/16.ConfigurableAnnotations.html
index 42a271a..70e8041 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/16.ConfigurableAnnotations.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/16.ConfigurableAnnotations.html
@@ -25,7 +25,7 @@
<h5 class='figure'>Example:</h5>
<p class='bpcode w800'>
<jc>// Servlet with properties applied</jc>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
properties={
<ja>@Property</ja>(name=<jsf>BEAN_sortProperties</jsf>, value=<js>"true"</js>),
<ja>@Property</ja>(name=<jsf>SERIALIZER_trimNulls</jsf>, value=<js>"true"</js>),
@@ -36,7 +36,7 @@
</p>
<p class='bpcode w800'>
<jc>// Servlet with config annotations applied</jc>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
...
)
<ja>@BeanConfig</ja>(sortProperties=<js>"true"</js>)
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/17.Transforms.html b/juneau-doc/docs/Topics/06.juneau-rest-server/17.Transforms.html
index d8270a3..e0d20f3 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/17.Transforms.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/17.Transforms.html
@@ -30,7 +30,7 @@
</ul>
<p class='bpcode w800'>
<jc>// Servlet with transforms applied</jc>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
...
)
<ja>@BeanConfig</ja>(
@@ -54,7 +54,7 @@
</p>
<p class='bpcode w800'>
<jc>// Servlet with properties applied</jc>
- <ja>@RestResource</ja>(...)
+ <ja>@Rest</ja>(...)
<jk>public</jk> MyRestServlet <jk>extends</jk> BasicRestServlet {
<jk>public</jk> MyRestServlet(RestContextBuilder builder) {
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/18.URIs.html b/juneau-doc/docs/Topics/06.juneau-rest-server/18.URIs.html
index 4b59fcf..2f7b14a 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/18.URIs.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/18.URIs.html
@@ -22,7 +22,7 @@
The following example shows a REST method that returns a list of URIs of various forms:
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
uriAuthority=<js>"http://foo.com:123"</js>,
uriContext=<js>"/myContext"</js>
)
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/19.Guards.html b/juneau-doc/docs/Topics/06.juneau-rest-server/19.Guards.html
index 5b01aa9..0110c40 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/19.Guards.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/19.Guards.html
@@ -22,7 +22,7 @@
Guards are associated with resource classes and methods via the following:
</p>
<ul class='javatree'>
- <li class='ja'>{@link oajr.annotation.RestResource#guards() RestResource(guards)}
+ <li class='ja'>{@link oajr.annotation.Rest#guards() Rest(guards)}
<li class='ja'>{@link oajr.annotation.RestMethod#guards() RestMethod(guards)}
<li class='jm'>{@link oajr.RestContextBuilder#guards(Class...)}
</ul>
@@ -37,7 +37,7 @@
}
<jc>// Servlet with class-level guard applied</jc>
- <ja>@RestResource</ja>(guards=BillyGuard.<jk>class</jk>)
+ <ja>@Rest</ja>(guards=BillyGuard.<jk>class</jk>)
<jk>public</jk> MyRestServlet <jk>extends</jk> BasicRestServlet {
<jc>// Delete method that only Billy is allowed to call.</jc>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/20.RoleGuards.html b/juneau-doc/docs/Topics/06.juneau-rest-server/20.RoleGuards.html
index 7649fc6..3cf56cd 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/20.RoleGuards.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/20.RoleGuards.html
@@ -20,10 +20,10 @@
These are controlled via annotations on the REST class and methods:
</p>
<ul class='javatree'>
- <li class='ja'>{@link oajr.annotation.RestResource}
+ <li class='ja'>{@link oajr.annotation.Rest}
<ul>
- <li class='jf'>{@link oajr.annotation.RestResource#roleGuard() roleGuard()}
- <li class='jf'>{@link oajr.annotation.RestResource#rolesDeclared() rolesDeclared()}
+ <li class='jf'>{@link oajr.annotation.Rest#roleGuard() roleGuard()}
+ <li class='jf'>{@link oajr.annotation.Rest#rolesDeclared() rolesDeclared()}
</ul>
<li class='ja'>{@link oajr.annotation.RestMethod}
<ul>
@@ -39,7 +39,7 @@
<p class='bpcode w800'>
<jc>// Only admin users or users with both read/write and special access
// can run any methods on this class.</jc>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/foo"</js>,
roleGuard=<js>"ROLE_ADMIN || (ROLE_READ_WRITE && ROLE_SPECIAL)"</js>
)
@@ -69,7 +69,7 @@
<h5 class='figure'>Example:</h5>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
rolesDeclared=<js>"ROLE_ADMIN,ROLE_READ_WRITE,ROLE_READ_ONLY,ROLE_SPECIAL"</js>,
roleGuard=<js>"ROLE_ADMIN || (*WRITE* && *SPECIAL*)"</js>
)
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/21.Converters.html b/juneau-doc/docs/Topics/06.juneau-rest-server/21.Converters.html
index 0e836f2..0c29630 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/21.Converters.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/21.Converters.html
@@ -22,14 +22,14 @@
Converters are associated with resource classes and methods via the following:
</p>
<ul class='javatree'>
- <li class='ja'>{@link oajr.annotation.RestResource#converters() RestResource(converters)}
+ <li class='ja'>{@link oajr.annotation.Rest#converters() Rest(converters)}
<li class='ja'>{@link oajr.annotation.RestMethod#converters() RestMethod(converters)}
<li class='jm'>{@link oajr.RestContextBuilder#converters(Class...)}
</ul>
<h5 class='figure'>Example:</h5>
<p class='bpcode w800'>
<jc>// Associate the Traversable converter to all Java REST methods in this servlet</jc>
- <ja>@RestResource</ja>(converters=Traversable.<jk>class</jk>)
+ <ja>@Rest</ja>(converters=Traversable.<jk>class</jk>)
<jk>public</jk> MyRestServlet <jk>extends</jk> BasicRestServlet {
...
}
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/22.Messages.html b/juneau-doc/docs/Topics/06.juneau-rest-server/22.Messages.html
index e5dd289..bd2898a 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/22.Messages.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/22.Messages.html
@@ -16,11 +16,11 @@
Messages
<p>
- The {@link oajr.annotation.RestResource#messages @RestResource(messages)} annotation is used to associate a resource bundle with a servlet class.
+ The {@link oajr.annotation.Rest#messages @Rest(messages)} annotation is used to associate a resource bundle with a servlet class.
</p>
<p class='bpcode w800'>
<jc>// Servlet with associated resource bundle</jc>
- <ja>@RestResource</ja>(messages=<js>"nls/MyMessages"</js>)
+ <ja>@Rest</ja>(messages=<js>"nls/MyMessages"</js>)
<jk>public</jk> MyRestServlet <jk>extends</jk> BasicRestServlet {
<jc>// Returns the localized greeting from the "greeting" key in MyMessages.properties</jc>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/23.Encoders.html b/juneau-doc/docs/Topics/06.juneau-rest-server/23.Encoders.html
index ae1e9ea..a463063 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/23.Encoders.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/23.Encoders.html
@@ -16,7 +16,7 @@
Encoders
<p>
- The {@link oajr.annotation.RestResource#encoders @RestResource(encoders)} annotation can
+ The {@link oajr.annotation.Rest#encoders @Rest(encoders)} annotation can
be used to associate character encoders with a servlet class.
Encoders can be used to enable various kinds of compression (e.g. <l>"gzip"</l>) on requests and responses
based on the request <l>Accept-Encoding</l> and <l>Content-Encoding</l> headers.
@@ -25,7 +25,7 @@
<h5 class='figure'>Example:</h5>
<p class='bpcode w800'>
<jc>// Servlet with automated support for GZIP compression</jc>
- <ja>@RestResource</ja>(encoders={GzipEncoder.<jk>class</jk>})
+ <ja>@Rest</ja>(encoders={GzipEncoder.<jk>class</jk>})
<jk>public</jk> MyRestServlet <jk>extends</jk> BasicRestServlet {
...
}
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/24.SvlVariables.html b/juneau-doc/docs/Topics/06.juneau-rest-server/24.SvlVariables.html
index c34683b..8b3cf65 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/24.SvlVariables.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/24.SvlVariables.html
@@ -20,7 +20,7 @@
annotation values:
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
title=<js>"$L{my.label}"</js>
)
</p>
@@ -62,7 +62,7 @@
}
<jc>// Register it with our resource.</jc>
- <ja>@RestResource</ja>(...)
+ <ja>@Rest</ja>(...)
<jk>public class</jk> MyResource {
<jk>public</jk> MyResource(RestContextBuilder builder) {
@@ -83,7 +83,7 @@
</p>
<ul class='spaced-list'>
<li><l>Initialization-time variables</l>
- <br>These are variables that can be used in many of the annotations in {@link oajr.annotation.RestResource @RestResource}.
+ <br>These are variables that can be used in many of the annotations in {@link oajr.annotation.Rest @Rest}.
<br>The {@link oajr.RestContext#getVarResolver()} method returns initialization-time variables only.
<li><l>Request-time variables</l>
<br>These are variables that are available during HTTP-requests and can be used on annotation such as {@link oajr.annotation.HtmlDoc @HtmlDoc}.
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/25.ConfigurationFiles.html b/juneau-doc/docs/Topics/06.juneau-rest-server/25.ConfigurationFiles.html
index f36b181..d8188fd 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/25.ConfigurationFiles.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/25.ConfigurationFiles.html
@@ -46,12 +46,12 @@
Configuration files are associated with REST resources through the following:
</p>
<ul class='javatree'>
- <li class='ja'>{@link oajr.annotation.RestResource#config() RestResource(config)}
+ <li class='ja'>{@link oajr.annotation.Rest#config() Rest(config)}
</ul>
<h5 class='figure'>Example:</h5>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
<jc>// Config file is located at ./config_dir/myconfig.cfg</jc>
config=<js>"config_dir/myconfig.cfg"</js>,
...
@@ -64,7 +64,7 @@
location of the config file as a system property <l>"juneau.configFile"</l>:
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
<jc>// Config file location is defined as a system property</jc>
config=<js>"$S{juneau.configFile}"</js>,
...
@@ -79,7 +79,7 @@
A common usage is to use this method to initialize fields in your servlet.
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
<jc>// Config file is located at ./config_dir/myconfig.cfg</jc>
config=<js>"config_dir/myconfig.cfg"</js>,
...
@@ -98,7 +98,7 @@
Another common usage is to refer to config properties through <ck>$C</ck> variables in your annotations:
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
<jc>// Get stylesheet from myconfig.cfg, but default to devops.css if it's not specified</jc>
htmldoc=<ja>@HtmlDoc</ja>(
stylesheet=<js>"$C{MyServlet/stylesheet,servlet:/styles/devops.css}"</js>,
@@ -122,7 +122,7 @@
<jd>/**
* Sample REST resource that prints out a simple "Hello world!" message.
*/</jd>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
config=<js>"config_dir/myconfig.cfg"</js>,
...
)
@@ -158,7 +158,7 @@
<jd>/**
* Sample REST resource that prints out a simple "Hello world!" message.
*/</jd>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
messages=<js>"HelloWorldResources"</js>,
config=<js>"config_dir/myconfig.cfg"</js>,
...
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/26.StaticFiles.html b/juneau-doc/docs/Topics/06.juneau-rest-server/26.StaticFiles.html
index bf55663..6c0671c 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/26.StaticFiles.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/26.StaticFiles.html
@@ -16,7 +16,7 @@
Static files
<p>
- The {@link oajr.annotation.RestResource#staticFiles @RestResource(staticFiles)}
+ The {@link oajr.annotation.Rest#staticFiles @Rest(staticFiles)}
annotation is used to define paths and locations of statically-served files such as images or HTML
documents.
</p>
@@ -29,7 +29,7 @@
<p class='bpcode w800'>
<jk>package</jk> com.foo.mypackage;
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/myresource"</js>,
staticFiles={<js>"htdocs:docs"</js>}
)
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/27.ClientVersioning.html b/juneau-doc/docs/Topics/06.juneau-rest-server/27.ClientVersioning.html
index 9356a5e..f6e7323 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/27.ClientVersioning.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/27.ClientVersioning.html
@@ -23,14 +23,14 @@
The APIs involved with defining client version headers are:
</p>
<ul class='javatree'>
- <li class='ja'>{@link oajr.annotation.RestResource#clientVersionHeader() RestResource(clientVersionHeader)}
+ <li class='ja'>{@link oajr.annotation.Rest#clientVersionHeader() Rest(clientVersionHeader)}
<li class='jm'>{@link oajr.RestContextBuilder#clientVersionHeader(String)}
<li class='ja'>{@link oajr.annotation.RestMethod#clientVersion() RestMethod(clientVersion)}
</ul>
<h5 class='figure'>Example:</h5>
<p class='bpcode w800'>
<jc>// Option #1 - Defined via annotation resolving to a config file setting with default value.</jc>
- <ja>@RestResource</ja>(clientVersionHeader=<js>"Client-Version"</js>)
+ <ja>@Rest</ja>(clientVersionHeader=<js>"Client-Version"</js>)
<jk>public class</jk> MyResource {
<jc>// Call this method if Client-Version is at least 2.0.
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/29.Swagger/01.BasicRestServlet.html b/juneau-doc/docs/Topics/06.juneau-rest-server/29.Swagger/01.BasicRestServlet.html
index 66c1551..e130816 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/29.Swagger/01.BasicRestServlet.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/29.Swagger/01.BasicRestServlet.html
@@ -29,7 +29,7 @@
Here's the class that defines the behavior:
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
<jc>// Allow OPTIONS requests to be simulated using ?method=OPTIONS query parameter.</jc>
allowedMethodParams=<js>"OPTIONS"</js>,
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/29.Swagger/02.BasicSwaggerInfo.html b/juneau-doc/docs/Topics/06.juneau-rest-server/29.Swagger/02.BasicSwaggerInfo.html
index dbb366d..90364ea 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/29.Swagger/02.BasicSwaggerInfo.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/29.Swagger/02.BasicSwaggerInfo.html
@@ -23,11 +23,11 @@
</p>
<img class='bordered w900' src='doc-files/juneau-rest-server.Swagger.3.png'>
<p>
- The information is pulled from the {@link oajr.annotation.RestResource#swagger() @RestResource(swagger)} annotation.
+ The information is pulled from the {@link oajr.annotation.Rest#swagger() @Rest(swagger)} annotation.
</p>
<h5 class='figure'>org.apache.juneau.examples.rest.petstore.PetStoreResource</h5>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/petstore"</js>,
title=<js>"Petstore application"</js>,
...
@@ -75,7 +75,7 @@
You could equivalently embed JSON directly into your annotation like so:
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/petstore"</js>,
title=<js>"Petstore application"</js>,
...
@@ -96,7 +96,7 @@
However, a more typical (and less error-prone) scenario is to define all of your Swagger as annotations:
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/petstore"</js>,
title=<js>"Petstore application"</js>,
...
@@ -127,7 +127,7 @@
pull localized strings from resource bundles using {@link oajr.vars.LocalizationVar $L} variables.
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/petstore"</js>,
title=<js>"Petstore application"</js>,
messages=<js>"nls/MyMessages"</js>,
@@ -155,7 +155,7 @@
<jk>public class</jk> PetStoreResource <jk>extends</jk> BasicRestServletJena {...}
</p>
<p>
- A third option is to define your Swagger information in your {@link oajr.annotation.RestResource#messages @RestResource(messages)} resource
+ A third option is to define your Swagger information in your {@link oajr.annotation.Rest#messages @Rest(messages)} resource
bundle using predefined Swagger keywords:
</p>
<p class='bpcode w800'>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/29.Swagger/06.ParameterExamples.html b/juneau-doc/docs/Topics/06.juneau-rest-server/29.Swagger/06.ParameterExamples.html
index 15dab92..3462480 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/29.Swagger/06.ParameterExamples.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/29.Swagger/06.ParameterExamples.html
@@ -157,7 +157,7 @@
],
</p>
<p>
- Another option is to define these directly in your resource Swagger JSON file, or via {@link oajr.annotation.RestResource#swagger() @RestResource(swagger)}/{@link oajr.annotation.RestMethod#swagger() @RestMethod(swagger)}.
+ Another option is to define these directly in your resource Swagger JSON file, or via {@link oajr.annotation.Rest#swagger() @Rest(swagger)}/{@link oajr.annotation.RestMethod#swagger() @RestMethod(swagger)}.
</p>
<p>
Juneau also supports auto-generation of JSON-Schema directly from POJO classes.
@@ -218,7 +218,7 @@
<h5 class='figure'>Example:</h5>
<p class='bpcode w800'>
<jc>// Examples defined at class level.</jc>
- <ja>@RestResource</ja>(...)
+ <ja>@Rest</ja>(...)
<ja>@BeanConfig</ja>(
examples=<js>"{PetCreate: {name:'Doggie',price:9.99,species:'Dog',tags:['friendly','cute']}}"</js>
)
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/29.Swagger/07.Responses.html b/juneau-doc/docs/Topics/06.juneau-rest-server/29.Swagger/07.Responses.html
index 60c05e8..edbd626 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/29.Swagger/07.Responses.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/29.Swagger/07.Responses.html
@@ -46,7 +46,7 @@
</p>
<ul>
<li>{@link oaj.http.annotation.Response @Response} annotated classes, methods, and parameters.
- <li>{@link oajr.annotation.RestResource#swagger() @RestResource(swagger)} / {@link oajr.annotation.RestMethod#swagger() @RestMethod(swagger)} annotations.
+ <li>{@link oajr.annotation.Rest#swagger() @Rest(swagger)} / {@link oajr.annotation.RestMethod#swagger() @RestMethod(swagger)} annotations.
</ul>
<ul class='seealso'>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/29.Swagger/08.ResponseExamples.html b/juneau-doc/docs/Topics/06.juneau-rest-server/29.Swagger/08.ResponseExamples.html
index d5ddcb9..7c31984 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/29.Swagger/08.ResponseExamples.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/29.Swagger/08.ResponseExamples.html
@@ -152,7 +152,7 @@
</p>
<p class='bpcode w800'>
<jc>// Examples defined at class level.</jc>
- <ja>@RestResource</ja>(...)
+ <ja>@Rest</ja>(...)
<ja>@BeanConfig</ja>(
examples=<js>"{PetCreate: {name:'Doggie',price:9.99,species:'Dog',tags:['friendly','cute']}}"</js>
)
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/30.HtmlDocAnnotation.html b/juneau-doc/docs/Topics/06.juneau-rest-server/30.HtmlDocAnnotation.html
index 1b161a2..3f59d60 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/30.HtmlDocAnnotation.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/30.HtmlDocAnnotation.html
@@ -21,7 +21,7 @@
It's used in the following locations:
</p>
<ul>
- <li>{@link oajr.annotation.RestResource @RestResource}-annotated classes.
+ <li>{@link oajr.annotation.Rest @Rest}-annotated classes.
<li>{@link oajr.annotation.RestMethod @RestMethod}-annotated methods.
</ul>
<p>
@@ -31,14 +31,14 @@
</p>
<p class='bpcode w800'>
<jc>// Title defined via property.</jc>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
properties={
<ja>@Property</ja>(name=<jsf>HTMLDOC_title</jsf>, value=<js>"My Resource Page"</js>)
}
)
<jc>// Title defined via @HtmlDoc annotation.</jc>
- <ja>@RestResource</ja>()
+ <ja>@Rest</ja>()
<ja>@HtmlDocConfig</ja>(
title=<js>"My Resource Page"</js>
)
@@ -84,7 +84,7 @@
<jd>/**
* Sample REST resource that prints out a simple "Hello world!" message.
*/</jd>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/helloWorld"</js>
)
<ja>@HtmlDocConfig</ja>(
@@ -105,7 +105,7 @@
SVL variables can be used in any of these annotations:
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/helloWorld"</js>,
<jc>// Register a config file.</jc>
config=<js>"MyConfig.cfg"</js>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/30.HtmlDocAnnotation/02.Widgets.html b/juneau-doc/docs/Topics/06.juneau-rest-server/30.HtmlDocAnnotation/02.Widgets.html
index 241b408..4438fe8 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/30.HtmlDocAnnotation/02.Widgets.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/30.HtmlDocAnnotation/02.Widgets.html
@@ -69,7 +69,7 @@
The following examples shows how to associate a widget with a REST method and then have it rendered in the links
and aside section of the page.
It shows an example of a widget that renders an image located in the <c>htdocs</c> static files
- directory in your classpath (see {@link oajr.annotation.RestResource#staticFiles() @RestResource(staticFiles)}):
+ directory in your classpath (see {@link oajr.annotation.Rest#staticFiles() @Rest(staticFiles)}):
</p>
<p class='bpcode w800'>
<jk>public class</jk> MyWidget <jk>extends</jk> Widget {
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/30.HtmlDocAnnotation/03.PredefinedWidgets.html b/juneau-doc/docs/Topics/06.juneau-rest-server/30.HtmlDocAnnotation/03.PredefinedWidgets.html
index aca3529..3912f00 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/30.HtmlDocAnnotation/03.PredefinedWidgets.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/30.HtmlDocAnnotation/03.PredefinedWidgets.html
@@ -202,7 +202,7 @@
Typically it's used in the footer of the page, as shown below in the <c>AddressBookResource</c> from the examples:
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/addressBook"</js>,
widgets={
PoweredByJuneau.<jk>class</jk>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/30.HtmlDocAnnotation/04.UiCustomization.html b/juneau-doc/docs/Topics/06.juneau-rest-server/30.HtmlDocAnnotation/04.UiCustomization.html
index 67af38f..cab7eb6 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/30.HtmlDocAnnotation/04.UiCustomization.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/30.HtmlDocAnnotation/04.UiCustomization.html
@@ -33,15 +33,15 @@
Instead, it just uses the existing open-ended API for defining branding via annotations on your REST classes.
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
...
<jc>// HTML-page specific settings</jc>
htmldoc=<ja>@HtmlDoc</ja>(
<jc>// Default page header contents.</jc>
header={
- <js>"<h1>$R{resourceTitle}</h1>"</js>, <jc>// Use @RestResource(title)</jc>
- <js>"<h2>$R{methodSummary,resourceDescription}</h2>"</js>, <jc>// Use either @RestMethod(summary) or @RestResource(description)</jc>
+ <js>"<h1>$R{resourceTitle}</h1>"</js>, <jc>// Use @Rest(title)</jc>
+ <js>"<h2>$R{methodSummary,resourceDescription}</h2>"</js>, <jc>// Use either @RestMethod(summary) or @Rest(description)</jc>
<js>"$C{REST/header}"</js> <jc>// Extra header HTML defined in external config file.</jc>
},
@@ -72,7 +72,7 @@
<jk>public interface</jk> BasicRestConfig {}
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
...
htmldoc=<ja>@HtmlDoc</ja>(
htmldoc=<ja>@HtmlDoc</ja>(
@@ -88,11 +88,11 @@
<jk>public abstract class</jk> BasicRestServlet <jk>extends</jk> RestServlet <jk>implements</jk> BasicRestConfig {...}
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>
+ <ja>@Rest</ja>
<jk>public abstract class</jk> BasicRestServletGroup <jk>extends</jk> BasicRestServlet {...}
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
htmldoc=<ja>@HtmlDoc</ja>(
widgets={
ContentTypeMenuItem.<jk>class</jk>,
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/30.HtmlDocAnnotation/05.Stylesheets.html b/juneau-doc/docs/Topics/06.juneau-rest-server/30.HtmlDocAnnotation/05.Stylesheets.html
index d4191fd..6934c93 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/30.HtmlDocAnnotation/05.Stylesheets.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/30.HtmlDocAnnotation/05.Stylesheets.html
@@ -44,7 +44,7 @@
The stylesheet URL is controlled by the {@link oaj.html.annotation.HtmlDocConfig#stylesheet() @HtmlDocConfig(stylesheet)} annotation.
The {@link oajr.BasicRestServlet} class defines the stylesheet served up as a static file:
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
htmldoc=<ja>@HtmlDoc</ja>(
stylesheet=<js>"$C{REST/stylesheet,servlet:/styles/devops.css}"</js>,
),
@@ -63,7 +63,7 @@
file:
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
htmldoc=<ja>@HtmlDoc</ja>(
stylesheet=<js>"servlet:/my-styles/my-style.css}"</js>,
),
@@ -80,7 +80,7 @@
In case you're curious about how the menu item works, it's defined via a widget:
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
htmldoc=<ja>@HtmlDoc</ja>(
widgets={
PoweredByApache.<jk>class</jk>,
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/31.DefaultHeaders.html b/juneau-doc/docs/Topics/06.juneau-rest-server/31.DefaultHeaders.html
index e04959a..e2f70d5 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/31.DefaultHeaders.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/31.DefaultHeaders.html
@@ -20,17 +20,17 @@
</p>
<ul class='javatree'>
<li class='ja'>
- {@link oajr.annotation.RestResource#defaultRequestHeaders() RestResource(defaultRequestHeaders)}
+ {@link oajr.annotation.Rest#defaultRequestHeaders() Rest(defaultRequestHeaders)}
<br>Defines default headers on request when the client doesn't specify them.
<li class='ja'>
- {@link oajr.annotation.RestResource#defaultResponseHeaders() RestResource(defaultResponseHeaders)}
+ {@link oajr.annotation.Rest#defaultResponseHeaders() Rest(defaultResponseHeaders)}
<br>Appends the specified headers if they weren't already set programmatically.
</ul>
<h5 class='figure'>Example:</h5>
<p class='bpcode w800'>
<jc>// Servlet with default headers</jc>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
<jc>// Assume "text/json" Accept value when Accept not specified</jc>
defaultRequestHeaders={<js>"Accept: text/json"</js>},
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/32.LoggingAndDebugging.html b/juneau-doc/docs/Topics/06.juneau-rest-server/32.LoggingAndDebugging.html
index cee956d..0c30ce8 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/32.LoggingAndDebugging.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/32.LoggingAndDebugging.html
@@ -23,10 +23,10 @@
</p>
<ul class='javatree'>
<li class='ja'>
- {@link oajr.annotation.RestResource}
+ {@link oajr.annotation.Rest}
<ul>
- <li class='jm'>{@link oajr.annotation.RestResource#logging() logging()} - Class-level logging configuration and rules.
- <li class='jm'>{@link oajr.annotation.RestResource#debug() debug()} - Enable debug mode.
+ <li class='jm'>{@link oajr.annotation.Rest#logging() logging()} - Class-level logging configuration and rules.
+ <li class='jm'>{@link oajr.annotation.Rest#debug() debug()} - Enable debug mode.
</ul>
</li>
<li class='ja'>
@@ -39,12 +39,12 @@
<li class='jc'>
{@link oajr.RestContext}
<ul>
- <li class='jf'>{@link oajr.RestContext#REST_callLoggerConfig REST_callLoggerConfig} - Underlying configuration property for {@link oajr.annotation.RestResource#logging() @RestResource(logging)}.
- <li class='jf'>{@link oajr.RestContext#REST_debug REST_debug} - Underlying configuration property for {@link oajr.annotation.RestResource#debug() @RestResource(debug)}.
+ <li class='jf'>{@link oajr.RestContext#REST_callLoggerConfig REST_callLoggerConfig} - Underlying configuration property for {@link oajr.annotation.Rest#logging() @Rest(logging)}.
+ <li class='jf'>{@link oajr.RestContext#REST_debug REST_debug} - Underlying configuration property for {@link oajr.annotation.Rest#debug() @Rest(debug)}.
</ul>
</li>
<li class='ja'>
- {@link oajr.annotation.Logging} - Annotation for {@link oajr.annotation.RestResource#logging() @RestResource(logging)} and {@link oajr.annotation.RestMethod#logging() @RestMethod(logging)}
+ {@link oajr.annotation.Logging} - Annotation for {@link oajr.annotation.Rest#logging() @Rest(logging)} and {@link oajr.annotation.RestMethod#logging() @RestMethod(logging)}
<ul>
<li class='jm'>{@link oajr.annotation.Logging#level() level()} - The logging level.
<li class='jm'>{@link oajr.annotation.Logging#rules() rules()} - The logging rules.
@@ -82,7 +82,7 @@
The following code shows the output produced using the <js>"short"</js> setting:
</p>
<p class='bpcode'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
logging=<ja>@Logging</ja>(
level=<js>"info"</js>,
rules={
@@ -125,7 +125,7 @@
In comparison, using <js>"long"</js> formatting adds information about headers and body.
</p>
<p class='bpcode'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
debug=<js>"true"</js>, <jc>// Needed to capture request/response bodies for logging.</jc>
logging=<ja>@Logging</ja>(
level=<js>"info"</js>,
@@ -180,7 +180,7 @@
</p>
<p class='bpcode'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
logging=<ja>@Logging</ja>(
rules={
<jc>// Individual status codes.</jc>
@@ -216,7 +216,7 @@
The debug mode setting allows HTTP request/response bodies to be cached in memory for logging purposes:
</p>
<p class='bpcode'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
debug=<js>"true"</js>
)
</p>
@@ -250,7 +250,7 @@
can be used to disable logging entirely or on a per-request basis:
</p>
<p class='bpcode'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
logging=<ja>@Logging</ja>(
disabled=<js>"true"</js>
rules={
@@ -288,7 +288,7 @@
In the example below, we're causing two exceptions but only logging the first one:
</p>
<p class='bpcode'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
logging=<ja>@Logging</ja>(
useStackTraceHashing=<js>"true"</js>,
rules={
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/34.OverloadingHttpMethods.html b/juneau-doc/docs/Topics/06.juneau-rest-server/34.OverloadingHttpMethods.html
index b17c08c..476c8f5 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/34.OverloadingHttpMethods.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/34.OverloadingHttpMethods.html
@@ -29,11 +29,11 @@
}
</p>
<p>
- To support overloaded methods, the {@link oajr.annotation.RestResource#allowedMethodParams() @RestResource(allowedMethodParams)}
+ To support overloaded methods, the {@link oajr.annotation.Rest#allowedMethodParams() @Rest(allowedMethodParams)}
setting must be enabled on your servlet.
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
<jc>// Allow &method parameter on BAR requests</jc>
allowedMethodParams=<js>"BAR"</js>
)
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/35.BuiltInParameters.html b/juneau-doc/docs/Topics/06.juneau-rest-server/35.BuiltInParameters.html
index d94c7da..be1c71c 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/35.BuiltInParameters.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/35.BuiltInParameters.html
@@ -49,21 +49,21 @@
<td class='code'>&method=X</td>
<td>
Overload the HTTP method as a GET parameter (e.g <l>"POST"</l>).
- <br>Must be enabled via {@link oajr.annotation.RestResource#allowedMethodParams() @RestResource(allowedMethodParams)} setting.
+ <br>Must be enabled via {@link oajr.annotation.Rest#allowedMethodParams() @Rest(allowedMethodParams)} setting.
</td>
</tr>
<tr>
<td class='code'>&Header-Name=headerValue</td>
<td>
Specify a header value as a GET parameter.
- <br>Must be enabled via {@link oajr.annotation.RestResource#allowHeaderParams() @RestResource(allowHeaderParams)} setting.
+ <br>Must be enabled via {@link oajr.annotation.Rest#allowHeaderParams() @Rest(allowHeaderParams)} setting.
</td>
</tr>
<tr>
<td class='code'>&body=X</td>
<td>
Pass in the HTTP body content on PUT and POST methods as a UON-encoded GET parameter.
- <br>Must be enabled via {@link oajr.annotation.RestResource#allowBodyParam() @RestResource(allowBodyParam)} setting.
+ <br>Must be enabled via {@link oajr.annotation.Rest#allowBodyParam() @Rest(allowBodyParam)} setting.
</td>
</tr>
<tr>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/36.CustomSerializersAndParsers.html b/juneau-doc/docs/Topics/06.juneau-rest-server/36.CustomSerializersAndParsers.html
index c38397e..02e0dde 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/36.CustomSerializersAndParsers.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/36.CustomSerializersAndParsers.html
@@ -28,7 +28,7 @@
<jd>/**
* Sample resource that allows images to be uploaded and retrieved.
*/</jd>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/photos"</js>,
messages=<js>"nls/PhotosResource"</js>,
title=<js>"Photo REST service"</js>,
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/38.Injection.html b/juneau-doc/docs/Topics/06.juneau-rest-server/38.Injection.html
index c9fa476..4068158 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/38.Injection.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/38.Injection.html
@@ -21,7 +21,7 @@
<p>
The important class is the {@link oajr.RestResourceResolver} class which is used
to resolve child servlet/resource implementation classes inside parent contexts.
- In other words, it's used for resolving {@link oajr.annotation.RestResource#children() @RestResource(children)} instances.
+ In other words, it's used for resolving {@link oajr.annotation.Rest#children() @Rest(children)} instances.
</p>
<p>
The general approach starts with defining a resolver that uses the Spring application context for resolution:
@@ -76,7 +76,7 @@
sets it on the config object during initialization.
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
children={
...
}
@@ -100,7 +100,7 @@
After that, just define constructors on your child resources to take in Spring beans:
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/child"</js>
)
<jk>public class</jk> MyChildResource <jk>extends</jk> BasicRestServlet {
diff --git a/juneau-doc/docs/Topics/08.juneau-rest-server-springboot/02.ChildResources.html b/juneau-doc/docs/Topics/08.juneau-rest-server-springboot/02.ChildResources.html
index 2e94798..b185bd9 100644
--- a/juneau-doc/docs/Topics/08.juneau-rest-server-springboot/02.ChildResources.html
+++ b/juneau-doc/docs/Topics/08.juneau-rest-server-springboot/02.ChildResources.html
@@ -46,7 +46,7 @@
that extends from <c>HttpServlet</c>:
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/root"</js>,
children={
ChildResource.<jk>class</jk>
@@ -63,7 +63,7 @@
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/child"</js>,
children={
GrandChildResource.<jk>class</jk>
@@ -74,7 +74,7 @@
}
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/grandchild"</js>
)
<jk>public class</jk> GrandChildResource <jk>extends</jk> BasicRest {
diff --git a/juneau-doc/docs/Topics/09.juneau-rest-client/01.RestProxies/10.DualPurposeInterfaces.html b/juneau-doc/docs/Topics/09.juneau-rest-client/01.RestProxies/10.DualPurposeInterfaces.html
index 08fbb57..8e0f468 100644
--- a/juneau-doc/docs/Topics/09.juneau-rest-client/01.RestProxies/10.DualPurposeInterfaces.html
+++ b/juneau-doc/docs/Topics/09.juneau-rest-client/01.RestProxies/10.DualPurposeInterfaces.html
@@ -60,7 +60,7 @@
Next you define the implementation of your interface as a normal Juneau REST resource:
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/petstore"</js>,
title=<js>"Petstore application"</js>,
...
diff --git a/juneau-doc/docs/Topics/10.juneau-rest-mock.html b/juneau-doc/docs/Topics/10.juneau-rest-mock.html
index c190573..66607de 100644
--- a/juneau-doc/docs/Topics/10.juneau-rest-mock.html
+++ b/juneau-doc/docs/Topics/10.juneau-rest-mock.html
@@ -47,7 +47,7 @@
<ul class='javatree'>
<li class='jp'>{@link oajr.mock2}
<ul>
- <li class='jc'>{@link oajr.mock2.MockRest} - API for unit testing {@link oajr.annotation.RestResource @RestResource}-annotated classes.
+ <li class='jc'>{@link oajr.mock2.MockRest} - API for unit testing {@link oajr.annotation.Rest @Rest}-annotated classes.
<li class='jc'>{@link oajr.mock2.MockRemoteResource} - API for unit testing {@link oaj.http.remote.RemoteResource @RemoteResource}-annotated classes.
</ul>
</ul>
diff --git a/juneau-doc/docs/Topics/10.juneau-rest-mock/01.MockRest.html b/juneau-doc/docs/Topics/10.juneau-rest-mock/01.MockRest.html
index d8fff01..b77c1b3 100644
--- a/juneau-doc/docs/Topics/10.juneau-rest-mock/01.MockRest.html
+++ b/juneau-doc/docs/Topics/10.juneau-rest-mock/01.MockRest.html
@@ -16,7 +16,7 @@
MockRest
<p>
- The {@link oajr.mock2.MockRest} class is used for performing serverless unit testing of {@link oajr.annotation.RestResource @RestResource}-annotated
+ The {@link oajr.mock2.MockRest} class is used for performing serverless unit testing of {@link oajr.annotation.Rest @Rest}-annotated
classes. These include both parent resource classes that extend from {@link oajr.RestServlet} and child resources that do not.
</p>
<p>
@@ -41,7 +41,7 @@
<jk>public class</jk> MockTest {
<jc>// Our REST resource to test.</jc>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
serializers=SimpleJsonSerializer.<jk>class</jk>,
parsers=JsonParser.<jk>class</jk>
)
diff --git a/juneau-doc/docs/Topics/10.juneau-rest-mock/02.MockRemoteResource.html b/juneau-doc/docs/Topics/10.juneau-rest-mock/02.MockRemoteResource.html
index 8807116..e11f364 100644
--- a/juneau-doc/docs/Topics/10.juneau-rest-mock/02.MockRemoteResource.html
+++ b/juneau-doc/docs/Topics/10.juneau-rest-mock/02.MockRemoteResource.html
@@ -20,7 +20,7 @@
classes.
</p>
<p>
- The {@link oajr.mock2.MockRemoteResource} API requires a {@link oajr.annotation.RestResource @RestResource}-annotated class to be used as
+ The {@link oajr.mock2.MockRemoteResource} API requires a {@link oajr.annotation.Rest @Rest}-annotated class to be used as
an underlying mocked resource to process the request and return a response.
</p>
<h5 class='figure'>Example:</h5>
@@ -34,7 +34,7 @@
}
<jc>// Our mocked-up REST interface to test against.</jc>
- <ja>@RestResource</ja>
+ <ja>@Rest</ja>
<jk>public class</jk> MyRest {
<ja>@RestMethod</ja>(name=GET, path=<js>"/echoQuery"</js>)
diff --git a/juneau-doc/docs/Topics/11.juneau-microservice-core/03.Args.html b/juneau-doc/docs/Topics/11.juneau-microservice-core/03.Args.html
index 8415626..1604db9 100644
--- a/juneau-doc/docs/Topics/11.juneau-microservice-core/03.Args.html
+++ b/juneau-doc/docs/Topics/11.juneau-microservice-core/03.Args.html
@@ -82,7 +82,7 @@
</p>
<p class='bpcode w800'>
<jc>// $A used in annotation.</jc>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
title=<js>"$A{title}"</js>,
...
)
diff --git a/juneau-doc/docs/Topics/11.juneau-microservice-core/04.Manifest.html b/juneau-doc/docs/Topics/11.juneau-microservice-core/04.Manifest.html
index b4cc2d0..3f6e2f0 100644
--- a/juneau-doc/docs/Topics/11.juneau-microservice-core/04.Manifest.html
+++ b/juneau-doc/docs/Topics/11.juneau-microservice-core/04.Manifest.html
@@ -67,7 +67,7 @@
</p>
<p class='bpcode w800'>
<jc>// $MF used in annotation.</jc>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
title=<js>"$MF{Application-Title}"</js>,
...
)
diff --git a/juneau-doc/docs/Topics/11.juneau-microservice-core/05.Config.html b/juneau-doc/docs/Topics/11.juneau-microservice-core/05.Config.html
index b9cbf30..38aab81 100644
--- a/juneau-doc/docs/Topics/11.juneau-microservice-core/05.Config.html
+++ b/juneau-doc/docs/Topics/11.juneau-microservice-core/05.Config.html
@@ -111,7 +111,7 @@
<p>
<h5 class='figure'>BasicRestConfig.java</h5>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
config=<js>"$S{juneau.configFile,SYSTEM_DEFAULT}"</js>
...
)
diff --git a/juneau-doc/docs/Topics/12.juneau-microservice-jetty/03.ResourceClasses.html b/juneau-doc/docs/Topics/12.juneau-microservice-jetty/03.ResourceClasses.html
index 85e724b..2b37e11 100644
--- a/juneau-doc/docs/Topics/12.juneau-microservice-jetty/03.ResourceClasses.html
+++ b/juneau-doc/docs/Topics/12.juneau-microservice-jetty/03.ResourceClasses.html
@@ -20,7 +20,7 @@
The example is a router page that serves as a jumping off page to child resources.
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/*"</js>,
title=<js>"My Microservice"</js>,
description=<js>"Top-level resources page"</js>,
@@ -71,7 +71,7 @@
...which is generated by this class...
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/helloWorld"</js>,
title=<js>"Hello World example"</js>,
description=<js>"Simplest possible REST resource"</js>
diff --git a/juneau-doc/docs/Topics/12.juneau-microservice-jetty/05.Config.html b/juneau-doc/docs/Topics/12.juneau-microservice-jetty/05.Config.html
index f6efeff..618dc1c 100644
--- a/juneau-doc/docs/Topics/12.juneau-microservice-jetty/05.Config.html
+++ b/juneau-doc/docs/Topics/12.juneau-microservice-jetty/05.Config.html
@@ -27,7 +27,7 @@
classes that extend from {@link oajr.BasicRestServlet} use several <c>$C</c> variables to externalize values:
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
...
<jc>// HTML-page specific settings</jc>
@@ -35,8 +35,8 @@
<jc>// Default page header contents.</jc>
header={
- <js>"<h1>$R{resourceTitle}</h1>"</js>, <jc>// Use @RestResource(title)</jc>
- <js>"<h2>$R{methodSummary,resourceDescription}</h2>"</js>, <jc>// Use either @RestMethod(summary) or @RestResource(description)</jc>
+ <js>"<h1>$R{resourceTitle}</h1>"</js>, <jc>// Use @Rest(title)</jc>
+ <js>"<h2>$R{methodSummary,resourceDescription}</h2>"</js>, <jc>// Use either @RestMethod(summary) or @Rest(description)</jc>
<js>"$C{REST/header}"</js> <jc>// Extra header HTML defined in external config file.</jc>
},
@@ -118,7 +118,7 @@
<cc>#---------------------------------</cc>
<cc># Contents of MyHelloResource.java </cc>
<cc>#---------------------------------</cc>
- <ja>@RestResource</ja>(...)
+ <ja>@Rest</ja>(...)
<jk>public class</jk> MyHelloResource <jk>extends</jk> BasicRestServlet {
<jk>private</jk> String <jf>greeting</jf>;
@@ -153,7 +153,7 @@
<cc>#---------------------------------</cc>
<cc># Contents of MyHelloResource.java </cc>
<cc>#---------------------------------</cc>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/hello"</js>,
messages=<js>"nls/Messages"</js>,
...
diff --git a/juneau-doc/docs/Topics/12.juneau-microservice-jetty/07.UiCustomization.html b/juneau-doc/docs/Topics/12.juneau-microservice-jetty/07.UiCustomization.html
index 575bdd5..bca5e06 100644
--- a/juneau-doc/docs/Topics/12.juneau-microservice-jetty/07.UiCustomization.html
+++ b/juneau-doc/docs/Topics/12.juneau-microservice-jetty/07.UiCustomization.html
@@ -61,15 +61,15 @@
pulls in this information using {@link oaj.config.vars.ConfigVar $C} and {@link oajr.vars.UrlVar $U} variables:
</p>
<p class='bpcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
...
<jc>// HTML-page specific settings</jc>
htmldoc=<ja>@HtmlDoc</ja>(
<jc>// Default page header contents.</jc>
header={
- <js>"<h1>$R{resourceTitle}</h1>"</js>, <jc>// Use @RestResource(title)</jc>
- <js>"<h2>$R{methodSummary,resourceDescription}</h2>"</js>, <jc>// Use either @RestMethod(summary) or @RestResource(description)</jc>
+ <js>"<h1>$R{resourceTitle}</h1>"</js>, <jc>// Use @Rest(title)</jc>
+ <js>"<h2>$R{methodSummary,resourceDescription}</h2>"</js>, <jc>// Use either @RestMethod(summary) or @Rest(description)</jc>
<js>"$C{REST/header}"</js> <jc>// Extra header HTML defined in external config file.</jc>
},
diff --git a/juneau-doc/docs/Topics/13.my-jetty-microservice/01.Installing.html b/juneau-doc/docs/Topics/13.my-jetty-microservice/01.Installing.html
index 9b869ff..ad707e8 100644
--- a/juneau-doc/docs/Topics/13.my-jetty-microservice/01.Installing.html
+++ b/juneau-doc/docs/Topics/13.my-jetty-microservice/01.Installing.html
@@ -61,7 +61,7 @@
<br>This class routes HTTP requests to child resources:
<br><br>
<p class='bcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/"</js>,
title=<js>"My Microservice"</js>,
description=<js>"Top-level resources page"</js>,
@@ -120,7 +120,7 @@
#=======================================================================================================================</cc>
<cs>[REST]</cs>
- <cc># Comma-delimited list of key-value pairs that represent locations of static files that can be served up by your @RestResource-annotated
+ <cc># Comma-delimited list of key-value pairs that represent locations of static files that can be served up by your @Rest-annotated
# classes. These are static files that are served up by the servlet under the specified sub-paths.
# For example, given the following setting...
# staticFiles = htdocs:my-docs,styles/my-styles
diff --git a/juneau-doc/docs/Topics/14.my-springboot-microservice/01.Installing.html b/juneau-doc/docs/Topics/14.my-springboot-microservice/01.Installing.html
index 758a182..9273615 100644
--- a/juneau-doc/docs/Topics/14.my-springboot-microservice/01.Installing.html
+++ b/juneau-doc/docs/Topics/14.my-springboot-microservice/01.Installing.html
@@ -67,7 +67,7 @@
<br>This is identical to the Jetty example.
<br><br>
<p class='bcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/"</js>,
title=<js>"My Microservice"</js>,
description=<js>"Top-level resources page"</js>,
@@ -108,7 +108,7 @@
#=======================================================================================================================</cc>
<cs>[REST]</cs>
- <cc># Comma-delimited list of key-value pairs that represent locations of static files that can be served up by your @RestResource-annotated
+ <cc># Comma-delimited list of key-value pairs that represent locations of static files that can be served up by your @Rest-annotated
# classes. These are static files that are served up by the servlet under the specified sub-paths.
# For example, given the following setting...
# staticFiles = htdocs:my-docs,styles/my-styles
diff --git a/juneau-doc/docs/Topics/16.juneau-examples-rest/01.RootResources.html b/juneau-doc/docs/Topics/16.juneau-examples-rest/01.RootResources.html
index 694fe3e..5f42a5d 100644
--- a/juneau-doc/docs/Topics/16.juneau-examples-rest/01.RootResources.html
+++ b/juneau-doc/docs/Topics/16.juneau-examples-rest/01.RootResources.html
@@ -77,7 +77,7 @@
<jd>/**
* Sample REST resource showing how to implement a "router" resource page.
*/</jd>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/"</js>,
title=<js>"Root resources"</js>,
description=<js>"Example of a router resource page."</js>,
@@ -127,7 +127,7 @@
These are resources whose paths are direct descendants to the parent resource.
</p>
<p>
- Child resources must be annotated with the {@link oajr.annotation.RestResource#path() @RestResource(path)} annotation to
+ Child resources must be annotated with the {@link oajr.annotation.Rest#path() @Rest(path)} annotation to
identify the subpath of the child.
Children CAN extend from {@link oajr.BasicRestServlet} but it is not a requirement.
</p>
@@ -140,11 +140,11 @@
</p>
<p>
During servlet initialization of the <l>RootResources</l> object, the toolkit looks for the
- <l>@RestResource(children)</l> annotation.
+ <l>@Rest(children)</l> annotation.
If it finds it, it instantiates instances of each class and recursively performs servlet initialization
on them.
It then associates the child resource with the parent by the name specified by the
- <l>@RestResource(path)</l> annotation on the child class.
+ <l>@Rest(path)</l> annotation on the child class.
</p>
<p>
When a request for the child URL (<l>/helloWorld</l>) is received, the <l>RootResources</l> servlet
diff --git a/juneau-doc/docs/Topics/16.juneau-examples-rest/02.HelloWorldResource.html b/juneau-doc/docs/Topics/16.juneau-examples-rest/02.HelloWorldResource.html
index 82ddab3..ff41fea 100644
--- a/juneau-doc/docs/Topics/16.juneau-examples-rest/02.HelloWorldResource.html
+++ b/juneau-doc/docs/Topics/16.juneau-examples-rest/02.HelloWorldResource.html
@@ -24,7 +24,7 @@
<jd>/**
* Sample REST resource that prints out a simple "Hello world!" message.
*/</jd>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
title=<js>"Hello World"</js>,
description=<js>"An example of the simplest-possible resource"</js>,
path=<js>"/helloWorld"</js>,
@@ -49,7 +49,7 @@
<p>
Notice that in this case we're not extending from {@link oajr.RestServlet}.
We are however implementing {@link oajr.BasicRestConfig} which is a no-op
- interface that defines a default <ja>@RestResource</ja> annotation with all the serializers, parsers,
+ interface that defines a default <ja>@Rest</ja> annotation with all the serializers, parsers,
and configuration defined on the {@link oajr.BasicRestServlet} class.
</p>
<p>
diff --git a/juneau-doc/docs/Topics/16.juneau-examples-rest/03.DtoExamples.html b/juneau-doc/docs/Topics/16.juneau-examples-rest/03.DtoExamples.html
index 66e70ac..d98db18 100644
--- a/juneau-doc/docs/Topics/16.juneau-examples-rest/03.DtoExamples.html
+++ b/juneau-doc/docs/Topics/16.juneau-examples-rest/03.DtoExamples.html
@@ -52,7 +52,7 @@
<jd>/**
* Sample resource that shows how to generate ATOM feeds.
*/</jd>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/atom"</js>,
title=<js>"Sample ATOM feed resource"</js>,
description=<js>"Sample resource that shows how to render ATOM feeds"</js>,
@@ -162,7 +162,7 @@
<jd>/**
* Sample resource that shows how to serialize JSON-Schema documents.
*/</jd>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/jsonSchema"</js>,
messages=<js>"nls/JsonSchemaResource"</js>,
title=<js>"Sample JSON-Schema document"</js>,
diff --git a/juneau-doc/docs/Topics/16.juneau-examples-rest/04.ConfigResource.html b/juneau-doc/docs/Topics/16.juneau-examples-rest/04.ConfigResource.html
index 2d406aa..4d84ad7 100644
--- a/juneau-doc/docs/Topics/16.juneau-examples-rest/04.ConfigResource.html
+++ b/juneau-doc/docs/Topics/16.juneau-examples-rest/04.ConfigResource.html
@@ -43,7 +43,7 @@
<jd>/**
* Shows contents of the microservice configuration file.
*/</jd>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/config"</js>,
title=<js>"Configuration"</js>,
description=<js>"Contents of configuration file."</js>,
diff --git a/juneau-doc/docs/Topics/17.juneau-examples-rest-jetty/01.Installing.html b/juneau-doc/docs/Topics/17.juneau-examples-rest-jetty/01.Installing.html
index 6d4d318..2072bc8 100644
--- a/juneau-doc/docs/Topics/17.juneau-examples-rest-jetty/01.Installing.html
+++ b/juneau-doc/docs/Topics/17.juneau-examples-rest-jetty/01.Installing.html
@@ -61,7 +61,7 @@
<br>This class routes HTTP requests to child resources:
<br><br>
<p class='bcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/*"</js>,
title=<js>"Root resources"</js>,
description=<js>"Example of a router resource page."</js>,
@@ -141,7 +141,7 @@
#=======================================================================================================================</cc>
<cs>[REST]</cs>
- <cc># Comma-delimited list of key-value pairs that represent locations of static files that can be served up by your @RestResource-annotated
+ <cc># Comma-delimited list of key-value pairs that represent locations of static files that can be served up by your @Rest-annotated
# classes. These are static files that are served up by the servlet under the specified sub-paths.
# For example, given the following setting...
# staticFiles = htdocs:my-docs,styles/my-styles
diff --git a/juneau-doc/docs/Topics/18.juneau-examples-rest-springboot/01.Installing.html b/juneau-doc/docs/Topics/18.juneau-examples-rest-springboot/01.Installing.html
index 6a9d9cd..fd4f933 100644
--- a/juneau-doc/docs/Topics/18.juneau-examples-rest-springboot/01.Installing.html
+++ b/juneau-doc/docs/Topics/18.juneau-examples-rest-springboot/01.Installing.html
@@ -66,7 +66,7 @@
<br>This class routes HTTP requests to child resources:
<br><br>
<p class='bcode w800'>
- <ja>@RestResource</ja>(
+ <ja>@Rest</ja>(
path=<js>"/*"</js>,
title=<js>"Root resources"</js>,
description=<js>"Example of a router resource page."</js>,
diff --git a/juneau-doc/docs/Topics/19.Security/03.juneau-rest-server.html b/juneau-doc/docs/Topics/19.Security/03.juneau-rest-server.html
index e4968cf..2d15a79 100644
--- a/juneau-doc/docs/Topics/19.Security/03.juneau-rest-server.html
+++ b/juneau-doc/docs/Topics/19.Security/03.juneau-rest-server.html
@@ -16,7 +16,7 @@
juneau-rest-server
<p>
- Denial of service attacks can be alleviated through the {@link oajr.annotation.RestResource#maxInput() maxInput()}
+ Denial of service attacks can be alleviated through the {@link oajr.annotation.Rest#maxInput() maxInput()}
setting. Arbitrarily-large input will trigger an exception before causing out-of-memory errors.
The default value for this setting is 100MB.
</p>
diff --git a/juneau-examples/juneau-examples-rest-jetty/juneau-examples-rest-jetty.cfg b/juneau-examples/juneau-examples-rest-jetty/juneau-examples-rest-jetty.cfg
index 1ed0651..24c7561 100755
--- a/juneau-examples/juneau-examples-rest-jetty/juneau-examples-rest-jetty.cfg
+++ b/juneau-examples/juneau-examples-rest-jetty/juneau-examples-rest-jetty.cfg
@@ -39,7 +39,7 @@
#=======================================================================================================================
[REST]
-# Comma-delimited list of key-value pairs that represent locations of static files that can be served up by your @RestResource-annotated
+# Comma-delimited list of key-value pairs that represent locations of static files that can be served up by your @Rest-annotated
# classes. These are static files that are served up by the servlet under the specified sub-paths.
# For example, given the following setting...
# staticFiles = htdocs:my-docs,styles/my-styles
diff --git a/juneau-examples/juneau-examples-rest-springboot/src/main/resources/juneau.cfg b/juneau-examples/juneau-examples-rest-springboot/src/main/resources/juneau.cfg
index 98e4574..c18ac8c 100755
--- a/juneau-examples/juneau-examples-rest-springboot/src/main/resources/juneau.cfg
+++ b/juneau-examples/juneau-examples-rest-springboot/src/main/resources/juneau.cfg
@@ -16,7 +16,7 @@
#=======================================================================================================================
[REST]
-# Comma-delimited list of key-value pairs that represent locations of static files that can be served up by your @RestResource-annotated
+# Comma-delimited list of key-value pairs that represent locations of static files that can be served up by your @Rest-annotated
# classes. These are static files that are served up by the servlet under the specified sub-paths.
# For example, given the following setting...
# staticFiles = htdocs:my-docs,styles/my-styles
diff --git a/juneau-microservice/juneau-my-jetty-microservice/my-jetty-microservice.cfg b/juneau-microservice/juneau-my-jetty-microservice/my-jetty-microservice.cfg
index a23e103..19709a5 100755
--- a/juneau-microservice/juneau-my-jetty-microservice/my-jetty-microservice.cfg
+++ b/juneau-microservice/juneau-my-jetty-microservice/my-jetty-microservice.cfg
@@ -41,7 +41,7 @@
#=======================================================================================================================
[REST]
-# Comma-delimited list of key-value pairs that represent locations of static files that can be served up by your @RestResource-annotated
+# Comma-delimited list of key-value pairs that represent locations of static files that can be served up by your @Rest-annotated
# classes. These are static files that are served up by the servlet under the specified sub-paths.
# For example, given the following setting...
# staticFiles = htdocs:my-docs,styles/my-styles
diff --git a/juneau-microservice/juneau-my-springboot-microservice/src/main/resources/juneau.cfg b/juneau-microservice/juneau-my-springboot-microservice/src/main/resources/juneau.cfg
index 857df5e..c9e29be 100755
--- a/juneau-microservice/juneau-my-springboot-microservice/src/main/resources/juneau.cfg
+++ b/juneau-microservice/juneau-my-springboot-microservice/src/main/resources/juneau.cfg
@@ -16,7 +16,7 @@
#=======================================================================================================================
[REST]
-# Comma-delimited list of key-value pairs that represent locations of static files that can be served up by your @RestResource-annotated
+# Comma-delimited list of key-value pairs that represent locations of static files that can be served up by your @Rest-annotated
# classes. These are static files that are served up by the servlet under the specified sub-paths.
# For example, given the following setting...
# staticFiles = htdocs:my-docs,styles/my-styles
diff --git a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRest.java b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRest.java
index 9c3168f..786ec8b 100644
--- a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRest.java
+++ b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRest.java
@@ -37,7 +37,7 @@
* <jk>public class</jk> MockTest {
*
* <jc>// Our REST resource to test.</jc>
- * <ja>@RestResource</ja>(serializers=JsonSerializer.Simple.<jk>class</jk>, parsers=JsonParser.<jk>class</jk>)
+ * <ja>@Rest</ja>(serializers=JsonSerializer.Simple.<jk>class</jk>, parsers=JsonParser.<jk>class</jk>)
* <jk>public static class</jk> MyRest {
*
* <ja>@RestMethod</ja>(name=<jsf>PUT</jsf>, path=<js>"/String"</js>)
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestCallHandler.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestCallHandler.java
index d0dacf1..26df41d 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestCallHandler.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestCallHandler.java
@@ -90,7 +90,7 @@
try {
context.checkForInitException();
- // If the resource path contains variables (e.g. @RestResource(path="/f/{a}/{b}"), then we want to resolve
+ // If the resource path contains variables (e.g. @Rest(path="/f/{a}/{b}"), then we want to resolve
// those variables and push the servletPath to include the resolved variables. The new pathInfo will be
// the remainder after the new servletPath.
// Only do this for the top-level resource because the logic for child resources are processed next.
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestConfig.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestConfig.java
index 8a3f63a..a93e52c 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestConfig.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestConfig.java
@@ -96,8 +96,8 @@
// Default page header contents.
header={
- "<h1>$R{resourceTitle}</h1>", // Use @RestResource(title)
- "<h2>$R{methodSummary,resourceDescription}</h2>", // Use either @RestMethod(summary) or @RestResource(description)
+ "<h1>$R{resourceTitle}</h1>", // Use @Rest(title)
+ "<h2>$R{methodSummary,resourceDescription}</h2>", // Use either @RestMethod(summary) or @Rest(description)
"$C{REST/header}" // Extra header HTML defined in external config file.
},
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestInfoProvider.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestInfoProvider.java
index 28034dd..5163601 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestInfoProvider.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestInfoProvider.java
@@ -252,11 +252,11 @@
* <h5 class='figure'>Examples:</h5>
* <p class='bcode w800'>
* <jc>// Direct value</jc>
- * <ja>@RestResource</ja>(siteName=<js>"My Site"</js>)
+ * <ja>@Rest</ja>(siteName=<js>"My Site"</js>)
* <jk>public class</jk> MyResource {...}
*
* <jc>// Pulled from some other location</jc>
- * <ja>@RestResource</ja>(siteName=<js>"$L{myLocalizedSiteName}"</js>)
+ * <ja>@Rest</ja>(siteName=<js>"$L{myLocalizedSiteName}"</js>)
* <jk>public class</jk> MyResource {...}
* </p>
* <li>Localized strings from resource bundle identified by {@link Rest#messages() @Rest(messages)}
@@ -304,11 +304,11 @@
* <h5 class='figure'>Examples:</h5>
* <p class='bcode w800'>
* <jc>// Direct value</jc>
- * <ja>@RestResource</ja>(title=<js>"My Resource"</js>)
+ * <ja>@Rest</ja>(title=<js>"My Resource"</js>)
* <jk>public class</jk> MyResource {...}
*
* <jc>// Pulled from some other location</jc>
- * <ja>@RestResource</ja>(title=<js>"$L{myLocalizedTitle}"</js>)
+ * <ja>@Rest</ja>(title=<js>"$L{myLocalizedTitle}"</js>)
* <jk>public class</jk> MyResource {...}
* </p>
* <li>Localized strings from resource bundle identified by {@link Rest#messages() @Rest(messages)}
@@ -357,11 +357,11 @@
* <h5 class='figure'>Examples:</h5>
* <p class='bcode w800'>
* <jc>// Direct value</jc>
- * <ja>@RestResource</ja>(description=<js>"My Resource"</js>)
+ * <ja>@Rest</ja>(description=<js>"My Resource"</js>)
* <jk>public class</jk> MyResource {...}
*
* <jc>// Pulled from some other location</jc>
- * <ja>@RestResource</ja>(description=<js>"$L{myLocalizedDescription}"</js>)
+ * <ja>@Rest</ja>(description=<js>"$L{myLocalizedDescription}"</js>)
* <jk>public class</jk> MyResource {...}
* </p>
* <li>Localized strings from resource bundle identified by {@link Rest#messages() @Rest(messages)}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ResponseHandler.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ResponseHandler.java
index 5c18cae..dd3803e 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ResponseHandler.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ResponseHandler.java
@@ -56,7 +56,7 @@
* The following example shows how to create a response handler to handle special <c>Foo</c> objects outside the
* normal Juneau architecture.
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* path=<js>"/example"</js>,
* responseHandlers=FooHandler.<jk>class</jk>
* )
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 7aa67cb..9415272 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
@@ -122,7 +122,7 @@
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Option #1 - Defined via annotation resolving to a config file setting with default value.</jc>
- * <ja>@RestResource</ja>(allowBodyParam=<js>"$C{REST/allowBodyParam,false}"</js>)
+ * <ja>@Rest</ja>(allowBodyParam=<js>"$C{REST/allowBodyParam,false}"</js>)
* <jk>public class</jk> MyResource {
*
* <jc>// Option #2 - Defined via builder passed in through resource constructor.</jc>
@@ -184,7 +184,7 @@
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Option #1 - Defined via annotation.</jc>
- * <ja>@RestResource</ja>(allowedHeaderParams=<js>"Accept,Content-Type"</js>)
+ * <ja>@Rest</ja>(allowedHeaderParams=<js>"Accept,Content-Type"</js>)
* <jk>public class</jk> MyResource {
*
* <jc>// Option #2 - Defined via builder passed in through resource constructor.</jc>
@@ -251,7 +251,7 @@
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Option #1 - Defined via annotation resolving to a config file setting with default value.</jc>
- * <ja>@RestResource</ja>(allowedMethodHeaders=<js>"PATCH"</js>)
+ * <ja>@Rest</ja>(allowedMethodHeaders=<js>"PATCH"</js>)
* <jk>public class</jk> MyResource {
*
* <jc>// Option #2 - Defined via builder passed in through resource constructor.</jc>
@@ -324,7 +324,7 @@
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Option #1 - Defined via annotation.</jc>
- * <ja>@RestResource</ja>(allowedMethodParams=<js>"HEAD,OPTIONS,PUT"</js>)
+ * <ja>@Rest</ja>(allowedMethodParams=<js>"HEAD,OPTIONS,PUT"</js>)
* <jk>public class</jk> MyResource {
*
* <jc>// Option #2 - Defined via builder passed in through resource constructor.</jc>
@@ -390,7 +390,7 @@
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Option #1 - Defined via annotation resolving to a config file setting with default value.</jc>
- * <ja>@RestResource</ja>(allowMethodParams=<js>"$C{REST/allowHeaderParams,false}"</js>)
+ * <ja>@Rest</ja>(allowMethodParams=<js>"$C{REST/allowHeaderParams,false}"</js>)
* <jk>public class</jk> MyResource {
*
* <jc>// Option #2 - Defined via builder passed in through resource constructor.</jc>
@@ -477,7 +477,7 @@
* }
*
* <jc>// Option #1 - Registered via annotation resolving to a config file setting with default value.</jc>
- * <ja>@RestResource</ja>(callHandler=MyRestCallHandler.<jk>class</jk>)
+ * <ja>@Rest</ja>(callHandler=MyRestCallHandler.<jk>class</jk>)
* <jk>public class</jk> MyResource {
*
* <jc>// Option #2 - Registered via builder passed in through resource constructor.</jc>
@@ -547,7 +547,7 @@
* }
*
* <jc>// Option #1 - Registered via annotation resolving to a config file setting with default value.</jc>
- * <ja>@RestResource</ja>(callLogger=MyLogger.<jk>class</jk>)
+ * <ja>@Rest</ja>(callLogger=MyLogger.<jk>class</jk>)
* <jk>public class</jk> MyResource {
*
* <jc>// Option #2 - Registered via builder passed in through resource constructor.</jc>
@@ -600,7 +600,7 @@
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Option #1 - Registered via annotation.</jc>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* logging=<ja>@Logging</ja>(
* level=<js>"INFO"</js>,
* rules={
@@ -717,11 +717,11 @@
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Our child resource.</jc>
- * <ja>@RestResource</ja>(path=<js>"/child"</js>)
+ * <ja>@Rest</ja>(path=<js>"/child"</js>)
* <jk>public class</jk> MyChildResource {...}
*
* <jc>// Option #1 - Registered via annotation.</jc>
- * <ja>@RestResource</ja>(children={MyChildResource.<jk>class</jk>})
+ * <ja>@Rest</ja>(children={MyChildResource.<jk>class</jk>})
* <jk>public class</jk> MyResource {
*
* <jc>// Option #2 - Registered via builder passed in through resource constructor.</jc>
@@ -820,7 +820,7 @@
* }
*
* <jc>// Option #1 - Registered via annotation.</jc>
- * <ja>@RestResource</ja>(classpathResourceFinder=MyClasspathResourceFinder.<jk>class</jk>)
+ * <ja>@Rest</ja>(classpathResourceFinder=MyClasspathResourceFinder.<jk>class</jk>)
* <jk>public class</jk> MyResource {
*
* <jc>// Option #2 - Registered via builder passed in through resource constructor.</jc>
@@ -892,7 +892,7 @@
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Option #1 - Defined via annotation resolving to a config file setting with default value.</jc>
- * <ja>@RestResource</ja>(clientVersionHeader=<js>"$C{REST/clientVersionHeader,Client-Version}"</js>)
+ * <ja>@Rest</ja>(clientVersionHeader=<js>"$C{REST/clientVersionHeader,Client-Version}"</js>)
* <jk>public class</jk> MyResource {
*
* <jc>// Option #2 - Defined via builder passed in through resource constructor.</jc>
@@ -983,7 +983,7 @@
* }
*
* <jc>// Option #1 - Registered via annotation resolving to a config file setting with default value.</jc>
- * <ja>@RestResource</ja>(converters={MyConverter.<jk>class</jk>})
+ * <ja>@Rest</ja>(converters={MyConverter.<jk>class</jk>})
* <jk>public class</jk> MyResource {
*
* <jc>// Option #2 - Registered via builder passed in through resource constructor.</jc>
@@ -1084,7 +1084,7 @@
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Option #1 - Defined via annotation resolving to a config file setting with default value.</jc>
- * <ja>@RestResource</ja>(defaultCharset=<js>"$C{REST/defaultCharset,US-ASCII}"</js>)
+ * <ja>@Rest</ja>(defaultCharset=<js>"$C{REST/defaultCharset,US-ASCII}"</js>)
* <jk>public class</jk> MyResource {
*
* <jc>// Option #2 - Defined via builder passed in through resource constructor.</jc>
@@ -1150,7 +1150,7 @@
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Option #1 - Defined via annotation resolving to a config file setting with default value.</jc>
- * <ja>@RestResource</ja>(defaultRequestAttributes={<js>"Foo: bar"</js>, <js>"Baz: $C{REST/myAttributeValue}"</js>})
+ * <ja>@Rest</ja>(defaultRequestAttributes={<js>"Foo: bar"</js>, <js>"Baz: $C{REST/myAttributeValue}"</js>})
* <jk>public class</jk> MyResource {
*
* <jc>// Option #2 - Defined via builder passed in through resource constructor.</jc>
@@ -1217,7 +1217,7 @@
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Option #1 - Defined via annotation resolving to a config file setting with default value.</jc>
- * <ja>@RestResource</ja>(defaultRequestHeaders={<js>"Accept: application/json"</js>, <js>"My-Header: $C{REST/myHeaderValue}"</js>})
+ * <ja>@Rest</ja>(defaultRequestHeaders={<js>"Accept: application/json"</js>, <js>"My-Header: $C{REST/myHeaderValue}"</js>})
* <jk>public class</jk> MyResource {
*
* <jc>// Option #2 - Defined via builder passed in through resource constructor.</jc>
@@ -1283,7 +1283,7 @@
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Option #1 - Defined via annotation resolving to a config file setting with default value.</jc>
- * <ja>@RestResource</ja>(defaultResponseHeaders={<js>"Content-Type: $C{REST/defaultContentType,text/plain}"</js>,<js>"My-Header: $C{REST/myHeaderValue}"</js>})
+ * <ja>@Rest</ja>(defaultResponseHeaders={<js>"Content-Type: $C{REST/defaultContentType,text/plain}"</js>,<js>"My-Header: $C{REST/myHeaderValue}"</js>})
* <jk>public class</jk> MyResource {
*
* <jc>// Option #2 - Defined via builder passed in through resource constructor.</jc>
@@ -1338,7 +1338,7 @@
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Option #1 - Registered via annotation.</jc>
- * <ja>@RestResource</ja>(encoders={GzipEncoder.<jk>class</jk>})
+ * <ja>@Rest</ja>(encoders={GzipEncoder.<jk>class</jk>})
* <jk>public class</jk> MyResource {
*
* <jc>// Option #2 - Registered via builder passed in through resource constructor.</jc>
@@ -1421,7 +1421,7 @@
* }
*
* <jc>// Option #1 - Registered via annotation.</jc>
- * <ja>@RestResource</ja>(guards={BillyGuard.<jk>class</jk>})
+ * <ja>@Rest</ja>(guards={BillyGuard.<jk>class</jk>})
* <jk>public class</jk> MyResource {
*
* <jc>// Option #2 - Registered via builder passed in through resource constructor.</jc>
@@ -1517,7 +1517,7 @@
* }
*
* <jc>// Option #1 - Registered via annotation resolving to a config file setting with default value.</jc>
- * <ja>@RestResource</ja>(infoProvider=MyRestInfoProvider.<jk>class</jk>)
+ * <ja>@Rest</ja>(infoProvider=MyRestInfoProvider.<jk>class</jk>)
* <jk>public class</jk> MyResource {
*
* <jc>// Option #2 - Registered via builder passed in through resource constructor.</jc>
@@ -1601,7 +1601,7 @@
* }
*
* <jc>// Option #1 - Registered via annotation resolving to a config file setting with default value.</jc>
- * <ja>@RestResource</ja>(logger=MyRestLogger.<jk>class</jk>)
+ * <ja>@Rest</ja>(logger=MyRestLogger.<jk>class</jk>)
* <jk>public class</jk> MyResource {
*
* <jc>// Option #2 - Registered via builder passed in through resource constructor.</jc>
@@ -1658,7 +1658,7 @@
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Option #1 - Defined via annotation resolving to a config file setting with default value.</jc>
- * <ja>@RestResource</ja>(maxInput=<js>"$C{REST/maxInput,10M}"</js>)
+ * <ja>@Rest</ja>(maxInput=<js>"$C{REST/maxInput,10M}"</js>)
* <jk>public class</jk> MyResource {
*
* <jc>// Option #2 - Defined via builder passed in through resource constructor.</jc>
@@ -1747,7 +1747,7 @@
* <jk>package</jk> org.apache.foo;
*
* <jc>// Resolve messages to org/apache/foo/nls/MyMessages.properties</jc>
- * <ja>@RestResource</ja>(messages=<js>"nls/MyMessages"</js>)
+ * <ja>@Rest</ja>(messages=<js>"nls/MyMessages"</js>)
* <jk>public class</jk> MyResource {...}
*
* <ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/hello/{you}"</js>)
@@ -1818,7 +1818,7 @@
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Option #1 - Defined via annotation.</jc>
- * <ja>@RestResource</ja>(mimeTypes={<js>"text/plain txt text TXT"</js>})
+ * <ja>@Rest</ja>(mimeTypes={<js>"text/plain txt text TXT"</js>})
* <jk>public class</jk> MyResource {
*
* <jc>// Option #2 - Defined via builder passed in through resource constructor.</jc>
@@ -1894,7 +1894,7 @@
* }
*
* <jc>// Option #1 - Registered via annotation.</jc>
- * <ja>@RestResource</ja>(paramResolvers=MyRestParam.<jk>class</jk>)
+ * <ja>@Rest</ja>(paramResolvers=MyRestParam.<jk>class</jk>)
* <jk>public class</jk> MyResource {
*
* <jc>// Option #2 - Registered via builder passed in through resource constructor.</jc>
@@ -1974,7 +1974,7 @@
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Option #1 - Defined via annotation.</jc>
- * <ja>@RestResource</ja>(parsers={JsonParser.<jk>class</jk>, XmlParser.<jk>class</jk>})
+ * <ja>@Rest</ja>(parsers={JsonParser.<jk>class</jk>, XmlParser.<jk>class</jk>})
* <jk>public class</jk> MyResource {
*
* <jc>// Option #2 - Defined via builder passed in through resource constructor.</jc>
@@ -2061,7 +2061,7 @@
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Option #1 - Defined via annotation.</jc>
- * <ja>@RestResource</ja>(partParser=SimplePartParser.<jk>class</jk>)
+ * <ja>@Rest</ja>(partParser=SimplePartParser.<jk>class</jk>)
* <jk>public class</jk> MyResource {
*
* <jc>// Option #2 - Defined via builder passed in through resource constructor.</jc>
@@ -2132,7 +2132,7 @@
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Option #1 - Defined via annotation.</jc>
- * <ja>@RestResource</ja>(partSerializer=SimplePartSerializer.<jk>class</jk>)
+ * <ja>@Rest</ja>(partSerializer=SimplePartSerializer.<jk>class</jk>)
* <jk>public class</jk> MyResource {
*
* <jc>// Option #2 - Defined via builder passed in through resource constructor.</jc>
@@ -2197,7 +2197,7 @@
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Option #1 - Defined via annotation.</jc>
- * <ja>@RestResource</ja>(path=<js>"/myResource"</js>)
+ * <ja>@Rest</ja>(path=<js>"/myResource"</js>)
* <jk>public class</jk> MyResource {
*
* <jc>// Option #2 - Defined via builder passed in through resource constructor.</jc>
@@ -2266,7 +2266,7 @@
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Option #1 - Defined via annotation.</jc>
- * <ja>@RestResource</ja>(renderResponseStackTraces=<jk>true</jk>)
+ * <ja>@Rest</ja>(renderResponseStackTraces=<jk>true</jk>)
* <jk>public class</jk> MyResource {
*
* <jc>// Option #2 - Defined via builder passed in through resource constructor.</jc>
@@ -2346,7 +2346,7 @@
* }
*
* <jc>// Option #1 - Defined via annotation.</jc>
- * <ja>@RestResource</ja>(resourceResolver=MyResourceResolver.<jk>class</jk>)
+ * <ja>@Rest</ja>(resourceResolver=MyResourceResolver.<jk>class</jk>)
* <jk>public class</jk> MyResource {
*
* <jc>// Option #2 - Defined via builder passed in through resource constructor.</jc>
@@ -2438,7 +2438,7 @@
* }
*
* <jc>// Option #1 - Defined via annotation.</jc>
- * <ja>@RestResource</ja>(responseHandlers=MyResponseHandler.<jk>class</jk>)
+ * <ja>@Rest</ja>(responseHandlers=MyResponseHandler.<jk>class</jk>)
* <jk>public class</jk> MyResource {
*
* <jc>// Option #2 - Defined via builder passed in through resource constructor.</jc>
@@ -2509,7 +2509,7 @@
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* rolesDeclared=<js>"ROLE_ADMIN,ROLE_READ_WRITE,ROLE_READ_ONLY,ROLE_SPECIAL"</js>,
* roleGuard=<js>"ROLE_ADMIN || (ROLE_READ_WRITE && ROLE_SPECIAL)"</js>
* )
@@ -2550,7 +2550,7 @@
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* path=<js>"/foo"</js>,
* roleGuard=<js>"ROLE_ADMIN || (ROLE_READ_WRITE && ROLE_SPECIAL)"</js>
* )
@@ -2632,7 +2632,7 @@
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Option #1 - Defined via annotation.</jc>
- * <ja>@RestResource</ja>(serializers={JsonSerializer.<jk>class</jk>, XmlSerializer.<jk>class</jk>})
+ * <ja>@Rest</ja>(serializers={JsonSerializer.<jk>class</jk>, XmlSerializer.<jk>class</jk>})
* <jk>public class</jk> MyResource {
*
* <jc>// Option #2 - Defined via builder passed in through resource constructor.</jc>
@@ -2724,7 +2724,7 @@
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Option #1 - Defined via annotation resolving to a config file setting with default value.</jc>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* staticFileResponseHeaders={
* <js>"Cache-Control: $C{REST/cacheControl,nocache}"</js>,
* <js>"My-Header: $C{REST/myHeaderValue}"</js>
@@ -2757,7 +2757,7 @@
* <p>
* Note that headers can also be specified per path-mapping via the {@link Rest#staticFiles() @Rest(staticFiles)} annotation.
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* staticFiles={
* <js>"htdocs:docs:{'Cache-Control':'max-age=86400, public'}"</js>
* }
@@ -2810,7 +2810,7 @@
* <p class='bcode w800'>
* <jk>package</jk> com.foo.mypackage;
*
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* path=<js>"/myresource"</js>,
* staticFiles={
* <js>"htdocs:docs"</js>,
@@ -2833,7 +2833,7 @@
* <p>
* The location is interpreted as an absolute path if it starts with <js>'/'</js>.
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* staticFiles={
* <js>"htdocs:/docs"</js>
* }
@@ -2853,7 +2853,7 @@
* <p>
* Response headers can be specified for served files by adding a 3rd section that consists of a {@doc SimpleJson} object.
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* staticFiles={
* <js>"htdocs:docs:{'Cache-Control':'max-age=86400, public'}"</js>
* }
@@ -2863,7 +2863,7 @@
* <p>
* The same path can map to multiple locations. Files are searched in the order
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* staticFiles={
* <jc>// Search in absolute location '/htdocs/folder' before location 'htdocs.package' relative to servlet package.</jc>
* <js>"htdocs:/htdocs/folder,htdocs:htdocs.package"</js>
@@ -2922,7 +2922,7 @@
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Option #1 - Defined via annotation resolving to a config file setting with default value.</jc>
- * <ja>@RestResource</ja>(produces={<js>"$C{REST/supportedProduces,application/json}"</js>})
+ * <ja>@Rest</ja>(produces={<js>"$C{REST/supportedProduces,application/json}"</js>})
* <jk>public class</jk> MyResource {
*
* <jc>// Option #2 - Defined via builder passed in through resource constructor.</jc>
@@ -3031,7 +3031,7 @@
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Option #1 - Defined via annotation resolving to a config file setting with default value.</jc>
- * <ja>@RestResource</ja>(consumes={<js>"$C{REST/supportedConsumes,application/json}"</js>})
+ * <ja>@Rest</ja>(consumes={<js>"$C{REST/supportedConsumes,application/json}"</js>})
* <jk>public class</jk> MyResource {
*
* <jc>// Option #2 - Defined via builder passed in through resource constructor.</jc>
@@ -3089,7 +3089,7 @@
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Option #1 - Defined via annotation resolving to a config file setting with default value.</jc>
- * <ja>@RestResource</ja>(useClasspathResourceCaching=<js>"$C{REST/useClasspathResourceCaching,false}"</js>)
+ * <ja>@Rest</ja>(useClasspathResourceCaching=<js>"$C{REST/useClasspathResourceCaching,false}"</js>)
* <jk>public class</jk> MyResource {
*
* <jc>// Option #2 - Defined via builder passed in through resource constructor.</jc>
@@ -3150,7 +3150,7 @@
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Option #1 - Defined via annotation resolving to a config file setting with default value.</jc>
- * <ja>@RestResource</ja>(useStackTraceHashes=<js>"$C{REST/useStackTraceHashes,false}"</js>)
+ * <ja>@Rest</ja>(useStackTraceHashes=<js>"$C{REST/useStackTraceHashes,false}"</js>)
* <jk>public class</jk> MyResource {
*
* <jc>// Option #2 - Defined via builder passed in through resource constructor.</jc>
@@ -3220,7 +3220,7 @@
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Option #1 - Defined via annotation resolving to a config file setting with default value.</jc>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* path=<js>"/servlet"</js>,
* uriAuthority=<js>"$C{REST/authorityPathOverride,http://localhost:10000}"</js>
* )
@@ -3283,7 +3283,7 @@
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Option #1 - Defined via annotation resolving to a config file setting with default value.</jc>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* path=<js>"/servlet"</js>,
* uriContext=<js>"$C{REST/contextPathOverride,/foo}"</js>
* )
@@ -3344,7 +3344,7 @@
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Option #1 - Defined via annotation resolving to a config file setting with default value.</jc>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* path=<js>"/servlet"</js>,
* uriRelativity=<js>"$C{REST/uriRelativity,PATH_INFO}"</js>
* )
@@ -3405,7 +3405,7 @@
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Option #1 - Defined via annotation resolving to a config file setting with default value.</jc>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* path=<js>"/servlet"</js>,
* uriResolution=<js>"$C{REST/uriResolution,ABSOLUTE}"</js>
* )
@@ -3593,7 +3593,7 @@
/**
* Constructor.
*
- * @param resource The resource annotated with <ja>@RestResource</ja>.
+ * @param resource The resource annotated with <ja>@Rest</ja>.
* @return A new builder object.
* @throws ServletException Something bad happened.
*/
@@ -3605,7 +3605,7 @@
* Constructor.
*
* @param servletConfig The servlet config passed into the servlet by the servlet container.
- * @param resourceClass The class annotated with <ja>@RestResource</ja>.
+ * @param resourceClass The class annotated with <ja>@Rest</ja>.
* @param parentContext The parent context, or <jk>null</jk> if there is no parent context.
* @return A new builder object.
* @throws ServletException Something bad happened.
@@ -4061,7 +4061,7 @@
*
* <h5 class='figure'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* messages=<js>"nls/Messages"</js>,
* properties={
* <ja>@Property</ja>(name=<js>"title"</js>,value=<js>"$L{title}"</js>), <jc>// Localized variable in Messages.properties</jc>
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 1a981e1..be5097a 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
@@ -46,7 +46,7 @@
import org.apache.juneau.utils.*;
/**
- * Defines the initial configuration of a <c>RestServlet</c> or <c>@RestResource</c> annotated object.
+ * Defines the initial configuration of a <c>RestServlet</c> or <c>@Rest</c> annotated object.
*
* <p>
* An extension of the {@link ServletConfig} object used during servlet initialization.
@@ -60,8 +60,8 @@
* </ul>
*
* <p>
- * Methods are provided for overriding or augmenting the information provided by the <ja>@RestResource</ja> annotation.
- * In general, most information provided in the <ja>@RestResource</ja> annotation can be specified programmatically
+ * Methods are provided for overriding or augmenting the information provided by the <ja>@Rest</ja> annotation.
+ * In general, most information provided in the <ja>@Rest</ja> annotation can be specified programmatically
* through calls on this object.
*
* <p>
@@ -1595,7 +1595,7 @@
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* rolesDeclared=<js>"ROLE_ADMIN,ROLE_READ_WRITE,ROLE_READ_ONLY,ROLE_SPECIAL"</js>,
* roleGuard=<js>"ROLE_ADMIN || (ROLE_READ_WRITE && ROLE_SPECIAL)"</js>
* )
@@ -1622,7 +1622,7 @@
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* path=<js>"/foo"</js>,
* roleGuard=<js>"ROLE_ADMIN || (ROLE_READ_WRITE && ROLE_SPECIAL)"</js>
* )
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StaticFileMapping.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StaticFileMapping.java
index 2d0a621..92a6ec3 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StaticFileMapping.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StaticFileMapping.java
@@ -37,7 +37,7 @@
* <p class='bcode w800'>
* <jk>package</jk> com.foo.mypackage;
*
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* path=<js>"/myresource"</js>,
* staticFiles={<js>"htdocs:docs"</js>}
* )
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HookEvent.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HookEvent.java
index 5c7eca5..cf12769 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HookEvent.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HookEvent.java
@@ -57,7 +57,7 @@
*
* <h5 class='figure'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(...)
+ * <ja>@Rest</ja>(...)
* <jk>public class</jk> MyResource <jk>extends</jk> BasicRestServlet {
*
* <jc>// Add a request attribute to all incoming requests.</jc>
@@ -173,7 +173,7 @@
*
* <h5 class='figure'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(...)
+ * <ja>@Rest</ja>(...)
* <jk>public class</jk> MyResource <jk>extends</jk> BasicRestServlet {
*
* <jc>// Log the incoming request.</jc>
@@ -222,7 +222,7 @@
*
* <h5 class='figure'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(...)
+ * <ja>@Rest</ja>(...)
* <jk>public class</jk> MyResource <jk>extends</jk> BasicRestServlet {
*
* <jc>// Log the result of the request.</jc>
@@ -279,7 +279,7 @@
*
* <h5 class='figure'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(...)
+ * <ja>@Rest</ja>(...)
* <jk>public class</jk> MyResource <jk>extends</jk> BasicRestServlet {
*
* <jc>// Log the time it took to execute the request.</jc>
@@ -333,7 +333,7 @@
*
* <h5 class='figure'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(...)
+ * <ja>@Rest</ja>(...)
* <jk>public class</jk> PetStoreResource <jk>extends</jk> ResourceJena {
*
* <jc>// Our database.</jc>
@@ -443,7 +443,7 @@
*
* <h5 class='figure'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(...)
+ * <ja>@Rest</ja>(...)
* <jk>public class</jk> PetStoreResource <jk>extends</jk> ResourceJena {
*
* <jc>// Our database.</jc>
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 0c751bc..1a260b5 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
@@ -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>@RestResource</ja>(
+ * <ja>@Rest</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>@RestResource</ja>(
+ * <ja>@Rest</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>@RestResource</ja>(
+ * <ja>@Rest</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>@RestResource</ja>(
+ * <ja>@Rest</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>@RestResource</ja>(
+ * <ja>@Rest</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>@RestResource</ja>(
+ * <ja>@Rest</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>@RestResource</ja>(
+ * <ja>@Rest</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>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* htmldoc=<ja>@HtmlDoc</ja>(
* navlinks={
* <js>"up: request:/.."</js>,
@@ -391,7 +391,7 @@
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* htmldoc=<ja>@HtmlDoc</ja>(
* script={
* <js>"alert('Hello!')"</js>
@@ -431,7 +431,7 @@
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</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>@RestResource</ja>(
+ * <ja>@Rest</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/Logging.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Logging.java
index 2de9a7e..0e371f6 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Logging.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Logging.java
@@ -25,7 +25,7 @@
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* logging=<ja>@Logging</ja>(
* level=<js>"INFO"</js>,
* rules={
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/ResourceSwagger.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/ResourceSwagger.java
index 912eadc..05b9096 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/ResourceSwagger.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/ResourceSwagger.java
@@ -30,7 +30,7 @@
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* swagger=<ja>@ResourceSwagger</ja>(
* title=<js>"Petstore application"</js>
* )
@@ -62,7 +62,7 @@
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* swagger=<ja>@ResourceSwagger</ja>(
* description={
* <js>"This is a sample server Petstore server based on the Petstore sample at Swagger.io."<js>,
@@ -112,7 +112,7 @@
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* swagger=<ja>@MethodSwagger</ja>(
* contact=<js>"{name:'John Smith',email:'john.smith@foo.bar'}"</js>
* )
@@ -160,7 +160,7 @@
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* swagger=<ja>@MethodSwagger</ja>(
* externalDocs=<ja>@ExternalDocs</ja>(url=<js>"http://juneau.apache.org"</js>)
* )
@@ -191,7 +191,7 @@
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* swagger=<ja>@MethodSwagger</ja>(
* license=<js>"{name:'Apache 2.0',url:'http://www.apache.org/licenses/LICENSE-2.0.html'}"</js>
* )
@@ -240,7 +240,7 @@
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* swagger=<ja>@MethodSwagger</ja>(
* tags=<js>"[{name:'Foo',description:'Foobar'}]"</js>
* )
@@ -316,7 +316,7 @@
* The following are completely equivalent ways of defining the swagger description of a resource:
* <p class='bcode w800'>
* <jc>// Normal</jc>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* swagger=<ja>@ResourceSwagger</ja>(
* title=<js>"Petstore application"</js>,
* description={
@@ -352,7 +352,7 @@
* </p>
* <p class='bcode w800'>
* <jc>// Free-form</jc>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* swagger=@ResourceSwagger({
* <js>"title: 'Petstore application',"</js>,
* <js>"description: 'This is a sample server Petstore server based on the Petstore sample at Swagger.io.\nYou can find out more about Swagger at <a class='link' href='http://swagger.io'>http://swagger.io</a>.',"</js>,
@@ -385,7 +385,7 @@
* </p>
* <p class='bcode w800'>
* <jc>// Free-form with variables</jc>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* swagger=@ResourceSwagger(<js>"$F{MyResourceSwagger.json}"</js>)
* )
* </p>
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 ceccd47..804da06 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
@@ -38,7 +38,7 @@
* a REST resource.
*
* <ul class='seealso'>
- * <li class='link'>{@doc juneau-rest-server.RestResource}
+ * <li class='link'>{@doc juneau-rest-server.Rest}
* </ul>
*/
@Documented
@@ -453,7 +453,7 @@
* <p>
* Used to customize the output from the HTML Doc serializer.
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* path=<js>"/addressBook"</js>,
*
* <jc>// Links on the HTML rendition page.
@@ -689,18 +689,18 @@
*
* <h5 class='figure'>Example:</h5>
* <p class='bpcode'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* children={ChildResource.<jk>class</jk>}
* )
* <jk>public class</jk> TopLevelResource <jk>extends</jk> BasicRestServlet {...}
*
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* path=<js>"/child"</js>,
* children={GrandchildResource.<jk>class</jk>}
* )
* <jk>public class</jk> ChildResource {...}
*
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* path=<js>"/grandchild"</js>
* )
* <jk>public class</jk> GrandchildResource {
@@ -746,7 +746,7 @@
* }
* }
*
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* path=<js>"/myResource"</js>
* )
* <jk>public class</jk> MyResource <jk>extends</jk> BasicRestServlet {...}
@@ -762,7 +762,7 @@
*
* <h5 class='figure'>Example:</h5>
* <p class='bpcode'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* path=<js>"/myResource/{foo}/{bar}"</js>
* )
* <jk>public class</jk> MyResource <jk>extends</jk> BasicRestServlet {
@@ -895,7 +895,7 @@
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* rolesDeclared=<js>"ROLE_ADMIN,ROLE_READ_WRITE,ROLE_READ_ONLY,ROLE_SPECIAL"</js>,
* roleGuard=<js>"ROLE_ADMIN || (ROLE_READ_WRITE && ROLE_SPECIAL)"</js>
* )
@@ -918,7 +918,7 @@
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* path=<js>"/foo"</js>,
* roleGuard=<js>"ROLE_ADMIN || (ROLE_READ_WRITE && ROLE_SPECIAL)"</js>
* )
@@ -1035,7 +1035,7 @@
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
* <jc>// Option #1 - Defined via annotation resolving to a config file setting with default value.</jc>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* staticFileResponseHeaders={
* <js>"Cache-Control: $C{REST/cacheControl,nocache}"</js>,
* <js>"My-Header: $C{REST/myHeaderValue}"</js>
@@ -1066,9 +1066,9 @@
* </p>
*
* <p>
- * Note that headers can also be specified per path-mapping via the {@link Rest#staticFiles() @RestResource(staticFiles)} annotation.
+ * Note that headers can also be specified per path-mapping via the {@link Rest#staticFiles() Rest(staticFiles)} annotation.
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* staticFiles={
* <js>"htdocs:docs:{'Cache-Control':'max-age=86400, public'}"</js>
* }
@@ -1106,7 +1106,7 @@
* <p class='bcode w800'>
* <jk>package</jk> com.foo.mypackage;
*
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* path=<js>"/myresource"</js>,
* staticFiles={
* <js>"htdocs:docs"</js>,
@@ -1129,7 +1129,7 @@
* <p>
* The location is interpreted as an absolute path if it starts with <js>'/'</js>.
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* staticFiles={
* <js>"htdocs:/docs"</js>
* }
@@ -1149,7 +1149,7 @@
* <p>
* Response headers can be specified for served files by adding a 3rd section that consists of a {@doc SimpleJson} object.
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* staticFiles={
* <js>"htdocs:docs:{'Cache-Control':'max-age=86400, public'}"</js>
* }
@@ -1159,7 +1159,7 @@
* <p>
* The same path can map to multiple locations. Files are searched in the order
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* staticFiles={
* <jc>// Search in absolute location '/htdocs/folder' before location 'htdocs.package' relative to servlet package.</jc>
* <js>"htdocs:/htdocs/folder,htdocs:htdocs.package"</js>
@@ -1229,7 +1229,7 @@
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* path=<js>"/addressBook"</js>,
*
* <jc>// Swagger info.</jc>
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 545417a..8609545 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
@@ -326,7 +326,7 @@
try {
return Level.parse(string(in).toUpperCase());
} catch (Exception e) {
- throw new ConfigException("Invalid syntax for level on annotation @RestResource({0}): {1}", loc, in);
+ throw new ConfigException("Invalid syntax for level on annotation @Rest({0}): {1}", loc, in);
}
}
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestHook.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestHook.java
index 94f60ee..08389d0 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestHook.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestHook.java
@@ -24,7 +24,7 @@
* <p>
* For example, if you want to add an initialization method to your resource:
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(...)
+ * <ja>@Rest</ja>(...)
* <jk>public class</jk> MyResource {
*
* <jc>// Our database.</jc>
@@ -40,7 +40,7 @@
* <p>
* Or if you want to intercept REST calls:
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(...)
+ * <ja>@Rest</ja>(...)
* <jk>public class</jk> MyResource {
*
* <jc>// Add a request attribute to all incoming requests.</jc>
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/mock/MockRest.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/mock/MockRest.java
index a5dab2f..40b5148 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/mock/MockRest.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/mock/MockRest.java
@@ -29,7 +29,7 @@
* <jk>public class</jk> MockTest {
*
* <jc>// Our REST resource to test.</jc>
- * <ja>@RestResource</ja>(serializers=JsonSerializer.Simple.<jk>class</jk>, parsers=JsonParser.<jk>class</jk>)
+ * <ja>@Rest</ja>(serializers=JsonSerializer.Simple.<jk>class</jk>, parsers=JsonParser.<jk>class</jk>)
* <jk>public static class</jk> MyRest {
*
* <ja>@RestMethod</ja>(name=<jsf>PUT</jsf>, path=<js>"/String"</js>)
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/BoundedServletInputStream.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/BoundedServletInputStream.java
index 482a2b5..74a33bd 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/BoundedServletInputStream.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/BoundedServletInputStream.java
@@ -133,12 +133,12 @@
private void decrement() throws IOException {
remain--;
if (remain < 0)
- throw new IOException("Input limit exceeded. See @RestResource(maxInput).");
+ throw new IOException("Input limit exceeded. See @Rest(maxInput).");
}
private void decrement(long count) throws IOException {
remain -= count;
if (remain < 0)
- throw new IOException("Input limit exceeded. See @RestResource(maxInput).");
+ throw new IOException("Input limit exceeded. See @Rest(maxInput).");
}
}
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/FileVar.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/FileVar.java
index 08458ba..8d569d0 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/FileVar.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/FileVar.java
@@ -49,7 +49,7 @@
* <p>
* Example:
* <p class='bcode w800'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* htmldoc=<ja>@HtmlDoc</ja>(
* aside=<js>"$F{resources/MyAsideMessage.html, Oops not found!}"</js>
* )
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/PoweredByApache.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/PoweredByApache.java
index 7efbdc0..b17b811 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/PoweredByApache.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/PoweredByApache.java
@@ -26,7 +26,7 @@
* Typically it's used in the footer of the page, as shown below in the <c>RootResources</c> from the examples:
*
* <p class='bcode'>
- * <ja>@RestResource</ja>(
+ * <ja>@Rest</ja>(
* path=<js>"/"</js>,
* title=<js>"Root resources"</js>,
* description=<js>"Example of a router resource page."</js>,
diff --git a/juneau-sc/juneau-sc-server/juneau-server-config.cfg b/juneau-sc/juneau-sc-server/juneau-server-config.cfg
index ef52298..493e3e6 100755
--- a/juneau-sc/juneau-sc-server/juneau-server-config.cfg
+++ b/juneau-sc/juneau-sc-server/juneau-server-config.cfg
@@ -39,7 +39,7 @@
#=======================================================================================================================
[REST]
-# Comma-delimited list of key-value pairs that represent locations of static files that can be served up by your @RestResource-annotated
+# Comma-delimited list of key-value pairs that represent locations of static files that can be served up by your @Rest-annotated
# classes. These are static files that are served up by the servlet under the specified sub-paths.
# For example, given the following setting...
# staticFiles = htdocs:my-docs,styles/my-styles
