This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new bc68b29 Rename *Default classes to Basic*
bc68b29 is described below
commit bc68b2987f3fa662a88c4790d3f03f8ace7a116d
Author: JamesBognar <jamesbog...@apache.org>
AuthorDate: Fri Mar 2 10:31:35 2018 -0500
Rename *Default classes to Basic*
---
.../org/apache/juneau/dto/jsonschema/package.html | 2 +-
.../org/apache/juneau/html/HtmlDocSerializer.java | 6 +-
juneau-doc/src/main/javadoc/overview.html | 283 ++++++++++-----------
.../juneau/examples/rest/AtomFeedResource.java | 2 +-
.../examples/rest/CodeFormatterResource.java | 2 +-
.../juneau/examples/rest/DirectoryResource.java | 2 +-
.../examples/rest/DockerRegistryResource.java | 2 +-
.../juneau/examples/rest/HelloWorldResource.java | 2 +-
.../juneau/examples/rest/JsonSchemaResource.java | 2 +-
.../examples/rest/MethodExampleResource.java | 2 +-
.../juneau/examples/rest/PetStoreResource.java | 2 +-
.../juneau/examples/rest/PhotosResource.java | 2 +-
.../examples/rest/PredefinedLabelsResource.java | 2 +-
.../juneau/examples/rest/RequestEchoResource.java | 2 +-
.../apache/juneau/examples/rest/RootResources.java | 2 +-
.../juneau/examples/rest/SqlQueryResource.java | 2 +-
.../examples/rest/SystemPropertiesResource.java | 2 +-
.../juneau/examples/rest/TumblrParserResource.java | 2 +-
.../examples/rest/UrlEncodedFormResource.java | 2 +-
.../rest/addressbook/AddressBookResource.java | 2 +-
...tJenaDefault.java => BasicRestServletJena.java} | 2 +-
...naGroup.java => BasicRestServletJenaGroup.java} | 2 +-
.../microservice/resources/ConfigResource.java | 2 +-
.../microservice/resources/DebugResource.java | 2 +-
.../microservice/resources/DirectoryResource.java | 2 +-
.../microservice/resources/LogsResource.java | 2 +-
.../microservice/resources/SampleRootResource.java | 2 +-
.../microservice/resources/ShutdownResource.java | 2 +-
.../microservice/sample/HelloWorldResource.java | 2 +-
.../juneau/microservice/sample/RootResources.java | 2 +-
.../rest/test/BeanContextPropertiesResource.java | 2 +-
.../org/apache/juneau/rest/test/BpiResource.java | 2 +-
.../juneau/rest/test/CallbackStringsResource.java | 2 +-
.../juneau/rest/test/ClientFuturesResource.java | 2 +-
.../juneau/rest/test/ClientVersionResource.java | 6 +-
.../apache/juneau/rest/test/ConfigResource.java | 2 +-
.../apache/juneau/rest/test/ContentResource.java | 2 +-
.../juneau/rest/test/ErrorConditionsResource.java | 2 +-
.../apache/juneau/rest/test/FormDataResource.java | 2 +-
.../juneau/rest/test/HtmlDocLinksResource.java | 2 +-
.../apache/juneau/rest/test/HtmlDocResource.java | 2 +-
.../juneau/rest/test/InterfaceProxyResource.java | 2 +-
.../juneau/rest/test/LargePojosResource.java | 2 +-
.../apache/juneau/rest/test/MessagesResource.java | 2 +-
.../org/apache/juneau/rest/test/NlsResource.java | 14 +-
.../rest/test/OptionsWithoutNlsResource.java | 2 +-
.../rest/test/OverlappingMethodsResource.java | 2 +-
.../apache/juneau/rest/test/ParamsResource.java | 2 +-
.../apache/juneau/rest/test/ParsersResource.java | 2 +-
.../org/apache/juneau/rest/test/PathResource.java | 6 +-
.../juneau/rest/test/PathVariablesResource.java | 2 +-
.../org/apache/juneau/rest/test/PathsResource.java | 4 +-
.../juneau/rest/test/PropertiesResource.java | 2 +-
.../org/apache/juneau/rest/test/QueryResource.java | 2 +-
.../juneau/rest/test/RequestBeanProxyResource.java | 2 +-
.../juneau/rest/test/RestClient2Resource.java | 2 +-
.../juneau/rest/test/RestHooksInitResource.java | 4 +-
.../apache/juneau/rest/test/RestHooksResource.java | 8 +-
.../java/org/apache/juneau/rest/test/Root.java | 2 +-
.../juneau/rest/test/SerializersResource.java | 2 +-
.../juneau/rest/test/ThirdPartyProxyResource.java | 2 +-
.../juneau/rest/test/TransformsParentResource.java | 2 +-
.../org/apache/juneau/rest/test/UrisResource.java | 6 +-
.../{DefaultProvider.java => BasicProvider.java} | 4 +-
...ndlerDefault.java => BasicRestCallHandler.java} | 4 +-
...iderDefault.java => BasicRestInfoProvider.java} | 4 +-
...RestLoggerDefault.java => BasicRestLogger.java} | 2 +-
...Default.java => BasicRestResourceResolver.java} | 2 +-
...stServletDefault.java => BasicRestServlet.java} | 4 +-
...ervletGroup.java => BasicRestServletGroup.java} | 4 +-
.../{RestLoggerNoOp.java => NoOpRestLogger.java} | 2 +-
.../org/apache/juneau/rest/RestCallHandler.java | 2 +-
.../java/org/apache/juneau/rest/RestContext.java | 38 +--
.../org/apache/juneau/rest/RestContextBuilder.java | 18 +-
.../org/apache/juneau/rest/RestInfoProvider.java | 2 +-
.../java/org/apache/juneau/rest/RestLogger.java | 2 +-
.../apache/juneau/rest/RestResourceResolver.java | 2 +-
.../org/apache/juneau/rest/StaticFileMapping.java | 4 +-
.../apache/juneau/rest/annotation/HookEvent.java | 8 +-
.../juneau/rest/annotation/MethodSwagger.java | 10 +-
.../juneau/rest/remoteable/RemoteableServlet.java | 2 +-
81 files changed, 273 insertions(+), 286 deletions(-)
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 264b3e8..094782e 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
@@ -428,7 +428,7 @@
}
)
)
- <jk>public class</jk> JsonSchemaResource <jk>extends</jk>
RestServletJenaDefault {
+ <jk>public class</jk> JsonSchemaResource <jk>extends</jk>
BasicRestServletJena {
<jk>private</jk> Schema <jf>schema</jf>; <jc>// The schema
document</jc>
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 763690a..48abe4d 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
@@ -43,7 +43,7 @@ import org.apache.juneau.serializer.*;
*
<ja>@Property</ja>(name=HtmlDocSerializer.<jsf>HTMLDOC_navlinks</jsf>,
value=<js>"{options:'?method=OPTIONS',doc:'doc'}"</js>)
* }
* )
- * <jk>public class</jk> AddressBookResource <jk>extends</jk>
RestServletJenaDefault {
+ * <jk>public class</jk> AddressBookResource <jk>extends</jk>
BasicRestServletJena {
* </p>
*
* <p>
@@ -288,7 +288,7 @@ public class HtmlDocSerializer extends
HtmlStrippedDocSerializer {
* value=<js>"['options: ?method=OPTIONS',
'doc: doc']"</js>)
* }
* )
- * <jk>public class</jk> AddressBookResource <jk>extends</jk>
RestServletJenaDefault {
+ * <jk>public class</jk> AddressBookResource <jk>extends</jk>
BasicRestServletJena {
* </p>
*
* <p>
@@ -306,7 +306,7 @@ public class HtmlDocSerializer extends
HtmlStrippedDocSerializer {
* }
* )
* )
- * <jk>public class</jk> AddressBookResource <jk>extends</jk>
RestServletJenaDefault {
+ * <jk>public class</jk> AddressBookResource <jk>extends</jk>
BasicRestServletJena {
* </p>
*/
public static final String HTMLDOC_navlinks = PREFIX + "navlinks.ls";
diff --git a/juneau-doc/src/main/javadoc/overview.html
b/juneau-doc/src/main/javadoc/overview.html
index 356a708..27b5f54 100644
--- a/juneau-doc/src/main/javadoc/overview.html
+++ b/juneau-doc/src/main/javadoc/overview.html
@@ -188,7 +188,7 @@
<li><p><a class='doclink'
href='#juneau-rest-server.Instantiation'>Instantiation</a></p>
<ol>
<li><p><a class='doclink'
href='#juneau-rest-server.RestServlet'>RestServlet</a></p>
- <li><p><a class='doclink'
href='#juneau-rest-server.RestServletDefault'>RestServletDefault</a></p>
+ <li><p><a class='doclink'
href='#juneau-rest-server.BasicRestServlet'>BasicRestServlet</a></p>
<li><p><a class='doclink'
href='#juneau-rest-server.Children'>Children</a></p>
<li><p><a class='doclink'
href='#juneau-rest-server.RouterPages'>Router Pages</a></p>
<li><p><a class='doclink'
href='#juneau-rest-server.ResourceResolvers'>Resource Resolvers</a></p>
@@ -239,7 +239,7 @@
<li><p><a class='doclink'
href='#juneau-rest-server.OptionsPages'>OPTIONS pages</a></p>
<ol>
<li><p><a class='doclink'
href='#juneau-rest-server.RestInfoProvider'>RestInfoProvider</a></p>
- <li><p><a class='doclink'
href='#juneau-rest-server.RestInfoProviderDefault'>RestInfoProviderDefault</a></p>
+ <li><p><a class='doclink'
href='#juneau-rest-server.BasicRestInfoProvider'>BasicRestInfoProvider</a></p>
</ol>
<li><p><a class='doclink'
href='#juneau-rest-server.HtmlDocAnnotation'>@HtmlDoc</a></p>
<ol>
@@ -6379,7 +6379,7 @@
}
)
)
- <jk>public class</jk> HelloWorldResource <jk>extends</jk>
RestServletDefault {
+ <jk>public class</jk> HelloWorldResource <jk>extends</jk>
BasicRestServlet {
<ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/*"</js>,
summary=<js>"Responds with \"Hello world!\""</js>)
<jk>public</jk> String sayHello() {
@@ -6398,7 +6398,7 @@
<br>However, we could have returned any POJO consisting
of beans, maps, collections, etc...
</p>
<p>
- The {@link org.apache.juneau.rest.RestServletDefault}
class that we're using here is a subclass of
+ The {@link org.apache.juneau.rest.BasicRestServlet}
class that we're using here is a subclass of
{@link org.apache.juneau.rest.RestServlet} that
provides default support for a variety of content types.
<br>Implementers can choose to use this class, or
create their own subclass of
{@link org.apache.juneau.rest.RestServlet} with their
own specialized serializers and parsers.
@@ -6420,10 +6420,10 @@
{@link
org.apache.juneau.rest.RestServlet org.apache.juneau.rest.RestServlet}
<br>Contains all the main logic.
<ul>
- <li class='jac'>{@link
org.apache.juneau.rest.RestServletDefault
org.apache.juneau.rest.RestServletDefault}
+ <li class='jac'>{@link
org.apache.juneau.rest.BasicRestServlet org.apache.juneau.rest.BasicRestServlet}
<br>Provides a
default set of serializers, parsers, options page, stylesheet, and other common
settings.
<ul>
- <li
class='jac'>{@link org.apache.juneau.rest.RestServletGroup
org.apache.juneau.rest.RestServletGroup}
+ <li
class='jac'>{@link org.apache.juneau.rest.BasicRestServletGroup
org.apache.juneau.rest.BasicRestServletGroup}
<br>A default implementation for "router" pages.
</li>
</ul>
@@ -6491,7 +6491,7 @@
</p>
<p>
Most developers are not going to be using the
<l>RestServlet</l> class itself, and instead will
- extend from one of the preconfigured default
servlets such as {@link org.apache.juneau.rest.RestServletDefault}.
+ extend from one of the preconfigured default
servlets such as {@link org.apache.juneau.rest.BasicRestServlet}.
<br>The <l>RestServlet</l> class by itself is
not configured with any serializers and parsers, and therefore
not very useful on it's own.
<br>However, the class does provide a couple of
convenience methods to be aware of:
@@ -6510,11 +6510,11 @@
</div>
<!--
========================================================================================================
-->
- <a id="juneau-rest-server.RestServletDefault"></a>
- <h4 class='topic' onclick='toggle(this)'>7.3.2 -
RestServletDefault</h4>
+ <a id="juneau-rest-server.BasicRestServlet"></a>
+ <h4 class='topic' onclick='toggle(this)'>7.3.2 -
BasicRestServlet</h4>
<div class='topic'>
<p>
- The {@link
org.apache.juneau.rest.RestServletDefault} class is a subclass of {@link
org.apache.juneau.rest.RestServlet}
+ The {@link
org.apache.juneau.rest.BasicRestServlet} class is a subclass of {@link
org.apache.juneau.rest.RestServlet}
preconfigured with the following:
</p>
<ul class='spaced-list'>
@@ -6582,7 +6582,7 @@
// For example, "/servletPath/htdocs/javadoc.css" resolves to
the file "[servlet-package]/htdocs/javadoc.css"</jc>
staticFiles={<js>"htdocs:htdocs"</js>,<js>"styles:styles"</js>}
)
- <jk>public abstract class</jk> RestServletDefault <jk>extends</jk>
RestServlet {
+ <jk>public abstract class</jk> BasicRestServlet <jk>extends</jk>
RestServlet {
<jc>// Show resource options.</jc>
<ja>@RestMethod</ja>(name=<jsf>OPTIONS</jsf>,
path=<js>"/*"</js>,
@@ -6626,7 +6626,7 @@
path=<js>"/parent"</js>,
children={FooResource.<jk>class</jk>}
)
- <jk>public</jk> MyResource <jk>extends</jk> RestServletDefault {...}
+ <jk>public</jk> MyResource <jk>extends</jk> BasicRestServlet {...}
</p>
<p class='bcode'>
<jd>/** Child Resource */</jd>
@@ -6656,7 +6656,7 @@
<h4 class='topic' onclick='toggle(this)'>7.3.4 - Router
Pages</h4>
<div class='topic'>
<p>
- The {@link
org.apache.juneau.rest.RestServletGroup} class provides a default "router" page
for
+ The {@link
org.apache.juneau.rest.BasicRestServletGroup} class provides a default "router"
page for
child resources when a parent resource is
nothing more than a grouping of child resources.
</p>
<p>
@@ -6701,15 +6701,15 @@
</p>
<img class='bordered'
src="doc-files/juneau-rest-server.RouterPages.1.png" style='width:800px;'/>
<p>
- The {@link
org.apache.juneau.rest.RestServletGroup} class is nothing more than a subclass
of
- {@link
org.apache.juneau.rest.RestServletDefault} with a <l>getChildren()</l> method
mapped to the servlet
+ The {@link
org.apache.juneau.rest.BasicRestServletGroup} class is nothing more than a
subclass of
+ {@link org.apache.juneau.rest.BasicRestServlet}
with a <l>getChildren()</l> method mapped to the servlet
root path.
<br>The method returns a POJO with is just a
linked-list of beans with name/description properties.
</p>
<p class='bcode'>
<jc>// The entire contents of the RestServletGroup class.</jc>
- <jk>public class</jk> RestServletGroup <jk>extends</jk>
RestServletDefault {
+ <jk>public class</jk> RestServletGroup <jk>extends</jk>
BasicRestServlet {
<ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/"</js>,
description=<js>"Child resources"</js>)
<jk>public</jk> ChildResourceDescriptions
getChildren(RestRequest req) {
@@ -6740,7 +6740,7 @@
<ul class='doctree'>
<li class='jic'>{@link
org.apache.juneau.rest.RestResourceResolver}
<ul>
- <li class='jc'>{@link
org.apache.juneau.rest.RestResourceResolverDefault}
+ <li class='jc'>{@link
org.apache.juneau.rest.BasicRestResourceResolver}
</ul>
</ul>
<p>
@@ -7914,7 +7914,7 @@
<ja>@RestResource</ja>(
path=<js>"/urlEncodedForm"</js>
)
- <jk>public class</jk> UrlEncodedFormResource <jk>extends</jk>
RestServletDefault {
+ <jk>public class</jk> UrlEncodedFormResource <jk>extends</jk>
BasicRestServlet {
<jd>/** POST request handler */</jd>
<ja>@RestMethod</ja>(name=<jsf>POST</jsf>, path=<js>"/"</js>)
@@ -8304,7 +8304,7 @@
<ja>@Property</ja>(name=<jsf>JSON_escapeSolidus</jsf>,
value=<js>"true"</js>)
}
)
- <jk>public</jk> MyRestServlet <jk>extends</jk> RestServletDefault {...}
+ <jk>public</jk> MyRestServlet <jk>extends</jk> BasicRestServlet {...}
</p>
<p>
The programmatic equivalent to this is:
@@ -8312,7 +8312,7 @@
<p class='bcode'>
<jc>// Servlet with properties applied</jc>
<ja>@RestResource</ja>(...)
- <jk>public</jk> MyRestServlet <jk>extends</jk> RestServletDefault {
+ <jk>public</jk> MyRestServlet <jk>extends</jk> BasicRestServlet {
<jk>public</jk> MyRestServlet(RestContextBuilder builder) {
@@ -8421,7 +8421,7 @@
<jc>// Bean properties not defined on that interface
will be ignored.</jc>
}
)
- <jk>public</jk> MyRestServlet <jk>extends</jk> RestServletDefault {...}
+ <jk>public</jk> MyRestServlet <jk>extends</jk> BasicRestServlet {...}
</p>
<p>
The programmatic equivalent to this is:
@@ -8429,7 +8429,7 @@
<p class='bcode'>
<jc>// Servlet with properties applied</jc>
<ja>@RestResource</ja>(...)
- <jk>public</jk> MyRestServlet <jk>extends</jk> RestServletDefault {
+ <jk>public</jk> MyRestServlet <jk>extends</jk> BasicRestServlet {
<jk>public</jk> MyRestServlet(RestContextBuilder builder) {
@@ -9014,7 +9014,7 @@
</p>
<p>
The annotation itself can contain string variables.
- <br>For example, the Microservice API {@link
org.apache.juneau.rest.RestServletDefault} class defines the
+ <br>For example, the Microservice API {@link
org.apache.juneau.rest.BasicRestServlet} class defines the
location of the config file as a system property
<l>"juneau.configFile"</l>:
</p>
<p class='bcode'>
@@ -9080,7 +9080,7 @@
config=<js>"config_dir/myconfig.cfg"</js>,
...
)
- <jk>public class</jk> HelloWorldResource <jk>extends</jk>
RestServletDefault {
+ <jk>public class</jk> HelloWorldResource <jk>extends</jk>
BasicRestServlet {
<jd>/**
* GET request handler.
@@ -9117,7 +9117,7 @@
config=<js>"config_dir/myconfig.cfg"</js>,
...
)
- <jk>public class</jk> HelloWorldResource <jk>extends</jk>
RestServletDefault {
+ <jk>public class</jk> HelloWorldResource <jk>extends</jk>
BasicRestServlet {
<jd>/**
* GET request handler.
@@ -9153,7 +9153,7 @@
path=<js>"/myresource"</js>,
staticFiles={<js>"htdocs:docs"</js>}
)
- <jk>public class</jk> MyResource <jk>extends</jk> RestServletDefault
{...}
+ <jk>public class</jk> MyResource <jk>extends</jk> BasicRestServlet {...}
</p>
<p>
Static files are found by calling {@link
java.lang.Class#getResource(String)} up the class hierarchy.
@@ -9242,12 +9242,12 @@
<h5 class='figure'>OPTIONS page for HelloWorld sample
resource</h5>
<img class='bordered'
src='doc-files/juneau-rest-server.OptionsPages.1.png' style='width:800px;'>
<p>
- The {@link org.apache.juneau.rest.RestServletDefault}
class implements the page by creating a method
+ The {@link org.apache.juneau.rest.BasicRestServlet}
class implements the page by creating a method
mapped to the <l>OPTIONS</l> HTTP method that simply
returns a Swagger bean:
</p>
<p class='bcode'>
<ja>@RestResource</ja>(...)
- <jk>public class</jk> RestServletDefault <jk>extends</jk> RestServlet {
+ <jk>public class</jk> BasicRestServlet <jk>extends</jk> RestServlet {
<ja>@RestMethod</ja>(name=<jsf>OPTIONS</jsf>,
path=<js>"/*"</js>,
summary=<js>"Resource options"</js>,
@@ -9312,16 +9312,16 @@
</ul>
<p>
While you can implement this interface from
scratch, you may want to instead consider extending
- from the <l>RestInfoProviderDefault</l> class
described next.
+ from the <l>BasicRestInfoProvider</l> class
described next.
</p>
</div>
<!--
========================================================================================================
-->
- <a id="juneau-rest-server.RestInfoProviderDefault"></a>
- <h4 class='topic' onclick='toggle(this)'>7.23.2 -
RestInfoProviderDefault</h4>
+ <a id="juneau-rest-server.BasicRestInfoProvider"></a>
+ <h4 class='topic' onclick='toggle(this)'>7.23.2 -
BasicRestInfoProvider</h4>
<div class='topic'>
<p>
- The {@link
org.apache.juneau.rest.RestInfoProviderDefault} class is the default
implementation of the
+ The {@link
org.apache.juneau.rest.BasicRestInfoProvider} class is the default
implementation of the
{@link org.apache.juneau.rest.RestInfoProvider}
interface.
</p>
<p>
@@ -9341,25 +9341,25 @@
In addition to the methods defined on the
<l>RestInfoProvider</l> interface, it also includes the following methods:
</p>
<ul class='doctree'>
- <li class='jc'><code>{@link
org.apache.juneau.rest.RestInfoProviderDefault} <jk>implements</jk> {@link
org.apache.juneau.rest.RestInfoProvider}</code>
+ <li class='jc'><code>{@link
org.apache.juneau.rest.BasicRestInfoProvider} <jk>implements</jk> {@link
org.apache.juneau.rest.RestInfoProvider}</code>
<ul>
- <li class='jm'>{@link
org.apache.juneau.rest.RestInfoProviderDefault#getVersion(RestRequest)
getVersion(RestRequest)}
- <li class='jm'>{@link
org.apache.juneau.rest.RestInfoProviderDefault#getContact(RestRequest)
getContact(RestRequest)}
- <li class='jm'>{@link
org.apache.juneau.rest.RestInfoProviderDefault#getConsumes(RestRequest)
getConsumes(RestRequest)}
- <li class='jm'>{@link
org.apache.juneau.rest.RestInfoProviderDefault#getProduces(RestRequest)
getProduces(RestRequest)}
- <li class='jm'>{@link
org.apache.juneau.rest.RestInfoProviderDefault#getLicense(RestRequest)
getLicense(RestRequest)}
- <li class='jm'>{@link
org.apache.juneau.rest.RestInfoProviderDefault#getTags(RestRequest)
getTags(RestRequest)}
- <li class='jm'>{@link
org.apache.juneau.rest.RestInfoProviderDefault#getTermsOfService(RestRequest)
getTermsOfService(RestRequest)}
- <li class='jm'>{@link
org.apache.juneau.rest.RestInfoProviderDefault#getExternalDocs(RestRequest)
getExternalDocs(RestRequest)}
- <li class='jm'>{@link
org.apache.juneau.rest.RestInfoProviderDefault#getMethodSummary(Method,RestRequest)
getMethodSummary(Method,RestRequest)}
- <li class='jm'>{@link
org.apache.juneau.rest.RestInfoProviderDefault#getMethodDescription(Method,RestRequest)
getMethodDescription(Method,RestRequest)}
- <li class='jm'>{@link
org.apache.juneau.rest.RestInfoProviderDefault#getMethodOperationId(Method,RestRequest)
getMethodOperationId(Method,RestRequest)}
- <li class='jm'>{@link
org.apache.juneau.rest.RestInfoProviderDefault#getMethodConsumes(Method,RestRequest)
getMethodConsumes(Method,RestRequest)}
- <li class='jm'>{@link
org.apache.juneau.rest.RestInfoProviderDefault#getMethodProduces(Method,RestRequest)
getMethodProduces(Method,RestRequest)}
- <li class='jm'>{@link
org.apache.juneau.rest.RestInfoProviderDefault#getMethodParameters(Method,RestRequest)
getMethodParameters(Method,RestRequest)}
- <li class='jm'>{@link
org.apache.juneau.rest.RestInfoProviderDefault#getMethodResponses(Method,RestRequest)
getMethodResponses(Method,RestRequest)}
- <li class='jm'>{@link
org.apache.juneau.rest.RestInfoProviderDefault#getMethodTags(Method,RestRequest)
getMethodTags(Method,RestRequest)}
- <li class='jm'>{@link
org.apache.juneau.rest.RestInfoProviderDefault#getSwaggerFromFile(RestRequest)
getSwaggerFromFile(RestRequest)}
+ <li class='jm'>{@link
org.apache.juneau.rest.BasicRestInfoProvider#getVersion(RestRequest)
getVersion(RestRequest)}
+ <li class='jm'>{@link
org.apache.juneau.rest.BasicRestInfoProvider#getContact(RestRequest)
getContact(RestRequest)}
+ <li class='jm'>{@link
org.apache.juneau.rest.BasicRestInfoProvider#getConsumes(RestRequest)
getConsumes(RestRequest)}
+ <li class='jm'>{@link
org.apache.juneau.rest.BasicRestInfoProvider#getProduces(RestRequest)
getProduces(RestRequest)}
+ <li class='jm'>{@link
org.apache.juneau.rest.BasicRestInfoProvider#getLicense(RestRequest)
getLicense(RestRequest)}
+ <li class='jm'>{@link
org.apache.juneau.rest.BasicRestInfoProvider#getTags(RestRequest)
getTags(RestRequest)}
+ <li class='jm'>{@link
org.apache.juneau.rest.BasicRestInfoProvider#getTermsOfService(RestRequest)
getTermsOfService(RestRequest)}
+ <li class='jm'>{@link
org.apache.juneau.rest.BasicRestInfoProvider#getExternalDocs(RestRequest)
getExternalDocs(RestRequest)}
+ <li class='jm'>{@link
org.apache.juneau.rest.BasicRestInfoProvider#getMethodSummary(Method,RestRequest)
getMethodSummary(Method,RestRequest)}
+ <li class='jm'>{@link
org.apache.juneau.rest.BasicRestInfoProvider#getMethodDescription(Method,RestRequest)
getMethodDescription(Method,RestRequest)}
+ <li class='jm'>{@link
org.apache.juneau.rest.BasicRestInfoProvider#getMethodOperationId(Method,RestRequest)
getMethodOperationId(Method,RestRequest)}
+ <li class='jm'>{@link
org.apache.juneau.rest.BasicRestInfoProvider#getMethodConsumes(Method,RestRequest)
getMethodConsumes(Method,RestRequest)}
+ <li class='jm'>{@link
org.apache.juneau.rest.BasicRestInfoProvider#getMethodProduces(Method,RestRequest)
getMethodProduces(Method,RestRequest)}
+ <li class='jm'>{@link
org.apache.juneau.rest.BasicRestInfoProvider#getMethodParameters(Method,RestRequest)
getMethodParameters(Method,RestRequest)}
+ <li class='jm'>{@link
org.apache.juneau.rest.BasicRestInfoProvider#getMethodResponses(Method,RestRequest)
getMethodResponses(Method,RestRequest)}
+ <li class='jm'>{@link
org.apache.juneau.rest.BasicRestInfoProvider#getMethodTags(Method,RestRequest)
getMethodTags(Method,RestRequest)}
+ <li class='jm'>{@link
org.apache.juneau.rest.BasicRestInfoProvider#getSwaggerFromFile(RestRequest)
getSwaggerFromFile(RestRequest)}
</ul>
</ul>
<p>
@@ -9394,12 +9394,12 @@
<li>
Use any combination of the above.
<li>
- Extend the
<l>RestInfoProviderDefault</l> and provide customized behavior.
+ Extend the <l>BasicRestInfoProvider</l>
and provide customized behavior.
<br><h5 class='figure'>Example:</h5>
<p class='bcode'>
<jc>// Our customized info provider.</jc>
<jc>// Extend from the default implementation and selectively override
values.</jc>
- <jk>public class</jk> MyRestInfoProvider <jk>extends</jk>
RestInfoProviderDefault {
+ <jk>public class</jk> MyRestInfoProvider <jk>extends</jk>
BasicRestInfoProvider {
<jc>// Must provide this constructor!</jc>
<jk>public</jk> MyRestInfoProvider(RestContext context) {
@@ -9511,7 +9511,7 @@
}
)
)
- <jk>public class</jk> HelloWorldResource <jk>extends</jk>
RestServletDefault {...}
+ <jk>public class</jk> HelloWorldResource <jk>extends</jk>
BasicRestServlet {...}
</p>
<p>
SVL variables can be used in any of these annotations:
@@ -9537,7 +9537,7 @@
}
)
)
- <jk>public class</jk> HelloWorldResource <jk>extends</jk>
RestServletDefault {...}
+ <jk>public class</jk> HelloWorldResource <jk>extends</jk>
BasicRestServlet {...}
</p>
<h5 class='section'>See Also:</h5>
<ul>
@@ -9696,7 +9696,7 @@
<br>Instead, it just uses the existing
open-ended API for defining branding.
</p>
<p>
- The Juneau icon shown is a result of the header
annotation on the {@link org.apache.juneau.rest.RestServletDefault} class:
+ The Juneau icon shown is a result of the header
annotation on the {@link org.apache.juneau.rest.BasicRestServlet} class:
</p>
<p class='bcode'>
<ja>@RestResource</ja>(
@@ -9716,7 +9716,7 @@
),
staticFiles={<js>"htdocs:htdocs"</js>}
)
- <jk>public abstract class</jk> RestServletDefault <jk>extends</jk>
RestServlet {...}
+ <jk>public abstract class</jk> BasicRestServlet <jk>extends</jk>
RestServlet {...}
</p>
<p>
The <js>"juneau.png"</js> image file is located
in <code>org.apache.juneau.rest.htdocs</code> package and
@@ -9725,7 +9725,7 @@
<br>Then we just reference using a URI
resolution variable <js>"$U{servlet:/htdocs/juneau.png}"</js>.
</p>
<p>
- To change this image, you can extend the
<l>RestServletDefault</l> class and simply override the annotations
+ To change this image, you can extend the
<l>BasicRestServlet</l> class and simply override the annotations
pointing to your own icon.
</p>
<p class='bcode'>
@@ -9746,7 +9746,7 @@
),
staticFiles={<js>"my-htdocs:my-htdocs"</js>}
)
- <jk>public class</jk> MyResourceBaseClass <jk>extends</jk>
RestServletDefault {...}
+ <jk>public class</jk> MyResourceBaseClass <jk>extends</jk>
BasicRestServlet {...}
</p>
<p>
The footer icon shown is generated by a
predefined widget:
@@ -9790,7 +9790,7 @@
staticFiles={<js>"my-htdocs:my-htdocs"</js>}
...
)
- <jk>public class</jk> MyResourceBaseClass <jk>extends</jk>
RestServletDefault {...}
+ <jk>public class</jk> MyResourceBaseClass <jk>extends</jk>
BasicRestServlet {...}
</p>
<p>
Note how the "User Interface" is open-ended to
pretty much lets you do whatever you want.
@@ -9819,7 +9819,7 @@
<img class='bordered'
src='doc-files/juneau-rest-server.Stylesheets.3.png' style='width:800px'/>
<p>
The stylesheet URL is controlled by the {@link
org.apache.juneau.rest.annotation.HtmlDoc#stylesheet() @HtmlDoc.stylesheet()}
annotation.
- <br>The {@link
org.apache.juneau.rest.RestServletDefault} class defines the stylesheet served
up as a static file:
+ <br>The {@link
org.apache.juneau.rest.BasicRestServlet} class defines the stylesheet served up
as a static file:
<p class='bcode'>
<ja>@RestResource</ja>(
htmldoc=<ja>@HtmlDoc</ja>(
@@ -9828,7 +9828,7 @@
staticFiles={<js>"styles:styles"</js>}
)
- <jk>public abstract class</jk> RestServletDefault <jk>extends</jk>
RestServlet {...}
+ <jk>public abstract class</jk> BasicRestServlet <jk>extends</jk>
RestServlet {...}
</p>
<p>
The
<js>"$C{REST/stylesheet,servlet:/styles/devops.css}"</js> variable says to use
the URI defined
@@ -9846,7 +9846,7 @@
),
staticFiles={<js>"my-styles:my-styles"</js>}
)
- <jk>public class</jk> MyResourceBaseClass <jk>extends</jk>
RestServletDefault {...}
+ <jk>public class</jk> MyResourceBaseClass <jk>extends</jk>
BasicRestServlet {...}
</p>
<p>
You can try out different stylesheets by
passing in a <code>stylesheet</code> attribute in the request
@@ -10204,7 +10204,7 @@
}
)
)
- <jk>public class</jk> PhotosResource <jk>extends</jk>
RestServletDefault {
+ <jk>public class</jk> PhotosResource <jk>extends</jk> BasicRestServlet {
<jc>// Our cache of photos</jc>
<jk>private</jk> Map<Integer,Photo> photos = <jk>new</jk>
TreeMap<Integer,Photo>();
@@ -10907,7 +10907,7 @@
<ja>@RestResource</ja>(
path=<js>"/child"</js>
)
- <jk>public class</jk> MyChildResource <jk>extends</jk>
RestServletDefault {
+ <jk>public class</jk> MyChildResource <jk>extends</jk> BasicRestServlet
{
<jk>private final</jk> Bean1 <jf>bean1</jf>;
<jk>private final</jk> Bean2 <jf>bean2</jf>;
@@ -10951,7 +10951,7 @@
<br>The following examples is pulled from the REST
examples:
</p>
<p class='bcode'>
- <jk>public class</jk> PredefinedLabelsResource <jk>extends</jk>
RestServletDefault {
+ <jk>public class</jk> PredefinedLabelsResource <jk>extends</jk>
BasicRestServlet {
<ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/"</js>)
<jk>public</jk> ResourceDescription[] getChildMethods() {
@@ -11131,12 +11131,12 @@
to specify the serializers/parsers associated
with a provider, and optionally filters and properties to
apply to those serializers and parsers.
<li class='jc'>
- {@link
org.apache.juneau.rest.jaxrs.DefaultProvider} - A default provider that
provides the same level
- of media type support as the {@link
org.apache.juneau.rest.RestServletDefault} class.
+ {@link
org.apache.juneau.rest.jaxrs.BasicProvider} - A default provider that provides
the same level
+ of media type support as the {@link
org.apache.juneau.rest.BasicRestServlet} class.
</ul>
<p>
- For the most part, when using these components, you'll
either use the existing <l>DefaultProvider</l> or
- <l>JuneauProvider</l> providers, or define your own by
subclassing <l>BaseProvider</l>.
+ For the most part, when using these components, you'll
either use the existing <l>BasicProvider</l>,
+ or define your own by subclassing <l>BaseProvider</l>.
</p>
</div>
</div>
@@ -12761,7 +12761,7 @@
</p>
<p class='bcode'>
<ja>@RestResource</ja>(...)
- <jk>public class</jk> MyHelloResource <jk>extends</jk>
RestServletDefault {
+ <jk>public class</jk> MyHelloResource <jk>extends</jk> BasicRestServlet
{
<jc>// Access config file when initializing fields.</jc>
<jk>private</jk> String greeting =
getConfig().getString(<js>"MyHelloResource/greeting"</js>);
@@ -12800,7 +12800,7 @@
messages=<js>"nls/Messages"</js>,
...
)
- <jk>public class</jk> MyHelloResource <jk>extends</jk>
RestServletDefault {
+ <jk>public class</jk> MyHelloResource <jk>extends</jk> BasicRestServlet
{
<jd>/** Standard hello message. */</jd>
<ja>@RestMethod</ja>(name=<jsf>GET</jsf>,
path=<js>"/{person}"</js>)
@@ -12906,7 +12906,7 @@
<li>
The <l>children</l> annotation make up the list
of child resources.
<br>These child resources can be anything that
extends from <l>Servlet</l>, although usually
- they will be subclasses of {@link
org.apache.juneau.rest.RestServletDefault} or other resource groups.
+ they will be subclasses of {@link
org.apache.juneau.rest.BasicRestServlet} or other resource groups.
</ul>
<p>
If you click the <l>helloWorld</l> link in your
application, you'll get a simple hello world message:
@@ -12921,7 +12921,7 @@
title=<js>"Hello World example"</js>,
description=<js>"Simplest possible REST resource"</js>
)
- <jk>public class</jk> HelloWorldResource <jk>extends</jk>
RestServletDefault {
+ <jk>public class</jk> HelloWorldResource <jk>extends</jk>
BasicRestServlet {
<ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/*"</js>)
<jk>public</jk> String sayHello() {
@@ -13130,11 +13130,11 @@
<br>Contains all the REST servlet logic.
<ul>
<li class='jac'>
- {@link
org.apache.juneau.rest.RestServletDefault
org.apache.juneau.rest.RestServletDefault}
+ {@link
org.apache.juneau.rest.BasicRestServlet org.apache.juneau.rest.BasicRestServlet}
<br>Defines default serializers
and parsers, and OPTIONs page logic.
<ul>
<li class='jac'>
- {@link
org.apache.juneau.rest.RestServletGroup org.apache.juneau.rest.RestServletGroup}
+ {@link
org.apache.juneau.rest.BasicRestServletGroup
org.apache.juneau.rest.BasicRestServletGroup}
<br>Specialized
subclass for grouping other resources
</li>
</ul>
@@ -13234,7 +13234,7 @@
<h5 class='figure'>HelloWorldResource.java</h5>
<p class='bcode'>
<ja>@RestResource</ja>(messages=<js>"nls/HelloWorldResource"</js>,
path=<js>"/helloWorld"</js>)
- <jk>public class</jk> HelloWorldResource <jk>extends</jk>
RestServletDefault {
+ <jk>public class</jk> HelloWorldResource <jk>extends</jk>
BasicRestServlet {
</p>
<p>
It should be noted that child resources do not need to
be defined this way.
@@ -13288,7 +13288,7 @@
}
)
)
- <jk>public class</jk> HelloWorldResource <jk>extends</jk>
RestServletDefault {
+ <jk>public class</jk> HelloWorldResource <jk>extends</jk>
BasicRestServlet {
<jk>private static final long</jk> <jsf>serialVersionUID</jsf>
= 1L;
<jd>/** GET request handler */</jd>
@@ -13317,7 +13317,7 @@
<br>Contains all the REST servlet logic.
<ul>
<li class='jac'>
- {@link
org.apache.juneau.rest.RestServletDefault
org.apache.juneau.rest.RestServletDefault}
+ {@link
org.apache.juneau.rest.BasicRestServlet org.apache.juneau.rest.BasicRestServlet}
<br>Defines default serializers
and parsers, and OPTIONs page logic.
</li>
</ul>
@@ -13372,7 +13372,7 @@
}
)
)
- <jk>public class</jk> MethodExampleResource <jk>extends</jk>
RestServletDefault {
+ <jk>public class</jk> MethodExampleResource <jk>extends</jk>
BasicRestServlet {
<jk>private static final long</jk> <jsf>serialVersionUID</jsf>
= 1L;
<jd>/** Example GET request that redirects to our example
method */</jd>
@@ -13575,11 +13575,11 @@
{@link org.apache.juneau.rest.RestRequest#getSwagger()}
method.
</p>
<p>
- To define an OPTIONS request handler, the {@link
org.apache.juneau.rest.RestServletDefault} class defines
+ To define an OPTIONS request handler, the {@link
org.apache.juneau.rest.BasicRestServlet} class defines
the following Java method:
</p>
- <h5 class='figure'>RestServletDefault.java</h5>
+ <h5 class='figure'>BasicRestServlet.java</h5>
<p class='bcode'>
<jd>/** OPTIONS request handler */</jd>
<ja>@RestMethod</ja>(name=<jsf>OPTIONS</jsf>, path=<js>"/*"</js>)
@@ -13677,7 +13677,7 @@
path=<js>"/urlEncodedForm"</js>,
messages=<js>"nls/UrlEncodedFormResource"</js>
)
- <jk>public class</jk> UrlEncodedFormResource <jk>extends</jk>
RestServletDefault {
+ <jk>public class</jk> UrlEncodedFormResource <jk>extends</jk>
BasicRestServlet {
<jk>private static final long</jk> <jsf>serialVersionUID</jsf>
= 1L;
<jd>/** GET request handler */</jd>
@@ -13901,7 +13901,7 @@
EnumerationSwap.<jk>class</jk>
}
)
- <jk>public class</jk> RequestEchoResource <jk>extends</jk>
RestServletDefault {
+ <jk>public class</jk> RequestEchoResource <jk>extends</jk>
BasicRestServlet {
<jd>/** GET request handler */</jd>
<ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/*"</js>,
converters={Queryable.<jk>class</jk>,Traversable.<jk>class</jk>})
@@ -14451,7 +14451,7 @@
url:'http://juneau.apache.org'}}]"</js>,
externalDocs=<js>"{description:'Home
page',url:'http://juneau.apache.org'}"</js>
)
- <jk>public class</jk> AddressBookResource <jk>extends</jk>
RestServletJenaDefault {
+ <jk>public class</jk> AddressBookResource <jk>extends</jk>
BasicRestServletJena {
<jk>private static final long</jk> <jsf>serialVersionUID</jsf>
= 1L;
<jc>// The in-memory address book</jc>
@@ -14689,7 +14689,7 @@
* [OPTIONS /*]
* View resource options
*/</jd>
- <ja>@Override</ja> <jc>/* RestServletDefault */</jc>
+ <ja>@Override</ja> <jc>/* BasicRestServlet */</jc>
<ja>@RestMethod</ja>(name=<jsf>OPTIONS</jsf>,
path=<js>"/*"</js>)
<jk>public</jk> Swagger getOptions(RestRequest req) {
<jk>return</jk> req.getSwagger();
@@ -15374,7 +15374,7 @@
},
encoders=GzipEncoder.<jk>class</jk>
)
- <jk>public class</jk> AtomFeedResource <jk>extends</jk>
RestServletJenaDefault {
+ <jk>public class</jk> AtomFeedResource <jk>extends</jk>
BasicRestServletJena {
<jk>private static final long</jk> <jsf>serialVersionUID</jsf>
= 1L;
<jk>private</jk> Feed <jf>feed</jf>; <jc>// The root resource
object</jc>
@@ -15483,7 +15483,7 @@
}
)
)
- <jk>public class</jk> DockerRegistryResource <jk>extends</jk>
RestServletDefault {
+ <jk>public class</jk> DockerRegistryResource <jk>extends</jk>
BasicRestServlet {
<jk>private static final long</jk> <jsf>serialVersionUID</jsf>
= 1L;
<jc>// Get registry URL from examples.cfg file.</jc>
@@ -15568,7 +15568,7 @@
}
)
)
- <jk>public class</jk> TumblrParserResource <jk>extends</jk>
RestServletDefault {
+ <jk>public class</jk> TumblrParserResource <jk>extends</jk>
BasicRestServlet {
<jk>private static final long</jk> <jsf>serialVersionUID</jsf>
= 1L;
<ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/"</js>)
@@ -15656,7 +15656,7 @@
}
)
)
- <jk>public class</jk> PhotosResource <jk>extends</jk>
RestServletDefault {
+ <jk>public class</jk> PhotosResource <jk>extends</jk> BasicRestServlet {
<jc>// Our cache of photos</jc>
<jk>private</jk> Map<Integer,Photo> photos = <jk>new</jk>
TreeMap<Integer,Photo>();
@@ -15805,7 +15805,7 @@
}
)
)
- <jk>public class</jk> JsonSchemaResource <jk>extends</jk>
RestServletJenaDefault {
+ <jk>public class</jk> JsonSchemaResource <jk>extends</jk>
BasicRestServletJena {
<jk>private static final long</jk> <jsf>serialVersionUID</jsf>
= 1L;
<jk>private</jk> Schema schema; <jc>// The schema document</jc>
@@ -15896,7 +15896,7 @@
}
)
)
- <jk>public class</jk> SqlQueryResource <jk>extends</jk>
RestServletDefault {
+ <jk>public class</jk> SqlQueryResource <jk>extends</jk>
BasicRestServlet {
<jk>private static final long</jk> <jsf>serialVersionUID</jsf>
= 1L;
<jk>private</jk> Config <jf>cf</jf> = getConfig();
@@ -16091,7 +16091,7 @@
}
)
)
- <jk>public class</jk> ConfigResource <jk>extends</jk>
RestServletDefault {
+ <jk>public class</jk> ConfigResource <jk>extends</jk> BasicRestServlet
{
<jk>private static final long</jk> <jsf>serialVersionUID</jsf>
= 1L;
<jd>/**
@@ -16542,46 +16542,15 @@
TBD
</p>
- <h5 class='topic'>juneau-svl</h5>
- <ul class='spaced-list'>
- <li>
- New variables:
- <ul>
- <li>{@link
org.apache.juneau.svl.vars.PatternMatchVar}
- <li>{@link
org.apache.juneau.svl.vars.NotEmptyVar}
- <li>{@link
org.apache.juneau.svl.vars.UpperCaseVar}
- <li>{@link
org.apache.juneau.svl.vars.LowerCaseVar}
- </ul>
- <li>
- Variables moved from <l>juneau-microservice</l>:
- <ul>
- <li>{@link
org.apache.juneau.svl.vars.ArgsVar}
- <li>{@link
org.apache.juneau.svl.vars.ManifestFileVar}
- </ul>
- </ul>
-
- <h5 class='topic'>juneau-config</h5>
- <ul class='spaced-list'>
- <li>
- <code>Config.save()</code> method renamed to
{@link org.apache.juneau.config.Config#commit()}.
- <li>
- <code>Config.write(Reader,boolean)</code>
method renamed to {@link org.apache.juneau.config.Config#load(Reader,boolean)}.
- </ul>
-
- <h5 class='topic'>juneau-rest-server</h5>
- <ul class='spaced-list'>
- <li>
- <code>RestServletGroupDefault</code> renamed to
{@link org.apache.juneau.rest.RestServletGroup}.
- </ul>
<h5 class='topic'>juneau-microservice</h5>
<ul class='spaced-list'>
<li>
<code>Resource</code> and
<code>ResourceGroup</code> classes removed.
- <br>{@link
org.apache.juneau.rest.RestServletDefault} and {@link
org.apache.juneau.rest.RestServletGroup} can be used instead.
+ <br>{@link
org.apache.juneau.rest.BasicRestServlet} and {@link
org.apache.juneau.rest.BasicRestServletGroup} can be used instead.
<li>
<code>ResourceJena</code> and
<code>ResourceJenaGroup</code> classes rename to
- {@link
org.apache.juneau.microservice.RestServletJenaDefault} and {@link
org.apache.juneau.microservice.RestServletJenaGroup} can be used instead.
+ {@link
org.apache.juneau.microservice.BasicRestServletJena} and {@link
org.apache.juneau.microservice.BasicRestServletJenaGroup} can be used instead.
</ul>
</div>
@@ -16670,11 +16639,6 @@
that can be used as hash keys.
</ul>
<li>
- New SVL variables:
- <ul>
- <li>{@link
org.apache.juneau.svl.vars.CoalesceVar}
- </ul>
- <li>
Improvements to the HTTP-Part APIs.
<br>The existing
<code>PartSerializer</code>/<code>PartParser</code> classes
have been replaced with the following all
located in the new <code>org.apache.juneau.httppart</code> package:
@@ -16738,6 +16702,25 @@
New support for <a class='doclink'
href='#juneau-marshall.PojoBuilders'>POJO Builders</a>.
</ul>
+ <h5 class='topic'>juneau-svl</h5>
+ <ul class='spaced-list'>
+ <li>
+ New variables:
+ <ul>
+ <li>{@link
org.apache.juneau.svl.vars.CoalesceVar}
+ <li>{@link
org.apache.juneau.svl.vars.PatternMatchVar}
+ <li>{@link
org.apache.juneau.svl.vars.NotEmptyVar}
+ <li>{@link
org.apache.juneau.svl.vars.UpperCaseVar}
+ <li>{@link
org.apache.juneau.svl.vars.LowerCaseVar}
+ </ul>
+ <li>
+ Variables moved from <l>juneau-microservice</l>:
+ <ul>
+ <li>{@link
org.apache.juneau.svl.vars.ArgsVar}
+ <li>{@link
org.apache.juneau.svl.vars.ManifestFileVar}
+ </ul>
+ </ul>
+
<h5 class='topic'>juneau-config</h5>
<ul class='spaced-list'>
<li>
@@ -16774,6 +16757,10 @@
<h5 class='topic'>juneau-rest-server</h5>
<ul class='spaced-list'>
<li>
+ <code>RestServletDefault</code> renamed to
{@link org.apache.juneau.rest.BasicRestServlet}.
+ <li>
+ <code>RestServletGroupDefault</code> renamed to
{@link org.apache.juneau.rest.BasicRestServletGroup}.
+ <li>
The <js>"$R{...}"</js> variable has been split
into the following:
<ul>
<li><js>"$RA{key1[,key2...]}"</js> -
{@link org.apache.juneau.rest.vars.RequestAttributeVar}, first non-null value
returned by <code>HttpServletRequest.getAttribute(String)</code>.
@@ -16928,15 +16915,15 @@
</ul>
<li>
<code>RestCallHandler</code> split up into
{@link org.apache.juneau.rest.RestCallHandler} and
- {@link
org.apache.juneau.rest.RestCallHandlerDefault}
+ {@link
org.apache.juneau.rest.BasicRestCallHandler}
<li>
<code>RestInfoProvider</code> split up into
{@link org.apache.juneau.rest.RestInfoProvider} and
- {@link
org.apache.juneau.rest.RestInfoProviderDefault}
+ {@link
org.apache.juneau.rest.BasicRestInfoProvider}
<li>
<code>RestLogger</code> split up into {@link
org.apache.juneau.rest.RestLogger},
- {@link
org.apache.juneau.rest.RestLoggerDefault} and {@link
org.apache.juneau.rest.RestLoggerNoOp}
+ {@link org.apache.juneau.rest.BasicRestLogger}
and {@link org.apache.juneau.rest.NoOpRestLogger}
<li>
- <code>RestResourceResolverSimple</code> renamed
to {@link org.apache.juneau.rest.RestResourceResolverDefault}
+ <code>RestResourceResolverSimple</code> renamed
to {@link org.apache.juneau.rest.BasicRestResourceResolver}
<li>
Introduced the following classes that helps
make the code more understandable:
<ul>
@@ -16965,7 +16952,7 @@
<br>The {@link
org.apache.juneau.rest.response.DefaultHandler} class now calls
<code>finish()</code>
instead of <code>close()</code> on the stream.
<li>
- Added the following annotations to the {@link
org.apache.juneau.rest.RestServletDefault} class
+ Added the following annotations to the {@link
org.apache.juneau.rest.BasicRestServlet} class
(which were previously defined on the
<code><del>Resource</del></code> class):
<p class='bcode'>
<ja>@RestResource</ja>(
@@ -17665,7 +17652,7 @@
<li>
Eliminated the
<code>RestServletJenaDefault</code> class to remove the Jena dependency class
on
the <code>juneau-rest-server</code> artifact.
- <br>It's simple enough to simply extend
<code>RestServletDefault</code> and add the RDF serializers and
+ <br>It's simple enough to simply extend
<code>BasicRestServlet</code> and add the RDF serializers and
parsers.
</ul>
@@ -17878,7 +17865,7 @@
<li><code>description()</code>
<li><code>branding()</code>
</ul>
- Instead, the {@link
org.apache.juneau.rest.RestServletDefault} class defines the following default
header
+ Instead, the {@link
org.apache.juneau.rest.BasicRestServlet} class defines the following default
header
that can be easily overridden:
<p class='bcode'>
htmldoc=<ja>@HtmlDoc</ja>(
@@ -19458,7 +19445,7 @@
<li><code><del>RestServlet.getConfigMgr()</del></code>
</ul>
<li>Removed {@link org.apache.juneau.jso.JsoParser}
- from {@link
org.apache.juneau.rest.RestServletDefault} and
<code><del>RestServletJenaDefault</del></code>.
+ from {@link
org.apache.juneau.rest.BasicRestServlet} and
<code><del>RestServletJenaDefault</del></code>.
These may represent a security risk if not
handled correctly, so removed
them as a precaution.
<li>Removed
<code>RestServletProperties.REST_htDocsFolder</code>. Replaced with {@link
org.apache.juneau.rest.annotation.RestResource#staticFiles()
@RestResource.staticFiles()}.
@@ -19509,7 +19496,7 @@
<li><js>"$MF{key,default}""</js> -
Manifest file entries.
</ul>
<li>CSS stylesheet now configurable through config file
entry <js>"REST/stylesheet"</js>.
- <li>New {@link
org.apache.juneau.microservice.RestServletJenaDefault} class if you want your
REST interface to support RDF.
+ <li>New {@link
org.apache.juneau.microservice.BasicRestServletJena} class if you want your
REST interface to support RDF.
<li>Eliminated the following classes:
<ul>
<li><code>org.apache.juneau.microservice.RootResource</code>
@@ -19599,7 +19586,7 @@
<li>New
<code><del>RestServlet.handleNotFound(int,RestRequest,RestResponse)</del></code>
method for customized handling
of when a resource or method
was not found.
</ul>
- <li>{@link org.apache.juneau.rest.RestServletDefault}
now automatically processes <js>"/favicon.ico"</js> requests by
+ <li>{@link org.apache.juneau.rest.BasicRestServlet}
now automatically processes <js>"/favicon.ico"</js> requests by
overriding the new
<code><del>RestServlet.handleNotFound(int,RestRequest,RestResponse)</del></code>
method.
<li>New {@link org.apache.juneau.rest.RestRequest}
methods:
<ul>
@@ -19783,19 +19770,19 @@
<li><code>$E{var}</code> - Environment
variables.
</ul>
<li>Added methods
<code><del>RestServlet.getDescription(RestRequest)</del></code> and
<del><code>RestServlet.getLabel(RestRequest)</code></del>.
- <li>{@link org.apache.juneau.rest.RestServletDefault}
and <code><del>RestServletJenaDefault</del></code> now provide default HTML
titles
+ <li>{@link org.apache.juneau.rest.BasicRestServlet} and
<code><del>RestServletJenaDefault</del></code> now provide default HTML titles
and descriptions:
<p class='bcode'>
<ja>@Property</ja>(name=<jsf>HTMLDOC_title</jsf>,
value=<js>"$R{resourceTitle}"</js>),
<ja>@Property</ja>(name=<jsf>HTMLDOC_description</jsf>,
value=<js>"$R{resourceDescription}"</js>)
</p>
- <li>Options pages on {@link
org.apache.juneau.rest.RestServletDefault} and
<code><del>RestServletJenaDefault</del></code> now provide default descriptions
and back links:
+ <li>Options pages on {@link
org.apache.juneau.rest.BasicRestServlet} and
<code><del>RestServletJenaDefault</del></code> now provide default descriptions
and back links:
and descriptions:
<p class='bcode'>
<ja>@Property</ja>(name=<jsf>HTMLDOC_navlinks</jsf>,
value=<js>"{back:'$R{servletURI}"</js>),
<ja>@Property</ja>(name=<jsf>HTMLDOC_description</jsf>,
value=<js>"Resource options"</js>)
</p>
- <li>New {@link org.apache.juneau.rest.RestServletGroup}
class.
+ <li>New {@link
org.apache.juneau.rest.BasicRestServletGroup} class.
<li>Removed
<code>RestServletProperties.REST_trimTrailingUriSlashes</code> and
<code>RestServletProperties.REST_pathInfoBlankForNull</code>.
<li>New annotations for providing labels and
descriptions. Useful if you don't plan on having to support other languages,
so you don't
want to provide labels in resource bundles.
@@ -19957,7 +19944,7 @@
<h5 class='topic'>Server</h5>
<ul class='spaced-list'>
- <li>Added a default OPTIONS page to {@link
org.apache.juneau.rest.RestServletDefault} and
<code><del>RestServletJenaDefault</del></code>.
+ <li>Added a default OPTIONS page to {@link
org.apache.juneau.rest.BasicRestServlet} and
<code><del>RestServletJenaDefault</del></code>.
<li><code>RestServletProperties.REST_allowMethodParam</code> has been enhanced
to allow you to
explicitly specify which HTTP methods can be
used in the <code>&method</code> parameter.
<li>New methods added to {@link
org.apache.juneau.rest.RestRequest}:
@@ -20095,7 +20082,7 @@
<li><code>&noTrace=true</code> now prevents any
errors from being logged in log file.
<li>Workaround for Jetty issue where
<code>ServletContext.getContextPath()</code> always ends with <js>"null"</js>.
<li><code>RestServletProperties.REST_allowMethodParam</code> is now
<jk>true</jk> by default on all subclasses
- of {@link
org.apache.juneau.rest.RestServletDefault} and
<code><del>RestServletJenaDefault</del></code>.
+ of {@link
org.apache.juneau.rest.BasicRestServlet} and
<code><del>RestServletJenaDefault</del></code>.
</ul>
<h5 class='topic'>Client</h5>
@@ -20154,7 +20141,7 @@
<li>Removed properties parameters from
<code><del>RestServlet.onPreCall(RestRequest)</del></code> and
<code><del>RestServlet#onPostCall(RestRequest,RestResponse)</del></code> methods
since the properties are already accessible
through <code>RestRequest.getProperties()</code>.
<li>Added {@link org.apache.juneau.uon.UonSerializer}
and {@link org.apache.juneau.uon.UonParser} to serializer and parser lists on
- {@link
org.apache.juneau.rest.RestServletDefault} and
<code><del>RestServletJenaDefault</del></code>.
+ {@link org.apache.juneau.rest.BasicRestServlet}
and <code><del>RestServletJenaDefault</del></code>.
</ul>
<h5 class='topic'>Client</h5>
@@ -20838,7 +20825,7 @@
Fixed some HTML formatting issues in {@link
org.apache.juneau.html.HtmlSerializer}.
</li>
<li>
- {@link org.apache.juneau.rest.RestServletDefault} now
includes {@link org.apache.juneau.plaintext.PlainTextSerializer} and {@link
org.apache.juneau.plaintext.PlainTextParser} for plain-text support.
+ {@link org.apache.juneau.rest.BasicRestServlet} now
includes {@link org.apache.juneau.plaintext.PlainTextSerializer} and {@link
org.apache.juneau.plaintext.PlainTextParser} for plain-text support.
</li>
<li>
Child resources now render on default
<code>OPTIONS</code> pages through new method
<del><code>ResourceOptions.getChildren()</code></del>.
@@ -21411,7 +21398,7 @@
Allows parsing form posts directly to POJOs.
</li>
<li>
- Support for <code>Accept</code> and
<code>Content-Type</code> <js>"application/x-www-form-urlencoded"</js> added by
default on {@link org.apache.juneau.rest.RestServletDefault}.
+ Support for <code>Accept</code> and
<code>Content-Type</code> <js>"application/x-www-form-urlencoded"</js> added by
default on {@link org.apache.juneau.rest.BasicRestServlet}.
</li>
<li>
New
<code><del>RestServlet.renderError(HttpServletRequest,HttpServletResponse,RestException)</del></code>
method to allow customized handling of response errors.
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/AtomFeedResource.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/AtomFeedResource.java
index ce46f11..8c8f91f 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/AtomFeedResource.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/AtomFeedResource.java
@@ -52,7 +52,7 @@ import org.apache.juneau.rest.widget.*;
},
encoders=GzipEncoder.class
)
-public class AtomFeedResource extends RestServletJenaDefault {
+public class AtomFeedResource extends BasicRestServletJena {
private static final long serialVersionUID = 1L;
private Feed feed; // The root resource object
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/CodeFormatterResource.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/CodeFormatterResource.java
index e784d22..61fe830 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/CodeFormatterResource.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/CodeFormatterResource.java
@@ -44,7 +44,7 @@ import org.apache.juneau.rest.annotation.*;
)
)
@SuppressWarnings({"serial"})
-public class CodeFormatterResource extends RestServletDefault {
+public class CodeFormatterResource extends BasicRestServlet {
/** [GET /] - Display query entry page. */
@RestMethod(name=GET, path="/")
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/DirectoryResource.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/DirectoryResource.java
index 0f438c2..6bfd28c 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/DirectoryResource.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/DirectoryResource.java
@@ -56,7 +56,7 @@ import org.apache.juneau.utils.*;
@Property(name="allowPuts", value="false")
}
)
-public class DirectoryResource extends RestServletDefault {
+public class DirectoryResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
private File rootDir; // The root directory
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/DockerRegistryResource.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/DockerRegistryResource.java
index 41cf2ac..a02f634 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/DockerRegistryResource.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/DockerRegistryResource.java
@@ -40,7 +40,7 @@ import org.apache.juneau.rest.labels.*;
aside="$F{resources/DockerRegistryResourceAside.html}"
)
)
-public class DockerRegistryResource extends RestServletDefault {
+public class DockerRegistryResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
// Get registry URL from examples.cfg file.
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HelloWorldResource.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HelloWorldResource.java
index fc2706d..27d6f8b 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HelloWorldResource.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HelloWorldResource.java
@@ -38,7 +38,7 @@ import org.apache.juneau.rest.annotation.*;
}
)
)
-public class HelloWorldResource extends RestServletDefault {
+public class HelloWorldResource extends BasicRestServlet {
/** GET request handler */
@RestMethod(name=GET, path="/*", summary="Responds with \"Hello
world!\"")
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/JsonSchemaResource.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/JsonSchemaResource.java
index 808d674..1190b7a 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/JsonSchemaResource.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/JsonSchemaResource.java
@@ -46,7 +46,7 @@ import org.apache.juneau.rest.widget.*;
}
)
)
-public class JsonSchemaResource extends RestServletJenaDefault {
+public class JsonSchemaResource extends BasicRestServletJena {
private static final long serialVersionUID = 1L;
private Schema schema; // The schema document
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/MethodExampleResource.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/MethodExampleResource.java
index 23d5bae..4bb0bc4 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/MethodExampleResource.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/MethodExampleResource.java
@@ -42,7 +42,7 @@ import org.apache.juneau.utils.*;
}
)
)
-public class MethodExampleResource extends RestServletDefault {
+public class MethodExampleResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
private static final UUID SAMPLE_UUID =
UUID.fromString("aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee");
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PetStoreResource.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PetStoreResource.java
index 8ff2d7d..5ca3a92 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PetStoreResource.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PetStoreResource.java
@@ -68,7 +68,7 @@ import org.apache.juneau.transforms.*;
),
staticFiles={"htdocs:htdocs"}
)
-public class PetStoreResource extends RestServletJenaDefault {
+public class PetStoreResource extends BasicRestServletJena {
private static final long serialVersionUID = 1L;
// Our database.
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PhotosResource.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PhotosResource.java
index 817410f..cd4f61d 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PhotosResource.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PhotosResource.java
@@ -55,7 +55,7 @@ import org.apache.juneau.serializer.*;
@Property(name=HTML_uriAnchorText, value="SERVLET_RELATIVE")
}
)
-public class PhotosResource extends RestServletDefault {
+public class PhotosResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
// Our cache of photos
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PredefinedLabelsResource.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PredefinedLabelsResource.java
index 752ecbc..e04ae04 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PredefinedLabelsResource.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PredefinedLabelsResource.java
@@ -42,7 +42,7 @@ import org.apache.juneau.rest.widget.*;
}
)
)
-public class PredefinedLabelsResource extends RestServletDefault {
+public class PredefinedLabelsResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
@RestMethod(name=GET, path="/")
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RequestEchoResource.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RequestEchoResource.java
index f163091..1f4b9c0 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RequestEchoResource.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RequestEchoResource.java
@@ -63,7 +63,7 @@ import org.apache.juneau.transforms.*;
EnumerationSwap.class
}
)
-public class RequestEchoResource extends RestServletDefault {
+public class RequestEchoResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
/** GET request handler */
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RootResources.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RootResources.java
index 1816511..1e339c0 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RootResources.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RootResources.java
@@ -81,7 +81,7 @@ import org.apache.juneau.rest.widget.*;
ShutdownResource.class
}
)
-public class RootResources extends RestServletJenaGroup {
+public class RootResources extends BasicRestServletJenaGroup {
// IMPORTANT! If you don't need RDF support, change the parent class
to ResourceGroup.
// It allows you to remove the Jena prerequisite.
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SqlQueryResource.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SqlQueryResource.java
index dfc97a0..c8b1d43 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SqlQueryResource.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SqlQueryResource.java
@@ -55,7 +55,7 @@ import org.apache.juneau.rest.widget.*;
}
)
)
-public class SqlQueryResource extends RestServletDefault {
+public class SqlQueryResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
private String driver, connectionUrl;
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SystemPropertiesResource.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SystemPropertiesResource.java
index a62f997..877d501 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SystemPropertiesResource.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SystemPropertiesResource.java
@@ -87,7 +87,7 @@ import org.apache.juneau.rest.widget.*;
externalDocs="{description:'Home
page',url:'http://juneau.apache.org'}"
)
)
-public class SystemPropertiesResource extends RestServletDefault {
+public class SystemPropertiesResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
@RestMethod(
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TumblrParserResource.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TumblrParserResource.java
index b05cba5..b796cd9 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TumblrParserResource.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TumblrParserResource.java
@@ -40,7 +40,7 @@ import org.apache.juneau.rest.client.*;
}
)
)
-public class TumblrParserResource extends RestServletDefault {
+public class TumblrParserResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
private static final int MAX_POSTS = 100;
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/UrlEncodedFormResource.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/UrlEncodedFormResource.java
index 3f6a5af..5fd850a 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/UrlEncodedFormResource.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/UrlEncodedFormResource.java
@@ -49,7 +49,7 @@ import org.apache.juneau.transforms.*;
}
)
)
-public class UrlEncodedFormResource extends RestServletDefault {
+public class UrlEncodedFormResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
/** GET request handler */
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/addressbook/AddressBookResource.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/addressbook/AddressBookResource.java
index bf67847..c6e414a 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/addressbook/AddressBookResource.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/addressbook/AddressBookResource.java
@@ -117,7 +117,7 @@ import org.apache.juneau.utils.*;
externalDocs="{description:'Home
page',url:'http://juneau.apache.org'}"
)
)
-public class AddressBookResource extends RestServletJenaDefault {
+public class AddressBookResource extends BasicRestServletJena {
private static final long serialVersionUID = 1L;
// The in-memory address book
diff --git
a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/RestServletJenaDefault.java
b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/BasicRestServletJena.java
similarity index 95%
rename from
juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/RestServletJenaDefault.java
rename to
juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/BasicRestServletJena.java
index 2dd956f..c0711e8 100755
---
a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/RestServletJenaDefault.java
+++
b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/BasicRestServletJena.java
@@ -37,4 +37,4 @@ import org.apache.juneau.rest.annotation.*;
RdfParser.N3.class
}
)
-public abstract class RestServletJenaDefault extends RestServletDefault {}
+public abstract class BasicRestServletJena extends BasicRestServlet {}
diff --git
a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/RestServletJenaGroup.java
b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/BasicRestServletJenaGroup.java
similarity index 94%
rename from
juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/RestServletJenaGroup.java
rename to
juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/BasicRestServletJenaGroup.java
index 3c1f2b1..dde9662 100644
---
a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/RestServletJenaGroup.java
+++
b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/BasicRestServletJenaGroup.java
@@ -37,4 +37,4 @@ import org.apache.juneau.rest.annotation.*;
RdfParser.N3.class
}
)
-public abstract class RestServletJenaGroup extends RestServletGroup {}
+public abstract class BasicRestServletJenaGroup extends BasicRestServletGroup
{}
diff --git
a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/ConfigResource.java
b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/ConfigResource.java
index b08020f..d42919d 100755
---
a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/ConfigResource.java
+++
b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/ConfigResource.java
@@ -40,7 +40,7 @@ import org.apache.juneau.rest.annotation.Body;
}
)
)
-public class ConfigResource extends RestServletDefault {
+public class ConfigResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
/**
diff --git
a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/DebugResource.java
b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/DebugResource.java
index 983127c..957ba0d 100644
---
a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/DebugResource.java
+++
b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/DebugResource.java
@@ -39,7 +39,7 @@ import org.apache.juneau.rest.labels.*;
allowedMethodParams="OPTIONS,POST"
)
@SuppressWarnings("javadoc")
-public class DebugResource extends RestServletDefault {
+public class DebugResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
/**
diff --git
a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
index 94eeeb6..7f1b24f 100755
---
a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
+++
b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
@@ -73,7 +73,7 @@ import org.apache.juneau.utils.*;
@Property(name="DirectoryResource.rootDir", value="")
}
)
-public class DirectoryResource extends RestServletDefault {
+public class DirectoryResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
private File rootDir; // The root directory
diff --git
a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
index 46129f7..a90ab98 100755
---
a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
+++
b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
@@ -47,7 +47,7 @@ import org.apache.juneau.transforms.*;
DateSwap.ISO8601DT.class // Serialize Date objects as ISO8601
strings.
}
)
-public class LogsResource extends RestServletDefault {
+public class LogsResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
private File logDir;
diff --git
a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/SampleRootResource.java
b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/SampleRootResource.java
index 07d70e0..e834d9b 100755
---
a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/SampleRootResource.java
+++
b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/SampleRootResource.java
@@ -24,6 +24,6 @@ import org.apache.juneau.rest.annotation.*;
description="This is a sample router page",
children={ConfigResource.class,LogsResource.class}
)
-public class SampleRootResource extends RestServletGroup {
+public class SampleRootResource extends BasicRestServletGroup {
private static final long serialVersionUID = 1L;
}
diff --git
a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/ShutdownResource.java
b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/ShutdownResource.java
index dd33bfb..7b6e117 100755
---
a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/ShutdownResource.java
+++
b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/ShutdownResource.java
@@ -24,7 +24,7 @@ import org.apache.juneau.rest.annotation.*;
path="/shutdown",
title="Shut down this resource"
)
-public class ShutdownResource extends RestServletDefault {
+public class ShutdownResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
diff --git
a/juneau-microservice/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/HelloWorldResource.java
b/juneau-microservice/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/HelloWorldResource.java
index 371df39..718f54c 100755
---
a/juneau-microservice/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/HelloWorldResource.java
+++
b/juneau-microservice/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/HelloWorldResource.java
@@ -26,7 +26,7 @@ import org.apache.juneau.rest.annotation.RestResource;
path="/helloworld",
description="Simplest possible REST resource"
)
-public class HelloWorldResource extends RestServletDefault {
+public class HelloWorldResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
/**
diff --git
a/juneau-microservice/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/RootResources.java
b/juneau-microservice/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/RootResources.java
index a9f94d7..f0092d9 100755
---
a/juneau-microservice/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/RootResources.java
+++
b/juneau-microservice/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/RootResources.java
@@ -42,6 +42,6 @@ import org.apache.juneau.rest.widget.StyleMenuItem;
LogsResource.class
}
)
-public class RootResources extends RestServletGroup {
+public class RootResources extends BasicRestServletGroup {
private static final long serialVersionUID = 1L;
}
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/BeanContextPropertiesResource.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/BeanContextPropertiesResource.java
index c0620cb..910ae99 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/BeanContextPropertiesResource.java
+++
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/BeanContextPropertiesResource.java
@@ -29,7 +29,7 @@ import org.apache.juneau.transforms.*;
path="/testBeanContext",
pojoSwaps=DateSwap.ISO8601DTZ.class
)
-public class BeanContextPropertiesResource extends RestServletDefault {
+public class BeanContextPropertiesResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
//====================================================================================================
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/BpiResource.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/BpiResource.java
index e40ece7..86f437e 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/BpiResource.java
+++
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/BpiResource.java
@@ -24,7 +24,7 @@ import org.apache.juneau.rest.annotation.*;
@RestResource(
path="/testBpi"
)
-public class BpiResource extends RestServletJenaDefault {
+public class BpiResource extends BasicRestServletJena {
private static final long serialVersionUID = 1L;
//====================================================================================================
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/CallbackStringsResource.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/CallbackStringsResource.java
index 69481eb..6b2ea5a 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/CallbackStringsResource.java
+++
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/CallbackStringsResource.java
@@ -26,7 +26,7 @@ import org.apache.juneau.rest.annotation.*;
@RestResource(
path="/testCallback"
)
-public class CallbackStringsResource extends RestServletDefault {
+public class CallbackStringsResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
//====================================================================================================
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ClientFuturesResource.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ClientFuturesResource.java
index 35ea462..3637839 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ClientFuturesResource.java
+++
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ClientFuturesResource.java
@@ -24,7 +24,7 @@ import org.apache.juneau.rest.annotation.*;
@RestResource(
path="/testClientFutures"
)
-public class ClientFuturesResource extends RestServletDefault {
+public class ClientFuturesResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
//====================================================================================================
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ClientVersionResource.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ClientVersionResource.java
index 8ea723d..5a9e6e6 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ClientVersionResource.java
+++
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ClientVersionResource.java
@@ -28,12 +28,12 @@ import org.apache.juneau.rest.annotation.*;
}
)
@SuppressWarnings("serial")
-public class ClientVersionResource extends RestServletDefault {
+public class ClientVersionResource extends BasicRestServlet {
@RestResource(
path="/defaultHeader"
)
- public static class DefaultHeader extends RestServletDefault {
+ public static class DefaultHeader extends BasicRestServlet {
@RestMethod(name=GET, path="/")
public String test0() {
@@ -65,7 +65,7 @@ public class ClientVersionResource extends RestServletDefault
{
path="/customHeader",
clientVersionHeader="Custom-Client-Version"
)
- public static class CustomHeader extends RestServletDefault {
+ public static class CustomHeader extends BasicRestServlet {
@RestMethod(name=GET, path="/")
public String test0() {
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ConfigResource.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ConfigResource.java
index fe4b622..b44e78d 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ConfigResource.java
+++
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ConfigResource.java
@@ -24,7 +24,7 @@ import org.apache.juneau.rest.annotation.*;
path="/testConfig"
)
@SuppressWarnings("serial")
-public class ConfigResource extends RestServletDefault {
+public class ConfigResource extends BasicRestServlet {
@RestMethod(name=GET, path="/")
public Object test1(RestRequest req) {
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ContentResource.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ContentResource.java
index f719721..be72322 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ContentResource.java
+++
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ContentResource.java
@@ -26,7 +26,7 @@ import org.apache.juneau.rest.annotation.*;
path="/testContent",
allowedMethodParams="*"
)
-public class ContentResource extends RestServletDefault {
+public class ContentResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
//====================================================================================================
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ErrorConditionsResource.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ErrorConditionsResource.java
index 4fdf994..a7a03af 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ErrorConditionsResource.java
+++
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ErrorConditionsResource.java
@@ -24,7 +24,7 @@ import org.apache.juneau.rest.annotation.*;
@RestResource(
path="/testErrorConditions"
)
-public class ErrorConditionsResource extends RestServletDefault {
+public class ErrorConditionsResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
//====================================================================================================
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/FormDataResource.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/FormDataResource.java
index efe3a0a..23f345c 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/FormDataResource.java
+++
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/FormDataResource.java
@@ -27,7 +27,7 @@ import org.apache.juneau.rest.annotation.*;
@RestResource(
path="/testFormData"
)
-public class FormDataResource extends RestServletDefault {
+public class FormDataResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
//====================================================================================================
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/HtmlDocLinksResource.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/HtmlDocLinksResource.java
index 3c54110..9c1ceeb 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/HtmlDocLinksResource.java
+++
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/HtmlDocLinksResource.java
@@ -27,7 +27,7 @@ import org.apache.juneau.rest.annotation.*;
HtmlDocLinksResource.HtmlDocLinksResource2.class
}
)
-public class HtmlDocLinksResource extends RestServletDefault {
+public class HtmlDocLinksResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
@RestMethod(path="/test1")
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/HtmlDocResource.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/HtmlDocResource.java
index 45c398b..4881d3c 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/HtmlDocResource.java
+++
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/HtmlDocResource.java
@@ -33,7 +33,7 @@ import org.apache.juneau.rest.annotation.*;
HtmlDocResource.HtmlDocResource2.class
}
)
-public class HtmlDocResource extends RestServletDefault {
+public class HtmlDocResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
@RestMethod(path="/test1")
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/InterfaceProxyResource.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/InterfaceProxyResource.java
index 4051202..192cc98 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/InterfaceProxyResource.java
+++
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/InterfaceProxyResource.java
@@ -31,7 +31,7 @@ import org.junit.*;
*/
@RestResource(
path="/testInterfaceProxyResource")
-public class InterfaceProxyResource extends RestServletJenaDefault {
+public class InterfaceProxyResource extends BasicRestServletJena {
private static final long serialVersionUID = 1L;
//====================================================================================================
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/LargePojosResource.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/LargePojosResource.java
index 84d4854..f89177f 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/LargePojosResource.java
+++
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/LargePojosResource.java
@@ -23,7 +23,7 @@ import org.apache.juneau.rest.annotation.*;
@RestResource(
path="/testLargePojos"
)
-public class LargePojosResource extends RestServletJenaDefault {
+public class LargePojosResource extends BasicRestServletJena {
private static final long serialVersionUID = 1L;
//====================================================================================================
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/MessagesResource.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/MessagesResource.java
index 7ff4953..81d4684 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/MessagesResource.java
+++
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/MessagesResource.java
@@ -33,7 +33,7 @@ import org.apache.juneau.transform.*;
MessagesResource.ResourceBundleSwap.class
}
)
-public class MessagesResource extends RestServletDefault {
+public class MessagesResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
//====================================================================================================
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/NlsResource.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/NlsResource.java
index 1703dd8..46fbab8 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/NlsResource.java
+++
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/NlsResource.java
@@ -33,7 +33,7 @@ import org.apache.juneau.utils.*;
}
)
@SuppressWarnings({"serial"})
-public class NlsResource extends RestServletGroup {
+public class NlsResource extends BasicRestServletGroup {
private static final long serialVersionUID = 1L;
//====================================================================================================
@@ -45,7 +45,7 @@ public class NlsResource extends RestServletGroup {
title="Test1.a",
description="Test1.b"
)
- public static class Test1 extends RestServletDefault {
+ public static class Test1 extends BasicRestServlet {
@RestMethod(
name=POST, path="/{a}",
@@ -84,7 +84,7 @@ public class NlsResource extends RestServletGroup {
path="/test2",
messages="NlsResource"
)
- public static class Test2 extends RestServletDefault {
+ public static class Test2 extends BasicRestServlet {
@RestMethod(
name=POST, path="/{a}"
@@ -102,7 +102,7 @@ public class NlsResource extends RestServletGroup {
path="/test3",
messages="NlsResource"
)
- public static class Test3 extends RestServletDefault {
+ public static class Test3 extends BasicRestServlet {
@RestMethod(
name=POST, path="/{a}"
@@ -127,7 +127,7 @@ public class NlsResource extends RestServletGroup {
path="/test4",
messages="NlsResource"
)
- public static class Test4 extends RestServletDefault {
+ public static class Test4 extends BasicRestServlet {
@RestMethod(
name=POST, path="/{a}"
@@ -145,7 +145,7 @@ public class NlsResource extends RestServletGroup {
path="/test5",
messages="NlsResource"
)
- public static class Test5 extends RestServletDefault {
+ public static class Test5 extends BasicRestServlet {
@RestMethod(
name=POST, path="/{a}"
@@ -165,7 +165,7 @@ public class NlsResource extends RestServletGroup {
title="$L{foo}",
description="$L{foo}"
)
- public static class Test6 extends RestServletDefault {
+ public static class Test6 extends BasicRestServlet {
@RestMethod(
name=POST, path="/{a}",
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/OptionsWithoutNlsResource.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/OptionsWithoutNlsResource.java
index df835f0..055c62d 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/OptionsWithoutNlsResource.java
+++
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/OptionsWithoutNlsResource.java
@@ -24,7 +24,7 @@ import org.apache.juneau.rest.annotation.*;
@RestResource(
path="/testOptionsWithoutNls"
)
-public class OptionsWithoutNlsResource extends RestServletDefault {
+public class OptionsWithoutNlsResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
//====================================================================================================
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/OverlappingMethodsResource.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/OverlappingMethodsResource.java
index b3bc725..3673ee1 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/OverlappingMethodsResource.java
+++
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/OverlappingMethodsResource.java
@@ -25,7 +25,7 @@ import org.apache.juneau.rest.annotation.*;
path="/testOverlappingMethods",
serializers=PlainTextSerializer.class
)
-public class OverlappingMethodsResource extends RestServletDefault {
+public class OverlappingMethodsResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
//====================================================================================================
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ParamsResource.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ParamsResource.java
index aad23e1..1c73265 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ParamsResource.java
+++
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ParamsResource.java
@@ -46,7 +46,7 @@ import org.apache.juneau.utils.*;
pojoSwaps={CalendarSwap.DateMedium.class},
messages="ParamsResource"
)
-public class ParamsResource extends RestServletDefault {
+public class ParamsResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
//====================================================================================================
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ParsersResource.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ParsersResource.java
index 9bb3d9b..03f19ce 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ParsersResource.java
+++
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ParsersResource.java
@@ -30,7 +30,7 @@ import org.apache.juneau.rest.annotation.*;
parsers=ParsersResource.TestParserA.class,
serializers=PlainTextSerializer.class
)
-public class ParsersResource extends RestServletDefault {
+public class ParsersResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
public static class TestParserA extends ReaderParser {
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/PathResource.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/PathResource.java
index 43a54e4..8a7bb50 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/PathResource.java
+++
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/PathResource.java
@@ -27,7 +27,7 @@ import org.apache.juneau.rest.annotation.*;
PathResource.TestPath2.class
}
)
-public class PathResource extends RestServletDefault {
+public class PathResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
//====================================================================================================
@@ -44,7 +44,7 @@ public class PathResource extends RestServletDefault {
PathResource.TestPath3.class
}
)
- public static class TestPath2 extends RestServletDefault {
+ public static class TestPath2 extends BasicRestServlet {
private static final long serialVersionUID = 1L;
// Basic tests
@RestMethod(name=GET, path="/")
@@ -56,7 +56,7 @@ public class PathResource extends RestServletDefault {
@RestResource(
path="/testPath3"
)
- public static class TestPath3a extends RestServletDefault {
+ public static class TestPath3a extends BasicRestServlet {
private static final long serialVersionUID = 1L;
// Basic tests
@RestMethod(name=GET, path="/")
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/PathVariablesResource.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/PathVariablesResource.java
index 349bcce..806f516 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/PathVariablesResource.java
+++
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/PathVariablesResource.java
@@ -25,7 +25,7 @@ import org.apache.juneau.utils.*;
@RestResource(
path="/testPathVariables"
)
-public class PathVariablesResource extends RestServletDefault {
+public class PathVariablesResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
@RestMethod(name=GET, path="/test1/{x}/foo/{y}/bar/{z}/*")
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/PathsResource.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/PathsResource.java
index 8b922b8..46c4b53 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/PathsResource.java
+++
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/PathsResource.java
@@ -28,7 +28,7 @@ import org.apache.juneau.rest.annotation.*;
PathsResource.A.class
}
)
-public class PathsResource extends RestServletDefault {
+public class PathsResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
@RestMethod(name=GET, path="/*")
@@ -44,7 +44,7 @@ public class PathsResource extends RestServletDefault {
@RestResource(
path="/a"
)
- public static class A extends RestServletDefault {
+ public static class A extends BasicRestServlet {
private static final long serialVersionUID = 1L;
@RestMethod(name=GET, path="/*")
public ObjectMap doGet1(RestRequest req, @PathRemainder String
r) {
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/PropertiesResource.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/PropertiesResource.java
index 8f8dc5c..9dcd055 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/PropertiesResource.java
+++
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/PropertiesResource.java
@@ -39,7 +39,7 @@ import org.apache.juneau.serializer.*;
@Property(name="R6",value="$R{C}"),
}
)
-public class PropertiesResource extends RestServletDefault {
+public class PropertiesResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
//====================================================================================================
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/QueryResource.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/QueryResource.java
index 001f67a..68e412f 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/QueryResource.java
+++
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/QueryResource.java
@@ -24,7 +24,7 @@ import org.apache.juneau.rest.annotation.*;
@RestResource(
path="/testQuery"
)
-public class QueryResource extends RestServletDefault {
+public class QueryResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
//====================================================================================================
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/RequestBeanProxyResource.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/RequestBeanProxyResource.java
index 4928fb6..b56e520 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/RequestBeanProxyResource.java
+++
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/RequestBeanProxyResource.java
@@ -27,7 +27,7 @@ import org.apache.juneau.rest.annotation.*;
path="/testRequestBeanProxy"
)
@SuppressWarnings("serial")
-public class RequestBeanProxyResource extends RestServletJenaDefault {
+public class RequestBeanProxyResource extends BasicRestServletJena {
@RestMethod(name=GET, path="/echoQuery")
public Reader echoQuery(RestRequest req) throws Exception {
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/RestClient2Resource.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/RestClient2Resource.java
index 6c3c8fe..719649c 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/RestClient2Resource.java
+++
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/RestClient2Resource.java
@@ -25,7 +25,7 @@ import org.apache.juneau.rest.annotation.*;
@RestResource(
path="/testRestClient"
)
-public class RestClient2Resource extends RestServletDefault {
+public class RestClient2Resource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
//====================================================================================================
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/RestHooksInitResource.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/RestHooksInitResource.java
index 2f0b69e..3b8a838 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/RestHooksInitResource.java
+++
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/RestHooksInitResource.java
@@ -32,13 +32,13 @@ import org.apache.juneau.rest.annotation.*;
RestHooksInitResource.Sub.class
}
)
-public class RestHooksInitResource extends RestServletDefault {
+public class RestHooksInitResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
@RestResource(
path="/super"
)
- public static class Super extends RestServletDefault {
+ public static class Super extends BasicRestServlet {
private static final long serialVersionUID = 1L;
protected List<String> init = new ArrayList<String>();
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/RestHooksResource.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/RestHooksResource.java
index 0597272..333034b 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/RestHooksResource.java
+++
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/RestHooksResource.java
@@ -34,7 +34,7 @@ import org.apache.juneau.utils.*;
RestHooksResource.Post.class,
}
)
-public class RestHooksResource extends RestServletDefault {
+public class RestHooksResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
@RestResource(
@@ -69,7 +69,7 @@ public class RestHooksResource extends RestServletDefault {
}
}
- public static class StartParent extends RestServletDefault {
+ public static class StartParent extends BasicRestServlet {
private static final long serialVersionUID = 1L;
private boolean start1Called;
@@ -121,7 +121,7 @@ public class RestHooksResource extends RestServletDefault {
}
}
- public static class PreParent extends RestServletDefault {
+ public static class PreParent extends BasicRestServlet {
private static final long serialVersionUID = 1L;
private boolean pre1Called;
@@ -168,7 +168,7 @@ public class RestHooksResource extends RestServletDefault {
}
}
- public static class PostParent extends RestServletDefault {
+ public static class PostParent extends BasicRestServlet {
private static final long serialVersionUID = 1L;
private boolean post1Called;
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/Root.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/Root.java
index 6acd2e8..f52f038 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/Root.java
+++
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/Root.java
@@ -78,7 +78,7 @@ import org.apache.juneau.rest.labels.*;
ShutdownResource.class,
}
)
-public class Root extends RestServletDefault {
+public class Root extends BasicRestServlet {
private static final long serialVersionUID = 1L;
@RestMethod(name=GET, path="/")
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/SerializersResource.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/SerializersResource.java
index c92a04a..25ce7f9 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/SerializersResource.java
+++
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/SerializersResource.java
@@ -26,7 +26,7 @@ import org.apache.juneau.serializer.*;
path="/testSerializers",
serializers=SerializersResource.TestSerializerA.class
)
-public class SerializersResource extends RestServletDefault {
+public class SerializersResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
public static class TestSerializerA extends WriterSerializer {
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ThirdPartyProxyResource.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ThirdPartyProxyResource.java
index ddc9fc5..045ee8a 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ThirdPartyProxyResource.java
+++
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ThirdPartyProxyResource.java
@@ -36,7 +36,7 @@ import org.apache.juneau.utils.*;
path="/testThirdPartyProxy"
)
@SuppressWarnings("serial")
-public class ThirdPartyProxyResource extends RestServletJenaDefault {
+public class ThirdPartyProxyResource extends BasicRestServletJena {
public static FileWriter logFile;
static {
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/TransformsParentResource.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/TransformsParentResource.java
index eb52d29..8a97ad5 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/TransformsParentResource.java
+++
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/TransformsParentResource.java
@@ -21,6 +21,6 @@ import org.apache.juneau.rest.annotation.*;
@RestResource(
pojoSwaps={TransformsResource.SwapA1.class}
)
-public class TransformsParentResource extends RestServletDefault {
+public class TransformsParentResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
}
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/UrisResource.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/UrisResource.java
index aa46c10..dc19c29 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/UrisResource.java
+++
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/UrisResource.java
@@ -24,7 +24,7 @@ import org.apache.juneau.rest.annotation.*;
UrisResource.Child.class
}
)
-public class UrisResource extends RestServletDefault {
+public class UrisResource extends BasicRestServlet {
private static final long serialVersionUID = 1L;
@RestMethod(name=GET, path="/*")
@@ -53,7 +53,7 @@ public class UrisResource extends RestServletDefault {
GrandChild.class
}
)
- public static class Child extends RestServletDefault {
+ public static class Child extends BasicRestServlet {
private static final long serialVersionUID = 1L;
@RestMethod(name=GET, path="/*")
@@ -80,7 +80,7 @@ public class UrisResource extends RestServletDefault {
@RestResource(
path="/grandchild"
)
- public static class GrandChild extends RestServletDefault {
+ public static class GrandChild extends BasicRestServlet {
private static final long serialVersionUID = 1L;
@RestMethod(name=GET, path="/*")
diff --git
a/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/DefaultProvider.java
b/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/BasicProvider.java
similarity index 95%
rename from
juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/DefaultProvider.java
rename to
juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/BasicProvider.java
index 38796ca..926f4bf 100644
---
a/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/DefaultProvider.java
+++
b/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/BasicProvider.java
@@ -24,7 +24,7 @@ import org.apache.juneau.urlencoding.*;
import org.apache.juneau.xml.*;
/**
- * JAX-RS provider for the same serialize/parse support provided by the {@link
RestServletDefault} class.
+ * JAX-RS provider for the same serialize/parse support provided by the {@link
BasicRestServlet} class.
*
* <h5 class='section'>See Also:</h5>
* <ul>
@@ -71,5 +71,5 @@ import org.apache.juneau.xml.*;
UrlEncodingParser.class,
}
)
-public final class DefaultProvider extends BaseProvider {}
+public final class BasicProvider extends BaseProvider {}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestCallHandlerDefault.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestCallHandler.java
similarity index 99%
rename from
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestCallHandlerDefault.java
rename to
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestCallHandler.java
index 7a1830c..fbf0ed0 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestCallHandlerDefault.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestCallHandler.java
@@ -38,7 +38,7 @@ import org.apache.juneau.rest.vars.*;
* <li class='jf'>{@link RestContext#REST_callHandler}
* </ul>
*/
-public class RestCallHandlerDefault implements RestCallHandler {
+public class BasicRestCallHandler implements RestCallHandler {
private final RestContext context;
private final RestLogger logger;
@@ -49,7 +49,7 @@ public class RestCallHandlerDefault implements
RestCallHandler {
*
* @param context The resource context.
*/
- public RestCallHandlerDefault(RestContext context) {
+ public BasicRestCallHandler(RestContext context) {
this.context = context;
this.logger = context.getLogger();
this.restCallRouters = context.getCallRouters();
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestInfoProviderDefault.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestInfoProvider.java
similarity index 99%
rename from
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestInfoProviderDefault.java
rename to
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestInfoProvider.java
index 9204aa4..34a6ea2 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestInfoProviderDefault.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestInfoProvider.java
@@ -40,7 +40,7 @@ import org.apache.juneau.svl.*;
* <li class='link'><a class="doclink"
href="../../../../overview-summary.html#juneau-rest-server.OptionsPages">Overview
> juneau-rest-server > OPTIONS Pages</a>
* </ul>
*/
-public class RestInfoProviderDefault implements RestInfoProvider {
+public class BasicRestInfoProvider implements RestInfoProvider {
private final RestContext context;
private final String
@@ -60,7 +60,7 @@ public class RestInfoProviderDefault implements
RestInfoProvider {
*
* @param context The resource context.
*/
- public RestInfoProviderDefault(RestContext context) {
+ public BasicRestInfoProvider(RestContext context) {
this.context = context;
Builder b = new Builder(context);
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestLoggerDefault.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestLogger.java
similarity index 99%
rename from
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestLoggerDefault.java
rename to
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestLogger.java
index 16e2945..dcb5fad 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestLoggerDefault.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestLogger.java
@@ -35,7 +35,7 @@ import org.apache.juneau.json.*;
* <li class='link'><a class="doclink"
href="../../../../overview-summary.html#juneau-rest-server.LoggingAndErrorHandling">Overview
> juneau-rest-server > Logging and Error Handling</a>
* </ul>
*/
-public class RestLoggerDefault implements RestLogger {
+public class BasicRestLogger implements RestLogger {
private final JuneauLogger logger = JuneauLogger.getLogger(getClass());
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResourceResolverDefault.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestResourceResolver.java
similarity index 97%
rename from
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResourceResolverDefault.java
rename to
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestResourceResolver.java
index 2fd25d7..e3d1ede 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResourceResolverDefault.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestResourceResolver.java
@@ -36,7 +36,7 @@ import org.apache.juneau.internal.*;
* <li class='link'><a class="doclink"
href="../../../../overview-summary.html#juneau-rest-server.ResourceResolvers">Overview
> juneau-rest-server > Resource Resolvers</a>
* </ul>
*/
-public class RestResourceResolverDefault implements RestResourceResolver {
+public class BasicRestResourceResolver implements RestResourceResolver {
@Override /* RestResourceResolver */
public Object resolve(Object parent, Class<?> c, RestContextBuilder
builder) throws Exception {
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletDefault.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestServlet.java
similarity index 95%
rename from
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletDefault.java
rename to
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestServlet.java
index 0ff58de..5957356 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletDefault.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestServlet.java
@@ -160,7 +160,7 @@ import org.apache.juneau.xml.*;
*
* <h5 class='section'>See Also:</h5>
* <ul>
- * <li class='link'><a class="doclink"
href="../../../../overview-summary.html#juneau-rest-server.RestServletDefault">Overview
> juneau-rest-server > RestServletDefault</a>
+ * <li class='link'><a class="doclink"
href="../../../../overview-summary.html#juneau-rest-server.BasicRestServlet">Overview
> juneau-rest-server > BasicRestServlet</a>
* </ul>
*/
@RestResource(
@@ -216,7 +216,7 @@ import org.apache.juneau.xml.*;
// For example, "/servletPath/htdocs/javadoc.css" resolves to the file
"[servlet-package]/htdocs/javadoc.css"
staticFiles={"htdocs:htdocs","styles:styles"}
)
-public abstract class RestServletDefault extends RestServlet {
+public abstract class BasicRestServlet extends RestServlet {
private static final long serialVersionUID = 1L;
/**
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletGroup.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestServletGroup.java
similarity index 93%
rename from
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletGroup.java
rename to
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestServletGroup.java
index 8d0125f..3f1517f 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletGroup.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestServletGroup.java
@@ -18,7 +18,7 @@ import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.labels.*;
/**
- * Specialized subclass of {@link RestServletDefault} for showing "group"
pages.
+ * Specialized subclass of {@link BasicRestServlet} for showing "group" pages.
*
* <p>
* Group pages consist of simple lists of child resource URLs and their labels.
@@ -33,7 +33,7 @@ import org.apache.juneau.rest.labels.*;
* </ul>
*/
@RestResource
-public class RestServletGroup extends RestServletDefault {
+public class BasicRestServletGroup extends BasicRestServlet {
private static final long serialVersionUID = 1L;
/**
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestLoggerNoOp.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/NoOpRestLogger.java
similarity index 97%
rename from
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestLoggerNoOp.java
rename to
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/NoOpRestLogger.java
index 16e5217..a9401c1 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestLoggerNoOp.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/NoOpRestLogger.java
@@ -27,7 +27,7 @@ import java.util.logging.*;
* <li class='link'><a class="doclink"
href="../../../../overview-summary.html#juneau-rest-server.LoggingAndErrorHandling">Overview
> juneau-rest-server > Logging and Error Handling</a>
* </ul>
*/
-public class RestLoggerNoOp extends RestLoggerDefault {
+public class NoOpRestLogger extends BasicRestLogger {
/**
* Log a message to the logger.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestCallHandler.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestCallHandler.java
index f624676..8b19983 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestCallHandler.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestCallHandler.java
@@ -34,7 +34,7 @@ public interface RestCallHandler {
*
* <p>
* Used on annotation to indicate that the value should be inherited
from the parent class, and
- * ultimately {@link RestCallHandlerDefault} if not specified at any
level.
+ * ultimately {@link BasicRestCallHandler} if not specified at any
level.
*/
public interface Null extends RestCallHandler {}
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 ffe6bff..c6f1cc5 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
@@ -274,7 +274,7 @@ public final class RestContext extends BeanContext {
* <ul>
* <li><b>Name:</b> <js>"RestContext.callHandler.o"</js>
* <li><b>Data type:</b> {@link RestCallHandler} |
<code>Class<? <jk>extends</jk> {@link RestCallHandler}></code>
- * <li><b>Default:</b> {@link RestCallHandlerDefault}
+ * <li><b>Default:</b> {@link BasicRestCallHandler}
* <li><b>Session-overridable:</b> <jk>false</jk>
* <li><b>Annotations:</b>
* <ul>
@@ -295,7 +295,7 @@ public final class RestContext extends BeanContext {
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
* <jc>// Our customized call handler.</jc>
- * <jk>public class</jk> MyRestCallHandler <jk>extends</jk>
RestCallHandlerDefault {
+ * <jk>public class</jk> MyRestCallHandler <jk>extends</jk>
BasicRestCallHandler {
*
* <jc>// Must provide this constructor!</jc>
* <jk>public</jk> MyRestCallHandler(RestContext context) {
@@ -455,7 +455,7 @@ public final class RestContext extends BeanContext {
* <ul class='spaced-list'>
* <li>
* When defined as classes, instances are resolved using
the registered {@link #REST_resourceResolver} which
- * by default is {@link RestResourceResolverDefault} which
requires the class have one of the following
+ * by default is {@link BasicRestResourceResolver} which
requires the class have one of the following
* constructors:
* <ul>
* <li><code><jk>public</jk>
T(RestContextBuilder)</code>
@@ -1155,7 +1155,7 @@ public final class RestContext extends BeanContext {
* <ul>
* <li><b>Name:</b> <js>"RestContext.infoProvider.o"</js>
* <li><b>Data type:</b> <code>{@link RestInfoProvider} |
Class<? <jk>extends</jk> {@link RestInfoProvider}></code>
- * <li><b>Default:</b> {@link RestInfoProviderDefault}
+ * <li><b>Default:</b> {@link BasicRestInfoProvider}
* <li><b>Session-overridable:</b> <jk>false</jk>
* <li><b>Annotations:</b>
* <ul>
@@ -1176,7 +1176,7 @@ public final class RestContext extends BeanContext {
* <p class='bcode'>
* <jc>// Our customized info provider.</jc>
* <jc>// Extend from the default implementation and selectively
override values.</jc>
- * <jk>public class</jk> MyRestInfoProvider <jk>extends</jk>
RestInfoProviderDefault {
+ * <jk>public class</jk> MyRestInfoProvider <jk>extends</jk>
BasicRestInfoProvider {
*
* <jc>// Must provide this constructor!</jc>
* <jk>public</jk> MyRestInfoProvider(RestContext context)
{
@@ -1244,7 +1244,7 @@ public final class RestContext extends BeanContext {
* <ul>
* <li><b>Name:</b> <js>"RestContext.logger.o"</js>
* <li><b>Data type:</b> <code>{@link RestLogger} | Class<?
<jk>extends</jk> {@link RestLogger}></code>
- * <li><b>Default:</b> {@link RestLoggerDefault}
+ * <li><b>Default:</b> {@link BasicRestLogger}
* <li><b>Session-overridable:</b> <jk>false</jk>
* <li><b>Annotations:</b>
* <ul>
@@ -1264,8 +1264,8 @@ public final class RestContext extends BeanContext {
* <p>
* Two implementations are provided by default:
* <ul>
- * <li class='jc'>{@link RestLoggerDefault} - Default logging.
- * <li class='jc'>{@link RestLoggerNoOp} - Logging disabled.
+ * <li class='jc'>{@link BasicRestLogger} - Default logging.
+ * <li class='jc'>{@link NoOpRestLogger} - Logging disabled.
* </ul>
*
* <p>
@@ -1278,7 +1278,7 @@ public final class RestContext extends BeanContext {
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
* <jc>// Our customized logger.</jc>
- * <jk>public class</jk> MyRestLogger <jk>extends</jk>
RestLoggerDefault {
+ * <jk>public class</jk> MyRestLogger <jk>extends</jk>
BasicRestLogger {
*
* <ja>@Override</ja>
* <jk>public void</jk> log(Level level, Throwable cause,
String msg, Object...args) {
@@ -1701,7 +1701,7 @@ public final class RestContext extends BeanContext {
* <li>
* When defined as an instance, properties/transforms
defined on the resource/method are NOT inherited.
* <li>
- * Typically, you'll want your resource to extend directly
from {@link RestServletDefault} which comes
+ * Typically, you'll want your resource to extend directly
from {@link BasicRestServlet} which comes
* preconfigured with the following parsers:
* <ul>
* <li class='jc'>{@link JsonParser}
@@ -1992,7 +1992,7 @@ public final class RestContext extends BeanContext {
* <ul>
* <li class='jm'>{@link
RestContext#isRenderResponseStackTraces()
RestContext.isRenderResponseStackTraces()}
* </ul>
- * That method is used by {@link
RestCallHandlerDefault#renderError(HttpServletRequest, HttpServletResponse,
RestException)}.
+ * That method is used by {@link
BasicRestCallHandler#renderError(HttpServletRequest, HttpServletResponse,
RestException)}.
* </ul>
*/
public static final String REST_renderResponseStackTraces = PREFIX +
"renderResponseStackTraces.b";
@@ -2004,7 +2004,7 @@ public final class RestContext extends BeanContext {
* <ul>
* <li><b>Name:</b> <js>"RestContext.resourceResolver.o"</js>
* <li><b>Data type:</b> <code>{@link RestResourceResolver} |
Class<? <jk>extends</jk> {@link RestResourceResolver}></code>
- * <li><b>Default:</b> {@link RestResourceResolverDefault}
+ * <li><b>Default:</b> {@link BasicRestResourceResolver}
* <li><b>Session-overridable:</b> <jk>false</jk>
* <li><b>Annotations:</b>
* <ul>
@@ -2259,7 +2259,7 @@ public final class RestContext extends BeanContext {
* <li>
* When defined as an instance, properties/transforms
defined on the resource/method are NOT inherited.
* <li>
- * Typically, you'll want your resource to extend directly
from {@link RestServletDefault} which comes
+ * Typically, you'll want your resource to extend directly
from {@link BasicRestServlet} which comes
* preconfigured with the following serializers:
* <ul>
* <li class='jc'>{@link HtmlDocSerializer}
@@ -2391,7 +2391,7 @@ public final class RestContext extends BeanContext {
* <js>"styles:styles"</js>
* }
* )
- * <jk>public class</jk> MyResource <jk>extends</jk>
RestServletDefault {...}
+ * <jk>public class</jk> MyResource <jk>extends</jk>
BasicRestServlet {...}
* </p>
*
* <p>
@@ -2860,7 +2860,7 @@ public final class RestContext extends BeanContext {
defaultResponseHeaders =
getMapProperty(REST_defaultResponseHeaders, Object.class);
staticFileResponseHeaders =
getMapProperty(REST_staticFileResponseHeaders, Object.class);
- logger = getInstanceProperty(REST_logger, resource,
RestLogger.class, RestLoggerNoOp.class, true, this);
+ logger = getInstanceProperty(REST_logger, resource,
RestLogger.class, NoOpRestLogger.class, true, this);
varResolver = builder.varResolverBuilder
.vars(
@@ -3118,7 +3118,7 @@ public final class RestContext extends BeanContext {
this.callRouters = unmodifiableMap(_callRouters);
// Initialize our child resources.
- resourceResolver =
getInstanceProperty(REST_resourceResolver, resource,
RestResourceResolver.class, parentContext == null ?
RestResourceResolverDefault.class : parentContext.resourceResolver, true, this);
+ resourceResolver =
getInstanceProperty(REST_resourceResolver, resource,
RestResourceResolver.class, parentContext == null ?
BasicRestResourceResolver.class : parentContext.resourceResolver, true, this);
for (Object o : getArrayProperty(REST_children,
Object.class)) {
String path = null;
Object r = null;
@@ -3158,8 +3158,8 @@ public final class RestContext extends BeanContext {
childResources.put(path, rc2);
}
- callHandler = getInstanceProperty(REST_callHandler,
resource, RestCallHandler.class, RestCallHandlerDefault.class, true, this);
- infoProvider = getInstanceProperty(REST_infoProvider,
resource, RestInfoProvider.class, RestInfoProviderDefault.class, true, this);
+ callHandler = getInstanceProperty(REST_callHandler,
resource, RestCallHandler.class, BasicRestCallHandler.class, true, this);
+ infoProvider = getInstanceProperty(REST_infoProvider,
resource, RestInfoProvider.class, BasicRestInfoProvider.class, true, this);
} catch (RestException e) {
_initException = e;
@@ -3216,7 +3216,7 @@ public final class RestContext extends BeanContext {
*
<ja>@Property</ja>(name=<js>"v1"</js>,value=<js>"$R{foo,bar}"</js>), <jc>//
Request variable. value="bar"</jc>
* }
* )
- * <jk>public class</jk> MyRestResource <jk>extends</jk>
RestServletDefault {
+ * <jk>public class</jk> MyRestResource <jk>extends</jk>
BasicRestServlet {
* </p>
*
* <p>
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 fd90cdf..0a3a2d8 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
@@ -134,7 +134,7 @@ public class RestContextBuilder extends BeanContextBuilder
implements ServletCon
this.parentContext = parentContext;
properties = new RestContextProperties();
- logger(RestLoggerDefault.class);
+ logger(BasicRestLogger.class);
staticFileResponseHeader("Cache-Control", "max-age=86400,
public");
encoders(IdentityEncoder.INSTANCE);
@@ -561,7 +561,7 @@ public class RestContextBuilder extends BeanContextBuilder
implements ServletCon
*
* @param value
* The new value for this setting.
- * <br>The default is {@link RestCallHandlerDefault}.
+ * <br>The default is {@link BasicRestCallHandler}.
* @return This object (for method chaining).
*/
public RestContextBuilder callHandler(Class<? extends RestCallHandler>
value) {
@@ -581,7 +581,7 @@ public class RestContextBuilder extends BeanContextBuilder
implements ServletCon
*
* @param value
* The new value for this setting.
- * <br>The default is {@link RestCallHandlerDefault}.
+ * <br>The default is {@link BasicRestCallHandler}.
* @return This object (for method chaining).
*/
public RestContextBuilder callHandler(RestCallHandler value) {
@@ -987,7 +987,7 @@ public class RestContextBuilder extends BeanContextBuilder
implements ServletCon
*
* @param value
* The new value for this setting.
- * <br>The default is {@link RestInfoProviderDefault}.
+ * <br>The default is {@link BasicRestInfoProvider}.
* @return This object (for method chaining).
*/
public RestContextBuilder infoProvider(Class<? extends
RestInfoProvider> value) {
@@ -1007,7 +1007,7 @@ public class RestContextBuilder extends
BeanContextBuilder implements ServletCon
*
* @param value
* The new value for this setting.
- * <br>The default is {@link RestInfoProviderDefault}.
+ * <br>The default is {@link BasicRestInfoProvider}.
* @return This object (for method chaining).
*/
public RestContextBuilder infoProvider(RestInfoProvider value) {
@@ -1027,7 +1027,7 @@ public class RestContextBuilder extends
BeanContextBuilder implements ServletCon
*
* @param value
* The new value for this setting.
- * <br>The default is {@link RestLoggerDefault}.
+ * <br>The default is {@link BasicRestLogger}.
* <br>Can be <jk>null</jk> to disable logging.
* @return This object (for method chaining).
*/
@@ -1048,7 +1048,7 @@ public class RestContextBuilder extends
BeanContextBuilder implements ServletCon
*
* @param value
* The new value for this setting.
- * <br>The default is {@link RestLoggerDefault}.
+ * <br>The default is {@link BasicRestLogger}.
* <br>Can be <jk>null</jk> to disable logging.
* @return This object (for method chaining).
*/
@@ -1424,7 +1424,7 @@ public class RestContextBuilder extends
BeanContextBuilder implements ServletCon
*
* @param value
* The new value for this setting.
- * <br>The default is {@link RestResourceResolverDefault}.
+ * <br>The default is {@link BasicRestResourceResolver}.
* @return This object (for method chaining).
*/
public RestContextBuilder resourceResolver(Class<? extends
RestResourceResolver> value) {
@@ -1444,7 +1444,7 @@ public class RestContextBuilder extends
BeanContextBuilder implements ServletCon
*
* @param value
* The new value for this setting.
- * <br>The default is {@link RestResourceResolverDefault}.
+ * <br>The default is {@link BasicRestResourceResolver}.
* @return This object (for method chaining).
*/
public RestContextBuilder resourceResolver(RestResourceResolver value) {
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestInfoProvider.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestInfoProvider.java
index f163ef1..ed73946 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestInfoProvider.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestInfoProvider.java
@@ -36,7 +36,7 @@ public interface RestInfoProvider {
*
* <p>
* Used on annotation to indicate that the value should be inherited
from the parent class, and
- * ultimately {@link RestInfoProviderDefault} if not specified at any
level.
+ * ultimately {@link BasicRestInfoProvider} if not specified at any
level.
*/
public interface Null extends RestInfoProvider {}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestLogger.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestLogger.java
index 865554e..a17f46e 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestLogger.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestLogger.java
@@ -35,7 +35,7 @@ public interface RestLogger {
*
* <p>
* Used on annotation to indicate that the value should be inherited
from the parent class, and
- * ultimately {@link RestLoggerDefault} if not specified at any level.
+ * ultimately {@link BasicRestLogger} if not specified at any level.
*/
public interface Null extends RestLogger {}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResourceResolver.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResourceResolver.java
index 00b656d..04663f8 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResourceResolver.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResourceResolver.java
@@ -47,7 +47,7 @@ public interface RestResourceResolver {
*
* <p>
* Used on annotation to indicate that the value should be inherited
from the parent class, and
- * ultimately {@link RestResourceResolverDefault} if not specified at
any level.
+ * ultimately {@link BasicRestResourceResolver} if not specified at any
level.
*/
public interface Null extends RestResourceResolver {}
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 74b61d6..5beab56 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 @@ import org.apache.juneau.utils.*;
* path=<js>"/myresource"</js>,
* staticFiles={<js>"htdocs:docs"</js>}
* )
- * <jk>public class</jk> MyResource <jk>extends</jk> RestServletDefault {...}
+ * <jk>public class</jk> MyResource <jk>extends</jk> BasicRestServlet {...}
* </p>
*
* <p>
@@ -48,7 +48,7 @@ import org.apache.juneau.utils.*;
* the <l>foobar.html</l> file in the following ordered locations:
* <ol>
* <li><l>com.foo.mypackage.docs</l> package.
- * <li><l>org.apache.juneau.rest.docs</l> package (since
<l>RestServletDefault</l> is in <l>org.apache.juneau.rest</l>).
+ * <li><l>org.apache.juneau.rest.docs</l> package (since
<l>BasicRestServlet</l> is in <l>org.apache.juneau.rest</l>).
* <li><l>[working-dir]/docs</l> directory.
* </ol>
*
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 39fe87a..799489d 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
@@ -58,7 +58,7 @@ public enum HookEvent {
* <h5 class='figure'>Example:</h5>
* <p class='bcode'>
* <ja>@RestResource</ja>(...)
- * <jk>public class</jk> MyResource <jk>extends</jk>
RestServletDefault {
+ * <jk>public class</jk> MyResource <jk>extends</jk>
BasicRestServlet {
*
* <jc>// Add a request attribute to all incoming
requests.</jc>
* <ja>@RestHook</ja>(<jsf>START_CALL</jsf>)
@@ -175,7 +175,7 @@ public enum HookEvent {
* <h5 class='figure'>Example:</h5>
* <p class='bcode'>
* <ja>@RestResource</ja>(...)
- * <jk>public class</jk> MyResource <jk>extends</jk>
RestServletDefault {
+ * <jk>public class</jk> MyResource <jk>extends</jk>
BasicRestServlet {
*
* <jc>// Log the incoming request.</jc>
* <ja>@RestHook</ja>(<jsf>PRE_CALL</jsf>)
@@ -225,7 +225,7 @@ public enum HookEvent {
* <h5 class='figure'>Example:</h5>
* <p class='bcode'>
* <ja>@RestResource</ja>(...)
- * <jk>public class</jk> MyResource <jk>extends</jk>
RestServletDefault {
+ * <jk>public class</jk> MyResource <jk>extends</jk>
BasicRestServlet {
*
* <jc>// Log the result of the request.</jc>
* <ja>@RestHook</ja>(<jsf>POST_CALL</jsf>)
@@ -283,7 +283,7 @@ public enum HookEvent {
* <h5 class='figure'>Example:</h5>
* <p class='bcode'>
* <ja>@RestResource</ja>(...)
- * <jk>public class</jk> MyResource <jk>extends</jk>
RestServletDefault {
+ * <jk>public class</jk> MyResource <jk>extends</jk>
BasicRestServlet {
*
* <jc>// Log the time it took to execute the request.</jc>
* <ja>@RestHook</ja>(<jsf>END_CALL</jsf>)
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/MethodSwagger.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/MethodSwagger.java
index e201aaf..b1169d5 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/MethodSwagger.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/MethodSwagger.java
@@ -47,7 +47,7 @@ public @interface MethodSwagger {
*
* <h5 class='section'>See Also:</h5>
* <ul>
- * <li class='jm'>{@link
RestInfoProviderDefault#isDeprecated(java.lang.reflect.Method, RestRequest)
RestInfoProviderDefault.isDeprecated(Method,RestRequest)}
+ * <li class='jm'>{@link
BasicRestInfoProvider#isDeprecated(java.lang.reflect.Method, RestRequest)
BasicRestInfoProvider.isDeprecated(Method,RestRequest)}
* </ul>
*/
boolean deprecated() default false;
@@ -87,7 +87,7 @@ public @interface MethodSwagger {
*
* <h5 class='section'>See Also:</h5>
* <ul>
- * <li class='jm'>{@link
RestInfoProviderDefault#getMethodExternalDocs(java.lang.reflect.Method,
RestRequest) RestInfoProviderDefault.getMethodExternalDocs(Method,RestRequest)}
+ * <li class='jm'>{@link
BasicRestInfoProvider#getMethodExternalDocs(java.lang.reflect.Method,
RestRequest) BasicRestInfoProvider.getMethodExternalDocs(Method,RestRequest)}
* </ul>
*/
String externalDocs() default "";
@@ -126,7 +126,7 @@ public @interface MethodSwagger {
*
* <h5 class='section'>See Also:</h5>
* <ul>
- * <li class='jm'>{@link
RestInfoProviderDefault#getMethodParameters(java.lang.reflect.Method,
RestRequest) RestInfoProviderDefault.getMethodParameters(Method,RestRequest)}
+ * <li class='jm'>{@link
BasicRestInfoProvider#getMethodParameters(java.lang.reflect.Method,
RestRequest) BasicRestInfoProvider.getMethodParameters(Method,RestRequest)}
* </ul>
*/
Parameter[] parameters() default {};
@@ -168,7 +168,7 @@ public @interface MethodSwagger {
*
* <h5 class='section'>See Also:</h5>
* <ul>
- * <li class='jm'>{@link
RestInfoProviderDefault#getMethodResponses(java.lang.reflect.Method,
RestRequest) RestInfoProviderDefault.getMethodResponses(Method,RestRequest)}
+ * <li class='jm'>{@link
BasicRestInfoProvider#getMethodResponses(java.lang.reflect.Method, RestRequest)
BasicRestInfoProvider.getMethodResponses(Method,RestRequest)}
* </ul>
*/
Response[] responses() default {};
@@ -203,7 +203,7 @@ public @interface MethodSwagger {
*
* <h5 class='section'>See Also:</h5>
* <ul>
- * <li class='jm'>{@link
RestInfoProviderDefault#getMethodTags(java.lang.reflect.Method, RestRequest)
RestInfoProviderDefault.getMethodTags(Method,RestRequest)}
+ * <li class='jm'>{@link
BasicRestInfoProvider#getMethodTags(java.lang.reflect.Method, RestRequest)
BasicRestInfoProvider.getMethodTags(Method,RestRequest)}
* </ul>
*/
String tags() default "";
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remoteable/RemoteableServlet.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remoteable/RemoteableServlet.java
index fb0262e..fed6c3b 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remoteable/RemoteableServlet.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remoteable/RemoteableServlet.java
@@ -40,7 +40,7 @@ import org.apache.juneau.rest.annotation.*;
* </ul>
*/
@SuppressWarnings("serial")
-public abstract class RemoteableServlet extends RestServletDefault {
+public abstract class RemoteableServlet extends BasicRestServlet {
private final Map<String,Class<?>> classNameMap = new
ConcurrentHashMap<>();
--
To stop receiving notification emails like this one, please contact
jamesbog...@apache.org.
