Repository: incubator-reef Updated Branches: refs/heads/master 32c964579 -> 1dd187dc3
[REEF-421] Fix ambiguous injection subplan in NetworkService Ths pull request addressed the issue by removing @inject and @parameters of a constructor in NetworkService. JIRA: [REEF-421](https://issues.apache.org/jra/browse/REEF-421) Pull Request: This closes #256 Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/1dd187dc Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/1dd187dc Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/1dd187dc Branch: refs/heads/master Commit: 1dd187dc33f9be487f73242fd98fadd634f7fc4b Parents: 32c9645 Author: taegeonum <[email protected]> Authored: Fri Jun 26 20:45:09 2015 +0900 Committer: Markus Weimer <[email protected]> Committed: Sun Jun 28 08:54:34 2015 -0700 ---------------------------------------------------------------------- .../reef/io/network/impl/NetworkService.java | 23 +++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1dd187dc/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 3f49b11..6c02309 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 @@ -25,8 +25,6 @@ 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.NameResolverNameServerAddr; -import org.apache.reef.io.network.naming.parameters.NameResolverNameServerPort; import org.apache.reef.io.network.naming.parameters.NameResolverRetryCount; import org.apache.reef.io.network.naming.parameters.NameResolverRetryTimeout; import org.apache.reef.tang.Injector; @@ -146,18 +144,17 @@ public final class NetworkService<T> implements Stage, ConnectionFactory<T> { * @deprecated have an instance injected instead. */ @Deprecated - @Inject public NetworkService( - @Parameter(NetworkServiceParameters.NetworkServiceIdentifierFactory.class) final IdentifierFactory factory, - @Parameter(NetworkServiceParameters.NetworkServicePort.class) final int nsPort, - @Parameter(NameResolverNameServerAddr.class) final String nameServerAddr, - @Parameter(NameResolverNameServerPort.class) final int nameServerPort, - @Parameter(NameResolverRetryCount.class) final int retryCount, - @Parameter(NameResolverRetryTimeout.class) final int retryTimeout, - @Parameter(NetworkServiceParameters.NetworkServiceCodec.class) final Codec<T> codec, - @Parameter(NetworkServiceParameters.NetworkServiceTransportFactory.class) final TransportFactory tpFactory, - @Parameter(NetworkServiceParameters.NetworkServiceHandler.class) final EventHandler<Message<T>> recvHandler, - @Parameter(NetworkServiceParameters.NetworkServiceExceptionHandler.class) final EventHandler<Exception> exHandler, + 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),
