svn merge -c 1381845 from trunk for HADOOP-8754. Deprecate all the RPC.getServer() variants.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381849 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Tsz-wo Sze 2012-09-07 03:12:27 +00:00
parent 6628e4f726
commit 857ccb8621
2 changed files with 22 additions and 7 deletions

View File

@ -109,6 +109,9 @@ Release 2.0.1-alpha - UNRELEASED
HADOOP-8748. Refactor DFSClient retry utility methods to a new class
in org.apache.hadoop.io.retry. (Arun C Murthy via szetszwo)
HADOOP-8754. Deprecate all the RPC.getServer() variants. (Brandon Li
via szetszwo)
BUG FIXES
HADOOP-8372. NetUtils.normalizeHostName() incorrectly handles hostname

View File

@ -629,7 +629,7 @@ public class RPC {
/** Construct a server for a protocol implementation instance listening on a
* port and address.
* @deprecated protocol interface should be passed.
* @deprecated Please use {@link Builder} to build the {@link Server}
*/
@Deprecated
public static Server getServer(final Object instance, final String bindAddress, final int port, Configuration conf)
@ -639,7 +639,7 @@ public class RPC {
/** Construct a server for a protocol implementation instance listening on a
* port and address.
* @deprecated protocol interface should be passed.
* @deprecated Please use {@link Builder} to build the {@link Server}
*/
@Deprecated
public static Server getServer(final Object instance, final String bindAddress, final int port,
@ -651,7 +651,10 @@ public class RPC {
null);
}
/** Construct a server for a protocol implementation instance. */
/** Construct a server for a protocol implementation instance.
* @deprecated Please use {@link Builder} to build the {@link Server}
*/
@Deprecated
public static Server getServer(Class<?> protocol,
Object instance, String bindAddress,
int port, Configuration conf)
@ -661,7 +664,7 @@ public class RPC {
}
/** Construct a server for a protocol implementation instance.
* @deprecated secretManager should be passed.
* @deprecated Please use {@link Builder} to build the {@link Server}
*/
@Deprecated
public static Server getServer(Class<?> protocol,
@ -674,7 +677,10 @@ public class RPC {
conf, null, null);
}
/** Construct a server for a protocol implementation instance. */
/** Construct a server for a protocol implementation instance.
* @deprecated Please use {@link Builder} to build the {@link Server}
*/
@Deprecated
public static Server getServer(Class<?> protocol,
Object instance, String bindAddress, int port,
int numHandlers,
@ -685,6 +691,10 @@ public class RPC {
conf, secretManager, null);
}
/**
* @deprecated Please use {@link Builder} to build the {@link Server}
*/
@Deprecated
public static Server getServer(Class<?> protocol,
Object instance, String bindAddress, int port,
int numHandlers,
@ -697,8 +707,10 @@ public class RPC {
verbose, conf, secretManager, portRangeConfig);
}
/** Construct a server for a protocol implementation instance. */
/** Construct a server for a protocol implementation instance.
* @deprecated Please use {@link Builder} to build the {@link Server}
*/
@Deprecated
public static <PROTO extends VersionedProtocol, IMPL extends PROTO>
Server getServer(Class<PROTO> protocol,
IMPL instance, String bindAddress, int port,