juneau-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamesbog...@apache.org
Subject [juneau] branch master updated: Remove deprecated code.
Date Tue, 13 Oct 2020 17:04:27 GMT
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 c8a73d4  Remove deprecated code.
c8a73d4 is described below

commit c8a73d44be5032a12282e8a30cf710b737d9557e
Author: JamesBognar <james.bognar@salesforce.com>
AuthorDate: Tue Oct 13 13:04:22 2020 -0400

    Remove deprecated code.
---
 .../juneau/http/remote/RrpcInterfaceMeta.java      |  6 ---
 .../org/apache/juneau/remote/RemoteInterface.java  | 50 ----------------------
 .../org/apache/juneau/remote/package-info.java     | 18 --------
 .../java/org/apache/juneau/rest/RestRequest.java   |  1 -
 4 files changed, 75 deletions(-)

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/RrpcInterfaceMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/RrpcInterfaceMeta.java
index fcd72f1..3bc40ad 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/RrpcInterfaceMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/RrpcInterfaceMeta.java
@@ -18,7 +18,6 @@ import java.util.*;
 
 import org.apache.juneau.collections.*;
 import org.apache.juneau.reflect.*;
-import org.apache.juneau.remote.*;
 
 /**
  * Contains the meta-data about a remote proxy REST interface.
@@ -47,16 +46,11 @@ public class RrpcInterfaceMeta {
 	 * 	The absolute URL of the remote REST interface that implements this proxy interface.
 	 * 	<br>This is only used on the client side.
 	 */
-	@SuppressWarnings("deprecation")
 	public RrpcInterfaceMeta(Class<?> c, String uri) {
 		this.c = c;
 		String path = "";
 		ClassInfo ci = ClassInfo.of(c);
 
-		for (RemoteInterface r : ci.getAnnotations(RemoteInterface.class))
-			if (! r.path().isEmpty())
-				path = trimSlashes(r.path());
-
 		for (Remote r : ci.getAnnotations(Remote.class))
 			if (! r.path().isEmpty())
 				path = trimSlashes(r.path());
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remote/RemoteInterface.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remote/RemoteInterface.java
deleted file mode 100644
index 6213316..0000000
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remote/RemoteInterface.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// ***************************************************************************************************************************
-// * 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.         
                                    *
-// ***************************************************************************************************************************
-package org.apache.juneau.remote;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
-
-import java.lang.annotation.*;
-
-import org.apache.juneau.http.remote.*;
-
-/**
- * Identifies a remote proxy REST interface.
- *
- * <ul class='seealso'>
- * 	<li class='link'>{@doc RestRpc}
- * </ul>
- *
- * @deprecated Use {@link Remote}
- */
-@Documented
-@Target({TYPE})
-@Retention(RUNTIME)
-@Inherited
-@Deprecated
-public @interface RemoteInterface {
-
-	/**
-	 * REST service path.
-	 *
-	 * <p>
-	 * The possible values are:
-	 * <ul class='spaced-list'>
-	 * 	<li>An absolute URL.
-	 * 	<li>A relative URL interpreted as relative to the root URL defined on the <c>RestClient</c>
-	 * 	<li>No path interpreted as the class name (e.g. <js>"http://localhost/root-url/org.foo.MyInterface"</js>)
-	 * </ul>
-	 */
-	String path() default "";
-}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remote/package-info.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remote/package-info.java
deleted file mode 100755
index ab6684a..0000000
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remote/package-info.java
+++ /dev/null
@@ -1,18 +0,0 @@
-// ***************************************************************************************************************************
-// * 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 Interfaces API
- */
-package org.apache.juneau.remote;
-
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
index c7966a4..8603a08 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
@@ -55,7 +55,6 @@ import org.apache.juneau.marshall.*;
 import org.apache.juneau.oapi.*;
 import org.apache.juneau.parser.*;
 import org.apache.juneau.reflect.*;
-import org.apache.juneau.remote.*;
 import org.apache.juneau.rest.annotation.*;
 import org.apache.juneau.http.exception.*;
 import org.apache.juneau.http.header.*;


Mime
View raw message