Repository: incubator-reef Updated Branches: refs/heads/master 8505dee94 -> 13ffefeab
[REEF-439] Fix violations of HiddenField checkstyle This addressed the issue by * Configuring the check to ignore setters * Suppressing check for violations in setters which are not recognized as such * Fixing actual violations JIRA: [REEF-439](https://issues.apache.org/jira/browse/REEF-439) Pull Request: This closes #300 Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/13ffefea Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/13ffefea Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/13ffefea Branch: refs/heads/master Commit: 13ffefeab80dfde3cfc20b7018ba7f535d95e1b6 Parents: 8505dee Author: Mariia Mykhailova <[email protected]> Authored: Thu Jul 16 14:53:06 2015 -0700 Committer: Markus Weimer <[email protected]> Committed: Fri Jul 17 13:02:11 2015 -0700 ---------------------------------------------------------------------- .../reef/javabridge/generic/JobClient.java | 1 + .../org/apache/reef/client/DriverLauncher.java | 1 + .../reef/driver/evaluator/EvaluatorRequest.java | 3 ++ .../common/driver/context/EvaluatorContext.java | 6 ++-- .../evaluator/context/ContextRuntime.java | 12 ++++---- .../common/evaluator/task/TaskStatus.java | 16 +++++------ .../runtime/common/files/ClasspathProvider.java | 20 ++++++------- .../common/launch/CLRLaunchCommandBuilder.java | 1 + .../common/launch/JavaLaunchCommandBuilder.java | 2 ++ .../runtime/common/utils/DispatchingEStage.java | 1 + .../main/java/org/apache/reef/util/SetOnce.java | 1 + .../reef/util/logging/LoggingScopeImpl.java | 10 +++---- .../src/main/resources/checkstyle.xml | 3 +- .../reef/examples/group/bgd/MasterTask.java | 6 ++-- .../hellohttp/HttpServerShellCmdtHandler.java | 4 +-- .../loading/api/DataLoadingRequestBuilder.java | 4 +++ .../io/data/loading/api/DistributedDataSet.java | 1 + .../group/impl/config/ReduceOperatorSpec.java | 1 + .../network/group/impl/driver/FlatTopology.java | 9 +++--- .../network/group/impl/driver/TaskNodeImpl.java | 12 ++++---- .../group/impl/driver/TaskNodeStatusImpl.java | 8 +++--- .../network/group/impl/driver/TreeTopology.java | 11 +++---- .../group/impl/task/OperatorTopologyImpl.java | 6 ++-- .../impl/task/OperatorTopologyStructImpl.java | 8 +++--- .../io/network/naming/NameLookupClient.java | 16 +++++------ .../reef/io/storage/FramingOutputStream.java | 8 +++--- .../runtime/hdinsight/client/AzureUploader.java | 5 ++-- .../client/yarnrest/ApplicationState.java | 1 + .../client/yarnrest/ApplicationSubmission.java | 1 + .../runtime/local/driver/ProcessContainer.java | 1 + .../runtime/mesos/driver/REEFScheduler.java | 7 +++-- .../runtime/yarn/client/uploader/JobFolder.java | 4 +-- .../yarn/driver/YarnContainerManager.java | 1 + .../tang/implementation/ListInjectionPlan.java | 18 ++++++------ .../tang/implementation/SetInjectionPlan.java | 18 ++++++------ .../tang/implementation/StackBindLocation.java | 6 ++-- .../reef/tang/implementation/Subplan.java | 6 ++-- .../tang/implementation/java/InjectorImpl.java | 30 ++++++++++---------- .../java/org/apache/reef/tang/util/Tint.java | 12 ++++---- .../reef/tang/util/TracingMonotonicTreeMap.java | 1 + .../reef/tang/util/ValidateConfiguration.java | 4 +-- .../reef/tests/fail/driver/FailDriver.java | 4 +++ .../tests/fail/driver/FailDriverDelayedMsg.java | 1 + .../tests/messaging/task/TaskMessagingTask.java | 6 ++-- .../impl/DefaultRemoteManagerFactory.java | 4 +++ .../netty/NettyMessagingTransport.java | 10 +++---- .../reef/wake/time/runtime/RuntimeClock.java | 1 + .../apache/reef/webserver/HttpServerImpl.java | 12 ++++---- .../reef/webserver/ReefEventStateManager.java | 2 ++ 49 files changed, 181 insertions(+), 145 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobClient.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobClient.java b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobClient.java index 7c91742..da80dff 100644 --- a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobClient.java +++ b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobClient.java @@ -219,6 +219,7 @@ public class JobClient { /** * Set the driver memory. */ + @SuppressWarnings("checkstyle:hiddenfield") public void setDriverInfo(final String identifier, final int memory, final String jobSubmissionDirectory) { if (identifier == null || identifier.isEmpty()) { throw new RuntimeException("driver id cannot be null or empty"); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-common/src/main/java/org/apache/reef/client/DriverLauncher.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/client/DriverLauncher.java b/lang/java/reef-common/src/main/java/org/apache/reef/client/DriverLauncher.java index 3ffb8fe..5dd9ab2 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/client/DriverLauncher.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/client/DriverLauncher.java @@ -158,6 +158,7 @@ public final class DriverLauncher { /** * Update job status and notify the waiting thread. */ + @SuppressWarnings("checkstyle:hiddenfield") public synchronized void setStatusAndNotify(final LauncherStatus status) { LOG.log(Level.FINEST, "Set status: {0} -> {1}", new Object[]{this.status, status}); this.status = status; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-common/src/main/java/org/apache/reef/driver/evaluator/EvaluatorRequest.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/driver/evaluator/EvaluatorRequest.java b/lang/java/reef-common/src/main/java/org/apache/reef/driver/evaluator/EvaluatorRequest.java index dbaf6bd..e113a7f 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/driver/evaluator/EvaluatorRequest.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/driver/evaluator/EvaluatorRequest.java @@ -189,6 +189,7 @@ public final class EvaluatorRequest { * @param megaBytes the amount of megabytes to request for the Evaluator. * @return this builder */ + @SuppressWarnings("checkstyle:hiddenfield") public Builder setMemory(final int megaBytes) { this.megaBytes = megaBytes; return this; @@ -200,6 +201,7 @@ public final class EvaluatorRequest { * @param cores the number of cores * @return */ + @SuppressWarnings("checkstyle:hiddenfield") public Builder setNumberOfCores(final int cores) { this.cores = cores; return this; @@ -211,6 +213,7 @@ public final class EvaluatorRequest { * @param n * @return this Builder. */ + @SuppressWarnings("checkstyle:hiddenfield") public Builder setNumber(final int n) { this.n = n; return this; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/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 89db579..552f84a 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 @@ -238,11 +238,10 @@ public final class EvaluatorContext implements ActiveContext { Optional.<ActiveContext>of(this.contextRepresenters.getContext(getParentId().get())) : Optional.<ActiveContext>empty(); - final EvaluatorDescriptor evaluatorDescriptor = getEvaluatorDescriptor(); final String evaluatorID = getEvaluatorId(); return new FailedContextImpl( - id, message, description, cause, data, parentContext, evaluatorDescriptor, evaluatorID); + id, message, description, cause, data, parentContext, this.evaluatorDescriptor, evaluatorID); } public synchronized FailedContext getFailedContext( @@ -267,11 +266,10 @@ public final class EvaluatorContext implements ActiveContext { Optional.<ActiveContext>of(this.contextRepresenters.getContext(getParentId().get())) : Optional.<ActiveContext>empty(); - final EvaluatorDescriptor evaluatorDescriptor = getEvaluatorDescriptor(); final String evaluatorID = getEvaluatorId(); return new FailedContextImpl( - id, message, description, cause, data, parentContext, evaluatorDescriptor, evaluatorID); + id, message, description, cause, data, parentContext, this.evaluatorDescriptor, evaluatorID); } public synchronized boolean isRootContext() { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/ContextRuntime.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/ContextRuntime.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/ContextRuntime.java index 08ec14d..02cff45 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/ContextRuntime.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/ContextRuntime.java @@ -166,11 +166,11 @@ public final class ContextRuntime { final Injector childServiceInjector = this.serviceInjector.forkInjector(serviceConfiguration); - final ContextRuntime childContext = + final ContextRuntime newChildContext = new ContextRuntime(childServiceInjector, contextConfiguration, Optional.of(this)); - this.childContext = Optional.of(childContext); - return childContext; + this.childContext = Optional.of(newChildContext); + return newChildContext; } catch (final BindException e) { @@ -214,11 +214,11 @@ public final class ContextRuntime { } final Injector childServiceInjector = this.serviceInjector.forkInjector(); - final ContextRuntime childContext = + final ContextRuntime newChildContext = new ContextRuntime(childServiceInjector, contextConfiguration, Optional.of(this)); - this.childContext = Optional.of(childContext); - return childContext; + this.childContext = Optional.of(newChildContext); + return newChildContext; } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/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 dfaca1c..cb6613e 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 @@ -139,26 +139,26 @@ public final class TaskStatus { ReefServiceProtos.TaskStatusProto toProto() { this.check(); - final ReefServiceProtos.TaskStatusProto.Builder result = ReefServiceProtos.TaskStatusProto.newBuilder() + final ReefServiceProtos.TaskStatusProto.Builder resultBuilder = ReefServiceProtos.TaskStatusProto.newBuilder() .setContextId(this.contextId) .setTaskId(this.taskId) .setState(this.getProtoState()); if (this.result.isPresent()) { - result.setResult(ByteString.copyFrom(this.result.get())); + resultBuilder.setResult(ByteString.copyFrom(this.result.get())); } else if (this.lastException.isPresent()) { final byte[] error = this.exceptionCodec.toBytes(this.lastException.get()); - result.setResult(ByteString.copyFrom(error)); + resultBuilder.setResult(ByteString.copyFrom(error)); } else if (this.state == State.RUNNING) { for (final TaskMessage taskMessage : this.getMessages()) { - result.addTaskMessage(ReefServiceProtos.TaskStatusProto.TaskMessageProto.newBuilder() + resultBuilder.addTaskMessage(ReefServiceProtos.TaskStatusProto.TaskMessageProto.newBuilder() .setSourceId(taskMessage.getMessageSourceID()) .setMessage(ByteString.copyFrom(taskMessage.get())) .build()); } } - return result.build(); + return resultBuilder.build(); } private void check() { @@ -287,14 +287,14 @@ public final class TaskStatus { * @return the messages to be sent on the Task's behalf in the next heartbeat. */ private Collection<TaskMessage> getMessages() { - final List<TaskMessage> result = new ArrayList<>(this.evaluatorMessageSources.size()); + final List<TaskMessage> messageList = new ArrayList<>(this.evaluatorMessageSources.size()); for (final TaskMessageSource messageSource : this.evaluatorMessageSources) { final Optional<TaskMessage> taskMessageOptional = messageSource.getMessage(); if (taskMessageOptional.isPresent()) { - result.add(taskMessageOptional.get()); + messageList.add(taskMessageOptional.get()); } } - return result; + return messageList; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/files/ClasspathProvider.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/files/ClasspathProvider.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/files/ClasspathProvider.java index 4bc8bd4..cc0a024 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/files/ClasspathProvider.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/files/ClasspathProvider.java @@ -47,24 +47,24 @@ public final class ClasspathProvider { // Assemble the driver classpath final List<String> runtimeDriverClasspathPrefix = runtimeClasspathProvider.getDriverClasspathPrefix(); final List<String> runtimeDriverClasspathSuffix = runtimeClasspathProvider.getDriverClasspathSuffix(); - final List<String> driverClasspath = new ArrayList<>(baseClasspath.size() + + final List<String> driverClasspathList = new ArrayList<>(baseClasspath.size() + runtimeDriverClasspathPrefix.size() + runtimeDriverClasspathSuffix.size()); - driverClasspath.addAll(runtimeDriverClasspathPrefix); - driverClasspath.addAll(baseClasspath); - driverClasspath.addAll(runtimeDriverClasspathSuffix); - this.driverClasspath = Collections.unmodifiableList(driverClasspath); + driverClasspathList.addAll(runtimeDriverClasspathPrefix); + driverClasspathList.addAll(baseClasspath); + driverClasspathList.addAll(runtimeDriverClasspathSuffix); + this.driverClasspath = Collections.unmodifiableList(driverClasspathList); // Assemble the evaluator classpath final List<String> runtimeEvaluatorClasspathPrefix = runtimeClasspathProvider.getEvaluatorClasspathPrefix(); final List<String> runtimeEvaluatorClasspathSuffix = runtimeClasspathProvider.getEvaluatorClasspathSuffix(); - final List<String> evaluatorClasspath = new ArrayList<>(runtimeEvaluatorClasspathPrefix.size() + + final List<String> evaluatorClasspathList = new ArrayList<>(runtimeEvaluatorClasspathPrefix.size() + baseClasspath.size() + runtimeEvaluatorClasspathSuffix.size()); - evaluatorClasspath.addAll(runtimeEvaluatorClasspathPrefix); - evaluatorClasspath.addAll(baseClasspath); - evaluatorClasspath.addAll(runtimeEvaluatorClasspathSuffix); - this.evaluatorClasspath = Collections.unmodifiableList(evaluatorClasspath); + evaluatorClasspathList.addAll(runtimeEvaluatorClasspathPrefix); + evaluatorClasspathList.addAll(baseClasspath); + evaluatorClasspathList.addAll(runtimeEvaluatorClasspathSuffix); + this.evaluatorClasspath = Collections.unmodifiableList(evaluatorClasspathList); } /** http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/CLRLaunchCommandBuilder.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/CLRLaunchCommandBuilder.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/CLRLaunchCommandBuilder.java index e51c039..617a43b 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/CLRLaunchCommandBuilder.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/CLRLaunchCommandBuilder.java @@ -74,6 +74,7 @@ public class CLRLaunchCommandBuilder implements LaunchCommandBuilder { } @Override + @SuppressWarnings("checkstyle:hiddenfield") public CLRLaunchCommandBuilder setMemory(final int megaBytes) { this.megaBytes = megaBytes; return this; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/JavaLaunchCommandBuilder.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/JavaLaunchCommandBuilder.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/JavaLaunchCommandBuilder.java index b9cb5e4..fca071c 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/JavaLaunchCommandBuilder.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/JavaLaunchCommandBuilder.java @@ -105,6 +105,7 @@ public final class JavaLaunchCommandBuilder implements LaunchCommandBuilder { } @Override + @SuppressWarnings("checkstyle:hiddenfield") public JavaLaunchCommandBuilder setMemory(final int megaBytes) { this.megaBytes = megaBytes; return this; @@ -156,6 +157,7 @@ public final class JavaLaunchCommandBuilder implements LaunchCommandBuilder { * @param assertionsEnabled * @return this */ + @SuppressWarnings("checkstyle:hiddenfield") public JavaLaunchCommandBuilder enableAssertions(final boolean assertionsEnabled) { this.assertionsEnabled = assertionsEnabled; return this; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/utils/DispatchingEStage.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/utils/DispatchingEStage.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/utils/DispatchingEStage.java index a03253c..80b14db 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/utils/DispatchingEStage.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/utils/DispatchingEStage.java @@ -90,6 +90,7 @@ public final class DispatchingEStage implements AutoCloseable { * @param <T> Message type. * @param <U> Type of message that event handler supports. Must be a subclass of T. */ + @SuppressWarnings("checkstyle:hiddenfield") public <T, U extends T> void register(final Class<T> type, final Set<EventHandler<U>> handlers) { this.handlers.put(type, new ExceptionHandlingEventHandler<>( new BroadCastEventHandler<>(handlers), this.errorHandler)); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-common/src/main/java/org/apache/reef/util/SetOnce.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/util/SetOnce.java b/lang/java/reef-common/src/main/java/org/apache/reef/util/SetOnce.java index ec6b7aa..89f4f66 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/util/SetOnce.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/util/SetOnce.java @@ -37,6 +37,7 @@ public final class SetOnce<T> { return value.get(); } + @SuppressWarnings("checkstyle:hiddenfield") public synchronized void set(final T value) { if (this.value.isPresent()) { throw new IllegalStateException("Trying to set new value " + value + http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LoggingScopeImpl.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LoggingScopeImpl.java b/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LoggingScopeImpl.java index a882ce5..9114812 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LoggingScopeImpl.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LoggingScopeImpl.java @@ -91,14 +91,14 @@ public class LoggingScopeImpl implements LoggingScope { } /** - * log massage. - * @param msg + * Log message. + * @param message */ - private void log(final String msg) { + private void log(final String message) { if (this.optionalParams.isPresent()) { - logger.log(logLevel, msg, params); + logger.log(logLevel, message, params); } else { - logger.log(logLevel, msg); + logger.log(logLevel, message); } } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-common/src/main/resources/checkstyle.xml ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/resources/checkstyle.xml b/lang/java/reef-common/src/main/resources/checkstyle.xml index a69a167..3af503a 100644 --- a/lang/java/reef-common/src/main/resources/checkstyle.xml +++ b/lang/java/reef-common/src/main/resources/checkstyle.xml @@ -184,7 +184,8 @@ <module name="EqualsHashCode"/> <module name="HiddenField"> <property name="ignoreConstructorParameter" value="true"/> - <property name="severity" value="warning"/> + <property name="ignoreSetter" value="true"/> + <property name="setterCanReturnItsClass" value="true"/> </module> <module name="IllegalInstantiation"/> <module name="InnerAssignment"/> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/MasterTask.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/MasterTask.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/MasterTask.java index 2c67b2a..70302ae 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/MasterTask.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/MasterTask.java @@ -218,10 +218,10 @@ public class MasterTask implements Task { return iters >= maxIters || Math.abs(gradNorm) <= 1e-3; } - private double findMinEta(final Vector model, final Vector descentDir, final Vector lineSearchEvals) { - final double wNormSqr = model.norm2Sqr(); + private double findMinEta(final Vector theModel, final Vector descentDir, final Vector lineSearchEvals) { + final double wNormSqr = theModel.norm2Sqr(); final double dNormSqr = descentDir.norm2Sqr(); - final double wDotd = model.dot(descentDir); + final double wDotd = theModel.dot(descentDir); final double[] t = ts.getT(); int i = 0; for (final double eta : t) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HttpServerShellCmdtHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HttpServerShellCmdtHandler.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HttpServerShellCmdtHandler.java index eba4854..041b447 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HttpServerShellCmdtHandler.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HttpServerShellCmdtHandler.java @@ -129,8 +129,8 @@ class HttpServerShellCmdtHandler implements HttpHandler { response.getOutputStream().write(cmdOutput.getBytes(Charset.forName("UTF-8"))); cmdOutput = null; } else if (parsedHttpRequest.getTargetEntity().equalsIgnoreCase("Driver")) { - final String cmdOutput = CommandUtils.runCommand(queryStr); - response.getOutputStream().write(cmdOutput.getBytes(Charset.forName("UTF-8"))); + final String commandOutput = CommandUtils.runCommand(queryStr); + response.getOutputStream().write(commandOutput.getBytes(Charset.forName("UTF-8"))); } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/api/DataLoadingRequestBuilder.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/api/DataLoadingRequestBuilder.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/api/DataLoadingRequestBuilder.java index f227374..a54ecfd 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/api/DataLoadingRequestBuilder.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/api/DataLoadingRequestBuilder.java @@ -117,6 +117,7 @@ public final class DataLoadingRequestBuilder * the compute requests to add * @return this */ + @SuppressWarnings("checkstyle:hiddenfield") public DataLoadingRequestBuilder addComputeRequests(final List<EvaluatorRequest> computeRequests) { for (final EvaluatorRequest computeRequest : computeRequests) { addComputeRequest(computeRequest); @@ -131,6 +132,7 @@ public final class DataLoadingRequestBuilder * the data requests to add * @return this */ + @SuppressWarnings("checkstyle:hiddenfield") public DataLoadingRequestBuilder addDataRequests(final List<EvaluatorRequest> dataRequests) { for (final EvaluatorRequest dataRequest : dataRequests) { addDataRequest(dataRequest); @@ -178,11 +180,13 @@ public final class DataLoadingRequestBuilder return this; } + @SuppressWarnings("checkstyle:hiddenfield") public DataLoadingRequestBuilder loadIntoMemory(final boolean inMemory) { this.inMemory = inMemory; return this; } + @SuppressWarnings("checkstyle:hiddenfield") public DataLoadingRequestBuilder renewFailedEvaluators(final boolean renewFailedEvaluators) { this.renewFailedEvaluators = renewFailedEvaluators; return this; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/api/DistributedDataSet.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/api/DistributedDataSet.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/api/DistributedDataSet.java index e95ca3e..24f82ce 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/api/DistributedDataSet.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/api/DistributedDataSet.java @@ -59,6 +59,7 @@ public final class DistributedDataSet implements Iterable<DistributedDataSetPart * @param partitions * the partitions to add */ + @SuppressWarnings("checkstyle:hiddenfield") public void addPartitions(final Collection<DistributedDataSetPartition> partitions) { this.partitions.addAll(partitions); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/config/ReduceOperatorSpec.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/config/ReduceOperatorSpec.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/config/ReduceOperatorSpec.java index 1953d79..e2313ab 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/config/ReduceOperatorSpec.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/config/ReduceOperatorSpec.java @@ -94,6 +94,7 @@ public class ReduceOperatorSpec implements OperatorSpec { return this; } + @SuppressWarnings("checkstyle:hiddenfield") public Builder setReduceFunctionClass(final Class<? extends ReduceFunction> redFuncClass) { this.redFuncClass = redFuncClass; return this; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/FlatTopology.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/FlatTopology.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/FlatTopology.java index e2e1093..46d2345 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/FlatTopology.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/FlatTopology.java @@ -81,6 +81,7 @@ public class FlatTopology implements Topology { } @Override + @SuppressWarnings("checkstyle:hiddenfield") public void setRootTask(final String rootId) { this.rootId = rootId; } @@ -192,9 +193,9 @@ public class FlatTopology implements Topology { nodes.remove(taskId); } - private void setRootNode(final String rootId) { - LOG.finest(getQualifiedName() + "Setting " + rootId + " as root"); - final TaskNode node = new TaskNodeImpl(senderStage, groupName, operName, rootId, driverId, true); + private void setRootNode(final String newRootId) { + LOG.finest(getQualifiedName() + "Setting " + newRootId + " as root"); + final TaskNode node = new TaskNodeImpl(senderStage, groupName, operName, newRootId, driverId, true); this.root = node; for (final Map.Entry<String, TaskNode> nodeEntry : nodes.entrySet()) { @@ -204,7 +205,7 @@ public class FlatTopology implements Topology { root.addChild(leaf); leaf.setParent(root); } - nodes.put(rootId, root); + nodes.put(newRootId, root); } /** http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TaskNodeImpl.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TaskNodeImpl.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TaskNodeImpl.java index f1a70be..f2c465c 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TaskNodeImpl.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TaskNodeImpl.java @@ -121,8 +121,8 @@ public class TaskNodeImpl implements TaskNode { child.onParentDead(); } } - final int version = this.version.incrementAndGet(); - LOG.finest(getQualifiedName() + "Bumping up to version-" + version); + final int newVersion = this.version.incrementAndGet(); + LOG.finest(getQualifiedName() + "Bumping up to version-" + newVersion); LOG.exiting("TaskNodeImpl", "onFailedTask", getQualifiedName()); } @@ -135,13 +135,13 @@ public class TaskNodeImpl implements TaskNode { "Trying to set running on an already running task. Something fishy!!!"); return; } - final int version = this.version.get(); - LOG.finest(getQualifiedName() + "Changed status to running version-" + version); + final int newVersion = this.version.get(); + LOG.finest(getQualifiedName() + "Changed status to running version-" + newVersion); if (parent != null && parent.isRunning()) { final GroupCommunicationMessage gcm = Utils.bldVersionedGCM(groupName, operName, ReefNetworkGroupCommProtos.GroupCommMessage.Type.ParentAdd, parent.getTaskId(), parent.getVersion(), taskId, - version, Utils.EMPTY_BYTE_ARR); + newVersion, Utils.EMPTY_BYTE_ARR); taskNodeStatus.expectAckFor(gcm.getType(), gcm.getSrcid()); senderStage.onNext(gcm); parent.onChildRunning(taskId); @@ -152,7 +152,7 @@ public class TaskNodeImpl implements TaskNode { if (child.isRunning()) { final GroupCommunicationMessage gcm = Utils.bldVersionedGCM(groupName, operName, ReefNetworkGroupCommProtos.GroupCommMessage.Type.ChildAdd, child.getTaskId(), - child.getVersion(), taskId, version, + child.getVersion(), taskId, newVersion, Utils.EMPTY_BYTE_ARR); taskNodeStatus.expectAckFor(gcm.getType(), gcm.getSrcid()); senderStage.onNext(gcm); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TaskNodeStatusImpl.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TaskNodeStatusImpl.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TaskNodeStatusImpl.java index 12679b8..cde7fcf 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TaskNodeStatusImpl.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TaskNodeStatusImpl.java @@ -138,10 +138,10 @@ public class TaskNodeStatusImpl implements TaskNodeStatus { } @Override - public void updateFailureOf(final String taskId) { - LOG.entering("TaskNodeStatusImpl", "updateFailureOf", new Object[]{getQualifiedName(), taskId}); - activeNeighbors.remove(taskId); - neighborStatus.remove(taskId); + public void updateFailureOf(final String failTaskId) { + LOG.entering("TaskNodeStatusImpl", "updateFailureOf", new Object[]{getQualifiedName(), failTaskId}); + activeNeighbors.remove(failTaskId); + neighborStatus.remove(failTaskId); LOG.exiting("TaskNodeStatusImpl", "updateFailureOf", getQualifiedName()); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TreeTopology.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TreeTopology.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TreeTopology.java index b0a940d..774a8f1 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TreeTopology.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TreeTopology.java @@ -90,6 +90,7 @@ public class TreeTopology implements Topology { } @Override + @SuppressWarnings("checkstyle:hiddenfield") public void setRootTask(final String rootId) { LOG.entering("TreeTopology", "setRootTask", new Object[]{getQualifiedName(), rootId}); this.rootId = rootId; @@ -219,9 +220,9 @@ public class TreeTopology implements Topology { LOG.exiting("TreeTopology", "removeChild", getQualifiedName() + taskId); } - private void setRootNode(final String rootId) { - LOG.entering("TreeTopology", "setRootNode", new Object[]{getQualifiedName(), rootId}); - final TaskNode node = new TaskNodeImpl(senderStage, groupName, operName, rootId, driverId, true); + private void setRootNode(final String newRootId) { + LOG.entering("TreeTopology", "setRootNode", new Object[]{getQualifiedName(), newRootId}); + final TaskNode node = new TaskNodeImpl(senderStage, groupName, operName, newRootId, driverId, true); this.root = node; this.logicalRoot = this.root; this.prev = this.root; @@ -231,8 +232,8 @@ public class TreeTopology implements Topology { addTaskNode(leaf); this.prev = leaf; } - nodes.put(rootId, root); - LOG.exiting("TreeTopology", "setRootNode", getQualifiedName() + rootId); + nodes.put(newRootId, root); + LOG.exiting("TreeTopology", "setRootNode", getQualifiedName() + newRootId); } private void unsetRootNode(final String taskId) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/OperatorTopologyImpl.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/OperatorTopologyImpl.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/OperatorTopologyImpl.java index 7418d33..308c33c 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/OperatorTopologyImpl.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/OperatorTopologyImpl.java @@ -252,11 +252,11 @@ public class OperatorTopologyImpl implements OperatorTopology { assert (effectiveTopology != null); - final Set<GroupCommunicationMessage> deletionDeltas = new HashSet<>(); - copyDeletionDeltas(deletionDeltas); + final Set<GroupCommunicationMessage> deletionDeltasSet = new HashSet<>(); + copyDeletionDeltas(deletionDeltasSet); LOG.finest(getQualifiedName() + "Updating effective topology struct with deletion msgs"); - effectiveTopology.update(deletionDeltas); + effectiveTopology.update(deletionDeltasSet); LOG.finest(getQualifiedName() + "Released topoLock"); } LOG.exiting("OperatorTopologyImpl", "refreshEffectiveTopology", getQualifiedName()); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/OperatorTopologyStructImpl.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/OperatorTopologyStructImpl.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/OperatorTopologyStructImpl.java index 483ac1b..fb8abac 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/OperatorTopologyStructImpl.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/OperatorTopologyStructImpl.java @@ -352,12 +352,12 @@ public class OperatorTopologyStructImpl implements OperatorTopologyStruct { return retVal; } - private void addToDeadMsgs(final String srcId, final int version) { - LOG.entering("OperatorTopologyStructImpl", "addToDeadMsgs", new Object[]{getQualifiedName(), srcId, version}); + private void addToDeadMsgs(final String srcId, final int srcVersion) { + LOG.entering("OperatorTopologyStructImpl", "addToDeadMsgs", new Object[]{getQualifiedName(), srcId, srcVersion}); deadMsgs.putIfAbsent(srcId, new HashSet<Integer>()); - deadMsgs.get(srcId).add(version); + deadMsgs.get(srcId).add(srcVersion); LOG.exiting("OperatorTopologyStructImpl", "addToDeadMsgs", Arrays.toString(new Object[]{getQualifiedName(), - srcId, version})); + srcId, srcVersion})); } private boolean addedToDeadMsgs(final NodeStruct node, final String msgSrcId, final int msgSrcVersion) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NameLookupClient.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NameLookupClient.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NameLookupClient.java index 0bcd71b..12824ea 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NameLookupClient.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NameLookupClient.java @@ -207,22 +207,22 @@ public class NameLookupClient implements Stage, NamingLookup { @Override public InetSocketAddress call() throws Exception { final int origRetryCount = NameLookupClient.this.retryCount; - int retryCount = origRetryCount; + int retriesLeft = origRetryCount; while (true) { try { return remoteLookup(id); } catch (final NamingException e) { - if (retryCount <= 0) { + if (retriesLeft <= 0) { throw e; } else { - final int retryTimeout = NameLookupClient.this.retryTimeout - * (origRetryCount - retryCount + 1); + final int currentRetryTimeout = NameLookupClient.this.retryTimeout + * (origRetryCount - retriesLeft + 1); LOG.log(Level.WARNING, "Caught Naming Exception while looking up " + id - + " with Name Server. Will retry " + retryCount - + " time(s) after waiting for " + retryTimeout + " msec."); - Thread.sleep(retryTimeout * retryCount); - --retryCount; + + " with Name Server. Will retry " + retriesLeft + + " time(s) after waiting for " + currentRetryTimeout + " msec."); + Thread.sleep(currentRetryTimeout * retriesLeft); + --retriesLeft; } } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/FramingOutputStream.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/FramingOutputStream.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/FramingOutputStream.java index 3fe4145..26013fa 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/FramingOutputStream.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/FramingOutputStream.java @@ -68,13 +68,13 @@ public class FramingOutputStream extends OutputStream implements Accumulable<byt @Override public void write(byte[] b) throws IOException { baos.write(b); - offset += b.length; + this.offset += b.length; } @Override - public void write(byte[] b, int offset, int length) throws IOException { - baos.write(b, offset, length); - offset += length; + public void write(byte[] b, int offsetToWrite, int length) throws IOException { + baos.write(b, offsetToWrite, length); + this.offset += length; } @Override http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/AzureUploader.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/AzureUploader.java b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/AzureUploader.java index 7e069ef..97ef3ea 100644 --- a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/AzureUploader.java +++ b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/AzureUploader.java @@ -87,6 +87,7 @@ final class AzureUploader { return "DefaultEndpointsProtocol=http;AccountName=" + accountName + ";AccountKey=" + accountKey; } + @SuppressWarnings("checkstyle:hiddenfield") public String createJobFolder(final String applicationID) throws IOException { try { this.applicationID = applicationID; @@ -145,7 +146,7 @@ final class AzureUploader { return "wasb://" + this.azureStorageContainerName + "@" + primaryURI.getHost() + path; } - private String assembleJobFolderName(final String applicationID) { - return this.baseFolder + (this.baseFolder.endsWith("/") ? "" : "/") + applicationID; + private String assembleJobFolderName(final String jobApplicationID) { + return this.baseFolder + (this.baseFolder.endsWith("/") ? "" : "/") + jobApplicationID; } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/ApplicationState.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/ApplicationState.java b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/ApplicationState.java index 6d42efe..92bea8e 100644 --- a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/ApplicationState.java +++ b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/ApplicationState.java @@ -255,6 +255,7 @@ public final class ApplicationState { return vCoreSeconds; } + @SuppressWarnings("checkstyle:hiddenfield") public void setVCoreSeconds(long vCoreSeconds) { this.vCoreSeconds = vCoreSeconds; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/ApplicationSubmission.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/ApplicationSubmission.java b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/ApplicationSubmission.java index 81c737f..4a2cf18 100644 --- a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/ApplicationSubmission.java +++ b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/ApplicationSubmission.java @@ -107,6 +107,7 @@ public final class ApplicationSubmission { return isUnmanagedAM; } + @SuppressWarnings("checkstyle:hiddenfield") public ApplicationSubmission setUnmanagedAM(boolean isUnmanagedAM) { this.isUnmanagedAM = isUnmanagedAM; return this; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/driver/ProcessContainer.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/driver/ProcessContainer.java b/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/driver/ProcessContainer.java index fe7f19c..cf9dfeb 100644 --- a/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/driver/ProcessContainer.java +++ b/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/driver/ProcessContainer.java @@ -111,6 +111,7 @@ final class ProcessContainer implements Container { } @Override + @SuppressWarnings("checkstyle:hiddenfield") public void addGlobalFiles(final File globalFolder) { try { copy(Arrays.asList(globalFolder.listFiles()), this.globalFolder); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/REEFScheduler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/REEFScheduler.java b/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/REEFScheduler.java index e7afdc4..4874468 100644 --- a/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/REEFScheduler.java +++ b/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/REEFScheduler.java @@ -152,6 +152,7 @@ final class REEFScheduler implements Scheduler { * All offers in each batch of offers will be either be launched or declined. */ @Override + @SuppressWarnings("checkstyle:hiddenfield") public void resourceOffers(final SchedulerDriver driver, final List<Protos.Offer> offers) { final Map<String, NodeDescriptorEventImpl.Builder> nodeDescriptorEvents = new HashMap<>(); @@ -497,11 +498,11 @@ final class REEFScheduler implements Scheduler { // Upload REEF_TAR to HDFS final FileSystem fileSystem = FileSystem.get(new Configuration()); final org.apache.hadoop.fs.Path src = new org.apache.hadoop.fs.Path(REEF_TAR); - final String reefTarUri = fileSystem.getUri().toString() + "/" + jobIdentifier + "/" + REEF_TAR; - final org.apache.hadoop.fs.Path dst = new org.apache.hadoop.fs.Path(reefTarUri); + final String reefTarUriValue = fileSystem.getUri().toString() + "/" + jobIdentifier + "/" + REEF_TAR; + final org.apache.hadoop.fs.Path dst = new org.apache.hadoop.fs.Path(reefTarUriValue); fileSystem.copyFromLocalFile(src, dst); - return reefTarUri; + return reefTarUriValue; } catch (IOException e) { throw new RuntimeException(e); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/client/uploader/JobFolder.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/client/uploader/JobFolder.java b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/client/uploader/JobFolder.java index 0756b63..7769c7f 100644 --- a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/client/uploader/JobFolder.java +++ b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/client/uploader/JobFolder.java @@ -96,9 +96,9 @@ public final class JobFolder { /** * Creates a LocalResource instance for the JAR file referenced by the given Path. */ - public LocalResource getLocalResourceForPath(final Path path) throws IOException { + public LocalResource getLocalResourceForPath(final Path jarPath) throws IOException { final LocalResource localResource = Records.newRecord(LocalResource.class); - final FileStatus status = FileContext.getFileContext(fileSystem.getUri()).getFileStatus(path); + final FileStatus status = FileContext.getFileContext(fileSystem.getUri()).getFileStatus(jarPath); localResource.setType(LocalResourceType.ARCHIVE); localResource.setVisibility(LocalResourceVisibility.APPLICATION); localResource.setResource(ConverterUtils.getYarnUrlFromPath(status.getPath())); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YarnContainerManager.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YarnContainerManager.java b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YarnContainerManager.java index 24edc75..7c15b78 100644 --- a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YarnContainerManager.java +++ b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YarnContainerManager.java @@ -121,6 +121,7 @@ final class YarnContainerManager } @Override + @SuppressWarnings("checkstyle:hiddenfield") public void onContainersAllocated(final List<Container> containers) { // ID is used for logging only http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/ListInjectionPlan.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/ListInjectionPlan.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/ListInjectionPlan.java index 73fef1b..18e7056 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/ListInjectionPlan.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/ListInjectionPlan.java @@ -32,17 +32,17 @@ public class ListInjectionPlan<T> extends InjectionPlan<T> { public ListInjectionPlan(Node name, List<InjectionPlan<T>> entries) { super(name); this.entries.addAll(entries); - int numAlternatives = 1; - boolean isAmbiguous = false; - boolean isInjectable = true; + int numAlternativesAccumulator = 1; + boolean isAmbiguousAccumulator = false; + boolean isInjectableAccumulator = true; for (InjectionPlan<T> ip : entries) { - numAlternatives *= ip.getNumAlternatives(); - isAmbiguous |= ip.isAmbiguous(); - isInjectable &= ip.isInjectable(); + numAlternativesAccumulator *= ip.getNumAlternatives(); + isAmbiguousAccumulator |= ip.isAmbiguous(); + isInjectableAccumulator &= ip.isInjectable(); } - this.numAlternatives = numAlternatives; - this.isAmbiguous = isAmbiguous; - this.isInjectable = isInjectable; + this.numAlternatives = numAlternativesAccumulator; + this.isAmbiguous = isAmbiguousAccumulator; + this.isInjectable = isInjectableAccumulator; } @Override http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/SetInjectionPlan.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/SetInjectionPlan.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/SetInjectionPlan.java index 30fdfff..8b65ad4 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/SetInjectionPlan.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/SetInjectionPlan.java @@ -32,17 +32,17 @@ public class SetInjectionPlan<T> extends InjectionPlan<T> { public SetInjectionPlan(Node name, Set<InjectionPlan<T>> entries) { super(name); this.entries.addAll(entries); - int numAlternatives = 1; - boolean isAmbiguous = false; - boolean isInjectable = true; + int numAlternativesAccumulator = 1; + boolean isAmbiguousAccumulator = false; + boolean isInjectableAccumulator = true; for (InjectionPlan<T> ip : entries) { - numAlternatives *= ip.getNumAlternatives(); - isAmbiguous |= ip.isAmbiguous(); - isInjectable &= ip.isInjectable(); + numAlternativesAccumulator *= ip.getNumAlternatives(); + isAmbiguousAccumulator |= ip.isAmbiguous(); + isInjectableAccumulator &= ip.isInjectable(); } - this.numAlternatives = numAlternatives; - this.isAmbiguous = isAmbiguous; - this.isInjectable = isInjectable; + this.numAlternatives = numAlternativesAccumulator; + this.isAmbiguous = isAmbiguousAccumulator; + this.isInjectable = isInjectableAccumulator; } @Override http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/StackBindLocation.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/StackBindLocation.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/StackBindLocation.java index e62a857..063ecd6 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/StackBindLocation.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/StackBindLocation.java @@ -26,9 +26,9 @@ public class StackBindLocation implements BindLocation { final StackTraceElement[] stack; public StackBindLocation() { - StackTraceElement[] stack = new Throwable().getStackTrace(); - if (stack.length != 0) { - this.stack = Arrays.copyOfRange(stack, 1, stack.length); + StackTraceElement[] stackTrace = new Throwable().getStackTrace(); + if (stackTrace.length != 0) { + this.stack = Arrays.copyOfRange(stackTrace, 1, stackTrace.length); } else { this.stack = new StackTraceElement[0]; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/Subplan.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/Subplan.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/Subplan.java index 3f17a1a..5ec7ec5 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/Subplan.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/Subplan.java @@ -38,11 +38,11 @@ public final class Subplan<T> extends InjectionPlan<T> { if (selectedIndex != -1) { this.numAlternatives = alternatives[selectedIndex].getNumAlternatives(); } else { - int numAlternatives = 0; + int numAlternativesSum = 0; for (InjectionPlan<? extends T> a : alternatives) { - numAlternatives += a.getNumAlternatives(); + numAlternativesSum += a.getNumAlternatives(); } - this.numAlternatives = numAlternatives; + this.numAlternatives = numAlternativesSum; } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/InjectorImpl.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/InjectorImpl.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/InjectorImpl.java index 6349326..32d15a0 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/InjectorImpl.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/InjectorImpl.java @@ -633,12 +633,12 @@ public class InjectorImpl implements Injector { T ret; try { ConstructorDef<T> def = (ConstructorDef<T>) constructor.getConstructorDef(); - java.lang.reflect.Constructor<T> c = getConstructor(def); + java.lang.reflect.Constructor<T> construct = getConstructor(def); if (aspect != null) { - ret = aspect.inject(def, c, args); + ret = aspect.inject(def, construct, args); } else { - ret = c.newInstance(args); + ret = construct.newInstance(args); } } catch (IllegalArgumentException e) { StringBuilder sb = new StringBuilder("Internal Tang error? Could not call constructor " + @@ -683,19 +683,19 @@ public class InjectorImpl implements Injector { } @Override - public <T> void bindVolatileInstance(Class<T> c, T o) throws BindException { - bindVolatileInstanceNoCopy(c, o); + public <T> void bindVolatileInstance(Class<T> cl, T o) throws BindException { + bindVolatileInstanceNoCopy(cl, o); } @Override - public <T> void bindVolatileParameter(Class<? extends Name<T>> c, T o) + public <T> void bindVolatileParameter(Class<? extends Name<T>> cl, T o) throws BindException { - bindVolatileParameterNoCopy(c, o); + bindVolatileParameterNoCopy(cl, o); } - <T> void bindVolatileInstanceNoCopy(Class<T> c, T o) throws BindException { + <T> void bindVolatileInstanceNoCopy(Class<T> cl, T o) throws BindException { assertNotConcurrent(); - Node n = javaNamespace.getNode(c); + Node n = javaNamespace.getNode(cl); if (n instanceof ClassNode) { ClassNode<?> cn = (ClassNode<?>) n; Object old = getCachedInstance(cn); @@ -705,33 +705,33 @@ public class InjectorImpl implements Injector { } instances.put(cn, o); } else { - throw new IllegalArgumentException("Expected Class but got " + c + throw new IllegalArgumentException("Expected Class but got " + cl + " (probably a named parameter)."); } } - <T> void bindVolatileParameterNoCopy(Class<? extends Name<T>> c, T o) + <T> void bindVolatileParameterNoCopy(Class<? extends Name<T>> cl, T o) throws BindException { - Node n = javaNamespace.getNode(c); + Node n = javaNamespace.getNode(cl); if (n instanceof NamedParameterNode) { NamedParameterNode<?> np = (NamedParameterNode<?>) n; Object old = this.c.getNamedParameter(np); if (old != null) { // XXX need to get the binding site here! throw new BindException( - "Attempt to re-bind named parameter " + ReflectionUtilities.getFullName(c) + ". Old value was [" + old + "Attempt to re-bind named parameter " + ReflectionUtilities.getFullName(cl) + ". Old value was [" + old + "] new value is [" + o + "]"); } try { namedParameterInstances.put(np, o); } catch (IllegalArgumentException e) { throw new BindException( - "Attempt to re-bind named parameter " + ReflectionUtilities.getFullName(c) + ". Old value was [" + old + "Attempt to re-bind named parameter " + ReflectionUtilities.getFullName(cl) + ". Old value was [" + old + "] new value is [" + o + "]"); } } else { - throw new IllegalArgumentException("Expected Name, got " + c + throw new IllegalArgumentException("Expected Name, got " + cl + " (probably a class)"); } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/Tint.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/Tint.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/Tint.java index 9760adb..1eba8a1 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/Tint.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/Tint.java @@ -677,11 +677,11 @@ public class Tint { uses.append("<a href='#" + u + "'>" + stripPrefix(u, pack) + "</a> "); } sb.append(cell(uses, USES)); - StringBuffer setters = new StringBuffer(); + StringBuffer settersStr = new StringBuffer(); for (String f : getSettersOf(n)) { - setters.append("<a href='#" + f + "'>" + stripPrefix(f, pack) + "</a> "); + settersStr.append("<a href='#" + f + "'>" + stripPrefix(f, pack) + "</a> "); } - sb.append(cell(setters, SETTERS)); + sb.append(cell(settersStr, SETTERS)); sb.append("</div>"); sb.append("</div>"); return row(sb); @@ -718,11 +718,11 @@ public class Tint { uses.append("<a href='#" + u + "'>" + stripPrefix(u, pack) + "</a> "); } sb.append(cell(uses, USES)); - StringBuffer setters = new StringBuffer(); + StringBuffer settersStr = new StringBuffer(); for (String f : getSettersOf(n)) { - setters.append("<a href='#" + f + "'>" + stripPrefix(f, pack) + "</a> "); + settersStr.append("<a href='#" + f + "'>" + stripPrefix(f, pack) + "</a> "); } - sb.append(cell(setters, SETTERS)); + sb.append(cell(settersStr, SETTERS)); sb.append("</div>"); sb.append("</div>"); return row(sb); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/TracingMonotonicTreeMap.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/TracingMonotonicTreeMap.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/TracingMonotonicTreeMap.java index afb172c..1fb87e3 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/TracingMonotonicTreeMap.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/TracingMonotonicTreeMap.java @@ -133,6 +133,7 @@ public final class TracingMonotonicTreeMap<K, V> implements TracingMonotonicMap< } @Override + @SuppressWarnings("checkstyle:hiddenfield") public BindLocation setValue(BindLocation value) { throw new UnsupportedOperationException(); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/ValidateConfiguration.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/ValidateConfiguration.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/ValidateConfiguration.java index 9ba6450..a50a9eb 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/ValidateConfiguration.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/ValidateConfiguration.java @@ -93,8 +93,8 @@ public class ValidateConfiguration { root = ClassHierarchyProto.Node.parseFrom(chin); } - final ClassHierarchy ch = new ProtocolBufferClassHierarchy(root); - final ConfigurationBuilder cb = t.newConfigurationBuilder(ch); + final ClassHierarchy classHierarchy = new ProtocolBufferClassHierarchy(root); + final ConfigurationBuilder cb = t.newConfigurationBuilder(classHierarchy); if (!inConfig.canRead()) { throw new IOException("Cannot read input config file: " + inConfig); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-tests/src/main/java/org/apache/reef/tests/fail/driver/FailDriver.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/main/java/org/apache/reef/tests/fail/driver/FailDriver.java b/lang/java/reef-tests/src/main/java/org/apache/reef/tests/fail/driver/FailDriver.java index a425d34..cf864bd 100644 --- a/lang/java/reef-tests/src/main/java/org/apache/reef/tests/fail/driver/FailDriver.java +++ b/lang/java/reef-tests/src/main/java/org/apache/reef/tests/fail/driver/FailDriver.java @@ -259,6 +259,7 @@ public final class FailDriver { final class RunningTaskHandler implements EventHandler<RunningTask> { @Override + @SuppressWarnings("checkstyle:hiddenfield") public void onNext(final RunningTask task) { checkMsgOrder(task); FailDriver.this.task = task; @@ -280,6 +281,7 @@ public final class FailDriver { final class SuspendedTaskHandler implements EventHandler<SuspendedTask> { @Override + @SuppressWarnings("checkstyle:hiddenfield") public void onNext(final SuspendedTask task) { checkMsgOrder(task); state = DriverState.RESUME; @@ -314,6 +316,7 @@ public final class FailDriver { final class FailedTaskHandler implements EventHandler<FailedTask> { @Override + @SuppressWarnings("checkstyle:hiddenfield") public void onNext(final FailedTask task) { LOG.log(Level.WARNING, "Task failed: " + task.getId(), task.getReason().orElse(null)); checkMsgOrder(task); @@ -325,6 +328,7 @@ public final class FailDriver { final class CompletedTaskHandler implements EventHandler<CompletedTask> { @Override + @SuppressWarnings("checkstyle:hiddenfield") public void onNext(final CompletedTask task) { checkMsgOrder(task); task.getActiveContext().close(); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-tests/src/main/java/org/apache/reef/tests/fail/driver/FailDriverDelayedMsg.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/main/java/org/apache/reef/tests/fail/driver/FailDriverDelayedMsg.java b/lang/java/reef-tests/src/main/java/org/apache/reef/tests/fail/driver/FailDriverDelayedMsg.java index ba23dc2..12737c8 100644 --- a/lang/java/reef-tests/src/main/java/org/apache/reef/tests/fail/driver/FailDriverDelayedMsg.java +++ b/lang/java/reef-tests/src/main/java/org/apache/reef/tests/fail/driver/FailDriverDelayedMsg.java @@ -95,6 +95,7 @@ public final class FailDriverDelayedMsg { public final class RunningTaskHandler implements EventHandler<RunningTask> { @Override + @SuppressWarnings("checkstyle:hiddenfield") public void onNext(final RunningTask task) { FailDriverDelayedMsg.this.task = task; LOG.log(Level.INFO, "ENTER: FailDriverDelayedMsg.send(TaskRuntime): {0}", task); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-tests/src/main/java/org/apache/reef/tests/messaging/task/TaskMessagingTask.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/main/java/org/apache/reef/tests/messaging/task/TaskMessagingTask.java b/lang/java/reef-tests/src/main/java/org/apache/reef/tests/messaging/task/TaskMessagingTask.java index 18365d7..3e31330 100644 --- a/lang/java/reef-tests/src/main/java/org/apache/reef/tests/messaging/task/TaskMessagingTask.java +++ b/lang/java/reef-tests/src/main/java/org/apache/reef/tests/messaging/task/TaskMessagingTask.java @@ -75,9 +75,9 @@ public final class TaskMessagingTask implements Task, TaskMessageSource { public class DriverMessageHandler implements EventHandler<DriverMessage> { @Override public void onNext(DriverMessage driverMessage) { - final byte[] message = driverMessage.get().get(); - LOG.log(Level.INFO, "TaskMsg.send() invoked: {0}", CODEC.decode(message)); - TaskMessagingTask.this.message = Optional.of(TaskMessage.from(this.toString(), message)); + final byte[] driverMsg = driverMessage.get().get(); + LOG.log(Level.INFO, "TaskMsg.send() invoked: {0}", CODEC.decode(driverMsg)); + TaskMessagingTask.this.message = Optional.of(TaskMessage.from(this.toString(), driverMsg)); } } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/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 f083aa0..2d63b34 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 @@ -77,6 +77,7 @@ public final class DefaultRemoteManagerFactory implements RemoteManagerFactory { @Override + @SuppressWarnings("checkstyle:hiddenfield") public <T> RemoteManager getInstance(final String name, final String hostAddress, final int listeningPort, @@ -100,6 +101,7 @@ public final class DefaultRemoteManagerFactory implements RemoteManagerFactory { } @Override + @SuppressWarnings("checkstyle:hiddenfield") public <T> RemoteManager getInstance(final String name, final String hostAddress, final int listeningPort, @@ -122,6 +124,7 @@ public final class DefaultRemoteManagerFactory implements RemoteManagerFactory { } @Override + @SuppressWarnings("checkstyle:hiddenfield") public <T> RemoteManager getInstance(String name, Codec<T> codec, EventHandler<Throwable> errorHandler) { return new DefaultRemoteManagerImplementation(name, DefaultRemoteManagerImplementation.UNKNOWN_HOST_NAME, // Indicate to use the localAddressProvider @@ -136,6 +139,7 @@ public final class DefaultRemoteManagerFactory implements RemoteManagerFactory { } @Override + @SuppressWarnings("checkstyle:hiddenfield") public <T> RemoteManager getInstance(final String name, final int listeningPort, final Codec<T> codec, http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/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 cfb386e..33d7137 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 @@ -183,20 +183,20 @@ public class NettyMessagingTransport implements Transport { LOG.log(Level.FINE, "Binding to {0}", port); - Channel acceptor = null; + Channel acceptorFound = null; try { if (port > 0) { - acceptor = this.serverBootstrap.bind(new InetSocketAddress(host, port)).sync().channel(); + acceptorFound = this.serverBootstrap.bind(new InetSocketAddress(host, port)).sync().channel(); } else { Iterator<Integer> ports = tcpPortProvider.iterator(); - while (acceptor == null) { + while (acceptorFound == null) { if (!ports.hasNext()) { break; } port = ports.next(); LOG.log(Level.FINEST, "Try port {0}", port); try { - acceptor = this.serverBootstrap.bind(new InetSocketAddress(host, port)).sync().channel(); + acceptorFound = this.serverBootstrap.bind(new InetSocketAddress(host, port)).sync().channel(); } catch (final Exception ex) { if (ex instanceof BindException) { LOG.log(Level.FINEST, "The port {0} is already bound. Try again", port); @@ -217,7 +217,7 @@ public class NettyMessagingTransport implements Transport { throw transportException; } - this.acceptor = acceptor; + this.acceptor = acceptorFound; this.serverPort = port; this.localAddress = new InetSocketAddress(host, this.serverPort); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/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 e08f220..6b162bc 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 @@ -158,6 +158,7 @@ public final class RuntimeClock implements Clock { } } + @SuppressWarnings("checkstyle:hiddenfield") private <T extends Time> void subscribe(final Class<T> eventClass, final Set<EventHandler<T>> handlers) { for (final EventHandler<T> handler : handlers) { this.handlers.subscribe(eventClass, handler); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/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 6cef8e0..8935ff0 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 @@ -75,28 +75,28 @@ public final class HttpServerImpl implements HttpServer { this.loggingScopeFactory = loggingScopeFactory; try (final LoggingScope ls = this.loggingScopeFactory.httpServer()) { this.jettyHandler = jettyHandler; - int port = portNumber; + int availablePort = portNumber; Server srv = null; boolean found = false; for (int attempt = 0; attempt < maxRetryAttempts; ++attempt) { if (attempt > 0) { - port = getNextPort(maxPortNumber, minPortNumber); + availablePort = getNextPort(maxPortNumber, minPortNumber); } - srv = new Server(port); + srv = new Server(availablePort); try { srv.start(); found = true; break; } catch (final BindException ex) { - LOG.log(Level.FINEST, "Cannot use port: {0}. Will try another", port); + LOG.log(Level.FINEST, "Cannot use port: {0}. Will try another", availablePort); } } if (found) { this.server = srv; - this.port = port; + this.port = availablePort; this.server.setHandler(jettyHandler); - LOG.log(Level.INFO, "Jetty Server started with port: {0}", port); + LOG.log(Level.INFO, "Jetty Server started with port: {0}", availablePort); } else { throw new RuntimeException("Could not find available port in " + maxRetryAttempts + " attempts"); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/13ffefea/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ReefEventStateManager.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ReefEventStateManager.java b/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ReefEventStateManager.java index 6e2848a..175c646 100644 --- a/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ReefEventStateManager.java +++ b/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ReefEventStateManager.java @@ -217,6 +217,7 @@ public final class ReefEventStateManager { */ public final class StartStateHandler implements EventHandler<StartTime> { @Override + @SuppressWarnings("checkstyle:hiddenfield") public void onNext(final StartTime startTime) { LOG.log(Level.INFO, "StartStateHandler: Driver started with endpoint identifier [{0}] and StartTime [{1}]", @@ -230,6 +231,7 @@ public final class ReefEventStateManager { */ public final class StopStateHandler implements EventHandler<StopTime> { @Override + @SuppressWarnings("checkstyle:hiddenfield") public void onNext(final StopTime stopTime) { LOG.log(Level.INFO, "StopStateHandler called. StopTime: {0}", stopTime); ReefEventStateManager.this.stopTime = stopTime;
