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 16:51:47 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 5cfa6bd  Remove deprecated code.
5cfa6bd is described below

commit 5cfa6bd83c23aff79abad76c8b1b92d593c15a3d
Author: JamesBognar <james.bognar@salesforce.com>
AuthorDate: Tue Oct 13 12:51:41 2020 -0400

    Remove deprecated code.
---
 .../apache/juneau/http/remote/RemoteResource.java  | 50 ----------------------
 .../juneau/rest/client/remote/RemoteMeta.java      |  6 +--
 2 files changed, 1 insertion(+), 55 deletions(-)

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/RemoteResource.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/RemoteResource.java
deleted file mode 100644
index 17f741a..0000000
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/remote/RemoteResource.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.http.remote;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
-
-import java.lang.annotation.*;
-
-/**
- * Identifies a proxy against a REST interface.
- *
- * <div class='warn'>
- * 	<b>Deprecated</b> - Use {@link Remote}
- * </div>
- *
- * <ul class='seealso'>
- * 	<li class='link'>{@doc RestcProxies}
- * </ul>
- */
-@Documented
-@Target({TYPE})
-@Retention(RUNTIME)
-@Inherited
-@Deprecated
-public @interface RemoteResource {
-
-	/**
-	 * 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-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMeta.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMeta.java
index a5d5959..9e361c2 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMeta.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMeta.java
@@ -45,15 +45,11 @@ public class RemoteMeta {
 	 *
 	 * @param c The interface class annotated with a {@link org.apache.juneau.http.remote.Remote
@Remote} annotation (optional).
 	 */
-	@SuppressWarnings("deprecation")
 	public RemoteMeta(Class<?> c) {
 		String path = "";
 
 		ClassInfo ci = ClassInfo.of(c);
-		for (RemoteResource r : ci.getAnnotations(RemoteResource.class))
-			if (! r.path().isEmpty())
-				path = trimSlashes(r.path());
-		for (org.apache.juneau.http.remote.RemoteResource r : ci.getAnnotations(org.apache.juneau.http.remote.RemoteResource.class))
+		for (Remote r : ci.getAnnotations(Remote.class))
 			if (! r.path().isEmpty())
 				path = trimSlashes(r.path());
 


Mime
View raw message