Repository: incubator-reef Updated Branches: refs/heads/master 4151f059c -> b860e04be
[REEF-566] Remove APIs with no dependencies deprecated since 0.11 from Wake Remove deprecated methods from Wake that are not called at all and thus can be trivially removed. JIRA: [REEF-566](https://issues.apache.org/jira/browse/REEF-566) Pull Request: This closes #344 Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/b860e04b Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/b860e04b Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/b860e04b Branch: refs/heads/master Commit: b860e04be23d08d4a12b52b18f5aeb7cb3e4e402 Parents: 4151f05 Author: Brian Cho <[email protected]> Authored: Fri Aug 7 00:26:43 2015 +0900 Committer: Byung-Gon Chun <[email protected]> Committed: Fri Aug 7 09:27:44 2015 +0900 ---------------------------------------------------------------------- .../org/apache/reef/wake/remote/NetUtils.java | 44 -------------------- .../DefaultRemoteManagerImplementation.java | 27 ------------ 2 files changed, 71 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/b860e04b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/NetUtils.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/NetUtils.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/NetUtils.java deleted file mode 100644 index c4a86d4..0000000 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/NetUtils.java +++ /dev/null @@ -1,44 +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.reef.wake.remote; - -import org.apache.reef.wake.remote.address.LocalAddressProvider; -import org.apache.reef.wake.remote.address.LocalAddressProviderFactory; - -/** - * @deprecated Use <code>org.apache.reef.wake.remote.address.LocalAddressProvider</code> instead. - */ -@Deprecated -public final class NetUtils { - private static final LocalAddressProvider LOCAL_ADDRESS_PROVIDER = LocalAddressProviderFactory.getInstance(); - - /** - * @deprecated Use <code>org.apache.reef.wake.remote.address.LocalAddressProvider#getLocalAddress()</code> instead. - */ - @Deprecated - public static String getLocalAddress() { - return LOCAL_ADDRESS_PROVIDER.getLocalAddress(); - } - - /** - * Empty private constructor to prohibit instantiation of utility class. - */ - private NetUtils() { - } -} http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/b860e04b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/DefaultRemoteManagerImplementation.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/DefaultRemoteManagerImplementation.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/DefaultRemoteManagerImplementation.java index 5dd2851..3aee204 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/DefaultRemoteManagerImplementation.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/DefaultRemoteManagerImplementation.java @@ -24,12 +24,10 @@ import org.apache.reef.wake.EventHandler; import org.apache.reef.wake.impl.StageManager; import org.apache.reef.wake.remote.*; import org.apache.reef.wake.remote.address.LocalAddressProvider; -import org.apache.reef.wake.remote.address.LocalAddressProviderFactory; import org.apache.reef.wake.remote.ports.RangeTcpPortProvider; import org.apache.reef.wake.remote.ports.TcpPortProvider; import org.apache.reef.wake.remote.transport.Transport; import org.apache.reef.wake.remote.transport.TransportFactory; -import org.apache.reef.wake.remote.transport.netty.MessagingTransportFactory; import org.apache.reef.wake.remote.transport.netty.NettyMessagingTransport; import javax.inject.Inject; @@ -69,31 +67,6 @@ public class DefaultRemoteManagerImplementation implements RemoteManager { public static final String UNKNOWN_HOST_NAME = NettyMessagingTransport.UNKNOWN_HOST_NAME; /** - * @deprecated have an instance injected instead. Or use RemoteManagerFactory.getInstance() - */ - @Deprecated - public <T> DefaultRemoteManagerImplementation( - final String name, - final String hostAddress, - final int listeningPort, - final Codec<T> codec, - final EventHandler<Throwable> errorHandler, - final boolean orderingGuarantee, - final int numberOfTries, - final int retryTimeout) { - this(name, - hostAddress, - listeningPort, - codec, - errorHandler, - orderingGuarantee, - numberOfTries, - retryTimeout, - LocalAddressProviderFactory.getInstance(), - new MessagingTransportFactory()); - } - - /** * @deprecated have an instance injected instead. */ @Deprecated
