You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2018/10/11 12:37:48 UTC
[juneau] branch master updated (e05c5a3 -> aa2065c)
This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git.
from e05c5a3 Slightly better initialization in RestServlet.
new 08e8217 Rename "remote interface
new aa2065c Rename "remote inteface" to "rrpc interface".
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/juneau/http/HttpMethodName.java | 4 +--
.../src/main/resources/ReleaseNotes/7.2.0.html | 6 ++--
.../src/main/resources/ReleaseNotes/7.2.1.html | 14 +++++++++-
.../03.Instantiation/04.RouterPages.html | 2 +-
.../06.RestMethod/16.PredefinedHelperBeans.html | 2 +-
.../Topics/07.juneau-rest-server/07.restRPC.html | 32 +++++++++++-----------
.../12.juneau-examples-rest/01.RootResources.html | 2 +-
.../08.AddressBookResource.html | 6 ++--
.../09.SampleRemoteableServlet.html | 6 ++--
.../apache/juneau/examples/rest/RootResources.java | 2 +-
...nterfaceServlet.java => SampleRrpcServlet.java} | 8 +++---
.../rest/addressbook/AddressBookResource.java | 4 +--
.../examples/rest/AddressBookResourceTest.java | 2 +-
...ServletTest.java => SampleRrpcServletTest.java} | 4 +--
.../apache/juneau/examples/rest/_TestSuite.java | 2 +-
.../rest/test/client/InterfaceProxyTest.java | 4 +--
.../org/apache/juneau/rest/client/RestClient.java | 18 ++++++------
.../java/org/apache/juneau/rest/RestContext.java | 8 +++---
.../apache/juneau/rest/annotation/RestMethod.java | 2 +-
...emoteInterfaceServlet.java => RrpcServlet.java} | 2 +-
20 files changed, 71 insertions(+), 59 deletions(-)
rename juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/{SampleRemoteInterfaceServlet.java => SampleRrpcServlet.java} (91%)
rename juneau-examples/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/{SampleRemoteInterfaceServletTest.java => SampleRrpcServletTest.java} (94%)
rename juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remote/{RemoteInterfaceServlet.java => RrpcServlet.java} (96%)
[juneau] 02/02: Rename "remote inteface" to "rrpc interface".
Posted by ja...@apache.org.
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
commit aa2065cab5281bd5d6f4d5bb0959bbb88d5663f1
Author: JamesBognar <ja...@apache.org>
AuthorDate: Thu Oct 11 08:37:22 2018 -0400
Rename "remote inteface" to "rrpc interface".
---
juneau-doc/src/main/resources/ReleaseNotes/7.2.1.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/juneau-doc/src/main/resources/ReleaseNotes/7.2.1.html b/juneau-doc/src/main/resources/ReleaseNotes/7.2.1.html
index c4a1864..6c2f248 100644
--- a/juneau-doc/src/main/resources/ReleaseNotes/7.2.1.html
+++ b/juneau-doc/src/main/resources/ReleaseNotes/7.2.1.html
@@ -16,7 +16,7 @@
7.2.1 (TBD)
<p>
- Summary.
+ This release contains mostly bug fixes.
</p>
<h5 class='topic w800'>juneau-marshall</h5>
[juneau] 01/02: Rename "remote interface
Posted by ja...@apache.org.
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
commit 08e82170e531661b4b711625622e8861748829d3
Author: JamesBognar <ja...@apache.org>
AuthorDate: Thu Oct 11 08:35:14 2018 -0400
Rename "remote interface
---
.../org/apache/juneau/http/HttpMethodName.java | 4 +--
.../src/main/resources/ReleaseNotes/7.2.0.html | 6 ++--
.../src/main/resources/ReleaseNotes/7.2.1.html | 12 ++++++++
.../03.Instantiation/04.RouterPages.html | 2 +-
.../06.RestMethod/16.PredefinedHelperBeans.html | 2 +-
.../Topics/07.juneau-rest-server/07.restRPC.html | 32 +++++++++++-----------
.../12.juneau-examples-rest/01.RootResources.html | 2 +-
.../08.AddressBookResource.html | 6 ++--
.../09.SampleRemoteableServlet.html | 6 ++--
.../apache/juneau/examples/rest/RootResources.java | 2 +-
...nterfaceServlet.java => SampleRrpcServlet.java} | 8 +++---
.../rest/addressbook/AddressBookResource.java | 4 +--
.../examples/rest/AddressBookResourceTest.java | 2 +-
...ServletTest.java => SampleRrpcServletTest.java} | 4 +--
.../apache/juneau/examples/rest/_TestSuite.java | 2 +-
.../rest/test/client/InterfaceProxyTest.java | 4 +--
.../org/apache/juneau/rest/client/RestClient.java | 18 ++++++------
.../java/org/apache/juneau/rest/RestContext.java | 8 +++---
.../apache/juneau/rest/annotation/RestMethod.java | 2 +-
...emoteInterfaceServlet.java => RrpcServlet.java} | 2 +-
20 files changed, 70 insertions(+), 58 deletions(-)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpMethodName.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpMethodName.java
index 5f11db6..3209764 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpMethodName.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpMethodName.java
@@ -46,8 +46,8 @@ public final class HttpMethodName {
/** {@doc RFC2616.section9#sec9.9 CONNECT} */
public static final String CONNECT = "CONNECT";
- /** Special case for a REST method that implements a proxy interface. */
- public static final String PROXY = "PROXY";
+ /** Special case for a REST method that implements a REST-RPC interface. */
+ public static final String RRPC = "RRPC";
/** A non-standard value. */
public static final String OTHER = "OTHER";
diff --git a/juneau-doc/src/main/resources/ReleaseNotes/7.2.0.html b/juneau-doc/src/main/resources/ReleaseNotes/7.2.0.html
index 75cd332..970472b 100644
--- a/juneau-doc/src/main/resources/ReleaseNotes/7.2.0.html
+++ b/juneau-doc/src/main/resources/ReleaseNotes/7.2.0.html
@@ -60,7 +60,7 @@
<ul class='doctree'>
<li class='ja'>{@link oaj.remote.RemoteInterface}
- Used for remote proxy interfaces served up through
- {@link oajr.remote.RemoteInterfaceServlet} or REST <js>"PROXY"</js> methods.
+ <code><del>RemoteInterfaceServlet</del></code> or REST <js>"PROXY"</js> methods.
<br>Defaults to <js>"POST"</js> with method signatures as paths.
<li class='ja'>{@link oajrc.remote.RemoteResource}
- Used for 3rd-party REST interfaces.
@@ -265,9 +265,9 @@
<li>
Fixed bug where incorrect media type was being set on responses (e.g. <code>text/html+schema</code> instead of <code>text/html</code> for schema documents).
<li>
- The <code>RemoteableServlet</code> class has been moved and renamed to {@link oajr.remote.RemoteInterfaceServlet}.
+ The <code>RemoteableServlet</code> class has been moved and renamed to <code><del>RemoteInterfaceServlet</del></code>.
<li>
- {@link oajr.remote.RemoteInterfaceServlet} now provides a form page for invoking remote interface methods in a browser.
+ <code><del>RemoteInterfaceServlet</del></code> now provides a form page for invoking remote interface methods in a browser.
<li>
Newlines were being stripped from <code><ja>@HtmlDoc</ja>(script)</code> when serialized which could cause script lines to become commented out.
<li>
diff --git a/juneau-doc/src/main/resources/ReleaseNotes/7.2.1.html b/juneau-doc/src/main/resources/ReleaseNotes/7.2.1.html
index 2faed92..c4a1864 100644
--- a/juneau-doc/src/main/resources/ReleaseNotes/7.2.1.html
+++ b/juneau-doc/src/main/resources/ReleaseNotes/7.2.1.html
@@ -36,4 +36,16 @@
package in <code>juneau-marshall</code>. This allows them to be used as return types in remote REST interfaces.
<br>A new {@link oajr.helper.ResolvingReaderResource} class has been added that includes the variable-resolving support since
this relies on the <code>juneau-svl</code> package.
+ <li>
+ The <code>RemoteInterfaceServlet</code> class has been renamed to {@link oajr.remote.RrpcServlet}.
+ <li>
+ <code><ja>@RestMethod</ja>(name=<js>"PROXY"</js>)</code> has been changed to <code><ja>@RestMethod</ja>(name=<js>"RRPC"</js>)</code>.
</ul>
+
+<h5 class='topic w800'>juneau-rest-client</h5>
+<ul class='spaced-list'>
+ <li>
+ The <code>RestClient.getRemoteInterface()</code> method has been renamed to {@link oajrc.RestClient#getRrpcInterface(Class)}.
+ <li>
+ Fixed a bug where <code><ja>@RemoteMethod</ja>(path)</code> values containing '/' characters were erroneously being encoded.
+</ul>
\ No newline at end of file
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/03.Instantiation/04.RouterPages.html b/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/03.Instantiation/04.RouterPages.html
index 2c57f03..a068113 100644
--- a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/03.Instantiation/04.RouterPages.html
+++ b/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/03.Instantiation/04.RouterPages.html
@@ -36,7 +36,7 @@ Router Pages
RequestEchoResource.<jk>class</jk>,
TempDirResource.<jk>class</jk>,
AddressBookResource.<jk>class</jk>,
- SampleRemoteInterfaceServlet.<jk>class</jk>,
+ SampleRrpcServlet.<jk>class</jk>,
PhotosResource.<jk>class</jk>,
AtomFeedResource.<jk>class</jk>,
JsonSchemaResource.<jk>class</jk>,
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod/16.PredefinedHelperBeans.html b/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod/16.PredefinedHelperBeans.html
index f85614a..f48c6f4 100644
--- a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod/16.PredefinedHelperBeans.html
+++ b/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod/16.PredefinedHelperBeans.html
@@ -191,7 +191,7 @@ Predefined Helper Beans
MethodExampleResource.<jk>class</jk>,
RequestEchoResource.<jk>class</jk>,
AddressBookResource.<jk>class</jk>,
- SampleRemoteInterfaceServlet.<jk>class</jk>,
+ SampleRrpcServlet.<jk>class</jk>,
DtoExamples.<jk>class</jk>,
PhotosResource.<jk>class</jk>,
SqlQueryResource.<jk>class</jk>,
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/07.restRPC.html b/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/07.restRPC.html
index 561abd9..b955a42 100644
--- a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/07.restRPC.html
+++ b/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/07.restRPC.html
@@ -13,7 +13,7 @@
***************************************************************************************************************************/
-->
-restRPC
+{updated} restRPC
<p>
The restRPC (RPC over REST) API allows the creation of client-side remote proxy interfaces for calling methods on server-side POJOs using entirely REST.
@@ -71,9 +71,9 @@ restRPC
<ul class='doctree'>
<li class='jc'>{@link oajrc.RestClient}
<ul>
- <li class='jm'>{@link oajrc.RestClient#getRemoteInterface(Class) getRemoteInterface(Class)}
- <li class='jm'>{@link oajrc.RestClient#getRemoteInterface(Class,Object) getRemoteInterface(Class,Object)}
- <li class='jm'>{@link oajrc.RestClient#getRemoteInterface(Class,Object,Serializer,Parser) getRemoteInterface(Class,Object,Serializer,Parser)}
+ <li class='jm'>{@link oajrc.RestClient#getRrpcInterface(Class) getRrpcInterface(Class)}
+ <li class='jm'>{@link oajrc.RestClient#getRrpcInterface(Class,Object) getRrpcInterface(Class,Object)}
+ <li class='jm'>{@link oajrc.RestClient#getRrpcInterface(Class,Object,Serializer,Parser) getRrpcInterface(Class,Object,Serializer,Parser)}
</ul>
</ul>
<p>
@@ -93,7 +93,7 @@ restRPC
.build();
<jc>// Create a proxy interface.</jc>
- IAddressBook ab = client.getRemoteInterface(IAddressBook.<jk>class</jk>);
+ IAddressBook ab = client.getRrpcInterface(IAddressBook.<jk>class</jk>);
<jc>// Invoke a method on the server side and get the returned result.</jc>
Person p = ab.createPerson(
@@ -140,9 +140,9 @@ restRPC
</p>
<ol class='spaced-list'>
<li>
- Extending from {@link oajr.remote.RemoteInterfaceServlet}.
+ Extending from {@link oajr.remote.RrpcServlet}.
<li>
- Using a <code><ja>@RestMethod</ja>(name=<jsf>PROXY</jsf>)</code> annotation on a Java method.
+ Using a <code><ja>@RestMethod</ja>(name=<jsf>RRPC</jsf>)</code> annotation on a Java method.
</ol>
<p>
In either case, the proxy communications layer is pure REST.
@@ -152,21 +152,21 @@ restRPC
a browser with no coding involved.
</p>
-<h5 class='topic'>RemoteInterfaceServlet</h5>
+<h5 class='topic'>RrpcServlet</h5>
<p>
- The {@link oajr.remote.RemoteInterfaceServlet} class is a simple specialized servlet with an abstract
+ The {@link oajr.remote.RrpcServlet} class is a simple specialized servlet with an abstract
<code>getServiceMap()</code> method to define the server-side POJOs:
</p>
<p class='bpcode w800'>
<ja>@RestResource</ja>(
path=<js>"/remote"</js>
)
- <jk>public class</jk> SampleRemoteInterfaceServlet <jk>extends</jk> RemoteInterfaceServlet {
+ <jk>public class</jk> SampleRrpcServlet <jk>extends</jk> RrpcServlet {
<jc>// Our server-side POJO.</jc>
<jk>private</jk> AddressBook <jf>addressBook</jf> = <jk>new</jk> AddressBook();
- <ja>@Override</ja> <jc>/* RemoteInterfaceServlet */</jc>
+ <ja>@Override</ja> <jc>/* RrpcServlet */</jc>
<jk>protected</jk> Map<Class<?>,Object> getServiceMap() <jk>throws</jk> Exception {
Map<Class<?>,Object> m = <jk>new</jk> LinkedHashMap<Class<?>,Object>();
@@ -180,22 +180,22 @@ restRPC
}
</p>
-<h5 class='topic'>@RestMethod(name=PROXY)</h5>
+<h5 class='topic'>@RestMethod(name=RRPC)</h5>
<p>
- The <code><ja>@RestMethod</ja>(name=<jsf>PROXY</jsf>)</code> approach is easier if you only have a single
+ The <code><ja>@RestMethod</ja>(name=<jsf>RRPC</jsf>)</code> approach is easier if you only have a single
interface you want to expose.
<br>You simply define a Java method whose return type is an interface, and return the implementation of that
interface:
</p>
<p class='bpcode w800'>
<jc>// Our exposed interface.</jc>
- <ja>@RestMethod</ja>(name=<jsf>PROXY</jsf>, path=<js>"/addressbookproxy/*"</js>)
+ <ja>@RestMethod</ja>(name=<jsf>RRPC</jsf>, path=<js>"/addressbookproxy/*"</js>)
<jk>public</jk> IAddressBook getProxy() {
<jk>return</jk> addressBook;
}
</p>
-<h5 class='topic'>RemoteInterfaceServlet in a browser</h5>
+<h5 class='topic'>RrpcServlet in a browser</h5>
<p>
If you point your browser to the servlet above, you get a list of available interfaces:
</p>
@@ -299,7 +299,7 @@ restRPC
<jc>// Allow us to use method=POST from a browser.</jc>
allowedMethodParams=<js>"*"</js>
)
- <jk>public class</jk> SampleRemoteInterfaceServlet <jk>extends</jk> RemoteInterfaceServlet {
+ <jk>public class</jk> SampleRrpcServlet <jk>extends</jk> RrpcServlet {
</p>
<p>
For example, to invoke the <code>getPeople()</code> method on our bean:
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/01.RootResources.html b/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/01.RootResources.html
index 7ec43d6..e3dd4d4 100644
--- a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/01.RootResources.html
+++ b/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/01.RootResources.html
@@ -110,7 +110,7 @@ RootResources
RequestEchoResource.<jk>class</jk>,
TempDirResource.<jk>class</jk>,
AddressBookResource.<jk>class</jk>,
- SampleRemoteInterfaceServlet.<jk>class</jk>,
+ SampleRrpcServlet.<jk>class</jk>,
PhotosResource.<jk>class</jk>,
AtomFeedResource.<jk>class</jk>,
JsonSchemaResource.<jk>class</jk>,
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/08.AddressBookResource.html b/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/08.AddressBookResource.html
index 1e81d88..719fe42 100644
--- a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/08.AddressBookResource.html
+++ b/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/08.AddressBookResource.html
@@ -130,7 +130,7 @@ AddressBookResource
<p class='bpcode w800'>
<jd>/**
* Interface used to help illustrate proxy interfaces.
- * See {<ja>@link</ja> SampleRemoteInterfaceServlet}.
+ * See {<ja>@link</ja> SampleRrpcServlet}.
*/</jd>
<jk>public interface</jk> IAddressBook {
@@ -684,10 +684,10 @@ AddressBookResource
}
<jd>/**
- * [PROXY /*]
+ * [RRPC /*]
* Return a proxy interface to IAddressBook.
*/</jd>
- <ja>@RestMethod</ja>(name=<jsf>PROXY</jsf>, path=<js>"/proxy/*"</js>)
+ <ja>@RestMethod</ja>(name=<jsf>RRPC</jsf>, path=<js>"/proxy/*"</js>)
<jk>public</jk> IAddressBook getProxy() {
<jk>return</jk> <jf>addressBook</jf>;
}
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/09.SampleRemoteableServlet.html b/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/09.SampleRemoteableServlet.html
index 218c952..c9b7173 100644
--- a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/09.SampleRemoteableServlet.html
+++ b/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/09.SampleRemoteableServlet.html
@@ -13,14 +13,14 @@
***************************************************************************************************************************/
-->
-SampleRemoteInterfaceServlet
+SampleRrpcServlet
<p>
- The <l>SampleRemoteInterfaceServlet</l> class shows examples of the following:
+ The <l>SampleRrpcServlet</l> class shows examples of the following:
</p>
<ul class='spaced-list'>
<li>
- Extending the {@link oajr.remote.RemoteInterfaceServlet} class to create a proxy
+ Extending the {@link oajr.remote.RrpcServlet} class to create a proxy
service.
<li>
Using the {@link oajrc.RestClient} class to create remote interfaces.
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 ce801aa..df3afdb 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
@@ -63,7 +63,7 @@ import org.apache.juneau.rest.widget.*;
MethodExampleResource.class,
RequestEchoResource.class,
AddressBookResource.class,
- SampleRemoteInterfaceServlet.class,
+ SampleRrpcServlet.class,
DtoExamples.class,
PhotosResource.class,
SqlQueryResource.class,
diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SampleRemoteInterfaceServlet.java b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SampleRrpcServlet.java
similarity index 91%
rename from juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SampleRemoteInterfaceServlet.java
rename to juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SampleRrpcServlet.java
index ab12d6e..1f6f706 100644
--- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SampleRemoteInterfaceServlet.java
+++ b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SampleRrpcServlet.java
@@ -22,7 +22,7 @@ import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.remote.*;
/**
- * Class showing the functionality of the RemoteInterfaceServlet class.
+ * Class showing the functionality of the RrpcServlet class.
*/
@SuppressWarnings("serial")
@RestResource(
@@ -46,16 +46,16 @@ import org.apache.juneau.rest.remote.*;
externalDocs=@ExternalDocs(description="Apache Juneau",url="http://juneau.apache.org")
)
)
-public class SampleRemoteInterfaceServlet extends RemoteInterfaceServlet {
+public class SampleRrpcServlet extends RrpcServlet {
private final AddressBook addressBook;
- public SampleRemoteInterfaceServlet() {
+ public SampleRrpcServlet() {
addressBook = new AddressBook();
addressBook.init();
}
- @Override /* RemoteInterfaceServlet */
+ @Override /* RrpcServlet */
protected Map<Class<?>,Object> getServiceMap() throws Exception {
Map<Class<?>,Object> m = new LinkedHashMap<>();
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 bec95c1..b592516 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
@@ -350,10 +350,10 @@ public class AddressBookResource extends BasicRestServletJena {
}
/**
- * [PROXY /*]
+ * [RRPC /*]
* Return a proxy interface to IAddressBook.
*/
- @RestMethod(name=PROXY, path="/proxy/*")
+ @RestMethod(name=RRPC, path="/proxy/*")
public IAddressBook getProxy() {
return addressBook;
}
diff --git a/juneau-examples/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/AddressBookResourceTest.java b/juneau-examples/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/AddressBookResourceTest.java
index a7b2119..5b4e59a 100644
--- a/juneau-examples/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/AddressBookResourceTest.java
+++ b/juneau-examples/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/AddressBookResourceTest.java
@@ -274,7 +274,7 @@ public class AddressBookResourceTest extends RestTestcase {
List<Person> people;
- IAddressBook ab = client.getRemoteInterface(IAddressBook.class, "/addressBook/proxy");
+ IAddressBook ab = client.getRrpcInterface(IAddressBook.class, "/addressBook/proxy");
// Reinitialize the resource
ab.init();
diff --git a/juneau-examples/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/SampleRemoteInterfaceServletTest.java b/juneau-examples/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/SampleRrpcServletTest.java
similarity index 94%
rename from juneau-examples/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/SampleRemoteInterfaceServletTest.java
rename to juneau-examples/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/SampleRrpcServletTest.java
index 66e79ad..c4c37a7 100644
--- a/juneau-examples/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/SampleRemoteInterfaceServletTest.java
+++ b/juneau-examples/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/SampleRrpcServletTest.java
@@ -22,7 +22,7 @@ import org.apache.juneau.rest.client.*;
import org.apache.juneau.transforms.*;
import org.junit.*;
-public class SampleRemoteInterfaceServletTest extends RestTestcase {
+public class SampleRrpcServletTest extends RestTestcase {
static RestClient[] clients;
@@ -60,7 +60,7 @@ public class SampleRemoteInterfaceServletTest extends RestTestcase {
@Test
public void testBasic() throws Exception {
for (RestClient client : clients) {
- IAddressBook ab = client.getRemoteInterface(IAddressBook.class, path);
+ IAddressBook ab = client.getRrpcInterface(IAddressBook.class, path);
Person p = ab.createPerson(
new CreatePerson("Test Person",
AddressBook.toCalendar("Aug 1, 1999"),
diff --git a/juneau-examples/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/_TestSuite.java b/juneau-examples/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/_TestSuite.java
index 205ebf2..c7734ef 100644
--- a/juneau-examples/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/_TestSuite.java
+++ b/juneau-examples/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/_TestSuite.java
@@ -27,7 +27,7 @@ import org.junit.runners.Suite.*;
AddressBookResourceTest.class,
RootResourcesTest.class,
RootContentTest.class,
- SampleRemoteInterfaceServletTest.class,
+ SampleRrpcServletTest.class,
TestMultiPartFormPostsTest.class
})
public class _TestSuite {
diff --git a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/client/InterfaceProxyTest.java b/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/client/InterfaceProxyTest.java
index 38e8375..53101bd 100644
--- a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/client/InterfaceProxyTest.java
+++ b/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/client/InterfaceProxyTest.java
@@ -240,7 +240,7 @@ public class InterfaceProxyTest {
//====================================================================================================
// Test that Q-values are being resolved correctly.
//====================================================================================================
- @RestMethod(name=PROXY, path="/proxy/*")
+ @RestMethod(name=RRPC, path="/proxy/*")
public InterfaceProxy getProxy() {
return new InterfaceProxy() {
@@ -945,7 +945,7 @@ public class InterfaceProxyTest {
public InterfaceProxyTest(String label, Serializer serializer, Parser parser) {
proxy = cache.get(label);
if (proxy == null) {
- proxy = RestClient.create().mockHttpConnection(interfaceProxyResource).serializer(serializer).parser(parser).build().getRemoteInterface(InterfaceProxy.class, "/proxy");
+ proxy = RestClient.create().mockHttpConnection(interfaceProxyResource).serializer(serializer).parser(parser).build().getRrpcInterface(InterfaceProxy.class, "/proxy");
cache.put(label, proxy);
}
}
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
index 6a0ecd3..543d311 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
@@ -1145,8 +1145,8 @@ public class RestClient extends BeanContext implements Closeable {
* Create a new Remote Interface against a {@link RemoteInterface @RemoteInterface}-annotated class.
*
* <p>
- * Remote interfaces are interfaces exposed on the server side using either the <code>RemoteInterfaceServlet</code>
- * or <code>PROXY</code> REST methods.
+ * Remote interfaces are interfaces exposed on the server side using either the <code>RrpcServlet</code>
+ * or <code>RRPC</code> REST methods.
*
* <p>
* The URL to the REST interface is based on the following values:
@@ -1180,23 +1180,23 @@ public class RestClient extends BeanContext implements Closeable {
* @return The new proxy interface.
* @throws RemoteMetadataException If the REST URI cannot be determined based on the information given.
*/
- public <T> T getRemoteInterface(final Class<T> interfaceClass) {
- return getRemoteInterface(interfaceClass, null);
+ public <T> T getRrpcInterface(final Class<T> interfaceClass) {
+ return getRrpcInterface(interfaceClass, null);
}
/**
- * Same as {@link #getRemoteInterface(Class)} except explicitly specifies the URL of the REST interface.
+ * Same as {@link #getRrpcInterface(Class)} except explicitly specifies the URL of the REST interface.
*
* @param interfaceClass The interface to create a proxy for.
* @param restUrl The URL of the REST interface.
* @return The new proxy interface.
*/
- public <T> T getRemoteInterface(final Class<T> interfaceClass, final Object restUrl) {
- return getRemoteInterface(interfaceClass, restUrl, serializer, parser);
+ public <T> T getRrpcInterface(final Class<T> interfaceClass, final Object restUrl) {
+ return getRrpcInterface(interfaceClass, restUrl, serializer, parser);
}
/**
- * Same as {@link #getRemoteInterface(Class, Object)} but allows you to override the serializer and parser used.
+ * Same as {@link #getRrpcInterface(Class, Object)} but allows you to override the serializer and parser used.
*
* @param interfaceClass The interface to create a proxy for.
* @param restUrl The URL of the REST interface.
@@ -1205,7 +1205,7 @@ public class RestClient extends BeanContext implements Closeable {
* @return The new proxy interface.
*/
@SuppressWarnings({ "unchecked" })
- public <T> T getRemoteInterface(final Class<T> interfaceClass, Object restUrl, final Serializer serializer, final Parser parser) {
+ public <T> T getRrpcInterface(final Class<T> interfaceClass, Object restUrl, final Serializer serializer, final Parser parser) {
if (restUrl == null) {
RemoteInterfaceMeta rm = new RemoteInterfaceMeta(interfaceClass, asString(restUrl));
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 99f6200..0050221 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
@@ -3227,10 +3227,10 @@ public final class RestContext extends BeanContext {
RestJavaMethod sm = new RestJavaMethod(resource, method, this);
String httpMethod = sm.getHttpMethod();
- // PROXY is a special case where a method returns an interface that we
+ // RRPC is a special case where a method returns an interface that we
// can perform REST calls against.
// We override the CallMethod.invoke() method to insert our logic.
- if ("PROXY".equals(httpMethod)) {
+ if ("RRPC".equals(httpMethod)) {
final ClassMeta<?> interfaceClass = beanContext.getClassMeta(method.getGenericReturnType());
final RemoteInterfaceMeta rim = new RemoteInterfaceMeta(interfaceClass.getInnerClass(), null);
@@ -4779,7 +4779,7 @@ public final class RestContext extends BeanContext {
void setRequest(RestRequest req) {
// Must be careful not to bleed thread-locals.
if (this.req.get() != null)
- throw new RuntimeException("Thread-local request object was not cleaned up from previous request. " + this + ", thread=["+Thread.currentThread().getId()+"]");
+ System.err.println("WARNING: Thread-local request object was not cleaned up from previous request. " + this + ", thread=["+Thread.currentThread().getId()+"]");
this.req.set(req);
}
@@ -4795,7 +4795,7 @@ public final class RestContext extends BeanContext {
void setResponse(RestResponse res) {
// Must be careful not to bleed thread-locals.
if (this.res.get() != null)
- throw new RuntimeException("Thread-local response object was not cleaned up from previous request. " + this + ", thread=["+Thread.currentThread().getId()+"]");
+ System.err.println("WARNING: Thread-local response object was not cleaned up from previous request. " + this + ", thread=["+Thread.currentThread().getId()+"]");
this.res.set(res);
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java
index cc26bc9..2144535 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java
@@ -532,7 +532,7 @@ public @interface RestMethod {
* as <js>"POST"</js>.
* <br>Otherwise, defaults to <js>"GET"</js>.
* <li>
- * <js>"PROXY"</js>
+ * <js>"RRPC"</js>
* - Remote-proxy interface.
* <br>This denotes a Java method that returns an object (usually an interface, often annotated with the
* {@link RemoteInterface @RemoteInterface} annotation) to be used as a remote proxy using
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remote/RemoteInterfaceServlet.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remote/RrpcServlet.java
similarity index 96%
rename from juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remote/RemoteInterfaceServlet.java
rename to juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remote/RrpcServlet.java
index ccf2150..dc7b36b 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remote/RemoteInterfaceServlet.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remote/RrpcServlet.java
@@ -50,7 +50,7 @@ import org.apache.juneau.rest.exception.*;
* </ul>
*/
@SuppressWarnings({"serial","javadoc"})
-public abstract class RemoteInterfaceServlet extends BasicRestServlet {
+public abstract class RrpcServlet extends BasicRestServlet {
private final Map<String,RemoteInterfaceMeta> serviceMap = new ConcurrentHashMap<>();