Repository: incubator-reef Updated Branches: refs/heads/master 647b30a16 -> 2b374dfa5
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/ThreadPoolStage.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/ThreadPoolStage.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/ThreadPoolStage.java index 22bffd3..483a7e4 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/ThreadPoolStage.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/ThreadPoolStage.java @@ -56,8 +56,8 @@ public final class ThreadPoolStage<T> extends AbstractEStage<T> { * @throws WakeRuntimeException */ @Inject - public ThreadPoolStage(final @Parameter(StageHandler.class) EventHandler<T> handler, - final @Parameter(NumberOfThreads.class) int numThreads) { + public ThreadPoolStage(@Parameter(StageHandler.class) final EventHandler<T> handler, + @Parameter(NumberOfThreads.class) final int numThreads) { this(handler.getClass().getName(), handler, numThreads, null); } @@ -71,10 +71,10 @@ public final class ThreadPoolStage<T> extends AbstractEStage<T> { * @throws WakeRuntimeException */ @Inject - public ThreadPoolStage(final @Parameter(StageName.class) String name, - final @Parameter(StageHandler.class) EventHandler<T> handler, - final @Parameter(NumberOfThreads.class) int numThreads, - final @Parameter(ErrorHandler.class) EventHandler<Throwable> errorHandler) { + public ThreadPoolStage(@Parameter(StageName.class) final String name, + @Parameter(StageHandler.class) final EventHandler<T> handler, + @Parameter(NumberOfThreads.class) final int numThreads, + @Parameter(ErrorHandler.class) final EventHandler<Throwable> errorHandler) { super(name); this.handler = handler; this.errorHandler = errorHandler; @@ -95,9 +95,9 @@ public final class ThreadPoolStage<T> extends AbstractEStage<T> { * @throws WakeRuntimeException */ @Inject - public ThreadPoolStage(final @Parameter(StageName.class) String name, - final @Parameter(StageHandler.class) EventHandler<T> handler, - final @Parameter(NumberOfThreads.class) int numThreads) { + public ThreadPoolStage(@Parameter(StageName.class) final String name, + @Parameter(StageHandler.class) final EventHandler<T> handler, + @Parameter(NumberOfThreads.class) final int numThreads) { this(name, handler, numThreads, null); } @@ -108,8 +108,8 @@ public final class ThreadPoolStage<T> extends AbstractEStage<T> { * @param executor the external executor service provided */ @Inject - public ThreadPoolStage(final @Parameter(StageHandler.class) EventHandler<T> handler, - final @Parameter(StageExecutorService.class) ExecutorService executor) { + public ThreadPoolStage(@Parameter(StageHandler.class) final EventHandler<T> handler, + @Parameter(StageExecutorService.class) final ExecutorService executor) { this(handler.getClass().getName(), handler, executor); } @@ -122,9 +122,9 @@ public final class ThreadPoolStage<T> extends AbstractEStage<T> { * @param errorHandler the error handler */ @Inject - public ThreadPoolStage(final @Parameter(StageHandler.class) EventHandler<T> handler, - final @Parameter(StageExecutorService.class) ExecutorService executor, - final @Parameter(ErrorHandler.class) EventHandler<Throwable> errorHandler) { + public ThreadPoolStage(@Parameter(StageHandler.class) final EventHandler<T> handler, + @Parameter(StageExecutorService.class) final ExecutorService executor, + @Parameter(ErrorHandler.class) final EventHandler<Throwable> errorHandler) { this(handler.getClass().getName(), handler, executor, errorHandler); } @@ -137,9 +137,9 @@ public final class ThreadPoolStage<T> extends AbstractEStage<T> { * for consistent tracking, it is recommended to create executor with {@link DefaultThreadFactory} */ @Inject - public ThreadPoolStage(final @Parameter(StageName.class) String name, - final @Parameter(StageHandler.class) EventHandler<T> handler, - final @Parameter(StageExecutorService.class) ExecutorService executor) { + public ThreadPoolStage(@Parameter(StageName.class) final String name, + @Parameter(StageHandler.class) final EventHandler<T> handler, + @Parameter(StageExecutorService.class) final ExecutorService executor) { this(name, handler, executor, null); } @@ -153,10 +153,10 @@ public final class ThreadPoolStage<T> extends AbstractEStage<T> { * @param errorHandler the error handler */ @Inject - public ThreadPoolStage(final @Parameter(StageName.class) String name, - final @Parameter(StageHandler.class) EventHandler<T> handler, - final @Parameter(StageExecutorService.class) ExecutorService executor, - final @Parameter(ErrorHandler.class) EventHandler<Throwable> errorHandler) { + public ThreadPoolStage(@Parameter(StageName.class) final String name, + @Parameter(StageHandler.class) final EventHandler<T> handler, + @Parameter(StageExecutorService.class) final ExecutorService executor, + @Parameter(ErrorHandler.class) final EventHandler<Throwable> errorHandler) { super(name); this.handler = handler; this.errorHandler = errorHandler; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/profiler/WakeProfiler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/profiler/WakeProfiler.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/profiler/WakeProfiler.java index 96ed581..b6274f2 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/profiler/WakeProfiler.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/profiler/WakeProfiler.java @@ -41,7 +41,7 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.logging.Logger; public class WakeProfiler implements Aspect { - private final static Logger LOG = Logger.getLogger(WakeProfiler.class.toString()); + private static final Logger LOG = Logger.getLogger(WakeProfiler.class.toString()); private final Map<Object, Vertex<?>> vertex_object = new MonotonicHashMap<>(); private final Map<InjectionFuture<?>, Object> futures = new MonotonicHashMap<>(); private final Map<Object, Stats> stats = new MonotonicHashMap<>(); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/DefaultRemoteManagerFactory.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/DefaultRemoteManagerFactory.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/DefaultRemoteManagerFactory.java index bb11751..eacc3f4 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/DefaultRemoteManagerFactory.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/DefaultRemoteManagerFactory.java @@ -45,11 +45,11 @@ public class DefaultRemoteManagerFactory implements RemoteManagerFactory { @Inject private DefaultRemoteManagerFactory( - final @Parameter(RemoteConfiguration.MessageCodec.class) Codec<?> codec, - final @Parameter(RemoteConfiguration.ErrorHandler.class) EventHandler<Throwable> errorHandler, - final @Parameter(RemoteConfiguration.OrderingGuarantee.class) boolean orderingGuarantee, - final @Parameter(RemoteConfiguration.NumberOfTries.class) int numberOfTries, - final @Parameter(RemoteConfiguration.RetryTimeout.class) int retryTimeout, + @Parameter(RemoteConfiguration.MessageCodec.class) final Codec<?> codec, + @Parameter(RemoteConfiguration.ErrorHandler.class) final EventHandler<Throwable> errorHandler, + @Parameter(RemoteConfiguration.OrderingGuarantee.class) final boolean orderingGuarantee, + @Parameter(RemoteConfiguration.NumberOfTries.class) final int numberOfTries, + @Parameter(RemoteConfiguration.RetryTimeout.class) final int retryTimeout, final LocalAddressProvider localAddressProvider, final TransportFactory tpFactory) { this.codec = codec; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/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 c2b8e65..b5b66d8 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 @@ -97,14 +97,14 @@ public class DefaultRemoteManagerImplementation implements RemoteManager { @Deprecated @Inject public <T> DefaultRemoteManagerImplementation( - final @Parameter(RemoteConfiguration.ManagerName.class) String name, - final @Parameter(RemoteConfiguration.HostAddress.class) String hostAddress, - final @Parameter(RemoteConfiguration.Port.class) int listeningPort, - final @Parameter(RemoteConfiguration.MessageCodec.class) Codec<T> codec, - final @Parameter(RemoteConfiguration.ErrorHandler.class) EventHandler<Throwable> errorHandler, - final @Parameter(RemoteConfiguration.OrderingGuarantee.class) boolean orderingGuarantee, - final @Parameter(RemoteConfiguration.NumberOfTries.class) int numberOfTries, - final @Parameter(RemoteConfiguration.RetryTimeout.class) int retryTimeout, + @Parameter(RemoteConfiguration.ManagerName.class) final String name, + @Parameter(RemoteConfiguration.HostAddress.class) final String hostAddress, + @Parameter(RemoteConfiguration.Port.class) final int listeningPort, + @Parameter(RemoteConfiguration.MessageCodec.class) final Codec<T> codec, + @Parameter(RemoteConfiguration.ErrorHandler.class) final EventHandler<Throwable> errorHandler, + @Parameter(RemoteConfiguration.OrderingGuarantee.class) final boolean orderingGuarantee, + @Parameter(RemoteConfiguration.NumberOfTries.class) final int numberOfTries, + @Parameter(RemoteConfiguration.RetryTimeout.class) final int retryTimeout, final LocalAddressProvider localAddressProvider, final TransportFactory tpFactory) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/ports/RangeTcpPortProvider.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/ports/RangeTcpPortProvider.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/ports/RangeTcpPortProvider.java index 48fb163..fb677d3 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/ports/RangeTcpPortProvider.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/ports/RangeTcpPortProvider.java @@ -39,9 +39,9 @@ public final class RangeTcpPortProvider implements TcpPortProvider { private static final Logger LOG = Logger.getLogger(RangeTcpPortProvider.class.getName()); @Inject - public RangeTcpPortProvider(final @Parameter(TcpPortRangeBegin.class) int portRangeBegin, - final @Parameter(TcpPortRangeCount.class) int portRangeCount, - final @Parameter(TcpPortRangeTryCount.class) int portRangeTryCount) { + public RangeTcpPortProvider(@Parameter(TcpPortRangeBegin.class) final int portRangeBegin, + @Parameter(TcpPortRangeCount.class) final int portRangeCount, + @Parameter(TcpPortRangeTryCount.class) final int portRangeTryCount) { this.portRangeBegin = portRangeBegin; this.portRangeCount = portRangeCount; this.portRangeTryCount = portRangeTryCount; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/transport/netty/NettyMessagingTransport.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/transport/netty/NettyMessagingTransport.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/transport/netty/NettyMessagingTransport.java index f76edfb..cbf9aa4 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/transport/netty/NettyMessagingTransport.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/transport/netty/NettyMessagingTransport.java @@ -137,12 +137,12 @@ public class NettyMessagingTransport implements Transport { */ @Inject NettyMessagingTransport( - final @Parameter(RemoteConfiguration.HostAddress.class) String hostAddress, + @Parameter(RemoteConfiguration.HostAddress.class) final String hostAddress, @Parameter(RemoteConfiguration.Port.class) int port, - final @Parameter(RemoteConfiguration.RemoteClientStage.class) EStage<TransportEvent> clientStage, - final @Parameter(RemoteConfiguration.RemoteServerStage.class) EStage<TransportEvent> serverStage, - final @Parameter(RemoteConfiguration.NumberOfTries.class) int numberOfTries, - final @Parameter(RemoteConfiguration.RetryTimeout.class) int retryTimeout, + @Parameter(RemoteConfiguration.RemoteClientStage.class) final EStage<TransportEvent> clientStage, + @Parameter(RemoteConfiguration.RemoteServerStage.class) final EStage<TransportEvent> serverStage, + @Parameter(RemoteConfiguration.NumberOfTries.class) final int numberOfTries, + @Parameter(RemoteConfiguration.RetryTimeout.class) final int retryTimeout, final TcpPortProvider tcpPortProvider, final LocalAddressProvider localAddressProvider) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/time/runtime/RuntimeClock.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/time/runtime/RuntimeClock.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/time/runtime/RuntimeClock.java index e52d759..16166e6 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/time/runtime/RuntimeClock.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/time/runtime/RuntimeClock.java @@ -37,7 +37,7 @@ import java.util.logging.Logger; public final class RuntimeClock implements Clock { - private final static Logger LOG = Logger.getLogger(Clock.class.toString()); + private static final Logger LOG = Logger.getLogger(Clock.class.toString()); private final Timer timer; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/HttpServerImpl.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/HttpServerImpl.java b/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/HttpServerImpl.java index b4578c0..d17c9dc 100644 --- a/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/HttpServerImpl.java +++ b/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/HttpServerImpl.java @@ -66,10 +66,10 @@ public final class HttpServerImpl implements HttpServer { */ @Inject HttpServerImpl(final JettyHandler jettyHandler, - final @Parameter(PortNumber.class) int portNumber, - final @Parameter(MaxPortNumber.class) int maxPortNumber, - final @Parameter(MinPortNumber.class) int minPortNumber, - final @Parameter(MaxRetryAttempts.class) int maxRetryAttempts, + @Parameter(PortNumber.class) final int portNumber, + @Parameter(MaxPortNumber.class) final int maxPortNumber, + @Parameter(MinPortNumber.class) final int minPortNumber, + @Parameter(MaxRetryAttempts.class) final int maxRetryAttempts, final LoggingScopeFactory loggingScopeFactory) throws Exception { this.loggingScopeFactory = loggingScopeFactory; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/HttpServerReefEventHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/HttpServerReefEventHandler.java b/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/HttpServerReefEventHandler.java index c27dc7e..5bb62a5 100644 --- a/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/HttpServerReefEventHandler.java +++ b/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/HttpServerReefEventHandler.java @@ -70,8 +70,8 @@ public final class HttpServerReefEventHandler implements HttpHandler { @Inject public HttpServerReefEventHandler( final ReefEventStateManager reefStateManager, - final @Parameter(ClientCloseHandlers.class) Set<EventHandler<Void>> clientCloseHandlers, - final @Parameter(LogLevelName.class) String logLevel, + @Parameter(ClientCloseHandlers.class) final Set<EventHandler<Void>> clientCloseHandlers, + @Parameter(LogLevelName.class) final String logLevel, final LoggingScopeFactory loggingScopeFactory, final REEFFileNames reefFileNames) { this.reefStateManager = reefStateManager; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/JettyHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/JettyHandler.java b/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/JettyHandler.java index b4c28ff..6886e03 100644 --- a/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/JettyHandler.java +++ b/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/JettyHandler.java @@ -50,7 +50,7 @@ class JettyHandler extends AbstractHandler { * @param httpEventHandlers */ @Inject - JettyHandler(final @Parameter(HttpEventHandlers.class) Set<HttpHandler> httpEventHandlers) { + JettyHandler(@Parameter(HttpEventHandlers.class) final Set<HttpHandler> httpEventHandlers) { for (final HttpHandler handler : httpEventHandlers) { if (!eventHandlers.containsKey(handler.getUriSpecification())) { eventHandlers.put(handler.getUriSpecification().toLowerCase(), handler);
