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 33dcc7b JUNEAU-141 Move @RemoteResource/@RemoteMethod annotations
into juneau-marshall.
33dcc7b is described below
commit 33dcc7b6e7d0319bdcd010bbf577f808b07589b7
Author: JamesBognar <[email protected]>
AuthorDate: Fri Sep 6 17:55:29 2019 -0400
JUNEAU-141 Move @RemoteResource/@RemoteMethod annotations into
juneau-marshall.
---
.../apache/juneau/http}/remote/RemoteMethod.java | 2 +-
.../apache/juneau/http}/remote/RemoteResource.java | 2 +-
.../apache/juneau/http}/remote/RemoteReturn.java | 2 +-
.../apache/juneau/http/remote/package-info.java | 18 ++++++++++++++++
.../examples/rest/petstore/rest/PetStore.java | 2 +-
.../rest/test/client/RequestBeanProxyTest.java | 2 +-
.../rest/test/client/ThirdPartyProxyTest.java | 2 +-
.../juneau/rest/client/BodyAnnotationTest.java | 4 ++--
.../juneau/rest/client/EndToEndInterfaceTest.java | 3 ++-
.../juneau/rest/client/FormDataAnnotationTest.java | 4 ++--
.../juneau/rest/client/HeaderAnnotationTest.java | 4 ++--
.../juneau/rest/client/PathAnnotationTest.java | 4 ++--
.../juneau/rest/client/QueryAnnotationTest.java | 4 ++--
.../rest/client/RemoteMethodAnnotationTest.java | 3 ++-
.../rest/client/RemoteResourceAnnotationTest.java | 4 ++--
.../juneau/rest/client/RequestAnnotationTest.java | 3 ++-
.../juneau/rest/client/ResponseAnnotationTest.java | 3 ++-
.../org/apache/juneau/rest/client/RestClient.java | 2 ++
.../juneau/rest/client/remote/RemoteMethod.java | 3 +++
.../rest/client/remote/RemoteMethodMeta.java | 7 ++++--
.../rest/client/remote/RemoteMethodReturn.java | 25 ++++++++++++++++++++--
.../juneau/rest/client/remote/RemoteResource.java | 3 +++
.../rest/client/remote/RemoteResourceMeta.java | 8 +++++--
.../juneau/rest/client/remote/RemoteReturn.java | 3 +++
.../juneau/rest/mock2/MockRemoteResource.java | 2 +-
25 files changed, 90 insertions(+), 29 deletions(-)
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMethod.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/RemoteMethod.java
similarity index 96%
copy from
juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMethod.java
copy to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/RemoteMethod.java
index b86cca5..adc90a9 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMethod.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/RemoteMethod.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.rest.client.remote;
+package org.apache.juneau.http.remote;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteResource.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/RemoteResource.java
similarity index 96%
copy from
juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteResource.java
copy to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/RemoteResource.java
index 80d7e40..b7a1475 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteResource.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/RemoteResource.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.rest.client.remote;
+package org.apache.juneau.http.remote;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteReturn.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/RemoteReturn.java
similarity index 97%
copy from
juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteReturn.java
copy to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/RemoteReturn.java
index be884f3..48105d4 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteReturn.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/RemoteReturn.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.rest.client.remote;
+package org.apache.juneau.http.remote;
/**
* Possible values for the {@link RemoteMethod#returns()
@RemoteMethod(returns)} annotation.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/package-info.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/package-info.java
new file mode 100644
index 0000000..e99cedd
--- /dev/null
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/package-info.java
@@ -0,0 +1,18 @@
+/***************************************************************************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information regarding copyright
ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the "License"); you may not
use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+
***************************************************************************************************************************/
+
+/**
+ * Remote REST API
+ */
+package org.apache.juneau.http.remote;
\ No newline at end of file
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/petstore/rest/PetStore.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/petstore/rest/PetStore.java
index adc4fe1..6688486 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/petstore/rest/PetStore.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/petstore/rest/PetStore.java
@@ -22,7 +22,7 @@ import org.apache.juneau.examples.rest.petstore.*;
import org.apache.juneau.examples.rest.petstore.dto.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.rest.*;
-import org.apache.juneau.rest.client.remote.*;
+import org.apache.juneau.http.remote.*;
import org.apache.juneau.http.exception.*;
import org.apache.juneau.http.response.*;
diff --git
a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/RequestBeanProxyTest.java
b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/RequestBeanProxyTest.java
index fe65ba2..f8252d2 100644
---
a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/RequestBeanProxyTest.java
+++
b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/RequestBeanProxyTest.java
@@ -29,7 +29,7 @@ import org.apache.juneau.httppart.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.client.*;
-import org.apache.juneau.rest.client.remote.*;
+import org.apache.juneau.http.remote.*;
import org.apache.juneau.rest.mock2.*;
import org.apache.juneau.serializer.*;
import org.apache.juneau.uon.*;
diff --git
a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
index 9a02474..d89c438 100644
---
a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
+++
b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
@@ -29,7 +29,7 @@ import org.apache.juneau.json.*;
import org.apache.juneau.msgpack.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.rest.client.*;
-import org.apache.juneau.rest.client.remote.*;
+import org.apache.juneau.http.remote.*;
import org.apache.juneau.rest.test.*;
import
org.apache.juneau.rest.test.client.ThirdPartyProxyTest.ThirdPartyProxy.*;
import org.apache.juneau.rest.testutils.*;
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/BodyAnnotationTest.java
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/BodyAnnotationTest.java
index 534a9a4..4447839 100644
---
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/BodyAnnotationTest.java
+++
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/BodyAnnotationTest.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.rest.client.remote;
+package org.apache.juneau.rest.client;
import static org.junit.Assert.*;
@@ -26,7 +26,7 @@ import org.apache.juneau.json.*;
import org.apache.juneau.marshall.*;
import org.apache.juneau.oapi.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
+import org.apache.juneau.http.remote.*;
import org.apache.juneau.rest.mock2.*;
import org.apache.juneau.utils.*;
import org.junit.*;
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/EndToEndInterfaceTest.java
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/EndToEndInterfaceTest.java
index 3d29bb2..9331c3b 100644
---
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/EndToEndInterfaceTest.java
+++
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/EndToEndInterfaceTest.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.rest.client.remote;
+package org.apache.juneau.rest.client;
import static org.apache.juneau.http.HttpMethodName.*;
import static org.junit.Assert.*;
@@ -26,6 +26,7 @@ import org.apache.juneau.internal.*;
import org.apache.juneau.json.*;
import org.apache.juneau.marshall.*;
import org.apache.juneau.rest.annotation.*;
+import org.apache.juneau.http.remote.*;
import org.apache.juneau.rest.mock2.*;
import org.apache.juneau.http.exception.*;
import org.apache.juneau.rest.helper.*;
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/FormDataAnnotationTest.java
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/FormDataAnnotationTest.java
index 2d16366..6a4f40c 100644
---
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/FormDataAnnotationTest.java
+++
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/FormDataAnnotationTest.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.rest.client.remote;
+package org.apache.juneau.rest.client;
import static org.junit.Assert.*;
import static org.apache.juneau.testutils.TestUtils.*;
@@ -26,7 +26,7 @@ import org.apache.juneau.http.annotation.FormData;
import org.apache.juneau.http.annotation.Header;
import org.apache.juneau.jsonschema.annotation.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
+import org.apache.juneau.http.remote.*;
import org.apache.juneau.rest.mock2.*;
import org.apache.juneau.rest.testutils.*;
import org.apache.juneau.utils.*;
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/HeaderAnnotationTest.java
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/HeaderAnnotationTest.java
index 7132944..753d032 100644
---
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/HeaderAnnotationTest.java
+++
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/HeaderAnnotationTest.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.rest.client.remote;
+package org.apache.juneau.rest.client;
import static org.apache.juneau.testutils.TestUtils.*;
import static org.junit.Assert.*;
@@ -24,7 +24,7 @@ import org.apache.juneau.*;
import org.apache.juneau.http.annotation.Header;
import org.apache.juneau.jsonschema.annotation.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
+import org.apache.juneau.http.remote.*;
import org.apache.juneau.rest.mock2.*;
import org.apache.juneau.rest.testutils.*;
import org.apache.juneau.utils.*;
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/PathAnnotationTest.java
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/PathAnnotationTest.java
index 6ee55cd..89c4559 100644
---
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/PathAnnotationTest.java
+++
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/PathAnnotationTest.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.rest.client.remote;
+package org.apache.juneau.rest.client;
import static org.apache.juneau.testutils.TestUtils.*;
import static org.junit.Assert.*;
@@ -24,7 +24,7 @@ import org.apache.juneau.*;
import org.apache.juneau.http.annotation.Path;
import org.apache.juneau.jsonschema.annotation.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
+import org.apache.juneau.http.remote.*;
import org.apache.juneau.rest.mock2.*;
import org.apache.juneau.rest.testutils.*;
import org.apache.juneau.utils.*;
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/QueryAnnotationTest.java
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/QueryAnnotationTest.java
index 1234011..11d25e3 100644
---
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/QueryAnnotationTest.java
+++
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/QueryAnnotationTest.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.rest.client.remote;
+package org.apache.juneau.rest.client;
import static org.apache.juneau.testutils.TestUtils.*;
import static org.junit.Assert.*;
@@ -26,7 +26,7 @@ import org.apache.juneau.http.annotation.Query;
import org.apache.juneau.jsonschema.annotation.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
+import org.apache.juneau.http.remote.*;
import org.apache.juneau.rest.mock2.*;
import org.apache.juneau.rest.testutils.*;
import org.apache.juneau.utils.*;
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RemoteMethodAnnotationTest.java
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RemoteMethodAnnotationTest.java
index 808560e..e9af823 100644
---
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RemoteMethodAnnotationTest.java
+++
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RemoteMethodAnnotationTest.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.rest.client.remote;
+package org.apache.juneau.rest.client;
import static org.junit.Assert.*;
@@ -24,6 +24,7 @@ import org.apache.juneau.json.*;
import org.apache.juneau.marshall.*;
import org.apache.juneau.oapi.*;
import org.apache.juneau.rest.annotation.*;
+import org.apache.juneau.http.remote.*;
import org.apache.juneau.rest.mock2.*;
import org.junit.*;
import org.junit.runners.*;
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RemoteResourceAnnotationTest.java
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RemoteResourceAnnotationTest.java
index 536d1e5..5949e79 100644
---
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RemoteResourceAnnotationTest.java
+++
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RemoteResourceAnnotationTest.java
@@ -10,12 +10,12 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.rest.client.remote;
+package org.apache.juneau.rest.client;
import static org.junit.Assert.*;
import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.rest.client.*;
+import org.apache.juneau.http.remote.*;
import org.apache.juneau.rest.mock2.*;
import org.apache.juneau.rest.mock2.MockRemoteResource;
import org.junit.*;
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RequestAnnotationTest.java
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RequestAnnotationTest.java
index e183b94..edc0e15 100644
---
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RequestAnnotationTest.java
+++
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/RequestAnnotationTest.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.rest.client.remote;
+package org.apache.juneau.rest.client;
import static org.junit.Assert.*;
@@ -24,6 +24,7 @@ import org.apache.juneau.http.annotation.Path;
import org.apache.juneau.http.annotation.Query;
import org.apache.juneau.internal.*;
import org.apache.juneau.rest.annotation.*;
+import org.apache.juneau.http.remote.*;
import org.apache.juneau.rest.mock2.*;
import org.apache.juneau.rest.testutils.*;
import org.junit.*;
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/ResponseAnnotationTest.java
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/ResponseAnnotationTest.java
index f6a6df9..7ecabf1 100644
---
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/ResponseAnnotationTest.java
+++
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client/ResponseAnnotationTest.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.rest.client.remote;
+package org.apache.juneau.rest.client;
import static org.junit.Assert.*;
@@ -21,6 +21,7 @@ import org.apache.juneau.http.annotation.Response;
import org.apache.juneau.internal.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.annotation.*;
+import org.apache.juneau.http.remote.*;
import org.apache.juneau.rest.mock2.*;
import org.junit.*;
import org.junit.runners.*;
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 5ce0e18..f2162e2 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
@@ -33,6 +33,8 @@ import org.apache.http.entity.*;
import org.apache.http.impl.client.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.http.remote.RemoteReturn;
+import org.apache.juneau.http.remote.RemoteResource;
import org.apache.juneau.httppart.*;
import org.apache.juneau.httppart.bean.*;
import org.apache.juneau.internal.*;
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMethod.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMethod.java
index b86cca5..9802757 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMethod.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMethod.java
@@ -26,11 +26,14 @@ import org.apache.juneau.http.annotation.*;
* <ul class='seealso'>
* <li class='link'>{@doc juneau-rest-client.RestProxies}
* </ul>
+ *
+ * @deprecated Use {@link org.apache.juneau.http.remote.RemoteMethod}
*/
@Documented
@Target(METHOD)
@Retention(RUNTIME)
@Inherited
+@Deprecated
public @interface RemoteMethod {
/**
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMethodMeta.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMethodMeta.java
index 728110a..c3e5cf4 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMethodMeta.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMethodMeta.java
@@ -20,6 +20,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
+import org.apache.juneau.http.remote.RemoteMethod;
import org.apache.juneau.httppart.*;
import org.apache.juneau.httppart.bean.*;
import org.apache.juneau.internal.*;
@@ -84,14 +85,16 @@ public class RemoteMethodMeta {
RemoteMethodArg bodyArg;
RemoteMethodReturn methodReturn;
+ @SuppressWarnings("deprecation")
Builder(String parentPath, Method m, boolean
useMethodSignatures, String defaultMethod) {
MethodInfo mi = MethodInfo.of(m);
+ org.apache.juneau.rest.client.remote.RemoteMethod orm =
mi.getAnnotation(org.apache.juneau.rest.client.remote.RemoteMethod.class);
RemoteMethod rm = mi.getAnnotation(RemoteMethod.class);
- httpMethod = rm == null ? "" : rm.method();
- path = rm == null ? "" : rm.path();
+ httpMethod = rm == null ? (orm == null ? "" :
orm.method()) : rm.method();
+ path = rm == null ? (orm == null ? "" : orm.path()) :
rm.path();
if (path.isEmpty()) {
path = HttpUtils.detectHttpPath(m, !
useMethodSignatures);
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMethodReturn.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMethodReturn.java
index d35add0..b474384 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMethodReturn.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMethodReturn.java
@@ -15,6 +15,8 @@ package org.apache.juneau.rest.client.remote;
import java.lang.reflect.*;
import org.apache.juneau.*;
+import org.apache.juneau.http.remote.RemoteMethod;
+import org.apache.juneau.http.remote.RemoteReturn;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.httppart.bean.*;
import org.apache.juneau.reflect.*;
@@ -32,16 +34,35 @@ public final class RemoteMethodReturn {
private final RemoteReturn returnValue;
private final ResponseBeanMeta meta;
+ @SuppressWarnings("deprecation")
RemoteMethodReturn(MethodInfo m) {
- RemoteMethod rm = m.getAnnotation(RemoteMethod.class);
ClassInfo rt = m.getReturnType();
- RemoteReturn rv = rt.is(void.class) ? RemoteReturn.NONE : rm ==
null ? RemoteReturn.BODY : rm.returns();
+
+ org.apache.juneau.rest.client.remote.RemoteMethod orm =
m.getAnnotation(org.apache.juneau.rest.client.remote.RemoteMethod.class);
+ RemoteMethod rm = m.getAnnotation(RemoteMethod.class);
+
+ RemoteReturn rv = null;
+ if (rt.is(void.class))
+ rv = RemoteReturn.NONE;
+ else if (orm != null)
+ switch (orm.returns()) {
+ case BEAN: rv = RemoteReturn.BEAN; break;
+ case BODY: rv = RemoteReturn.BODY; break;
+ case NONE: rv = RemoteReturn.NONE; break;
+ case STATUS: rv = RemoteReturn.STATUS; break;
+ }
+ else if (rm != null)
+ rv = rm.returns();
+ else
+ rv = RemoteReturn.BODY;
+
if (rt.hasAnnotation(Response.class) && rt.isInterface()) {
this.meta = ResponseBeanMeta.create(m,
PropertyStore.DEFAULT);
rv = RemoteReturn.BEAN;
} else {
this.meta = null;
}
+
this.returnType = m.getReturnType().innerType();
this.returnValue = rv;
}
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteResource.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteResource.java
index 80d7e40..1f45758 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteResource.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteResource.java
@@ -23,11 +23,14 @@ import java.lang.annotation.*;
* <ul class='seealso'>
* <li class='link'>{@doc juneau-rest-client.RestProxies}
* </ul>
+ *
+ * @deprecated Use {@link org.apache.juneau.http.remote.RemoteMethod}
*/
@Documented
@Target({TYPE})
@Retention(RUNTIME)
@Inherited
+@Deprecated
public @interface RemoteResource {
/**
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteResourceMeta.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteResourceMeta.java
index 821fcf2..dcfef03 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteResourceMeta.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteResourceMeta.java
@@ -23,7 +23,7 @@ import org.apache.juneau.reflect.*;
* Contains the meta-data about a REST proxy class.
*
* <p>
- * Captures the information in {@link RemoteResource @RemoteResource} and
{@link RemoteMethod @RemoteMethod} annotations for
+ * Captures the information in {@link
org.apache.juneau.http.remote.RemoteResource @RemoteResource} and {@link
org.apache.juneau.http.remote.RemoteMethod @RemoteMethod} annotations for
* caching and reuse.
*
* <ul class='seealso'>
@@ -38,8 +38,9 @@ public class RemoteResourceMeta {
/**
* Constructor.
*
- * @param c The interface class annotated with a {@link RemoteResource
@RemoteResource} annotation (optional).
+ * @param c The interface class annotated with a {@link
org.apache.juneau.http.remote.RemoteResource @RemoteResource} annotation
(optional).
*/
+ @SuppressWarnings("deprecation")
public RemoteResourceMeta(Class<?> c) {
String path = "";
@@ -47,6 +48,9 @@ public class RemoteResourceMeta {
for (RemoteResource r :
ci.getAnnotationsParentFirst(RemoteResource.class))
if (! r.path().isEmpty())
path = trimSlashes(r.path());
+ for (org.apache.juneau.http.remote.RemoteResource r :
ci.getAnnotationsParentFirst(org.apache.juneau.http.remote.RemoteResource.class))
+ if (! r.path().isEmpty())
+ path = trimSlashes(r.path());
Map<Method,RemoteMethodMeta> methods = new LinkedHashMap<>();
for (MethodInfo m : ci.getPublicMethods())
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteReturn.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteReturn.java
index be884f3..07a6297 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteReturn.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteReturn.java
@@ -14,7 +14,10 @@ package org.apache.juneau.rest.client.remote;
/**
* Possible values for the {@link RemoteMethod#returns()
@RemoteMethod(returns)} annotation.
+ *
+ * @deprecated Use {@link org.apache.juneau.http.remote.RemoteReturn}
*/
+@Deprecated
public enum RemoteReturn {
/** HTTP response body */
diff --git
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRemoteResource.java
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRemoteResource.java
index 6479659..164e9cf 100644
---
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRemoteResource.java
+++
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRemoteResource.java
@@ -19,7 +19,7 @@ import org.apache.juneau.marshall.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.client.*;
-import org.apache.juneau.rest.client.remote.*;
+import org.apache.juneau.http.remote.*;
import org.apache.juneau.serializer.*;
/**
