Repository: incubator-reef Updated Branches: refs/heads/master 9f5a0ac50 -> 786f7e5e5
[REEF-565] Remove APIs with no dependencies deprecated since 0.11 from REEF-IO Remove deprecated methods from REEF-IO that are not called at all and thus can be trivially removed. JIRA: [REEF-565](https://issues.apache.org/jira/browse/REEF-565) Pull Request: This closes #343 Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/786f7e5e Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/786f7e5e Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/786f7e5e Branch: refs/heads/master Commit: 786f7e5e510a4f5ea5c302be2a966134123e0796 Parents: 9f5a0ac Author: Brian Cho <[email protected]> Authored: Thu Aug 6 15:31:43 2015 +0900 Committer: Byung-Gon Chun <[email protected]> Committed: Thu Aug 6 22:53:43 2015 +0900 ---------------------------------------------------------------------- .../group/impl/driver/GroupCommDriverImpl.java | 25 ----- .../reef/io/network/impl/NetworkService.java | 104 ------------------- .../reef/io/network/naming/NameClient.java | 30 ------ .../io/network/naming/NameLookupClient.java | 19 ---- .../io/network/naming/NameRegistryClient.java | 14 --- .../reef/io/network/naming/NameServerImpl.java | 11 -- 6 files changed, 203 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/786f7e5e/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/GroupCommDriverImpl.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/GroupCommDriverImpl.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/GroupCommDriverImpl.java index f87b96ee..c9de6e8 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/GroupCommDriverImpl.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/GroupCommDriverImpl.java @@ -60,9 +60,7 @@ import org.apache.reef.wake.impl.SingleThreadStage; import org.apache.reef.wake.impl.SyncStage; import org.apache.reef.wake.impl.ThreadPoolStage; import org.apache.reef.wake.remote.address.LocalAddressProvider; -import org.apache.reef.wake.remote.address.LocalAddressProviderFactory; import org.apache.reef.wake.remote.transport.TransportFactory; -import org.apache.reef.wake.remote.transport.netty.MessagingTransportFactory; import javax.inject.Inject; import java.util.HashMap; @@ -118,29 +116,6 @@ public class GroupCommDriverImpl implements GroupCommServiceDriver { @Inject public GroupCommDriverImpl(final ConfigurationSerializer confSerializer, @Parameter(DriverIdentifier.class) final String driverId, - @Parameter(TreeTopologyFanOut.class) final int fanOut) { - this(confSerializer, driverId, fanOut, LocalAddressProviderFactory.getInstance()); - } - - /** - * @deprecated Have an instance injected instead. - */ - @Deprecated - @Inject - public GroupCommDriverImpl(final ConfigurationSerializer confSerializer, - @Parameter(DriverIdentifier.class) final String driverId, - @Parameter(TreeTopologyFanOut.class) final int fanOut, - final LocalAddressProvider localAddressProvider) { - this(confSerializer, driverId, fanOut, localAddressProvider, new MessagingTransportFactory()); - } - - /** - * @deprecated Have an instance injected instead. - */ - @Deprecated - @Inject - public GroupCommDriverImpl(final ConfigurationSerializer confSerializer, - @Parameter(DriverIdentifier.class) final String driverId, @Parameter(TreeTopologyFanOut.class) final int fanOut, final LocalAddressProvider localAddressProvider, final TransportFactory tpFactory) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/786f7e5e/lang/java/reef-io/src/main/java/org/apache/reef/io/network/impl/NetworkService.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/impl/NetworkService.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/impl/NetworkService.java index c2ff93c..acffa75 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/impl/NetworkService.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/impl/NetworkService.java @@ -23,20 +23,13 @@ import org.apache.reef.io.naming.Naming; import org.apache.reef.io.network.Connection; import org.apache.reef.io.network.ConnectionFactory; import org.apache.reef.io.network.Message; -import org.apache.reef.io.network.naming.NameClient; import org.apache.reef.io.network.naming.NameResolver; -import org.apache.reef.io.network.naming.parameters.NameResolverRetryCount; -import org.apache.reef.io.network.naming.parameters.NameResolverRetryTimeout; -import org.apache.reef.tang.Injector; -import org.apache.reef.tang.Tang; import org.apache.reef.tang.annotations.Parameter; -import org.apache.reef.tang.exceptions.InjectionException; import org.apache.reef.wake.*; import org.apache.reef.wake.impl.LoggingEventHandler; import org.apache.reef.wake.impl.SingleThreadStage; import org.apache.reef.wake.remote.Codec; import org.apache.reef.wake.remote.address.LocalAddressProvider; -import org.apache.reef.wake.remote.address.LocalAddressProviderFactory; import org.apache.reef.wake.remote.impl.TransportEvent; import org.apache.reef.wake.remote.transport.Transport; import org.apache.reef.wake.remote.transport.TransportFactory; @@ -56,21 +49,6 @@ public final class NetworkService<T> implements Stage, ConnectionFactory<T> { private static final Logger LOG = Logger.getLogger(NetworkService.class.getName()); - private static final int RETRY_COUNT; - private static final int RETRY_TIMEOUT; - - static { - try { - final Injector injector = Tang.Factory.getTang().newInjector(); - RETRY_COUNT = injector.getNamedInstance(NameResolverRetryCount.class); - RETRY_TIMEOUT = injector.getNamedInstance(NameResolverRetryTimeout.class); - } catch (final InjectionException ex) { - final String msg = "Exception while trying to find default values for retryCount & Timeout"; - LOG.log(Level.SEVERE, msg, ex); - throw new RuntimeException(msg, ex); - } - } - private final IdentifierFactory factory; private final Codec<T> codec; private final Transport transport; @@ -81,88 +59,6 @@ public final class NetworkService<T> implements Stage, ConnectionFactory<T> { private Identifier myId; /** - * @param factory - * @param nsPort - * @param nameServerAddr - * @param nameServerPort - * @param codec - * @param tpFactory - * @param recvHandler - * @param exHandler - * @deprecated have an instance injected instead. - */ - @Deprecated - public NetworkService(final IdentifierFactory factory, - final int nsPort, - final String nameServerAddr, - final int nameServerPort, - final Codec<T> codec, - final TransportFactory tpFactory, - final EventHandler<Message<T>> recvHandler, - final EventHandler<Exception> exHandler, - final LocalAddressProvider localAddressProvider) { - this(factory, nsPort, nameServerAddr, nameServerPort, - RETRY_COUNT, RETRY_TIMEOUT, codec, tpFactory, recvHandler, exHandler, localAddressProvider); - } - - /** - * @deprecated have an instance injected instead. - */ - @Deprecated - public NetworkService(final IdentifierFactory factory, - final int nsPort, - final String nameServerAddr, - final int nameServerPort, - final Codec<T> codec, - final TransportFactory tpFactory, - final EventHandler<Message<T>> recvHandler, - final EventHandler<Exception> exHandler) { - this(factory, nsPort, nameServerAddr, nameServerPort, - RETRY_COUNT, RETRY_TIMEOUT, codec, tpFactory, recvHandler, exHandler, - LocalAddressProviderFactory.getInstance()); - } - - /** - * @deprecated have an instance injected instead. - */ - @Deprecated - public NetworkService( - final IdentifierFactory factory, - final int nsPort, - final String nameServerAddr, - final int nameServerPort, - final int retryCount, - final int retryTimeout, - final Codec<T> codec, - final TransportFactory tpFactory, - final EventHandler<Message<T>> recvHandler, - final EventHandler<Exception> exHandler) { - this(factory, nsPort, nameServerAddr, nameServerPort, retryCount, retryTimeout, codec, tpFactory, recvHandler, - exHandler, LocalAddressProviderFactory.getInstance()); - } - - /** - * @deprecated have an instance injected instead. - */ - @Deprecated - public NetworkService( - final IdentifierFactory factory, - final int nsPort, - final String nameServerAddr, - final int nameServerPort, - final int retryCount, - final int retryTimeout, - final Codec<T> codec, - final TransportFactory tpFactory, - final EventHandler<Message<T>> recvHandler, - final EventHandler<Exception> exHandler, - final LocalAddressProvider localAddressProvider) { - this(factory, nsPort, new NameClient(nameServerAddr, nameServerPort, - 30000, factory, retryCount, retryTimeout, localAddressProvider, tpFactory), - codec, tpFactory, recvHandler, exHandler, localAddressProvider); - } - - /** * @deprecated in 0.12. Use Tang to obtain an instance of this instead. */ @Deprecated http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/786f7e5e/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NameClient.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NameClient.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NameClient.java index 6cc8581..bcacea7 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NameClient.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NameClient.java @@ -31,7 +31,6 @@ import org.apache.reef.wake.IdentifierFactory; import org.apache.reef.wake.impl.SyncStage; import org.apache.reef.wake.remote.Codec; import org.apache.reef.wake.remote.address.LocalAddressProvider; -import org.apache.reef.wake.remote.address.LocalAddressProviderFactory; import org.apache.reef.wake.remote.impl.TransportEvent; import org.apache.reef.wake.remote.transport.Transport; import org.apache.reef.wake.remote.transport.TransportFactory; @@ -55,17 +54,6 @@ public final class NameClient implements NameResolver { private NameRegistryClient registryClient; private Transport transport; - @Deprecated - public NameClient(final String serverAddr, - final int serverPort, - final IdentifierFactory factory, - final int retryCount, - final int retryTimeout, - final Cache<Identifier, InetSocketAddress> cache) { - this(serverAddr, serverPort, 10000, factory, retryCount, retryTimeout, cache, - LocalAddressProviderFactory.getInstance()); - } - /** * Constructs a naming client. * @@ -85,24 +73,6 @@ public final class NameClient implements NameResolver { this(serverAddr, serverPort, 10000, factory, retryCount, retryTimeout, cache, localAddressProvider); } - @Deprecated - public NameClient(final String serverAddr, - final int serverPort, - final long timeout, - final IdentifierFactory factory, - final int retryCount, - final int retryTimeout, - final Cache<Identifier, InetSocketAddress> cache) { - this(serverAddr, - serverPort, - timeout, - factory, - retryCount, - retryTimeout, - cache, - LocalAddressProviderFactory.getInstance()); - } - /** * Constructs a naming client. * http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/786f7e5e/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NameLookupClient.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NameLookupClient.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NameLookupClient.java index e503d26..67f6452 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NameLookupClient.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NameLookupClient.java @@ -104,25 +104,6 @@ public class NameLookupClient implements Stage, NamingLookup { LocalAddressProviderFactory.getInstance()); } - @Deprecated - public NameLookupClient(final String serverAddr, - final int serverPort, - final long timeout, - final IdentifierFactory factory, - final int retryCount, - final int retryTimeout, - final Cache<Identifier, InetSocketAddress> cache) { - this(serverAddr, - serverPort, - timeout, - factory, - retryCount, - retryTimeout, - cache, - LocalAddressProviderFactory.getInstance()); - - } - /** * Constructs a naming lookup client. * http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/786f7e5e/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NameRegistryClient.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NameRegistryClient.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NameRegistryClient.java index 766a06c..7dee0a3 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NameRegistryClient.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NameRegistryClient.java @@ -35,7 +35,6 @@ import org.apache.reef.wake.impl.SyncStage; import org.apache.reef.wake.remote.Codec; import org.apache.reef.wake.remote.RemoteConfiguration; import org.apache.reef.wake.remote.address.LocalAddressProvider; -import org.apache.reef.wake.remote.address.LocalAddressProviderFactory; import org.apache.reef.wake.remote.impl.TransportEvent; import org.apache.reef.wake.remote.transport.Link; import org.apache.reef.wake.remote.transport.Transport; @@ -108,19 +107,6 @@ public class NameRegistryClient implements Stage, NamingRegistry { } } - @Deprecated - public NameRegistryClient(final String serverAddr, - final int serverPort, - final long timeout, - final IdentifierFactory factory) { - - this(serverAddr, - serverPort, - timeout, - factory, - LocalAddressProviderFactory.getInstance()); - } - public NameRegistryClient(final String serverAddr, final int serverPort, final long timeout, final IdentifierFactory factory, final BlockingQueue<NamingRegisterResponse> replyQueue, http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/786f7e5e/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NameServerImpl.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NameServerImpl.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NameServerImpl.java index f283de2..21d5fa5 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NameServerImpl.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NameServerImpl.java @@ -107,17 +107,6 @@ public final class NameServerImpl implements NameServer { } /** - * @deprecated have an instance injected instead - */ - @Deprecated - public NameServerImpl( - final int port, - final IdentifierFactory factory, - final ReefEventStateManager reefEventStateManager) { - this(port, factory, reefEventStateManager, LocalAddressProviderFactory.getInstance()); - } - - /** * Constructs a name server. * * @param port a listening port number
