[REEF-389]: Fix violations of ModifierOrder checkstyle This addressed the issue by * reordering modifiers as suggested by checkstyle
JIRA: [REEF-389](https://issues.apache.org/jira/browse/REEF-389) Pull Request: This closes #233 Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/2b374dfa Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/2b374dfa Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/2b374dfa Branch: refs/heads/master Commit: 2b374dfa51856dc2c29928f889f8358a7877044b Parents: 647b30a Author: Mariia Mykhailova <[email protected]> Authored: Fri Jun 19 12:52:21 2015 -0700 Committer: Markus Weimer <[email protected]> Committed: Fri Jun 19 13:14:59 2015 -0700 ---------------------------------------------------------------------- .../apache/reef/bridge/client/LocalClient.java | 2 +- .../org/apache/reef/javabridge/JavaBridge.java | 2 +- .../reef/javabridge/RunningTaskBridge.java | 4 +- .../fs/FSCheckPointServiceConfiguration.java | 2 +- .../io/checkpoint/fs/FSCheckpointService.java | 4 +- .../reef/io/TcpPortConfigurationProvider.java | 6 +- .../apache/reef/runtime/common/Launcher.java | 2 +- .../runtime/common/client/ClientWireUp.java | 4 +- .../common/client/REEFImplementation.java | 6 +- .../runtime/common/client/RunningJobImpl.java | 12 ++-- .../runtime/common/client/RunningJobsImpl.java | 2 +- .../common/client/RuntimeErrorProtoHandler.java | 2 +- .../client/api/ClientRuntimeParameters.java | 2 +- .../DriverRuntimeConfigurationOptions.java | 2 +- .../runtime/common/driver/DriverSingletons.java | 50 +++++++-------- .../common/driver/DriverStartHandler.java | 6 +- .../common/driver/DriverStatusManager.java | 2 +- .../common/driver/api/RuntimeParameters.java | 8 +-- .../driver/catalog/ResourceCatalogImpl.java | 2 +- .../common/driver/client/ClientConnection.java | 4 +- .../common/driver/client/ClientManager.java | 10 +-- .../driver/context/ContextControlHandler.java | 2 +- .../common/driver/context/ContextFactory.java | 4 +- .../common/driver/context/EvaluatorContext.java | 2 +- .../evaluator/AllocatedEvaluatorImpl.java | 2 +- .../evaluator/EvaluatorControlHandler.java | 2 +- .../driver/evaluator/EvaluatorManager.java | 12 ++-- .../evaluator/EvaluatorMessageDispatcher.java | 64 ++++++++++---------- .../common/driver/idle/DriverIdleManager.java | 2 +- .../common/driver/task/RunningTaskImpl.java | 2 +- .../evaluator/EvaluatorConfiguration.java | 2 +- .../common/evaluator/EvaluatorRuntime.java | 8 +-- .../common/evaluator/HeartBeatManager.java | 4 +- .../evaluator/context/ContextLifeCycle.java | 10 +-- .../evaluator/context/RootContextLauncher.java | 16 ++--- .../defaults/DefaultContextMessageHandler.java | 2 +- .../evaluator/task/TaskLifeCycleHandlers.java | 4 +- .../common/evaluator/task/TaskRuntime.java | 16 ++--- .../common/evaluator/task/TaskStartImpl.java | 2 +- .../common/evaluator/task/TaskStatus.java | 6 +- .../common/evaluator/task/TaskStopImpl.java | 2 +- .../reef/runtime/common/files/JobJarMaker.java | 2 +- .../reef/runtime/common/launch/LaunchClass.java | 10 +-- .../common/launch/ProfilingStopHandler.java | 2 +- .../runtime/common/launch/REEFErrorHandler.java | 4 +- .../java/org/apache/reef/util/CommandUtils.java | 2 +- .../java/org/apache/reef/util/REEFVersion.java | 8 +-- .../reef/examples/group/bgd/BGDClient.java | 8 +-- .../bgd/parameters/BGDControlParameters.java | 16 ++--- .../group/broadcast/BroadcastDriver.java | 4 +- .../examples/group/broadcast/MasterTask.java | 2 +- .../apache/reef/examples/pool/JobDriver.java | 8 +-- .../apache/reef/examples/pool/SleepTask.java | 2 +- .../reef/examples/suspend/SuspendClient.java | 6 +- .../examples/suspend/SuspendClientControl.java | 2 +- .../reef/examples/suspend/SuspendDriver.java | 6 +- .../reef/io/data/loading/api/DataLoader.java | 6 +- .../loading/impl/InputFormatLoadingService.java | 8 +-- .../impl/JobConfExternalConstructor.java | 4 +- .../group/impl/operators/ReduceSender.java | 14 ++--- .../group/impl/task/GroupCommClientImpl.java | 4 +- .../reef/io/network/impl/BindNSToTask.java | 2 +- .../reef/io/network/impl/NetworkService.java | 20 +++--- .../reef/io/network/impl/UnbindNSFromTask.java | 2 +- .../reef/io/network/naming/NameServerImpl.java | 4 +- .../apache/reef/io/storage/ram/CodecRamMap.java | 2 +- .../reef/poison/PoisonedAlarmHandler.java | 2 +- .../context/PoisonedContextStartHandler.java | 4 +- .../PoissonPoisonedContextStartHandler.java | 2 +- .../poison/task/PoisonedTaskStartHandler.java | 4 +- .../task/PoissonPoisonedTaskStartHandler.java | 2 +- .../reef/runtime/hdinsight/cli/LogFetcher.java | 6 +- .../runtime/hdinsight/client/AzureUploader.java | 8 +-- .../client/HDInsightJobSubmissionHandler.java | 2 +- .../client/yarnrest/HDInsightInstance.java | 6 +- .../client/DriverConfigurationProvider.java | 4 +- .../local/client/LocalJobSubmissionHandler.java | 2 +- .../runtime/local/driver/ContainerManager.java | 8 +-- .../runtime/local/driver/ResourceManager.java | 12 ++-- .../process/ReefRunnableProcessObserver.java | 2 +- .../mesos/client/MesosJobSubmissionHandler.java | 6 +- .../driver/MesosResourceLaunchHandler.java | 2 +- .../runtime/mesos/driver/REEFEventHandlers.java | 8 +-- .../runtime/mesos/driver/REEFScheduler.java | 4 +- .../runtime/mesos/evaluator/REEFExecutor.java | 4 +- .../yarn/client/YarnJobSubmissionHandler.java | 2 +- .../yarn/driver/EvaluatorSetupHelper.java | 2 +- .../runtime/yarn/driver/REEFEventHandlers.java | 8 +-- .../yarn/driver/UploaderToJobfolder.java | 2 +- .../yarn/driver/YARNResourceLaunchHandler.java | 2 +- .../yarn/driver/YarnContainerManager.java | 2 +- .../apache/reef/tang/formats/CommandLine.java | 2 +- .../formats/ConfigurationModuleBuilder.java | 4 +- .../ConfigurationBuilderImpl.java | 4 +- .../reef/tang/implementation/Constructor.java | 2 +- .../reef/tang/implementation/InjectionPlan.java | 4 +- .../reef/tang/implementation/Subplan.java | 2 +- .../tang/implementation/java/JavaInstance.java | 2 +- .../reef/tang/util/ReflectionUtilities.java | 8 +-- .../java/org/apache/reef/tang/util/Tint.java | 6 +- .../EvaluatorReuseTestDriver.java | 2 +- .../reef/tests/fail/driver/FailDriver.java | 2 +- .../org/apache/reef/tests/fail/task/Driver.java | 2 +- .../org/apache/reef/wake/WakeConfiguration.java | 6 +- .../org/apache/reef/wake/WakeParameters.java | 12 ++-- .../IndependentIterationsThreadPoolStage.java | 2 +- .../reef/wake/impl/SingleThreadStage.java | 10 +-- .../org/apache/reef/wake/impl/SyncStage.java | 12 ++-- .../apache/reef/wake/impl/ThreadPoolStage.java | 42 ++++++------- .../apache/reef/wake/profiler/WakeProfiler.java | 2 +- .../impl/DefaultRemoteManagerFactory.java | 10 +-- .../DefaultRemoteManagerImplementation.java | 16 ++--- .../wake/remote/ports/RangeTcpPortProvider.java | 6 +- .../netty/NettyMessagingTransport.java | 10 +-- .../reef/wake/time/runtime/RuntimeClock.java | 2 +- .../apache/reef/webserver/HttpServerImpl.java | 8 +-- .../webserver/HttpServerReefEventHandler.java | 4 +- .../org/apache/reef/webserver/JettyHandler.java | 2 +- 118 files changed, 368 insertions(+), 368 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-bridge-client/src/main/java/org/apache/reef/bridge/client/LocalClient.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-bridge-client/src/main/java/org/apache/reef/bridge/client/LocalClient.java b/lang/java/reef-bridge-client/src/main/java/org/apache/reef/bridge/client/LocalClient.java index f0dbcff..d599542 100644 --- a/lang/java/reef-bridge-client/src/main/java/org/apache/reef/bridge/client/LocalClient.java +++ b/lang/java/reef-bridge-client/src/main/java/org/apache/reef/bridge/client/LocalClient.java @@ -55,7 +55,7 @@ public class LocalClient { final PreparedDriverFolderLauncher launcher, final REEFFileNames fileNames, final DriverConfigurationProvider driverConfigurationProvider, - final @Parameter(DriverConfigurationProviders.class) Set<ConfigurationProvider> configurationProviders) { + @Parameter(DriverConfigurationProviders.class) final Set<ConfigurationProvider> configurationProviders) { this.configurationSerializer = configurationSerializer; this.launcher = launcher; this.fileNames = fileNames; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/JavaBridge.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/JavaBridge.java b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/JavaBridge.java index 7ee3655..caf3132 100644 --- a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/JavaBridge.java +++ b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/JavaBridge.java @@ -19,7 +19,7 @@ package org.apache.reef.javabridge; public class JavaBridge { - private final static String CPP_BRIDGE = "JavaClrBridge"; + private static final String CPP_BRIDGE = "JavaClrBridge"; static { try { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/RunningTaskBridge.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/RunningTaskBridge.java b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/RunningTaskBridge.java index bff9b08..822c41e 100644 --- a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/RunningTaskBridge.java +++ b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/RunningTaskBridge.java @@ -25,8 +25,8 @@ import java.util.logging.Logger; public final class RunningTaskBridge extends NativeBridge { private static final Logger LOG = Logger.getLogger(RunningTaskBridge.class.getName()); - final private RunningTask jrunningTask; - final private ActiveContextBridge jactiveContext; + private final RunningTask jrunningTask; + private final ActiveContextBridge jactiveContext; public RunningTaskBridge(final RunningTask runningTask, final ActiveContextBridgeFactory factory) { this.jrunningTask = runningTask; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-checkpoint/src/main/java/org/apache/reef/io/checkpoint/fs/FSCheckPointServiceConfiguration.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-checkpoint/src/main/java/org/apache/reef/io/checkpoint/fs/FSCheckPointServiceConfiguration.java b/lang/java/reef-checkpoint/src/main/java/org/apache/reef/io/checkpoint/fs/FSCheckPointServiceConfiguration.java index 1fcd643..f8c18d2 100644 --- a/lang/java/reef-checkpoint/src/main/java/org/apache/reef/io/checkpoint/fs/FSCheckPointServiceConfiguration.java +++ b/lang/java/reef-checkpoint/src/main/java/org/apache/reef/io/checkpoint/fs/FSCheckPointServiceConfiguration.java @@ -89,7 +89,7 @@ public class FSCheckPointServiceConfiguration extends ConfigurationModuleBuilder private final boolean loadConfig; @Inject - public FileSystemConstructor(final @Parameter(IS_LOCAL.class) boolean isLocal) { + public FileSystemConstructor(@Parameter(IS_LOCAL.class) final boolean isLocal) { this.loadConfig = !isLocal; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-checkpoint/src/main/java/org/apache/reef/io/checkpoint/fs/FSCheckpointService.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-checkpoint/src/main/java/org/apache/reef/io/checkpoint/fs/FSCheckpointService.java b/lang/java/reef-checkpoint/src/main/java/org/apache/reef/io/checkpoint/fs/FSCheckpointService.java index fcc0d52..e43159c 100644 --- a/lang/java/reef-checkpoint/src/main/java/org/apache/reef/io/checkpoint/fs/FSCheckpointService.java +++ b/lang/java/reef-checkpoint/src/main/java/org/apache/reef/io/checkpoint/fs/FSCheckpointService.java @@ -49,9 +49,9 @@ public class FSCheckpointService implements CheckpointService { @Inject FSCheckpointService(final FileSystem fs, - final @Parameter(PATH.class) String basePath, + @Parameter(PATH.class) final String basePath, final CheckpointNamingService namingPolicy, - final @Parameter(REPLICATION_FACTOR.class) short replication) { + @Parameter(REPLICATION_FACTOR.class) final short replication) { this.fs = fs; this.base = new Path(basePath); this.namingPolicy = namingPolicy; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/io/TcpPortConfigurationProvider.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/io/TcpPortConfigurationProvider.java b/lang/java/reef-common/src/main/java/org/apache/reef/io/TcpPortConfigurationProvider.java index d6e8021..069ca0e 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/io/TcpPortConfigurationProvider.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/io/TcpPortConfigurationProvider.java @@ -41,9 +41,9 @@ public class TcpPortConfigurationProvider implements ConfigurationProvider { private static final Logger LOG = Logger.getLogger(TcpPortConfigurationProvider.class.getName()); @Inject - TcpPortConfigurationProvider(final @Parameter(TcpPortRangeBegin.class) int portRangeBegin, - final @Parameter(TcpPortRangeCount.class) int portRangeCount, - final @Parameter(TcpPortRangeTryCount.class) int portRangeTryCount) { + TcpPortConfigurationProvider(@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-common/src/main/java/org/apache/reef/runtime/common/Launcher.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/Launcher.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/Launcher.java index 65f454d..ba1c29e 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/Launcher.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/Launcher.java @@ -46,7 +46,7 @@ import java.util.logging.Logger; */ public final class Launcher { - private final static Logger LOG = Logger.getLogger(Launcher.class.getName()); + private static final Logger LOG = Logger.getLogger(Launcher.class.getName()); static { LoggingSetup.setupCommonsLogging(); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/ClientWireUp.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/ClientWireUp.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/ClientWireUp.java index e78ae49..93c97b7 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/ClientWireUp.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/ClientWireUp.java @@ -46,7 +46,7 @@ final class ClientWireUp { @Inject ClientWireUp(final RemoteManager remoteManager, - final @Parameter(ClientPresent.class) String clientPresent, + @Parameter(ClientPresent.class) final String clientPresent, final RuntimeErrorProtoHandler runtimeErrorProtoHandler, final JobStatusMessageHandler jobStatusMessageHandler) { this.remoteManager = Optional.ofNullable(remoteManager); @@ -57,7 +57,7 @@ final class ClientWireUp { } @Inject - ClientWireUp(final @Parameter(ClientPresent.class) String clientPresent, + ClientWireUp(@Parameter(ClientPresent.class) final String clientPresent, final RuntimeErrorProtoHandler runtimeErrorProtoHandler, final JobStatusMessageHandler jobStatusMessageHandler) { this(null, clientPresent, runtimeErrorProtoHandler, jobStatusMessageHandler); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/REEFImplementation.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/REEFImplementation.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/REEFImplementation.java index c20d46f..a18533a 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/REEFImplementation.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/REEFImplementation.java @@ -46,7 +46,7 @@ import java.util.logging.Logger; @Private public final class REEFImplementation implements REEF { - private final static Logger LOG = Logger.getLogger(REEFImplementation.class.getName()); + private static final Logger LOG = Logger.getLogger(REEFImplementation.class.getName()); private final JobSubmissionHandler jobSubmissionHandler; private final RunningJobs runningJobs; @@ -72,7 +72,7 @@ public final class REEFImplementation implements REEF { final ClientWireUp clientWireUp, final LoggingScopeFactory loggingScopeFactory, final REEFVersion reefVersion, - final @Parameter(DriverConfigurationProviders.class) Set<ConfigurationProvider> configurationProviders) { + @Parameter(DriverConfigurationProviders.class) final Set<ConfigurationProvider> configurationProviders) { this.jobSubmissionHandler = jobSubmissionHandler; this.runningJobs = runningJobs; this.jobSubmissionHelper = jobSubmissionHelper; @@ -128,7 +128,7 @@ public final class REEFImplementation implements REEF { } @NamedParameter(doc = "The driver remote identifier.") - public final static class DriverRemoteIdentifier implements Name<String> { + public static final class DriverRemoteIdentifier implements Name<String> { } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/RunningJobImpl.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/RunningJobImpl.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/RunningJobImpl.java index 93eb97a..4beea17 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/RunningJobImpl.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/RunningJobImpl.java @@ -64,12 +64,12 @@ public final class RunningJobImpl implements RunningJob, EventHandler<JobStatusP @Inject RunningJobImpl(final RemoteManager remoteManager, - final @Parameter(DriverIdentifier.class) String driverIdentifier, - final @Parameter(REEFImplementation.DriverRemoteIdentifier.class) String driverRID, - final @Parameter(JobRunningHandler.class) EventHandler<RunningJob> runningJobEventHandler, - final @Parameter(JobCompletedHandler.class) EventHandler<CompletedJob> completedJobEventHandler, - final @Parameter(JobFailedHandler.class) EventHandler<FailedJob> failedJobEventHandler, - final @Parameter(JobMessageHandler.class) EventHandler<JobMessage> jobMessageEventHandler, + @Parameter(DriverIdentifier.class) final String driverIdentifier, + @Parameter(REEFImplementation.DriverRemoteIdentifier.class) final String driverRID, + @Parameter(JobRunningHandler.class) final EventHandler<RunningJob> runningJobEventHandler, + @Parameter(JobCompletedHandler.class) final EventHandler<CompletedJob> completedJobEventHandler, + @Parameter(JobFailedHandler.class) final EventHandler<FailedJob> failedJobEventHandler, + @Parameter(JobMessageHandler.class) final EventHandler<JobMessage> jobMessageEventHandler, final ExceptionCodec exceptionCodec) { this.jobId = driverIdentifier; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/RunningJobsImpl.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/RunningJobsImpl.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/RunningJobsImpl.java index 495406e..d22ae1e 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/RunningJobsImpl.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/RunningJobsImpl.java @@ -48,7 +48,7 @@ final class RunningJobsImpl implements RunningJobs { @Inject RunningJobsImpl(final Injector injector, - final @Parameter(ResourceManagerErrorHandler.class) InjectionFuture<EventHandler<FailedRuntime>> failedRuntimeEventHandler) { + @Parameter(ResourceManagerErrorHandler.class) final InjectionFuture<EventHandler<FailedRuntime>> failedRuntimeEventHandler) { this.injector = injector; this.failedRuntimeEventHandler = failedRuntimeEventHandler; LOG.log(Level.FINE, "Instantiated 'RunningJobImpl'"); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/RuntimeErrorProtoHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/RuntimeErrorProtoHandler.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/RuntimeErrorProtoHandler.java index 8c0b614..1beb46f 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/RuntimeErrorProtoHandler.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/RuntimeErrorProtoHandler.java @@ -32,7 +32,7 @@ import java.util.logging.Logger; */ final class RuntimeErrorProtoHandler implements EventHandler<RemoteMessage<ReefServiceProtos.RuntimeErrorProto>> { - private final static Logger LOG = Logger.getLogger(RuntimeErrorProtoHandler.class.getName()); + private static final Logger LOG = Logger.getLogger(RuntimeErrorProtoHandler.class.getName()); private final InjectionFuture<RunningJobs> runningJobs; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/api/ClientRuntimeParameters.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/api/ClientRuntimeParameters.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/api/ClientRuntimeParameters.java index b670b20..07233f0 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/api/ClientRuntimeParameters.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/api/ClientRuntimeParameters.java @@ -24,6 +24,6 @@ import org.apache.reef.tang.annotations.NamedParameter; public final class ClientRuntimeParameters { @NamedParameter(doc = "The runtime error handler RID.") - public final static class RuntimeErrorHandlerRID implements Name<String> { + public static final class RuntimeErrorHandlerRID implements Name<String> { } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverRuntimeConfigurationOptions.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverRuntimeConfigurationOptions.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverRuntimeConfigurationOptions.java index b1e64e7..fac84ce 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverRuntimeConfigurationOptions.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverRuntimeConfigurationOptions.java @@ -28,6 +28,6 @@ import org.apache.reef.wake.EventHandler; */ public class DriverRuntimeConfigurationOptions { @NamedParameter(doc = "Called when a job control message is received by the client.") - public final static class JobControlHandler implements Name<EventHandler<ClientRuntimeProtocol.JobControlProto>> { + public static final class JobControlHandler implements Name<EventHandler<ClientRuntimeProtocol.JobControlProto>> { } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverSingletons.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverSingletons.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverSingletons.java index db7b739..8db275b 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverSingletons.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverSingletons.java @@ -48,35 +48,35 @@ final class DriverSingletons { @Inject DriverSingletons( // Application event handlers - final @Parameter(ContextActiveHandlers.class) Set<EventHandler<ActiveContext>> contextActiveEventHandlers, - final @Parameter(ContextClosedHandlers.class) Set<EventHandler<ClosedContext>> contextClosedEventHandlers, - final @Parameter(ContextFailedHandlers.class) Set<EventHandler<FailedContext>> contextFailedEventHandlers, - final @Parameter(ContextMessageHandlers.class) Set<EventHandler<ContextMessage>> contextMessageHandlers, - final @Parameter(TaskRunningHandlers.class) Set<EventHandler<RunningTask>> taskRunningEventHandlers, - final @Parameter(TaskCompletedHandlers.class) Set<EventHandler<CompletedTask>> taskCompletedEventHandlers, - final @Parameter(TaskSuspendedHandlers.class) Set<EventHandler<SuspendedTask>> taskSuspendedEventHandlers, - final @Parameter(TaskMessageHandlers.class) Set<EventHandler<TaskMessage>> taskMessageEventHandlers, - final @Parameter(TaskFailedHandlers.class) Set<EventHandler<FailedTask>> taskExceptionEventHandlers, - final @Parameter(EvaluatorAllocatedHandlers.class) Set<EventHandler<AllocatedEvaluator>> evaluatorAllocatedEventHandlers, - final @Parameter(EvaluatorFailedHandlers.class) Set<EventHandler<FailedEvaluator>> evaluatorFailedHandlers, - final @Parameter(EvaluatorCompletedHandlers.class) Set<EventHandler<CompletedEvaluator>> evaluatorCompletedHandlers, + @Parameter(ContextActiveHandlers.class) final Set<EventHandler<ActiveContext>> contextActiveEventHandlers, + @Parameter(ContextClosedHandlers.class) final Set<EventHandler<ClosedContext>> contextClosedEventHandlers, + @Parameter(ContextFailedHandlers.class) final Set<EventHandler<FailedContext>> contextFailedEventHandlers, + @Parameter(ContextMessageHandlers.class) final Set<EventHandler<ContextMessage>> contextMessageHandlers, + @Parameter(TaskRunningHandlers.class) final Set<EventHandler<RunningTask>> taskRunningEventHandlers, + @Parameter(TaskCompletedHandlers.class) final Set<EventHandler<CompletedTask>> taskCompletedEventHandlers, + @Parameter(TaskSuspendedHandlers.class) final Set<EventHandler<SuspendedTask>> taskSuspendedEventHandlers, + @Parameter(TaskMessageHandlers.class) final Set<EventHandler<TaskMessage>> taskMessageEventHandlers, + @Parameter(TaskFailedHandlers.class) final Set<EventHandler<FailedTask>> taskExceptionEventHandlers, + @Parameter(EvaluatorAllocatedHandlers.class) final Set<EventHandler<AllocatedEvaluator>> evaluatorAllocatedEventHandlers, + @Parameter(EvaluatorFailedHandlers.class) final Set<EventHandler<FailedEvaluator>> evaluatorFailedHandlers, + @Parameter(EvaluatorCompletedHandlers.class) final Set<EventHandler<CompletedEvaluator>> evaluatorCompletedHandlers, // Service event handlers - final @Parameter(ServiceContextActiveHandlers.class) Set<EventHandler<ActiveContext>> serviceContextActiveEventHandlers, - final @Parameter(ServiceContextClosedHandlers.class) Set<EventHandler<ClosedContext>> serviceContextClosedEventHandlers, - final @Parameter(ServiceContextFailedHandlers.class) Set<EventHandler<FailedContext>> serviceContextFailedEventHandlers, - final @Parameter(ServiceContextMessageHandlers.class) Set<EventHandler<ContextMessage>> serviceContextMessageHandlers, - final @Parameter(ServiceTaskRunningHandlers.class) Set<EventHandler<RunningTask>> serviceTaskRunningEventHandlers, - final @Parameter(ServiceTaskCompletedHandlers.class) Set<EventHandler<CompletedTask>> serviceTaskCompletedEventHandlers, - final @Parameter(ServiceTaskSuspendedHandlers.class) Set<EventHandler<SuspendedTask>> serviceTaskSuspendedEventHandlers, - final @Parameter(ServiceTaskMessageHandlers.class) Set<EventHandler<TaskMessage>> serviceTaskMessageEventHandlers, - final @Parameter(ServiceTaskFailedHandlers.class) Set<EventHandler<FailedTask>> serviceTaskExceptionEventHandlers, - final @Parameter(ServiceEvaluatorAllocatedHandlers.class) Set<EventHandler<AllocatedEvaluator>> serviceEvaluatorAllocatedEventHandlers, - final @Parameter(ServiceEvaluatorFailedHandlers.class) Set<EventHandler<FailedEvaluator>> serviceEvaluatorFailedHandlers, - final @Parameter(ServiceEvaluatorCompletedHandlers.class) Set<EventHandler<CompletedEvaluator>> serviceEvaluatorCompletedHandlers, + @Parameter(ServiceContextActiveHandlers.class) final Set<EventHandler<ActiveContext>> serviceContextActiveEventHandlers, + @Parameter(ServiceContextClosedHandlers.class) final Set<EventHandler<ClosedContext>> serviceContextClosedEventHandlers, + @Parameter(ServiceContextFailedHandlers.class) final Set<EventHandler<FailedContext>> serviceContextFailedEventHandlers, + @Parameter(ServiceContextMessageHandlers.class) final Set<EventHandler<ContextMessage>> serviceContextMessageHandlers, + @Parameter(ServiceTaskRunningHandlers.class) final Set<EventHandler<RunningTask>> serviceTaskRunningEventHandlers, + @Parameter(ServiceTaskCompletedHandlers.class) final Set<EventHandler<CompletedTask>> serviceTaskCompletedEventHandlers, + @Parameter(ServiceTaskSuspendedHandlers.class) final Set<EventHandler<SuspendedTask>> serviceTaskSuspendedEventHandlers, + @Parameter(ServiceTaskMessageHandlers.class) final Set<EventHandler<TaskMessage>> serviceTaskMessageEventHandlers, + @Parameter(ServiceTaskFailedHandlers.class) final Set<EventHandler<FailedTask>> serviceTaskExceptionEventHandlers, + @Parameter(ServiceEvaluatorAllocatedHandlers.class) final Set<EventHandler<AllocatedEvaluator>> serviceEvaluatorAllocatedEventHandlers, + @Parameter(ServiceEvaluatorFailedHandlers.class) final Set<EventHandler<FailedEvaluator>> serviceEvaluatorFailedHandlers, + @Parameter(ServiceEvaluatorCompletedHandlers.class) final Set<EventHandler<CompletedEvaluator>> serviceEvaluatorCompletedHandlers, // Client event handler - final @Parameter(DriverRuntimeConfigurationOptions.JobControlHandler.class) EventHandler<ClientRuntimeProtocol.JobControlProto> jobControlHandler, + @Parameter(DriverRuntimeConfigurationOptions.JobControlHandler.class) final EventHandler<ClientRuntimeProtocol.JobControlProto> jobControlHandler, // Resource*Handlers - Should be invoked once // The YarnResourceLaunchHandler creates and uploads http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverStartHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverStartHandler.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverStartHandler.java index dfdfafe..1343d6e 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverStartHandler.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverStartHandler.java @@ -40,8 +40,8 @@ public final class DriverStartHandler implements EventHandler<StartTime> { private final DriverStatusManager driverStatusManager; @Inject - DriverStartHandler(final @Parameter(org.apache.reef.driver.parameters.DriverStartHandler.class) Set<EventHandler<StartTime>> startHandler, - final @Parameter(DriverRestartHandler.class) EventHandler<StartTime> restartHandler, + DriverStartHandler(@Parameter(org.apache.reef.driver.parameters.DriverStartHandler.class) final Set<EventHandler<StartTime>> startHandler, + @Parameter(DriverRestartHandler.class) final EventHandler<StartTime> restartHandler, final DriverStatusManager driverStatusManager) { this.startHandlers = startHandler; this.restartHandler = Optional.of(restartHandler); @@ -51,7 +51,7 @@ public final class DriverStartHandler implements EventHandler<StartTime> { } @Inject - DriverStartHandler(final @Parameter(org.apache.reef.driver.parameters.DriverStartHandler.class) Set<EventHandler<StartTime>> startHandler, + DriverStartHandler(@Parameter(org.apache.reef.driver.parameters.DriverStartHandler.class) final Set<EventHandler<StartTime>> startHandler, final DriverStatusManager driverStatusManager) { this.startHandlers = startHandler; this.restartHandler = Optional.empty(); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverStatusManager.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverStatusManager.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverStatusManager.java index 793a84f..0724ff3 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverStatusManager.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverStatusManager.java @@ -57,7 +57,7 @@ public final class DriverStatusManager { @Inject DriverStatusManager(final Clock clock, final ClientConnection clientConnection, - final @Parameter(JobIdentifier.class) String jobIdentifier, + @Parameter(JobIdentifier.class) final String jobIdentifier, final ExceptionCodec exceptionCodec) { LOG.entering(DriverStatusManager.class.getCanonicalName(), "<init>"); this.clock = clock; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/api/RuntimeParameters.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/api/RuntimeParameters.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/api/RuntimeParameters.java index 1210a84..8b4aecc 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/api/RuntimeParameters.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/api/RuntimeParameters.java @@ -35,19 +35,19 @@ import org.apache.reef.wake.EventHandler; public final class RuntimeParameters { @NamedParameter(doc = "The resource allocation handler that stub runtimes send along allocated resources e.g., containers.") - public final static class ResourceAllocationHandler implements Name<EventHandler<ResourceAllocationEvent>> { + public static final class ResourceAllocationHandler implements Name<EventHandler<ResourceAllocationEvent>> { } @NamedParameter(doc = "The node descriptor handler that stub runtimes send along node information.") - public final static class NodeDescriptorHandler implements Name<EventHandler<NodeDescriptorEvent>> { + public static final class NodeDescriptorHandler implements Name<EventHandler<NodeDescriptorEvent>> { } @NamedParameter(doc = "The resource status handler.") - public final static class ResourceStatusHandler implements Name<EventHandler<ResourceStatusEvent>> { + public static final class ResourceStatusHandler implements Name<EventHandler<ResourceStatusEvent>> { } @NamedParameter(doc = "The resourcemanager status handler.") - public final static class RuntimeStatusHandler implements Name<EventHandler<RuntimeStatusEvent>> { + public static final class RuntimeStatusHandler implements Name<EventHandler<RuntimeStatusEvent>> { } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/catalog/ResourceCatalogImpl.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/catalog/ResourceCatalogImpl.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/catalog/ResourceCatalogImpl.java index 59f9c7b..77f3762 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/catalog/ResourceCatalogImpl.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/catalog/ResourceCatalogImpl.java @@ -33,7 +33,7 @@ import java.util.logging.Logger; @Private public final class ResourceCatalogImpl implements ResourceCatalog { - public final static String DEFAULT_RACK = "/default-rack"; + public static final String DEFAULT_RACK = "/default-rack"; private static final Logger LOG = Logger.getLogger(ResourceCatalog.class.getName()); private final Map<String, RackDescriptorImpl> racks = new HashMap<>(); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/client/ClientConnection.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/client/ClientConnection.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/client/ClientConnection.java index 7a84990..3f22e84 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/client/ClientConnection.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/client/ClientConnection.java @@ -45,8 +45,8 @@ public final class ClientConnection { @Inject public ClientConnection( final RemoteManager remoteManager, - final @Parameter(ClientRemoteIdentifier.class) String clientRID, - final @Parameter(JobIdentifier.class) String jobIdentifier) { + @Parameter(ClientRemoteIdentifier.class) final String clientRID, + @Parameter(JobIdentifier.class) final String jobIdentifier) { this.jobIdentifier = jobIdentifier; if (clientRID.equals(ClientRemoteIdentifier.NONE)) { LOG.log(Level.FINE, "Instantiated 'ClientConnection' without an actual connection to the client."); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/client/ClientManager.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/client/ClientManager.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/client/ClientManager.java index 8540837..8c9454f 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/client/ClientManager.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/client/ClientManager.java @@ -44,7 +44,7 @@ import java.util.logging.Logger; @DriverSide public final class ClientManager implements EventHandler<ClientRuntimeProtocol.JobControlProto> { - private final static Logger LOG = Logger.getLogger(ClientManager.class.getName()); + private static final Logger LOG = Logger.getLogger(ClientManager.class.getName()); private final InjectionFuture<Set<EventHandler<Void>>> clientCloseHandlers; @@ -63,10 +63,10 @@ public final class ClientManager implements EventHandler<ClientRuntimeProtocol.J @Inject - ClientManager(final @Parameter(ClientCloseHandlers.class) InjectionFuture<Set<EventHandler<Void>>> clientCloseHandlers, - final @Parameter(ClientCloseWithMessageHandlers.class) InjectionFuture<Set<EventHandler<byte[]>>> clientCloseWithMessageHandlers, - final @Parameter(ClientMessageHandlers.class) InjectionFuture<Set<EventHandler<byte[]>>> clientMessageHandlers, - final @Parameter(ClientRemoteIdentifier.class) String clientRID, + ClientManager(@Parameter(ClientCloseHandlers.class) final InjectionFuture<Set<EventHandler<Void>>> clientCloseHandlers, + @Parameter(ClientCloseWithMessageHandlers.class) final InjectionFuture<Set<EventHandler<byte[]>>> clientCloseWithMessageHandlers, + @Parameter(ClientMessageHandlers.class) final InjectionFuture<Set<EventHandler<byte[]>>> clientMessageHandlers, + @Parameter(ClientRemoteIdentifier.class) final String clientRID, final RemoteManager remoteManager, final DriverStatusManager driverStatusManager) { this.driverStatusManager = driverStatusManager; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/ContextControlHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/ContextControlHandler.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/ContextControlHandler.java index 9b9ca9c..29f8b17 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/ContextControlHandler.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/ContextControlHandler.java @@ -45,7 +45,7 @@ public class ContextControlHandler { */ @Inject ContextControlHandler(final EvaluatorControlHandler evaluatorControlHandler, - final @Parameter(EvaluatorManager.EvaluatorIdentifier.class) String evaluatorId) { + @Parameter(EvaluatorManager.EvaluatorIdentifier.class) final String evaluatorId) { this.evaluatorControlHandler = evaluatorControlHandler; this.evaluatorId = evaluatorId; LOG.log(Level.FINE, "Instantiated 'ContextControlHandler'"); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/ContextFactory.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/ContextFactory.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/ContextFactory.java index f5a41e2..d6d358f 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/ContextFactory.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/ContextFactory.java @@ -53,8 +53,8 @@ final class ContextFactory { @Inject - ContextFactory(final @Parameter(EvaluatorManager.EvaluatorIdentifier.class) String evaluatorId, - final @Parameter(EvaluatorManager.EvaluatorDescriptorName.class) EvaluatorDescriptor evaluatorDescriptor, + ContextFactory(@Parameter(EvaluatorManager.EvaluatorIdentifier.class) final String evaluatorId, + @Parameter(EvaluatorManager.EvaluatorDescriptorName.class) final EvaluatorDescriptor evaluatorDescriptor, final ConfigurationSerializer configurationSerializer, final ExceptionCodec exceptionCodec, final EvaluatorMessageDispatcher messageDispatcher, http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/EvaluatorContext.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/EvaluatorContext.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/EvaluatorContext.java index 3cefc12..89db579 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/EvaluatorContext.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/EvaluatorContext.java @@ -43,7 +43,7 @@ import java.util.logging.Logger; @Private public final class EvaluatorContext implements ActiveContext { - private final static Logger LOG = Logger.getLogger(EvaluatorContext.class.getName()); + private static final Logger LOG = Logger.getLogger(EvaluatorContext.class.getName()); private final String contextIdentifier; private final String evaluatorIdentifier; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/AllocatedEvaluatorImpl.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/AllocatedEvaluatorImpl.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/AllocatedEvaluatorImpl.java index 0bdf420..0cd1bbb 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/AllocatedEvaluatorImpl.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/AllocatedEvaluatorImpl.java @@ -53,7 +53,7 @@ import java.util.logging.Logger; @Private final class AllocatedEvaluatorImpl implements AllocatedEvaluator { - private final static Logger LOG = Logger.getLogger(AllocatedEvaluatorImpl.class.getName()); + private static final Logger LOG = Logger.getLogger(AllocatedEvaluatorImpl.class.getName()); private final EvaluatorManager evaluatorManager; private final String remoteID; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorControlHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorControlHandler.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorControlHandler.java index 014d62c..e648b87 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorControlHandler.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorControlHandler.java @@ -50,7 +50,7 @@ public final class EvaluatorControlHandler { @Inject EvaluatorControlHandler(final EvaluatorStatusManager stateManager, final RemoteManager remoteManager, - final @Parameter(EvaluatorManager.EvaluatorIdentifier.class) String evaluatorId) { + @Parameter(EvaluatorManager.EvaluatorIdentifier.class) final String evaluatorId) { this.stateManager = stateManager; this.remoteManager = remoteManager; this.evaluatorId = evaluatorId; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorManager.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorManager.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorManager.java index ea677e6..cb3c14a 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorManager.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorManager.java @@ -82,7 +82,7 @@ import java.util.logging.Logger; @DriverSide public final class EvaluatorManager implements Identifiable, AutoCloseable { - private final static Logger LOG = Logger.getLogger(EvaluatorManager.class.getName()); + private static final Logger LOG = Logger.getLogger(EvaluatorManager.class.getName()); private final EvaluatorHeartBeatSanityChecker sanityChecker = new EvaluatorHeartBeatSanityChecker(); private final Clock clock; @@ -109,8 +109,8 @@ public final class EvaluatorManager implements Identifiable, AutoCloseable { final RemoteManager remoteManager, final ResourceReleaseHandler resourceReleaseHandler, final ResourceLaunchHandler resourceLaunchHandler, - final @Parameter(EvaluatorIdentifier.class) String evaluatorId, - final @Parameter(EvaluatorDescriptorName.class) EvaluatorDescriptorImpl evaluatorDescriptor, + @Parameter(EvaluatorIdentifier.class) final String evaluatorId, + @Parameter(EvaluatorDescriptorName.class) final EvaluatorDescriptorImpl evaluatorDescriptor, final ContextRepresenters contextRepresenters, final ConfigurationSerializer configurationSerializer, final EvaluatorMessageDispatcher messageDispatcher, @@ -121,7 +121,7 @@ public final class EvaluatorManager implements Identifiable, AutoCloseable { final ExceptionCodec exceptionCodec, final EventHandlerIdlenessSource idlenessSource, final LoggingScopeFactory loggingScopeFactory, - final @Parameter(EvaluatorConfigurationProviders.class) Set<ConfigurationProvider> evaluatorConfigurationProviders, + @Parameter(EvaluatorConfigurationProviders.class) final Set<ConfigurationProvider> evaluatorConfigurationProviders, // TODO: Eventually remove the factories when they are removed from AllocatedEvaluatorImpl final JVMProcessFactory jvmProcessFactory, final CLRProcessFactory clrProcessFactory) { @@ -550,10 +550,10 @@ public final class EvaluatorManager implements Identifiable, AutoCloseable { // Dynamic Parameters @NamedParameter(doc = "The Evaluator Identifier.") - public final static class EvaluatorIdentifier implements Name<String> { + public static final class EvaluatorIdentifier implements Name<String> { } @NamedParameter(doc = "The Evaluator Host.") - public final static class EvaluatorDescriptorName implements Name<EvaluatorDescriptorImpl> { + public static final class EvaluatorDescriptorName implements Name<EvaluatorDescriptorImpl> { } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorMessageDispatcher.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorMessageDispatcher.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorMessageDispatcher.java index ef6be8e..a4f1273 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorMessageDispatcher.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorMessageDispatcher.java @@ -69,48 +69,48 @@ public final class EvaluatorMessageDispatcher { @Inject EvaluatorMessageDispatcher( // Application-provided Context event handlers - final @Parameter(ContextActiveHandlers.class) Set<EventHandler<ActiveContext>> contextActiveHandlers, - final @Parameter(ContextClosedHandlers.class) Set<EventHandler<ClosedContext>> contextClosedHandlers, - final @Parameter(ContextFailedHandlers.class) Set<EventHandler<FailedContext>> contextFailedHandlers, - final @Parameter(ContextMessageHandlers.class) Set<EventHandler<ContextMessage>> contextMessageHandlers, + @Parameter(ContextActiveHandlers.class) final Set<EventHandler<ActiveContext>> contextActiveHandlers, + @Parameter(ContextClosedHandlers.class) final Set<EventHandler<ClosedContext>> contextClosedHandlers, + @Parameter(ContextFailedHandlers.class) final Set<EventHandler<FailedContext>> contextFailedHandlers, + @Parameter(ContextMessageHandlers.class) final Set<EventHandler<ContextMessage>> contextMessageHandlers, // Service-provided Context event handlers - final @Parameter(ServiceContextActiveHandlers.class) Set<EventHandler<ActiveContext>> serviceContextActiveHandlers, - final @Parameter(ServiceContextClosedHandlers.class) Set<EventHandler<ClosedContext>> serviceContextClosedHandlers, - final @Parameter(ServiceContextFailedHandlers.class) Set<EventHandler<FailedContext>> serviceContextFailedHandlers, - final @Parameter(ServiceContextMessageHandlers.class) Set<EventHandler<ContextMessage>> serviceContextMessageHandlers, + @Parameter(ServiceContextActiveHandlers.class) final Set<EventHandler<ActiveContext>> serviceContextActiveHandlers, + @Parameter(ServiceContextClosedHandlers.class) final Set<EventHandler<ClosedContext>> serviceContextClosedHandlers, + @Parameter(ServiceContextFailedHandlers.class) final Set<EventHandler<FailedContext>> serviceContextFailedHandlers, + @Parameter(ServiceContextMessageHandlers.class) final Set<EventHandler<ContextMessage>> serviceContextMessageHandlers, // Application-provided Task event handlers - final @Parameter(TaskRunningHandlers.class) Set<EventHandler<RunningTask>> taskRunningHandlers, - final @Parameter(TaskCompletedHandlers.class) Set<EventHandler<CompletedTask>> taskCompletedHandlers, - final @Parameter(TaskSuspendedHandlers.class) Set<EventHandler<SuspendedTask>> taskSuspendedHandlers, - final @Parameter(TaskMessageHandlers.class) Set<EventHandler<TaskMessage>> taskMessageEventHandlers, - final @Parameter(TaskFailedHandlers.class) Set<EventHandler<FailedTask>> taskExceptionEventHandlers, + @Parameter(TaskRunningHandlers.class) final Set<EventHandler<RunningTask>> taskRunningHandlers, + @Parameter(TaskCompletedHandlers.class) final Set<EventHandler<CompletedTask>> taskCompletedHandlers, + @Parameter(TaskSuspendedHandlers.class) final Set<EventHandler<SuspendedTask>> taskSuspendedHandlers, + @Parameter(TaskMessageHandlers.class) final Set<EventHandler<TaskMessage>> taskMessageEventHandlers, + @Parameter(TaskFailedHandlers.class) final Set<EventHandler<FailedTask>> taskExceptionEventHandlers, // Service-provided Task event handlers - final @Parameter(ServiceTaskRunningHandlers.class) Set<EventHandler<RunningTask>> serviceTaskRunningEventHandlers, - final @Parameter(ServiceTaskCompletedHandlers.class) Set<EventHandler<CompletedTask>> serviceTaskCompletedEventHandlers, - final @Parameter(ServiceTaskSuspendedHandlers.class) Set<EventHandler<SuspendedTask>> serviceTaskSuspendedEventHandlers, - final @Parameter(ServiceTaskMessageHandlers.class) Set<EventHandler<TaskMessage>> serviceTaskMessageEventHandlers, - final @Parameter(ServiceTaskFailedHandlers.class) Set<EventHandler<FailedTask>> serviceTaskExceptionEventHandlers, + @Parameter(ServiceTaskRunningHandlers.class) final Set<EventHandler<RunningTask>> serviceTaskRunningEventHandlers, + @Parameter(ServiceTaskCompletedHandlers.class) final Set<EventHandler<CompletedTask>> serviceTaskCompletedEventHandlers, + @Parameter(ServiceTaskSuspendedHandlers.class) final Set<EventHandler<SuspendedTask>> serviceTaskSuspendedEventHandlers, + @Parameter(ServiceTaskMessageHandlers.class) final Set<EventHandler<TaskMessage>> serviceTaskMessageEventHandlers, + @Parameter(ServiceTaskFailedHandlers.class) final Set<EventHandler<FailedTask>> serviceTaskExceptionEventHandlers, // Application-provided Evaluator event handlers - final @Parameter(EvaluatorAllocatedHandlers.class) Set<EventHandler<AllocatedEvaluator>> evaluatorAllocatedHandlers, - final @Parameter(EvaluatorFailedHandlers.class) Set<EventHandler<FailedEvaluator>> evaluatorFailedHandlers, - final @Parameter(EvaluatorCompletedHandlers.class) Set<EventHandler<CompletedEvaluator>> evaluatorCompletedHandlers, + @Parameter(EvaluatorAllocatedHandlers.class) final Set<EventHandler<AllocatedEvaluator>> evaluatorAllocatedHandlers, + @Parameter(EvaluatorFailedHandlers.class) final Set<EventHandler<FailedEvaluator>> evaluatorFailedHandlers, + @Parameter(EvaluatorCompletedHandlers.class) final Set<EventHandler<CompletedEvaluator>> evaluatorCompletedHandlers, // Service-provided Evaluator event handlers - final @Parameter(ServiceEvaluatorAllocatedHandlers.class) Set<EventHandler<AllocatedEvaluator>> serviceEvaluatorAllocatedEventHandlers, - final @Parameter(ServiceEvaluatorFailedHandlers.class) Set<EventHandler<FailedEvaluator>> serviceEvaluatorFailedHandlers, - final @Parameter(ServiceEvaluatorCompletedHandlers.class) Set<EventHandler<CompletedEvaluator>> serviceEvaluatorCompletedHandlers, + @Parameter(ServiceEvaluatorAllocatedHandlers.class) final Set<EventHandler<AllocatedEvaluator>> serviceEvaluatorAllocatedEventHandlers, + @Parameter(ServiceEvaluatorFailedHandlers.class) final Set<EventHandler<FailedEvaluator>> serviceEvaluatorFailedHandlers, + @Parameter(ServiceEvaluatorCompletedHandlers.class) final Set<EventHandler<CompletedEvaluator>> serviceEvaluatorCompletedHandlers, // Application event handlers specific to a Driver restart - final @Parameter(DriverRestartTaskRunningHandlers.class) Set<EventHandler<RunningTask>> driverRestartTaskRunningHandlers, - final @Parameter(DriverRestartContextActiveHandlers.class) Set<EventHandler<ActiveContext>> driverRestartActiveContextHandlers, - final @Parameter(DriverRestartCompletedHandlers.class) Set<EventHandler<DriverRestartCompleted>> driverRestartCompletedHandlers, + @Parameter(DriverRestartTaskRunningHandlers.class) final Set<EventHandler<RunningTask>> driverRestartTaskRunningHandlers, + @Parameter(DriverRestartContextActiveHandlers.class) final Set<EventHandler<ActiveContext>> driverRestartActiveContextHandlers, + @Parameter(DriverRestartCompletedHandlers.class) final Set<EventHandler<DriverRestartCompleted>> driverRestartCompletedHandlers, // Service-provided event handlers specific to a Driver restart - final @Parameter(ServiceDriverRestartTaskRunningHandlers.class) Set<EventHandler<RunningTask>> serviceDriverRestartTaskRunningHandlers, - final @Parameter(ServiceDriverRestartContextActiveHandlers.class) Set<EventHandler<ActiveContext>> serviceDriverRestartActiveContextHandlers, - final @Parameter(ServiceDriverRestartCompletedHandlers.class) Set<EventHandler<DriverRestartCompleted>> serviceDriverRestartCompletedHandlers, + @Parameter(ServiceDriverRestartTaskRunningHandlers.class) final Set<EventHandler<RunningTask>> serviceDriverRestartTaskRunningHandlers, + @Parameter(ServiceDriverRestartContextActiveHandlers.class) final Set<EventHandler<ActiveContext>> serviceDriverRestartActiveContextHandlers, + @Parameter(ServiceDriverRestartCompletedHandlers.class) final Set<EventHandler<DriverRestartCompleted>> serviceDriverRestartCompletedHandlers, - final @Parameter(EvaluatorDispatcherThreads.class) int numberOfThreads, - final @Parameter(EvaluatorManager.EvaluatorIdentifier.class) String evaluatorIdentifier, + @Parameter(EvaluatorDispatcherThreads.class) final int numberOfThreads, + @Parameter(EvaluatorManager.EvaluatorIdentifier.class) final String evaluatorIdentifier, final DriverExceptionHandler driverExceptionHandler) { this.serviceDispatcher = new DispatchingEStage(driverExceptionHandler, numberOfThreads, evaluatorIdentifier); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/idle/DriverIdleManager.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/idle/DriverIdleManager.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/idle/DriverIdleManager.java index b82a26e..548ec1d 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/idle/DriverIdleManager.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/idle/DriverIdleManager.java @@ -38,7 +38,7 @@ public final class DriverIdleManager { private final InjectionFuture<DriverStatusManager> driverStatusManager; @Inject - DriverIdleManager(final @Parameter(DriverIdleSources.class) Set<DriverIdlenessSource> idlenessSources, + DriverIdleManager(@Parameter(DriverIdleSources.class) final Set<DriverIdlenessSource> idlenessSources, final InjectionFuture<DriverStatusManager> driverStatusManager) { this.idlenessSources = idlenessSources; this.driverStatusManager = driverStatusManager; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/task/RunningTaskImpl.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/task/RunningTaskImpl.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/task/RunningTaskImpl.java index 41f6918..887159f 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/task/RunningTaskImpl.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/task/RunningTaskImpl.java @@ -41,7 +41,7 @@ import java.util.logging.Logger; @DriverSide public final class RunningTaskImpl implements RunningTask { - private final static Logger LOG = Logger.getLogger(RunningTask.class.getName()); + private static final Logger LOG = Logger.getLogger(RunningTask.class.getName()); private final EvaluatorManager evaluatorManager; private final EvaluatorContext evaluatorContext; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/EvaluatorConfiguration.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/EvaluatorConfiguration.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/EvaluatorConfiguration.java index e48e927..48e1f25 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/EvaluatorConfiguration.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/EvaluatorConfiguration.java @@ -54,7 +54,7 @@ public final class EvaluatorConfiguration extends ConfigurationModuleBuilder { .bindNamedParameter(ApplicationIdentifier.class, APPLICATION_IDENTIFIER) .build(); - private final static class ExecutorServiceConstructor implements ExternalConstructor<ExecutorService> { + private static final class ExecutorServiceConstructor implements ExternalConstructor<ExecutorService> { @Inject ExecutorServiceConstructor() { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/EvaluatorRuntime.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/EvaluatorRuntime.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/EvaluatorRuntime.java index baea749..1f6974f 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/EvaluatorRuntime.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/EvaluatorRuntime.java @@ -44,7 +44,7 @@ import java.util.logging.Logger; @EvaluatorSide final class EvaluatorRuntime implements EventHandler<EvaluatorControlProto> { - private final static Logger LOG = Logger.getLogger(EvaluatorRuntime.class.getName()); + private static final Logger LOG = Logger.getLogger(EvaluatorRuntime.class.getName()); private final HeartBeatManager heartBeatManager; private final ContextManager contextManager; @@ -58,9 +58,9 @@ final class EvaluatorRuntime implements EventHandler<EvaluatorControlProto> { @Inject private EvaluatorRuntime( - final @Parameter(HeartbeatPeriod.class) int heartbeatPeriod, - final @Parameter(EvaluatorIdentifier.class) String evaluatorIdentifier, - final @Parameter(DriverRemoteIdentifier.class) String driverRID, + @Parameter(HeartbeatPeriod.class) final int heartbeatPeriod, + @Parameter(EvaluatorIdentifier.class) final String evaluatorIdentifier, + @Parameter(DriverRemoteIdentifier.class) final String driverRID, final HeartBeatManager.HeartbeatAlarmHandler heartbeatAlarmHandler, final HeartBeatManager heartBeatManager, final Clock clock, http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/HeartBeatManager.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/HeartBeatManager.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/HeartBeatManager.java index d85e8aa..5bb8d4e 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/HeartBeatManager.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/HeartBeatManager.java @@ -55,8 +55,8 @@ public class HeartBeatManager { final InjectionFuture<ContextManager> contextManager, final Clock clock, final RemoteManager remoteManager, - final @Parameter(HeartbeatPeriod.class) int heartbeatPeriod, - final @Parameter(DriverRemoteIdentifier.class) String driverRID) { + @Parameter(HeartbeatPeriod.class) final int heartbeatPeriod, + @Parameter(DriverRemoteIdentifier.class) final String driverRID) { this.evaluatorRuntime = evaluatorRuntime; this.contextManager = contextManager; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/ContextLifeCycle.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/ContextLifeCycle.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/ContextLifeCycle.java index dbb090b..964489b 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/ContextLifeCycle.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/ContextLifeCycle.java @@ -43,11 +43,11 @@ final class ContextLifeCycle { private final EventHandler<byte[]> contextMessageHandler; @Inject - ContextLifeCycle(final @Parameter(ContextIdentifier.class) String identifier, - final @Parameter(ContextMessageHandlers.class) Set<EventHandler<byte[]>> contextMessageHandlers, - final @Parameter(ContextStartHandlers.class) Set<EventHandler<ContextStart>> contextStartHandlers, - final @Parameter(ContextStopHandlers.class) Set<EventHandler<ContextStop>> contextStopHandlers, - final @Parameter(ContextMessageSources.class) Set<ContextMessageSource> contextMessageSources) { + ContextLifeCycle(@Parameter(ContextIdentifier.class) final String identifier, + @Parameter(ContextMessageHandlers.class) final Set<EventHandler<byte[]>> contextMessageHandlers, + @Parameter(ContextStartHandlers.class) final Set<EventHandler<ContextStart>> contextStartHandlers, + @Parameter(ContextStopHandlers.class) final Set<EventHandler<ContextStop>> contextStopHandlers, + @Parameter(ContextMessageSources.class) final Set<ContextMessageSource> contextMessageSources) { this.identifier = identifier; this.contextStartHandlers = contextStartHandlers; this.contextStopHandlers = contextStopHandlers; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/RootContextLauncher.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/RootContextLauncher.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/RootContextLauncher.java index 0802507..34078c9 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/RootContextLauncher.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/RootContextLauncher.java @@ -44,9 +44,9 @@ final class RootContextLauncher { private ContextRuntime rootContext = null; @Inject - RootContextLauncher(final @Parameter(RootContextConfiguration.class) String rootContextConfiguration, - final @Parameter(RootServiceConfiguration.class) String rootServiceConfiguration, - final @Parameter(InitialTaskConfiguration.class) String initialTaskConfiguration, + RootContextLauncher(@Parameter(RootContextConfiguration.class) final String rootContextConfiguration, + @Parameter(RootServiceConfiguration.class) final String rootServiceConfiguration, + @Parameter(InitialTaskConfiguration.class) final String initialTaskConfiguration, final Injector injector, final ConfigurationSerializer configurationSerializer) throws IOException, BindException { this.injector = injector; this.configurationSerializer = configurationSerializer; @@ -56,9 +56,9 @@ final class RootContextLauncher { } @Inject - RootContextLauncher(final @Parameter(RootContextConfiguration.class) String rootContextConfiguration, + RootContextLauncher(@Parameter(RootContextConfiguration.class) final String rootContextConfiguration, final Injector injector, - final @Parameter(RootServiceConfiguration.class) String rootServiceConfiguration, final ConfigurationSerializer configurationSerializer) throws IOException, BindException { + @Parameter(RootServiceConfiguration.class) final String rootServiceConfiguration, final ConfigurationSerializer configurationSerializer) throws IOException, BindException { this.injector = injector; this.configurationSerializer = configurationSerializer; this.rootContextConfiguration = this.configurationSerializer.fromString(rootContextConfiguration); @@ -68,8 +68,8 @@ final class RootContextLauncher { @Inject RootContextLauncher(final Injector injector, - final @Parameter(RootContextConfiguration.class) String rootContextConfiguration, - final @Parameter(InitialTaskConfiguration.class) String initialTaskConfiguration, final ConfigurationSerializer configurationSerializer) throws IOException, BindException { + @Parameter(RootContextConfiguration.class) final String rootContextConfiguration, + @Parameter(InitialTaskConfiguration.class) final String initialTaskConfiguration, final ConfigurationSerializer configurationSerializer) throws IOException, BindException { this.injector = injector; this.configurationSerializer = configurationSerializer; this.rootContextConfiguration = this.configurationSerializer.fromString(rootContextConfiguration); @@ -78,7 +78,7 @@ final class RootContextLauncher { } @Inject - RootContextLauncher(final @Parameter(RootContextConfiguration.class) String rootContextConfiguration, + RootContextLauncher(@Parameter(RootContextConfiguration.class) final String rootContextConfiguration, final Injector injector, final ConfigurationSerializer configurationSerializer) throws IOException, BindException { this.injector = injector; this.configurationSerializer = configurationSerializer; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/defaults/DefaultContextMessageHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/defaults/DefaultContextMessageHandler.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/defaults/DefaultContextMessageHandler.java index 9791d06..827aeac 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/defaults/DefaultContextMessageHandler.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/defaults/DefaultContextMessageHandler.java @@ -34,7 +34,7 @@ public final class DefaultContextMessageHandler implements ContextMessageHandler private final String contextID; @Inject - DefaultContextMessageHandler(final @Parameter(ContextIdentifier.class) String contextID) { + DefaultContextMessageHandler(@Parameter(ContextIdentifier.class) final String contextID) { this.contextID = contextID; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskLifeCycleHandlers.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskLifeCycleHandlers.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskLifeCycleHandlers.java index 6a3543f..403f546 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskLifeCycleHandlers.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskLifeCycleHandlers.java @@ -46,8 +46,8 @@ final class TaskLifeCycleHandlers { private final TaskStop taskStop; @Inject - TaskLifeCycleHandlers(final @Parameter(TaskConfigurationOptions.StopHandlers.class) Set<EventHandler<TaskStop>> taskStopHandlers, - final @Parameter(TaskConfigurationOptions.StartHandlers.class) Set<EventHandler<TaskStart>> taskStartHandlers, + TaskLifeCycleHandlers(@Parameter(TaskConfigurationOptions.StopHandlers.class) final Set<EventHandler<TaskStop>> taskStopHandlers, + @Parameter(TaskConfigurationOptions.StartHandlers.class) final Set<EventHandler<TaskStart>> taskStartHandlers, final TaskStartImpl taskStart, final TaskStopImpl taskStop) { this.taskStopHandlers = taskStopHandlers; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskRuntime.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskRuntime.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskRuntime.java index 6be5875..de63d60 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskRuntime.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskRuntime.java @@ -45,7 +45,7 @@ import java.util.logging.Logger; @EvaluatorSide public final class TaskRuntime implements Runnable { - private final static Logger LOG = Logger.getLogger(TaskRuntime.class.getName()); + private static final Logger LOG = Logger.getLogger(TaskRuntime.class.getName()); /** * User supplied Task code. @@ -75,9 +75,9 @@ public final class TaskRuntime implements Runnable { final HeartBeatManager heartBeatManager, final Task task, final TaskStatus currentStatus, - final @Parameter(TaskConfigurationOptions.CloseHandler.class) InjectionFuture<EventHandler<CloseEvent>> f_closeHandler, - final @Parameter(TaskConfigurationOptions.SuspendHandler.class) InjectionFuture<EventHandler<SuspendEvent>> f_suspendHandler, - final @Parameter(TaskConfigurationOptions.MessageHandler.class) InjectionFuture<EventHandler<DriverMessage>> f_messageHandler, + @Parameter(TaskConfigurationOptions.CloseHandler.class) final InjectionFuture<EventHandler<CloseEvent>> f_closeHandler, + @Parameter(TaskConfigurationOptions.SuspendHandler.class) final InjectionFuture<EventHandler<SuspendEvent>> f_suspendHandler, + @Parameter(TaskConfigurationOptions.MessageHandler.class) final InjectionFuture<EventHandler<DriverMessage>> f_messageHandler, final TaskLifeCycleHandlers taskLifeCycleHandlers) { this(heartBeatManager, task, currentStatus, f_closeHandler, f_suspendHandler, f_messageHandler, null, taskLifeCycleHandlers); } @@ -88,10 +88,10 @@ public final class TaskRuntime implements Runnable { final HeartBeatManager heartBeatManager, final Task task, final TaskStatus currentStatus, - final @Parameter(TaskConfigurationOptions.CloseHandler.class) InjectionFuture<EventHandler<CloseEvent>> f_closeHandler, - final @Parameter(TaskConfigurationOptions.SuspendHandler.class) InjectionFuture<EventHandler<SuspendEvent>> f_suspendHandler, - final @Parameter(TaskConfigurationOptions.MessageHandler.class) InjectionFuture<EventHandler<DriverMessage>> f_messageHandler, - final @Parameter(TaskConfigurationOptions.Memento.class) String memento, + @Parameter(TaskConfigurationOptions.CloseHandler.class) final InjectionFuture<EventHandler<CloseEvent>> f_closeHandler, + @Parameter(TaskConfigurationOptions.SuspendHandler.class) final InjectionFuture<EventHandler<SuspendEvent>> f_suspendHandler, + @Parameter(TaskConfigurationOptions.MessageHandler.class) final InjectionFuture<EventHandler<DriverMessage>> f_messageHandler, + @Parameter(TaskConfigurationOptions.Memento.class) final String memento, final TaskLifeCycleHandlers taskLifeCycleHandlers) { this.heartBeatManager = heartBeatManager; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskStartImpl.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskStartImpl.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskStartImpl.java index c12db85..1bbdbf8 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskStartImpl.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskStartImpl.java @@ -32,7 +32,7 @@ final class TaskStartImpl implements TaskStart { private final String id; @Inject - TaskStartImpl(final @Parameter(TaskConfigurationOptions.Identifier.class) String id) { + TaskStartImpl(@Parameter(TaskConfigurationOptions.Identifier.class) final String id) { this.id = id; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskStatus.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskStatus.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskStatus.java index b2c3781..11a63a5 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskStatus.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskStatus.java @@ -54,9 +54,9 @@ public final class TaskStatus { @Inject - TaskStatus(final @Parameter(TaskConfigurationOptions.Identifier.class) String taskId, - final @Parameter(ContextIdentifier.class) String contextId, - final @Parameter(TaskConfigurationOptions.TaskMessageSources.class) Set<TaskMessageSource> evaluatorMessageSources, + TaskStatus(@Parameter(TaskConfigurationOptions.Identifier.class) final String taskId, + @Parameter(ContextIdentifier.class) final String contextId, + @Parameter(TaskConfigurationOptions.TaskMessageSources.class) final Set<TaskMessageSource> evaluatorMessageSources, final HeartBeatManager heartBeatManager, final ExceptionCodec exceptionCodec) { this.taskId = taskId; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskStopImpl.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskStopImpl.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskStopImpl.java index d7df089..0a423a9 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskStopImpl.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskStopImpl.java @@ -31,7 +31,7 @@ final class TaskStopImpl implements TaskStop { private final String id; @Inject - TaskStopImpl(final @Parameter(TaskConfigurationOptions.Identifier.class) String id) { + TaskStopImpl(@Parameter(TaskConfigurationOptions.Identifier.class) final String id) { this.id = id; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/files/JobJarMaker.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/files/JobJarMaker.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/files/JobJarMaker.java index 2d9813c..d700b2a 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/files/JobJarMaker.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/files/JobJarMaker.java @@ -52,7 +52,7 @@ public final class JobJarMaker { @Inject JobJarMaker(final ConfigurationSerializer configurationSerializer, final REEFFileNames fileNames, - final @Parameter(DeleteTempFiles.class) boolean deleteTempFilesOnExit) { + @Parameter(DeleteTempFiles.class) final boolean deleteTempFilesOnExit) { this.configurationSerializer = configurationSerializer; this.fileNames = fileNames; this.deleteTempFilesOnExit = deleteTempFilesOnExit; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/LaunchClass.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/LaunchClass.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/LaunchClass.java index dfe9882..421b528 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/LaunchClass.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/LaunchClass.java @@ -56,10 +56,10 @@ public final class LaunchClass implements AutoCloseable, Runnable { @Inject LaunchClass(final REEFUncaughtExceptionHandler uncaughtExceptionHandler, final REEFErrorHandler errorHandler, - final @Parameter(LaunchID.class) String launchID, - final @Parameter(ErrorHandlerRID.class) String errorHandlerID, - final @Parameter(ClockConfigurationPath.class) String evaluatorConfigurationPath, - final @Parameter(ProfilingEnabled.class) boolean enableProfiling, + @Parameter(LaunchID.class) final String launchID, + @Parameter(ErrorHandlerRID.class) final String errorHandlerID, + @Parameter(ClockConfigurationPath.class) final String evaluatorConfigurationPath, + @Parameter(ProfilingEnabled.class) final boolean enableProfiling, final ConfigurationSerializer configurationSerializer, final REEFVersion reefVersion) { reefVersion.logVersion(); @@ -182,6 +182,6 @@ public final class LaunchClass implements AutoCloseable, Runnable { } @NamedParameter(doc = "If true, profiling will be enabled", short_name = "profiling", default_value = "false") - public final static class ProfilingEnabled implements Name<Boolean> { + public static final class ProfilingEnabled implements Name<Boolean> { } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/2b374dfa/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/ProfilingStopHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/ProfilingStopHandler.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/ProfilingStopHandler.java index 282c2d4..575b0a4 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/ProfilingStopHandler.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/ProfilingStopHandler.java @@ -39,7 +39,7 @@ final class ProfilingStopHandler implements EventHandler<StopTime> { private final String launchID; @Inject - public ProfilingStopHandler(final @Parameter(LaunchID.class) String launchID) { + public ProfilingStopHandler(@Parameter(LaunchID.class) final String launchID) { this.launchID = launchID; }
