Repository: incubator-reef Updated Branches: refs/heads/master cd77ecc1c -> 44cea4921
[REEF-360] Fix violations / reconfigure checkstyle checks in "Blocks" category This addressed the issue by * fixing LeftCurly and NeedBraces violations * fixing most AvoidNestedBlocks and EmptyBlock violations * configuring AvoidNestedBlocks to allow nested blocks in switch case * configuring EmptyBlock to allow blocks with comments only * allowing to configure per-case warning suppressions and suppressing AvoidNestedBlocks in org/apache/reef/util/MemoryUtils.java JIRA: [REEF-360](https://issues.apache.org/jira/browse/REEF-360) Pull Request: This closes #223 Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/44cea492 Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/44cea492 Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/44cea492 Branch: refs/heads/master Commit: 44cea4921d91a1cef18c9ac7b634a8f0077b4050 Parents: cd77ecc Author: Mariia Mykhailova <[email protected]> Authored: Fri Jun 12 13:19:33 2015 -0700 Committer: Brian Cho <[email protected]> Committed: Wed Jun 17 09:48:36 2015 +0900 ---------------------------------------------------------------------- .../reef/javabridge/generic/JobDriver.java | 3 +- .../util/logging/CLRBufferedLogHandler.java | 9 +- .../src/main/java/org/apache/reef/io/Tuple.java | 16 +++- .../common/driver/DriverStatusManager.java | 20 ++--- .../common/driver/client/ClientManager.java | 9 +- .../driver/context/ContextRepresenters.java | 4 +- .../evaluator/EvaluatorMessageDispatcher.java | 88 ++++++++++---------- .../launch/REEFUncaughtExceptionHandler.java | 4 +- .../common/utils/BroadCastEventHandler.java | 3 +- .../java/org/apache/reef/util/MemoryUtils.java | 11 ++- .../src/main/resources/checkstyle.xml | 11 ++- .../examples/group/utils/math/VectorCodec.java | 3 +- .../reef/examples/group/utils/math/Window.java | 9 +- .../apache/reef/examples/pool/JobDriver.java | 4 +- .../reef/examples/scheduler/TaskEntity.java | 16 +++- .../impl/EvaluatorToPartitionMapper.java | 3 +- .../io/data/loading/impl/NumberedSplit.java | 9 +- .../reef/io/network/util/StringIdentifier.java | 6 +- .../reef/io/storage/FramingOutputStream.java | 4 +- .../reef/io/storage/ram/SortingRamSpool.java | 3 +- .../reef/io/storage/util/GetAllIterable.java | 3 +- .../reef/runtime/hdinsight/cli/TFileParser.java | 3 +- .../client/yarnrest/HDInsightInstance.java | 1 + .../hdinsight/client/yarnrest/StringEntry.java | 8 +- .../runtime/mesos/driver/REEFExecutors.java | 4 +- .../yarn/client/YarnSubmissionHelper.java | 28 +++---- .../yarn/driver/YarnContainerManager.java | 3 +- .../org/apache/reef/tang/InjectionFuture.java | 4 +- .../implementation/java/ClassHierarchyImpl.java | 9 +- .../tang/implementation/types/AbstractNode.java | 8 +- .../types/ConstructorDefImpl.java | 3 +- .../reef/tang/util/ReflectionUtilities.java | 12 ++- .../java/org/apache/reef/tang/util/Tint.java | 7 +- .../java/org/apache/reef/util/Optional.java | 8 +- .../reef/wake/examples/join/BlockingJoin.java | 4 +- .../reef/wake/examples/p2p/Pull2Push.java | 2 - .../wake/impl/DefaultIdentifierFactory.java | 3 +- .../reef/wake/impl/DefaultThreadFactory.java | 9 +- .../reef/wake/impl/MultiEventHandler.java | 3 +- .../apache/reef/wake/impl/ThreadPoolStage.java | 3 +- .../org/apache/reef/wake/impl/TimerStage.java | 4 +- .../wake/impl/WakeUncaughtExceptionHandler.java | 3 +- .../reef/wake/metrics/UniformHistogram.java | 3 +- .../apache/reef/wake/profiler/WakeProfiler.java | 2 - .../reef/wake/remote/impl/MultiEncoder.java | 5 +- .../remote/impl/OrderedRemoteReceiverStage.java | 6 +- .../wake/remote/impl/ProxyEventHandler.java | 3 +- .../wake/remote/impl/RemoteEventComparator.java | 6 +- .../wake/remote/impl/RemoteEventEncoder.java | 6 +- .../remote/impl/RemoteReceiverEventHandler.java | 3 +- .../remote/impl/RemoteSenderEventHandler.java | 3 +- .../netty/NettyMessagingTransport.java | 4 +- .../reef/wake/rx/impl/RxThreadPoolStage.java | 3 +- .../reef/wake/rx/impl/TimeoutSubject.java | 4 +- .../java/org/apache/reef/wake/time/Time.java | 16 +++- .../reef/wake/time/runtime/LogicalTimer.java | 4 +- .../reef/wake/time/runtime/RuntimeClock.java | 9 +- 57 files changed, 273 insertions(+), 171 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobDriver.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobDriver.java b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobDriver.java index da75cb7..4bcc629 100644 --- a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobDriver.java +++ b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobDriver.java @@ -240,8 +240,9 @@ public final class JobDriver { private CLRBufferedLogHandler getCLRBufferedLogHandler() { for (Handler handler : Logger.getLogger("").getHandlers()) { - if (handler instanceof CLRBufferedLogHandler) + if (handler instanceof CLRBufferedLogHandler) { return (CLRBufferedLogHandler) handler; + } } return null; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-bridge-java/src/main/java/org/apache/reef/util/logging/CLRBufferedLogHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/util/logging/CLRBufferedLogHandler.java b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/util/logging/CLRBufferedLogHandler.java index 14a9a1e..dacdd50 100644 --- a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/util/logging/CLRBufferedLogHandler.java +++ b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/util/logging/CLRBufferedLogHandler.java @@ -74,16 +74,19 @@ public class CLRBufferedLogHandler extends Handler { */ @Override public void publish(LogRecord record) { - if (record == null) + if (record == null) { return; + } - if (!isLoggable(record)) + if (!isLoggable(record)) { return; + } synchronized (this) { this.logs.add(record); - if (!this.driverInitialized || this.logs.size() < BUFFER_LEN) + if (!this.driverInitialized || this.logs.size() < BUFFER_LEN) { return; + } } logAll(); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-common/src/main/java/org/apache/reef/io/Tuple.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/io/Tuple.java b/lang/java/reef-common/src/main/java/org/apache/reef/io/Tuple.java index 0ab60fe..cd2d6ed 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/io/Tuple.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/io/Tuple.java @@ -41,13 +41,21 @@ public final class Tuple<K, V> { @Override public boolean equals(final Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } final Tuple tuple = (Tuple) o; - if (!k.equals(tuple.k)) return false; - if (!v.equals(tuple.v)) return false; + if (!k.equals(tuple.k)) { + return false; + } + if (!v.equals(tuple.v)) { + return false; + } return true; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/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 4a329e2..793a84f 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 @@ -180,17 +180,17 @@ public final class DriverStatusManager { if (this.driverTerminationHasBeenCommunicatedToClient) { LOG.log(Level.SEVERE, ".sendJobEndingMessageToClient() called twice. Ignoring the second call"); } else { - { // Log the shutdown situation - if (this.shutdownCause.isPresent()) { - LOG.log(Level.WARNING, "Sending message about an unclean driver shutdown.", this.shutdownCause.get()); - } - if (exception.isPresent()) { - LOG.log(Level.WARNING, "There was an exception during clock.close().", exception.get()); - } - if (this.shutdownCause.isPresent() && exception.isPresent()) { - LOG.log(Level.WARNING, "The driver is shutdown because of an exception (see above) and there was an exception during clock.close(). Only the first exception will be sent to the client"); - } + // Log the shutdown situation + if (this.shutdownCause.isPresent()) { + LOG.log(Level.WARNING, "Sending message about an unclean driver shutdown.", this.shutdownCause.get()); } + if (exception.isPresent()) { + LOG.log(Level.WARNING, "There was an exception during clock.close().", exception.get()); + } + if (this.shutdownCause.isPresent() && exception.isPresent()) { + LOG.log(Level.WARNING, "The driver is shutdown because of an exception (see above) and there was an exception during clock.close(). Only the first exception will be sent to the client"); + } + if (this.shutdownCause.isPresent()) { // Send the earlier exception, if there was one this.clientConnection.send(getJobEndingMessage(this.shutdownCause)); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/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 51d090c..8540837 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 @@ -114,8 +114,9 @@ public final class ClientManager implements EventHandler<ClientRuntimeProtocol.J return clientCloseDispatcher; } else { synchronized (this) { - if (clientCloseDispatcher == null) + if (clientCloseDispatcher == null) { clientCloseDispatcher = new BroadCastEventHandler<>(clientCloseHandlers.get()); + } } return clientCloseDispatcher; } @@ -126,8 +127,9 @@ public final class ClientManager implements EventHandler<ClientRuntimeProtocol.J return clientCloseWithMessageDispatcher; } else { synchronized (this) { - if (clientCloseWithMessageDispatcher == null) + if (clientCloseWithMessageDispatcher == null) { clientCloseWithMessageDispatcher = new BroadCastEventHandler<>(clientCloseWithMessageHandlers.get()); + } } return clientCloseWithMessageDispatcher; } @@ -138,8 +140,9 @@ public final class ClientManager implements EventHandler<ClientRuntimeProtocol.J return clientMessageDispatcher; } else { synchronized (this) { - if (clientMessageDispatcher == null) + if (clientMessageDispatcher == null) { clientMessageDispatcher = new BroadCastEventHandler<>(clientMessageHandlers.get()); + } } return clientMessageDispatcher; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/ContextRepresenters.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/ContextRepresenters.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/ContextRepresenters.java index 0dffd19..b47da36 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/ContextRepresenters.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/ContextRepresenters.java @@ -65,7 +65,9 @@ public final class ContextRepresenters { */ public synchronized EvaluatorContext getContext(final String contextId) { for (final EvaluatorContext context : this.contextStack) { - if (context.getId().equals(contextId)) return context; + if (context.getId().equals(contextId)) { + return context; + } } throw new RuntimeException("Unknown evaluator context " + contextId); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/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 143d0c9..ef6be8e 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 @@ -118,56 +118,52 @@ public final class EvaluatorMessageDispatcher { this.driverRestartApplicationDispatcher = new DispatchingEStage(this.serviceDispatcher); this.driverRestartServiceDispatcher = new DispatchingEStage(this.serviceDispatcher); - { // Application Context event handlers - this.applicationDispatcher.register(ActiveContext.class, contextActiveHandlers); - this.applicationDispatcher.register(ClosedContext.class, contextClosedHandlers); - this.applicationDispatcher.register(FailedContext.class, contextFailedHandlers); - this.applicationDispatcher.register(ContextMessage.class, contextMessageHandlers); - } - { // Service Context event handlers - this.serviceDispatcher.register(ActiveContext.class, serviceContextActiveHandlers); - this.serviceDispatcher.register(ClosedContext.class, serviceContextClosedHandlers); - this.serviceDispatcher.register(FailedContext.class, serviceContextFailedHandlers); - this.serviceDispatcher.register(ContextMessage.class, serviceContextMessageHandlers); - } - { // Application Task event handlers. - this.applicationDispatcher.register(RunningTask.class, taskRunningHandlers); - this.applicationDispatcher.register(CompletedTask.class, taskCompletedHandlers); - this.applicationDispatcher.register(SuspendedTask.class, taskSuspendedHandlers); - this.applicationDispatcher.register(TaskMessage.class, taskMessageEventHandlers); - this.applicationDispatcher.register(FailedTask.class, taskExceptionEventHandlers); - } - { // Service Task event handlers - this.serviceDispatcher.register(RunningTask.class, serviceTaskRunningEventHandlers); - this.serviceDispatcher.register(CompletedTask.class, serviceTaskCompletedEventHandlers); - this.serviceDispatcher.register(SuspendedTask.class, serviceTaskSuspendedEventHandlers); - this.serviceDispatcher.register(TaskMessage.class, serviceTaskMessageEventHandlers); - this.serviceDispatcher.register(FailedTask.class, serviceTaskExceptionEventHandlers); - } - { // Application Evaluator event handlers - this.applicationDispatcher.register(FailedEvaluator.class, evaluatorFailedHandlers); - this.applicationDispatcher.register(CompletedEvaluator.class, evaluatorCompletedHandlers); - this.applicationDispatcher.register(AllocatedEvaluator.class, evaluatorAllocatedHandlers); - } - { // Service Evaluator event handlers - this.serviceDispatcher.register(FailedEvaluator.class, serviceEvaluatorFailedHandlers); - this.serviceDispatcher.register(CompletedEvaluator.class, serviceEvaluatorCompletedHandlers); - this.serviceDispatcher.register(AllocatedEvaluator.class, serviceEvaluatorAllocatedEventHandlers); - } + // Application Context event handlers + this.applicationDispatcher.register(ActiveContext.class, contextActiveHandlers); + this.applicationDispatcher.register(ClosedContext.class, contextClosedHandlers); + this.applicationDispatcher.register(FailedContext.class, contextFailedHandlers); + this.applicationDispatcher.register(ContextMessage.class, contextMessageHandlers); + + // Service Context event handlers + this.serviceDispatcher.register(ActiveContext.class, serviceContextActiveHandlers); + this.serviceDispatcher.register(ClosedContext.class, serviceContextClosedHandlers); + this.serviceDispatcher.register(FailedContext.class, serviceContextFailedHandlers); + this.serviceDispatcher.register(ContextMessage.class, serviceContextMessageHandlers); + + // Application Task event handlers. + this.applicationDispatcher.register(RunningTask.class, taskRunningHandlers); + this.applicationDispatcher.register(CompletedTask.class, taskCompletedHandlers); + this.applicationDispatcher.register(SuspendedTask.class, taskSuspendedHandlers); + this.applicationDispatcher.register(TaskMessage.class, taskMessageEventHandlers); + this.applicationDispatcher.register(FailedTask.class, taskExceptionEventHandlers); + + // Service Task event handlers + this.serviceDispatcher.register(RunningTask.class, serviceTaskRunningEventHandlers); + this.serviceDispatcher.register(CompletedTask.class, serviceTaskCompletedEventHandlers); + this.serviceDispatcher.register(SuspendedTask.class, serviceTaskSuspendedEventHandlers); + this.serviceDispatcher.register(TaskMessage.class, serviceTaskMessageEventHandlers); + this.serviceDispatcher.register(FailedTask.class, serviceTaskExceptionEventHandlers); + + // Application Evaluator event handlers + this.applicationDispatcher.register(FailedEvaluator.class, evaluatorFailedHandlers); + this.applicationDispatcher.register(CompletedEvaluator.class, evaluatorCompletedHandlers); + this.applicationDispatcher.register(AllocatedEvaluator.class, evaluatorAllocatedHandlers); + + // Service Evaluator event handlers + this.serviceDispatcher.register(FailedEvaluator.class, serviceEvaluatorFailedHandlers); + this.serviceDispatcher.register(CompletedEvaluator.class, serviceEvaluatorCompletedHandlers); + this.serviceDispatcher.register(AllocatedEvaluator.class, serviceEvaluatorAllocatedEventHandlers); // Application event handlers specific to a Driver restart - { - this.driverRestartApplicationDispatcher.register(RunningTask.class, driverRestartTaskRunningHandlers); - this.driverRestartApplicationDispatcher.register(ActiveContext.class, driverRestartActiveContextHandlers); - this.driverRestartApplicationDispatcher.register(DriverRestartCompleted.class, driverRestartCompletedHandlers); - } + this.driverRestartApplicationDispatcher.register(RunningTask.class, driverRestartTaskRunningHandlers); + this.driverRestartApplicationDispatcher.register(ActiveContext.class, driverRestartActiveContextHandlers); + this.driverRestartApplicationDispatcher.register(DriverRestartCompleted.class, driverRestartCompletedHandlers); // Service event handlers specific to a Driver restart - { - this.driverRestartServiceDispatcher.register(RunningTask.class, serviceDriverRestartTaskRunningHandlers); - this.driverRestartServiceDispatcher.register(ActiveContext.class, serviceDriverRestartActiveContextHandlers); - this.driverRestartServiceDispatcher.register(DriverRestartCompleted.class, serviceDriverRestartCompletedHandlers); - } + this.driverRestartServiceDispatcher.register(RunningTask.class, serviceDriverRestartTaskRunningHandlers); + this.driverRestartServiceDispatcher.register(ActiveContext.class, serviceDriverRestartActiveContextHandlers); + this.driverRestartServiceDispatcher.register(DriverRestartCompleted.class, serviceDriverRestartCompletedHandlers); + LOG.log(Level.FINE, "Instantiated 'EvaluatorMessageDispatcher'"); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/REEFUncaughtExceptionHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/REEFUncaughtExceptionHandler.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/REEFUncaughtExceptionHandler.java index 4030900..5159a4d 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/REEFUncaughtExceptionHandler.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/REEFUncaughtExceptionHandler.java @@ -49,9 +49,9 @@ final class REEFUncaughtExceptionHandler implements Thread.UncaughtExceptionHand LOG.log(Level.SEVERE, msg, throwable); this.errorHandler.onNext(new Exception(msg, throwable)); try { - this.wait(100); // TODO: Remove + this.wait(100); } catch (final InterruptedException e) { - + // try-catch block used to wait and give process a chance to setup communication with its parent } this.errorHandler.close(); LOG.log(Level.SEVERE, "System.exit(1)"); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/utils/BroadCastEventHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/utils/BroadCastEventHandler.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/utils/BroadCastEventHandler.java index 965441f..517e7b5 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/utils/BroadCastEventHandler.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/utils/BroadCastEventHandler.java @@ -33,8 +33,9 @@ public class BroadCastEventHandler<E> implements EventHandler<E> { @Override public void onNext(final E event) { - for (final EventHandler<E> handler : handlers) + for (final EventHandler<E> handler : handlers) { handler.onNext(event); + } } public void addEventHandler(final EventHandler<E> eventHandler) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-common/src/main/java/org/apache/reef/util/MemoryUtils.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/util/MemoryUtils.java b/lang/java/reef-common/src/main/java/org/apache/reef/util/MemoryUtils.java index 69aced0..3e83319 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/util/MemoryUtils.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/util/MemoryUtils.java @@ -98,12 +98,11 @@ public final class MemoryUtils { public static void main(final String[] args) { System.out.println(memPoolNames()); - { - final byte[] b = new byte[1 << 24]; - System.out.println(currentEdenMemoryUsageMB() - + "," + currentOldMemoryUsageMB() - + "," + currentPermMemoryUsageMB()); - } + + final byte[] b = new byte[1 << 24]; + System.out.println(currentEdenMemoryUsageMB() + + "," + currentOldMemoryUsageMB() + + "," + currentPermMemoryUsageMB()); System.gc(); System.out.println(currentEdenMemoryUsageMB() http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/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 b1af586..9f377e6 100644 --- a/lang/java/reef-common/src/main/resources/checkstyle.xml +++ b/lang/java/reef-common/src/main/resources/checkstyle.xml @@ -65,7 +65,10 @@ <module name="FileLength"/> <module name="FileTabCharacter"/> + <module name="SuppressWarningsFilter"/> + <module name="TreeWalker"> + <module name="SuppressWarningsHolder"/> <!-- Checks for Javadoc comments. --> <!-- See http://checkstyle.sf.net/config_javadoc.html --> @@ -147,8 +150,12 @@ <!-- Checks for blocks. You know, those {}'s --> <!-- See http://checkstyle.sf.net/config_blocks.html --> - <module name="AvoidNestedBlocks"/> - <module name="EmptyBlock"/> + <module name="AvoidNestedBlocks"> + <property name="allowInSwitchCase" value="true"/> + </module> + <module name="EmptyBlock"> + <property name="option" value="text"/> + </module> <module name="LeftCurly"/> <module name="NeedBraces"/> <module name="RightCurly"/> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/utils/math/VectorCodec.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/utils/math/VectorCodec.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/utils/math/VectorCodec.java index 36448d2..92ec713 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/utils/math/VectorCodec.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/utils/math/VectorCodec.java @@ -44,8 +44,9 @@ public class VectorCodec implements Codec<Vector> { try (DataInputStream dais = new DataInputStream(bais)) { int size = dais.readInt(); result = new DenseVector(size); - for (int i = 0; i < size; i++) + for (int i = 0; i < size; i++) { result.set(i, dais.readDouble()); + } } catch (IOException e) { throw new RuntimeException(e.getCause()); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/utils/math/Window.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/utils/math/Window.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/utils/math/Window.java index 9bb32d3..bd02439 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/utils/math/Window.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/utils/math/Window.java @@ -44,8 +44,9 @@ public class Window { } public double avg() { - if (list.size() == 0) + if (list.size() == 0) { return 0; + } double retVal = 0; for (double d : list) { retVal += d; @@ -54,12 +55,14 @@ public class Window { } public double avgIfAdded(double d) { - if (list.isEmpty()) + if (list.isEmpty()) { return d; + } int start = (list.size() < maxSize) ? 0 : 1; int numElems = (list.size() < maxSize) ? list.size() + 1 : maxSize; - for (int i = start; i < list.size(); i++) + for (int i = start; i < list.size(); i++) { d += list.get(i); + } return d / numElems; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-examples/src/main/java/org/apache/reef/examples/pool/JobDriver.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/pool/JobDriver.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/pool/JobDriver.java index 2f983bf..150739b 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/pool/JobDriver.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/pool/JobDriver.java @@ -227,7 +227,9 @@ public final class JobDriver { LOG.log(Level.INFO, "TIME: Active Context {0}", context.getId()); - if (isPiggyback) return; // Task already submitted + if (isPiggyback) { + return; // Task already submitted + } final boolean runTask; final int nTask; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/TaskEntity.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/TaskEntity.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/TaskEntity.java index ba837ff..42456f4 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/TaskEntity.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/TaskEntity.java @@ -45,13 +45,21 @@ final class TaskEntity { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } TaskEntity that = (TaskEntity) o; - if (taskId != that.taskId) return false; - if (!command.equals(that.command)) return false; + if (taskId != that.taskId) { + return false; + } + if (!command.equals(that.command)) { + return false; + } return true; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/impl/EvaluatorToPartitionMapper.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/impl/EvaluatorToPartitionMapper.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/impl/EvaluatorToPartitionMapper.java index e7d17e1..3ac11e9 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/impl/EvaluatorToPartitionMapper.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/impl/EvaluatorToPartitionMapper.java @@ -132,8 +132,9 @@ public class EvaluatorToPartitionMapper<V extends InputSplit> { } while (true) { final NumberedSplit<V> split = value.poll(); - if (split == null) + if (split == null) { return null; + } if (value == unallocatedSplits || unallocatedSplits.remove(split)) { LOG.log(Level.FINE, "Found split-" + split.getIndex() + " in the queue"); final NumberedSplit<V> old = evaluatorToSplits.putIfAbsent(evaluatorId, split); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/impl/NumberedSplit.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/impl/NumberedSplit.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/impl/NumberedSplit.java index 9efa127..f3cbc97 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/impl/NumberedSplit.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/impl/NumberedSplit.java @@ -53,11 +53,12 @@ final class NumberedSplit<E> implements Comparable<NumberedSplit<E>> { @Override public int compareTo(final NumberedSplit<E> o) { - if (this.index == o.index) + if (this.index == o.index) { return 0; - if (this.index < o.index) + } + if (this.index < o.index) { return -1; - else - return 1; + } + return 1; } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-io/src/main/java/org/apache/reef/io/network/util/StringIdentifier.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/util/StringIdentifier.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/util/StringIdentifier.java index c833562..f8da208 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/util/StringIdentifier.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/util/StringIdentifier.java @@ -68,12 +68,14 @@ public class StringIdentifier implements ComparableIdentifier { @Override public int compareTo(Identifier o) { if (o == null) { - if (str == null) + if (str == null) { return 0; + } return 1; } else { - if (str == null) + if (str == null) { return -1; + } return str.compareTo(o.toString()); } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/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 5c3b32f..3fe4145 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 @@ -86,7 +86,9 @@ public class FramingOutputStream extends OutputStream implements Accumulable<byt public void close() throws IOException { if (!closed) { try { - if (this.offset > 0) nextFrame(); + if (this.offset > 0) { + nextFrame(); + } } catch (StorageException e) { throw (IOException) e.getCause(); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/ram/SortingRamSpool.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/ram/SortingRamSpool.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/ram/SortingRamSpool.java index 5c8ee60..1ba55f4 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/ram/SortingRamSpool.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/ram/SortingRamSpool.java @@ -32,8 +32,9 @@ public class SortingRamSpool<T> implements Spool<T> { private Accumulator<T> acc = new Accumulator<T>() { @Override public void add(T datum) throws StorageException { - if (ready) + if (ready) { throw new IllegalStateException("add called after close!"); + } heap.add(datum); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/util/GetAllIterable.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/util/GetAllIterable.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/util/GetAllIterable.java index 68583b1..8be1b37 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/util/GetAllIterable.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/util/GetAllIterable.java @@ -62,8 +62,9 @@ public class GetAllIterable<T> implements final CharSequence key = curKey; curKey = findNextKey(); lastKey = key; - if (key == null) + if (key == null) { throw new NoSuchElementException(); + } final T v = map.get(key); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/cli/TFileParser.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/cli/TFileParser.java b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/cli/TFileParser.java index 621187a..3bbe9dd 100644 --- a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/cli/TFileParser.java +++ b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/cli/TFileParser.java @@ -88,8 +88,9 @@ final class TFileParser { final TFile.Reader.Scanner scanner = reader.createScanner(); for (int counter = 0; counter < 3 && !scanner.atEnd(); - counter += 1, scanner.advance()) { + counter += 1) { //skip VERSION, APPLICATION_ACL, and APPLICATION_OWNER + scanner.advance(); } LOG.log(Level.FINE, "Created Scanner for path {0}", path); return scanner; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/HDInsightInstance.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/HDInsightInstance.java b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/HDInsightInstance.java index ecad319..5894c8c 100644 --- a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/HDInsightInstance.java +++ b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/HDInsightInstance.java @@ -233,6 +233,7 @@ public final class HDInsightInstance { // Prime the cache try (final CloseableHttpResponse response = this.httpClient.execute(targetHost, httpget, result)) { + // empty try block used to automatically close resources } return result; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/StringEntry.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/StringEntry.java b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/StringEntry.java index 897eb2b..994496b 100644 --- a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/StringEntry.java +++ b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/StringEntry.java @@ -77,8 +77,12 @@ public final class StringEntry { @Override public boolean equals(final Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } final StringEntry that = (StringEntry) o; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/REEFExecutors.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/REEFExecutors.java b/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/REEFExecutors.java index 5df00ad..1de9817 100644 --- a/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/REEFExecutors.java +++ b/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/REEFExecutors.java @@ -48,7 +48,9 @@ final class REEFExecutors { this.executors.remove(id); } - public Set<String> getExecutorIds() { return executors.keySet(); } + public Set<String> getExecutorIds() { + return executors.keySet(); + } public int getMemory(final String id) { return executors.get(id).getMemory(); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/client/YarnSubmissionHelper.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/client/YarnSubmissionHelper.java b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/client/YarnSubmissionHelper.java index 0d573a9..637c6fd 100644 --- a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/client/YarnSubmissionHelper.java +++ b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/client/YarnSubmissionHelper.java @@ -60,21 +60,19 @@ public final class YarnSubmissionHelper implements Closeable{ final ClasspathProvider classpath) throws IOException, YarnException { this.fileNames = fileNames; this.classpath = classpath; - { - LOG.log(Level.FINE, "Initializing YARN Client"); - this.yarnClient = YarnClient.createYarnClient(); - this.yarnClient.init(yarnConfiguration); - this.yarnClient.start(); - LOG.log(Level.FINE, "Initialized YARN Client"); - } - { - LOG.log(Level.FINE, "Requesting Application ID from YARN."); - this.yarnClientApplication = this.yarnClient.createApplication(); - this.applicationResponse = yarnClientApplication.getNewApplicationResponse(); - this.applicationSubmissionContext = yarnClientApplication.getApplicationSubmissionContext(); - this.applicationId = applicationSubmissionContext.getApplicationId(); - LOG.log(Level.FINEST, "YARN Application ID: {0}", applicationId); - } + + LOG.log(Level.FINE, "Initializing YARN Client"); + this.yarnClient = YarnClient.createYarnClient(); + this.yarnClient.init(yarnConfiguration); + this.yarnClient.start(); + LOG.log(Level.FINE, "Initialized YARN Client"); + + LOG.log(Level.FINE, "Requesting Application ID from YARN."); + this.yarnClientApplication = this.yarnClient.createApplication(); + this.applicationResponse = yarnClientApplication.getNewApplicationResponse(); + this.applicationSubmissionContext = yarnClientApplication.getApplicationSubmissionContext(); + this.applicationId = applicationSubmissionContext.getApplicationId(); + LOG.log(Level.FINEST, "YARN Application ID: {0}", applicationId); } /** http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/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 cdb10e1..1efbbf6 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 @@ -666,8 +666,7 @@ final class YarnContainerManager logContainerChange(entry); } - private void logContainerChange(final String entry) - { + private void logContainerChange(final String entry) { try { writeToEvaluatorLog(entry); } catch (final IOException e) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/InjectionFuture.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/InjectionFuture.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/InjectionFuture.java index 79dc98e..c6ddde7 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/InjectionFuture.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/InjectionFuture.java @@ -108,7 +108,9 @@ public final class InjectionFuture<T> implements Future<T> { @SuppressWarnings("unchecked") @Override public T get() { - if (instance != null) return instance; + if (instance != null) { + return instance; + } try { synchronized (injector) { final T t; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/ClassHierarchyImpl.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/ClassHierarchyImpl.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/ClassHierarchyImpl.java index dedf318..8c898e9 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/ClassHierarchyImpl.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/ClassHierarchyImpl.java @@ -299,6 +299,7 @@ public class ClassHierarchyImpl implements JavaClassHierarchy { Node n = getAlreadyBoundNode(c); return n; } catch (NameResolutionException e) { + // node not bound yet } // First, walk up the class hierarchy, registering all out parents. This // can't be loopy. @@ -344,11 +345,8 @@ public class ClassHierarchyImpl implements JavaClassHierarchy { NamedParameterNode<?> np = (NamedParameterNode<?>) register(arg .getNamedParameterName()); try { - if (np.isSet()) { - /// XXX When handling sets, need to track target of generic parameter, and check the type here! - } else if (np.isList()) { - - } else { + // TODO: When handling sets, need to track target of generic parameter, and check the type here! + if (!np.isSet() && !np.isList()) { if (!ReflectionUtilities.isCoercable(classForName(arg.getType()), classForName(np.getFullArgName()))) { throw new ClassHierarchyException( @@ -385,6 +383,7 @@ public class ClassHierarchyImpl implements JavaClassHierarchy { try { return getAlreadyBoundNode(c); } catch (NameResolutionException e) { + // node not bound yet } final Node n = buildPathToNode(c); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/types/AbstractNode.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/types/AbstractNode.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/types/AbstractNode.java index cc95b0f..845471e 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/types/AbstractNode.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/types/AbstractNode.java @@ -55,8 +55,12 @@ public abstract class AbstractNode implements Node { @Override public boolean equals(Object o) { - if (o == null) return false; - if (o == this) return true; + if (o == null) { + return false; + } + if (o == this) { + return true; + } AbstractNode n = (AbstractNode) o; final boolean parentsEqual; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/types/ConstructorDefImpl.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/types/ConstructorDefImpl.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/types/ConstructorDefImpl.java index 4241490..46b2655 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/types/ConstructorDefImpl.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/types/ConstructorDefImpl.java @@ -135,8 +135,9 @@ public class ConstructorDefImpl<T> implements ConstructorDef<T> { } } // If not, then argument j from def is not in our list. Return false. - if (!found) + if (!found) { return false; + } } // Everything in def's arg list is in ours. Do we have at least one extra // argument? http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/ReflectionUtilities.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/ReflectionUtilities.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/ReflectionUtilities.java index 4bff7f4..ae77ff2 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/ReflectionUtilities.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/ReflectionUtilities.java @@ -108,7 +108,9 @@ public class ReflectionUtilities { if (c instanceof Class) { Class<?> clz = (Class<?>) c; final Type sc = clz.getSuperclass(); - if (sc != null) workQueue.add(sc); //c.getSuperclass()); + if (sc != null) { + workQueue.add(sc); //c.getSuperclass()); + } workQueue.addAll(Arrays.asList(clz.getGenericInterfaces())); } else if (c instanceof ParameterizedType) { ParameterizedType pt = (ParameterizedType) c; @@ -116,7 +118,9 @@ public class ReflectionUtilities { final Type sc = rawPt.getSuperclass(); // workQueue.add(pt); // workQueue.add(rawPt); - if (sc != null) workQueue.add(sc); + if (sc != null) { + workQueue.add(sc); + } workQueue.addAll(Arrays.asList(rawPt.getGenericInterfaces())); } else if (c instanceof WildcardType) { workQueue.add(Object.class); // XXX not really correct, but close enough? @@ -262,7 +266,9 @@ public class ReflectionUtilities { ArrayList<Type> al = new ArrayList<>(); al.addAll(Arrays.asList(clazz.getGenericInterfaces())); Type sc = clazz.getGenericSuperclass(); - if (sc != null) al.add(sc); + if (sc != null) { + al.add(sc); + } final Type[] interfaces = al.toArray(new Type[0]); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/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 6d48943..130e93f 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 @@ -339,8 +339,9 @@ public class Tint { for (int j = 1; j < tok.length; j++) { if (tok[j].matches("^[A-Z].*") || j > 4) { break; - } else + } else { sb.append("." + tok[j]); + } } String pack = sb.toString(); if (!currentPackage.equals(pack)) { @@ -488,7 +489,7 @@ public class Tint { } } } catch (NameResolutionException ex) { - + // } try { String s = e.getValue(); @@ -505,7 +506,7 @@ public class Tint { } } } catch (NameResolutionException ex) { - + // } } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-utils/src/main/java/org/apache/reef/util/Optional.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-utils/src/main/java/org/apache/reef/util/Optional.java b/lang/java/reef-utils/src/main/java/org/apache/reef/util/Optional.java index 1940e0b..46d321d 100644 --- a/lang/java/reef-utils/src/main/java/org/apache/reef/util/Optional.java +++ b/lang/java/reef-utils/src/main/java/org/apache/reef/util/Optional.java @@ -108,9 +108,13 @@ public final class Optional<T> implements Serializable { @Override public boolean equals(final Object obj) { - if (this == obj) return true; + if (this == obj) { + return true; + } - if (obj == null || getClass() != obj.getClass()) return false; + if (obj == null || getClass() != obj.getClass()) { + return false; + } final Optional that = (Optional) obj; return this.value == that.value || (this.value != null && this.value.equals(that.value)); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/examples/join/BlockingJoin.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/examples/join/BlockingJoin.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/examples/join/BlockingJoin.java index ed02117..72c6ea6 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/examples/join/BlockingJoin.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/examples/join/BlockingJoin.java @@ -75,7 +75,9 @@ public class BlockingJoin implements StaticObservable { @Override public void onNext(TupleEvent value) { - if (!leftDone) waitUntilLeftIsDone(); + if (!leftDone) { + waitUntilLeftIsDone(); + } if (left.contains(value)) { out.onNext(value); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/examples/p2p/Pull2Push.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/examples/p2p/Pull2Push.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/examples/p2p/Pull2Push.java index ae4378b..dd3d7ee 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/examples/p2p/Pull2Push.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/examples/p2p/Pull2Push.java @@ -81,8 +81,6 @@ public final class Pull2Push<T> implements Runnable, AutoCloseable { // The message source has returned null as the next message. We drop the message source in that case. Logger.getLogger(Pull2Push.class.getName()).log(Level.INFO, "Droping message source {0} from the queue", nextSource.toString()); } - } else { - // No source where available. We could put a wait() here. } } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/DefaultIdentifierFactory.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/DefaultIdentifierFactory.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/DefaultIdentifierFactory.java index b652452..4b6a3f7 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/DefaultIdentifierFactory.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/DefaultIdentifierFactory.java @@ -70,8 +70,9 @@ public class DefaultIdentifierFactory implements IdentifierFactory { @Override public Identifier getNewInstance(String str) { int index = str.indexOf("://"); - if (index < 0) + if (index < 0) { throw new RemoteRuntimeException("Invalid name " + str); + } String type = str.substring(0, index); Class<? extends Identifier> clazz = typeToClazzMap.get(type); Class<?>[] argTypes = {String.class}; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/DefaultThreadFactory.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/DefaultThreadFactory.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/DefaultThreadFactory.java index c94aaf2..e020a7f 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/DefaultThreadFactory.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/DefaultThreadFactory.java @@ -73,12 +73,15 @@ public final class DefaultThreadFactory implements ThreadFactory { @Override public Thread newThread(Runnable r) { Thread t = new Thread(group, r, prefix + threadNumber.getAndIncrement(), 0); - if (t.isDaemon()) + if (t.isDaemon()) { t.setDaemon(false); - if (t.getPriority() != Thread.NORM_PRIORITY) + } + if (t.getPriority() != Thread.NORM_PRIORITY) { t.setPriority(Thread.NORM_PRIORITY); - if (uncaughtExceptionHandler != null) + } + if (uncaughtExceptionHandler != null) { t.setUncaughtExceptionHandler(uncaughtExceptionHandler); + } return t; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/MultiEventHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/MultiEventHandler.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/MultiEventHandler.java index 7bcfaec..e2f9923 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/MultiEventHandler.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/MultiEventHandler.java @@ -50,8 +50,9 @@ public class MultiEventHandler<T> implements EventHandler<T> { @Override public void onNext(T event) { EventHandler<T> handler = (EventHandler<T>) map.get(event.getClass()); - if (handler == null) + if (handler == null) { throw new WakeRuntimeException("No event " + event.getClass() + " handler"); + } handler.onNext(event); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/ThreadPoolStage.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/ThreadPoolStage.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/ThreadPoolStage.java index e5c9ff6..22bffd3 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/ThreadPoolStage.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/ThreadPoolStage.java @@ -78,8 +78,9 @@ public final class ThreadPoolStage<T> extends AbstractEStage<T> { super(name); this.handler = handler; this.errorHandler = errorHandler; - if (numThreads <= 0) + if (numThreads <= 0) { throw new WakeRuntimeException(name + " numThreads " + numThreads + " is less than or equal to 0"); + } this.numThreads = numThreads; this.executor = Executors.newFixedThreadPool(numThreads, new DefaultThreadFactory(name)); StageManager.instance().register(this); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/TimerStage.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/TimerStage.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/TimerStage.java index a34af30..191110c 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/TimerStage.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/TimerStage.java @@ -105,7 +105,9 @@ public final class TimerStage implements Stage { @Override public void run() { - if (LOG.isLoggable(Level.FINEST)) LOG.log(Level.FINEST, "{0} {1}", new Object[]{name, event}); + if (LOG.isLoggable(Level.FINEST)) { + LOG.log(Level.FINEST, "{0} {1}", new Object[]{name, event}); + } handler.onNext(event); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/WakeUncaughtExceptionHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/WakeUncaughtExceptionHandler.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/WakeUncaughtExceptionHandler.java index e3dcd9a..f729fbe 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/WakeUncaughtExceptionHandler.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/WakeUncaughtExceptionHandler.java @@ -40,7 +40,8 @@ public final class WakeUncaughtExceptionHandler implements Thread.UncaughtExcept @Override public void uncaughtException(Thread t, Throwable e) { final String msg = "Thread " + t.getName() + " threw an uncaught exception."; - if (errorHandler != null) + if (errorHandler != null) { errorHandler.onNext(new Exception(msg, e)); + } } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/metrics/UniformHistogram.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/metrics/UniformHistogram.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/metrics/UniformHistogram.java index 7677b6e..c2869ae 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/metrics/UniformHistogram.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/metrics/UniformHistogram.java @@ -52,8 +52,9 @@ public class UniformHistogram implements Histogram { public void update(long value) { count.incrementAndGet(); int index = (int) (value / binWidth); - if (index >= numBins) + if (index >= numBins) { index = numBins - 1; + } values.incrementAndGet(index); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/profiler/WakeProfiler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/profiler/WakeProfiler.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/profiler/WakeProfiler.java index 8b2d345..96ed581 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/profiler/WakeProfiler.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/profiler/WakeProfiler.java @@ -110,8 +110,6 @@ public class WakeProfiler implements Aspect { Vertex<?> v = getVertex(o); if (o instanceof Set) { LOG.fine("Got a set arg for " + constructorDef + " length " + ((Set<?>) o).size()); - } else if (o instanceof InjectionFuture) { -// LOG.info("Got injection future arg. "->" + o); } v_args[i] = v; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/MultiEncoder.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/MultiEncoder.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/MultiEncoder.java index 41c9b95..4e3489e 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/MultiEncoder.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/MultiEncoder.java @@ -38,7 +38,7 @@ public class MultiEncoder<T> implements Encoder<T> { /** * Constructs an encoder that encodes an object to bytes based on the class name. * - * @param clazzToDecoderMap + * @param clazzToEncoderMap */ public MultiEncoder(Map<Class<? extends T>, Encoder<? extends T>> clazzToEncoderMap) { this.clazzToEncoderMap = clazzToEncoderMap; @@ -52,8 +52,9 @@ public class MultiEncoder<T> implements Encoder<T> { @Override public byte[] encode(T obj) { Encoder<T> encoder = (Encoder<T>) clazzToEncoderMap.get(obj.getClass()); - if (encoder == null) + if (encoder == null) { throw new RemoteRuntimeException("Encoder for " + obj.getClass() + " not known."); + } WakeTuplePBuf.Builder tupleBuilder = WakeTuplePBuf.newBuilder(); tupleBuilder.setClassName(obj.getClass().getName()); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/OrderedRemoteReceiverStage.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/OrderedRemoteReceiverStage.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/OrderedRemoteReceiverStage.java index 1d3e41f..2e76dac 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/OrderedRemoteReceiverStage.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/OrderedRemoteReceiverStage.java @@ -125,8 +125,9 @@ class OrderedPushEventHandler implements EventHandler<TransportEvent> { re.setLocalAddress(value.getLocalAddress()); re.setRemoteAddress(value.getRemoteAddress()); - if (LOG.isLoggable(Level.FINER)) + if (LOG.isLoggable(Level.FINER)) { LOG.log(Level.FINER, "{0} {1}", new Object[]{value, re}); + } LOG.log(Level.FINER, "Value length is {0}", value.getData().length); @@ -155,8 +156,9 @@ class OrderedPullEventHandler implements EventHandler<OrderedEventStream> { @Override public void onNext(OrderedEventStream stream) { - if (LOG.isLoggable(Level.FINER)) + if (LOG.isLoggable(Level.FINER)) { LOG.log(Level.FINER, "{0}", stream); + } synchronized (stream) { RemoteEvent<byte[]> event; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/ProxyEventHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/ProxyEventHandler.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/ProxyEventHandler.java index ad0046f..6a9fa06 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/ProxyEventHandler.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/ProxyEventHandler.java @@ -68,8 +68,9 @@ public class ProxyEventHandler<T> implements EventHandler<T> { */ @Override public void onNext(T event) { - if (LOG.isLoggable(Level.FINE)) + if (LOG.isLoggable(Level.FINE)) { LOG.log(Level.FINE, "remoteid: {0}\n{1}", new Object[]{remoteId.getSocketAddress(), event.toString()}); + } handler.onNext(new RemoteEvent<T>(myId.getSocketAddress(), remoteId.getSocketAddress(), "", remoteSinkName, seqGen.getNextSeq(remoteId.getSocketAddress()), event)); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/RemoteEventComparator.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/RemoteEventComparator.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/RemoteEventComparator.java index 3e025bd..83eb6ce 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/RemoteEventComparator.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/RemoteEventComparator.java @@ -27,10 +27,12 @@ public class RemoteEventComparator<T> implements Comparator<RemoteEvent<T>> { @Override public int compare(RemoteEvent<T> o1, RemoteEvent<T> o2) { - if (o1.getSeq() < o2.getSeq()) + if (o1.getSeq() < o2.getSeq()) { return -1; - if (o1.getSeq() > o2.getSeq()) + } + if (o1.getSeq() > o2.getSeq()) { return 1; + } return 0; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/RemoteEventEncoder.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/RemoteEventEncoder.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/RemoteEventEncoder.java index 7d3c7da..d5a777b 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/RemoteEventEncoder.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/RemoteEventEncoder.java @@ -50,10 +50,12 @@ public class RemoteEventEncoder<T> implements Encoder<RemoteEvent<T>> { */ @Override public byte[] encode(RemoteEvent<T> obj) { - if (obj.getSink() == null) + if (obj.getSink() == null) { throw new RemoteRuntimeException("Sink stage is null"); - if (obj.getEvent() == null) + } + if (obj.getEvent() == null) { throw new RemoteRuntimeException("Event is null"); + } WakeMessagePBuf.Builder builder = WakeMessagePBuf.newBuilder(); String source = obj.getSource() == null ? "" : obj.getSource(); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/RemoteReceiverEventHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/RemoteReceiverEventHandler.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/RemoteReceiverEventHandler.java index b7386b0..c75b30f 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/RemoteReceiverEventHandler.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/RemoteReceiverEventHandler.java @@ -54,8 +54,9 @@ class RemoteReceiverEventHandler implements EventHandler<TransportEvent> { re.setLocalAddress(e.getLocalAddress()); re.setRemoteAddress(e.getRemoteAddress()); - if (LOG.isLoggable(Level.FINER)) + if (LOG.isLoggable(Level.FINER)) { LOG.log(Level.FINER, "{0} {1}", new Object[]{e, re}); + } handler.onNext(re); } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/RemoteSenderEventHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/RemoteSenderEventHandler.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/RemoteSenderEventHandler.java index 394c310..308afc9 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/RemoteSenderEventHandler.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/RemoteSenderEventHandler.java @@ -107,8 +107,9 @@ class RemoteSenderEventHandler<T> implements EventHandler<RemoteEvent<T>> { // encode and write bytes // consumeQueue(); - if (LOG.isLoggable(Level.FINEST)) + if (LOG.isLoggable(Level.FINEST)) { LOG.log(Level.FINEST, "Send an event from " + linkRef.get().getLocalAddress() + " to " + linkRef.get().getRemoteAddress() + " value " + value); + } linkRef.get().write(encoder.encode(value)); } } catch (RemoteRuntimeException ex2) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/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 0072b7e..f76edfb 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 @@ -187,7 +187,9 @@ public class NettyMessagingTransport implements Transport { } else { Iterator<Integer> ports = tcpPortProvider.iterator(); while (acceptor == null) { - if (!ports.hasNext()) break; + if (!ports.hasNext()) { + break; + } port = ports.next(); LOG.log(Level.FINEST, "Try port {0}", port); try { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/rx/impl/RxThreadPoolStage.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/rx/impl/RxThreadPoolStage.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/rx/impl/RxThreadPoolStage.java index e9a4526..82d1208 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/rx/impl/RxThreadPoolStage.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/rx/impl/RxThreadPoolStage.java @@ -83,8 +83,9 @@ public final class RxThreadPoolStage<T> extends AbstractRxStage<T> { @Parameter(NumberOfThreads.class) final int numThreads) { super(name); this.observer = observer; - if (numThreads <= 0) + if (numThreads <= 0) { throw new WakeRuntimeException(name + " numThreads " + numThreads + " is less than or equal to 0"); + } tf = new DefaultThreadFactory(name); this.executor = Executors.newFixedThreadPool(numThreads, tf); this.completionExecutor = Executors.newSingleThreadExecutor(tf); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/rx/impl/TimeoutSubject.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/rx/impl/TimeoutSubject.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/rx/impl/TimeoutSubject.java index e8efd96..5d2d3c9 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/rx/impl/TimeoutSubject.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/rx/impl/TimeoutSubject.java @@ -47,7 +47,9 @@ public class TimeoutSubject<T> implements Subject<T, T> { finishedCopy = finished; finished = true; // lock out the caller from putting event through now } - if (!finishedCopy) destination.onError(new TimeoutException("TimeoutSubject expired")); + if (!finishedCopy) { + destination.onError(new TimeoutException("TimeoutSubject expired")); + } } }); this.timeBomb.start(); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/time/Time.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/time/Time.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/time/Time.java index c6619bd..a174461 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/time/Time.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/time/Time.java @@ -40,10 +40,18 @@ public abstract class Time implements Comparable<Time> { @Override public final int compareTo(Time o) { - if (this.timestamp < o.timestamp) return -1; - if (this.timestamp > o.timestamp) return 1; - if (this.hashCode() < o.hashCode()) return -1; - if (this.hashCode() > o.hashCode()) return 1; + if (this.timestamp < o.timestamp) { + return -1; + } + if (this.timestamp > o.timestamp) { + return 1; + } + if (this.hashCode() < o.hashCode()) { + return -1; + } + if (this.hashCode() > o.hashCode()) { + return 1; + } return 0; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/time/runtime/LogicalTimer.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/time/runtime/LogicalTimer.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/time/runtime/LogicalTimer.java index 84b4c10..cc6bee9 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/time/runtime/LogicalTimer.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/time/runtime/LogicalTimer.java @@ -41,7 +41,9 @@ public final class LogicalTimer implements Timer { @Override public boolean isReady(long time) { - if (this.current < time) this.current = time; + if (this.current < time) { + this.current = time; + } return true; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/44cea492/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 f4b97d4..6149db4 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 @@ -148,7 +148,9 @@ public final class RuntimeClock implements Clock { public final boolean isIdle() { synchronized (this.schedule) { for (Time t : this.schedule) { - if (t instanceof ClientAlarm) return false; + if (t instanceof ClientAlarm) { + return false; + } } return true; } @@ -228,9 +230,12 @@ public final class RuntimeClock implements Clock { alarm.handle(); } else { this.handlers.onNext(time); - if (time instanceof StopTime) break; // we're done. + if (time instanceof StopTime) { + break; // we're done. + } } } catch (InterruptedException e) { + // waiting interrupted - return to loop } } this.handlers.onNext(new RuntimeStop(this.timer.getCurrent()));
