Repository: incubator-reef Updated Branches: refs/heads/master de98f031e -> d414bb3b9
[REEF-358]: Fix checkstyle violations in the "Whitespace" category This change fixes all violations of these checks in our code. JIRA: [REEF-358](https://issues.apache.org/jira/browse/REEF-358) Pull Request: This closes #211 Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/d414bb3b Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/d414bb3b Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/d414bb3b Branch: refs/heads/master Commit: d414bb3b9bd82b4c962e13569cc6268d4ec14bcc Parents: de98f03 Author: Mariia Mykhailova <[email protected]> Authored: Wed Jun 10 09:57:40 2015 -0700 Committer: Markus Weimer <[email protected]> Committed: Thu Jun 11 08:26:27 2015 +0900 ---------------------------------------------------------------------- .../reef/examples/group/bgd/SlaveTask.java | 2 +- .../group/bgd/data/parser/SVMLightParser.java | 2 +- .../examples/scheduler/SchedulerResponse.java | 8 ++++---- .../io/network/group/api/driver/TaskNode.java | 2 +- .../group/api/driver/TaskNodeStatus.java | 2 +- .../io/network/group/impl/driver/MsgKey.java | 20 ++++++++++---------- .../network/group/impl/driver/TaskNodeImpl.java | 2 +- .../group/impl/utils/ConcurrentCountingMap.java | 20 ++++++++++---------- .../network/group/impl/utils/CountingMap.java | 16 ++++++++-------- .../group/impl/utils/CountingSemaphore.java | 12 ++++++------ .../impl/utils/ResettingCountDownLatch.java | 8 ++++---- .../io/network/naming/NameLookupClient.java | 2 +- .../io/network/naming/NameRegistryClient.java | 2 +- .../io/storage/local/CodecFileIterator.java | 2 +- .../io/storage/local/LocalStorageService.java | 1 - .../reef/tang/formats/ConfigurationFile.java | 2 +- .../tang/implementation/java/InjectorImpl.java | 2 +- .../java/org/apache/reef/tang/util/Tint.java | 2 +- .../apache/reef/wake/profiler/WakeProfiler.java | 3 +-- .../address/LegacyLocalAddressProvider.java | 2 +- .../wake/remote/ports/RandomRangeIterator.java | 2 +- .../reef/webserver/ParsedHttpRequest.java | 2 +- 22 files changed, 57 insertions(+), 59 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/d414bb3b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/SlaveTask.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/SlaveTask.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/SlaveTask.java index c62359b..9d753e1 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/SlaveTask.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/SlaveTask.java @@ -93,7 +93,7 @@ public class SlaveTask implements Task { */ loadData(); - for (boolean repeat = true; repeat; ) { + for (boolean repeat = true; repeat;) { final ControlMessages controlMessage = controlMessageBroadcaster.receive(); switch (controlMessage) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/d414bb3b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/data/parser/SVMLightParser.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/data/parser/SVMLightParser.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/data/parser/SVMLightParser.java index 8f4c9f6..38c7a28 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/data/parser/SVMLightParser.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/data/parser/SVMLightParser.java @@ -90,7 +90,7 @@ public class SVMLightParser implements Parser<String> { } LOG.log(Level.INFO, "OUT: {0} {1} {2}", - new Object[] { examples.size(), avgFtLen, avgFtLen / examples.size() }); + new Object[] {examples.size(), avgFtLen, avgFtLen / examples.size()}); examples.clear(); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/d414bb3b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/SchedulerResponse.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/SchedulerResponse.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/SchedulerResponse.java index bd29a26..d777757 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/SchedulerResponse.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/SchedulerResponse.java @@ -47,28 +47,28 @@ final class SchedulerResponse { * Create a response with OK status. */ public static SchedulerResponse OK(final String message){ - return new SchedulerResponse (SC_OK, message); + return new SchedulerResponse(SC_OK, message); } /** * Create a response with BAD_REQUEST status. */ public static SchedulerResponse BAD_REQUEST(final String message){ - return new SchedulerResponse (SC_BAD_REQUEST, message); + return new SchedulerResponse(SC_BAD_REQUEST, message); } /** * Create a response with FORBIDDEN status. */ public static SchedulerResponse FORBIDDEN(final String message){ - return new SchedulerResponse (SC_FORBIDDEN, message); + return new SchedulerResponse(SC_FORBIDDEN, message); } /** * Create a response with NOT FOUND status. */ public static SchedulerResponse NOT_FOUND(final String message){ - return new SchedulerResponse (SC_NOT_FOUND, message); + return new SchedulerResponse(SC_NOT_FOUND, message); } /** http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/d414bb3b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/api/driver/TaskNode.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/api/driver/TaskNode.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/api/driver/TaskNode.java index 72c95e0..8a626cf 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/api/driver/TaskNode.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/api/driver/TaskNode.java @@ -90,5 +90,5 @@ public interface TaskNode { TaskNode successor(); - void updatingTopology (); + void updatingTopology(); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/d414bb3b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/api/driver/TaskNodeStatus.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/api/driver/TaskNodeStatus.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/api/driver/TaskNodeStatus.java index 797f20f..41a2e07 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/api/driver/TaskNodeStatus.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/api/driver/TaskNodeStatus.java @@ -77,5 +77,5 @@ public interface TaskNodeStatus { * Called to denote that a UpdateTopology msg will. * be sent */ - void updatingTopology (); + void updatingTopology(); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/d414bb3b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/MsgKey.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/MsgKey.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/MsgKey.java index e700d4b..f4789ca 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/MsgKey.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/MsgKey.java @@ -30,37 +30,37 @@ public class MsgKey { private final String dst; private final ReefNetworkGroupCommProtos.GroupCommMessage.Type msgType; - public MsgKey (final String src, final String dst, final ReefNetworkGroupCommProtos.GroupCommMessage.Type msgType) { + public MsgKey(final String src, final String dst, final ReefNetworkGroupCommProtos.GroupCommMessage.Type msgType) { this.src = src; this.dst = dst; this.msgType = msgType; } - public MsgKey (final GroupCommunicationMessage msg) { + public MsgKey(final GroupCommunicationMessage msg) { this.src = msg.getSrcid() + ":" + msg.getSrcVersion(); this.dst = msg.getDestid() + ":" + msg.getVersion(); this.msgType = msg.getType(); } - public String getSrc () { - return src.split(":",2)[0]; + public String getSrc() { + return src.split(":", 2)[0]; } - public String getDst () { - return dst.split(":",2)[0]; + public String getDst() { + return dst.split(":", 2)[0]; } - public ReefNetworkGroupCommProtos.GroupCommMessage.Type getMsgType () { + public ReefNetworkGroupCommProtos.GroupCommMessage.Type getMsgType() { return msgType; } @Override - public String toString () { + public String toString() { return "(" + src + "," + dst + "," + msgType + ")"; } @Override - public boolean equals (final Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } @@ -81,7 +81,7 @@ public class MsgKey { } @Override - public int hashCode () { + public int hashCode() { int result = src.hashCode(); result = 31 * result + dst.hashCode(); result = 31 * result + msgType.hashCode(); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/d414bb3b/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 4490538..40ddcdd 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 @@ -307,7 +307,7 @@ public class TaskNodeImpl implements TaskNode { @Override public boolean resetTopologySetupSent() { - LOG.entering("TaskNodeImpl", "resetTopologySetupSent", new Object[]{getQualifiedName(),}); + LOG.entering("TaskNodeImpl", "resetTopologySetupSent", new Object[]{getQualifiedName(), }); final boolean retVal = topoSetupSent.compareAndSet(true, false); LOG.exiting("TaskNodeImpl", "resetTopologySetupSent", getQualifiedName() + retVal); return retVal; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/d414bb3b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/utils/ConcurrentCountingMap.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/utils/ConcurrentCountingMap.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/utils/ConcurrentCountingMap.java index 0ea1678..988dad2 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/utils/ConcurrentCountingMap.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/utils/ConcurrentCountingMap.java @@ -34,7 +34,7 @@ public class ConcurrentCountingMap<K, V> { private final ConcurrentMap<K, CountingMap<V>> map = new ConcurrentHashMap<>(); - public boolean remove (final K key, final V value) { + public boolean remove(final K key, final V value) { if (!map.containsKey(key)) { return false; } @@ -45,31 +45,31 @@ public class ConcurrentCountingMap<K, V> { return retVal; } - public void add (final K key, final V value) { + public void add(final K key, final V value) { map.putIfAbsent(key, new CountingMap<V>()); map.get(key).add(value); } - public CountingMap<V> get (final K key) { + public CountingMap<V> get(final K key) { return map.get(key); } - public boolean isEmpty () { + public boolean isEmpty() { return map.isEmpty(); } - public boolean containsKey (final K key) { + public boolean containsKey(final K key) { return map.containsKey(key); } - public boolean contains (final K key, final V value) { + public boolean contains(final K key, final V value) { if (!map.containsKey(key)) { return false; } return map.get(key).containsKey(value); } - public boolean notContains (final V value) { + public boolean notContains(final V value) { for (final CountingMap<V> innerMap : map.values()) { if (innerMap.containsKey(value)) { return false; @@ -79,18 +79,18 @@ public class ConcurrentCountingMap<K, V> { } @Override - public String toString () { + public String toString() { return map.toString(); } - public void clear () { + public void clear() { for (final CountingMap<V> value : map.values()) { value.clear(); } map.clear(); } - public static void main (final String[] args) { + public static void main(final String[] args) { final Logger LOG = Logger.getLogger(ConcurrentCountingMap.class.getName()); final ConcurrentCountingMap<ReefNetworkGroupCommProtos.GroupCommMessage.Type, String> strMap = new ConcurrentCountingMap<>(); LOG.log(Level.INFO, "OUT: {0}", strMap.isEmpty()); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/d414bb3b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/utils/CountingMap.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/utils/CountingMap.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/utils/CountingMap.java index 9bd206f..2742282 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/utils/CountingMap.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/utils/CountingMap.java @@ -34,31 +34,31 @@ public class CountingMap<L> { private final Map<L, Integer> map = new HashMap<>(); - public boolean containsKey (final L value) { + public boolean containsKey(final L value) { return map.containsKey(value); } - public int get (final L value) { + public int get(final L value) { if (!containsKey(value)) { return 0; } return map.get(value); } - public boolean isEmpty () { + public boolean isEmpty() { return map.isEmpty(); } - public void clear () { + public void clear() { map.clear(); } - public void add (final L value) { + public void add(final L value) { int cnt = (map.containsKey(value)) ? map.get(value) : 0; map.put(value, ++cnt); } - public boolean remove (final L value) { + public boolean remove(final L value) { if (!map.containsKey(value)) { return false; } @@ -73,11 +73,11 @@ public class CountingMap<L> { } @Override - public String toString () { + public String toString() { return map.toString(); } - public static void main (final String[] args) { + public static void main(final String[] args) { final Logger LOG = Logger.getLogger(CountingMap.class.getName()); final CountingMap<String> strMap = new CountingMap<>(); strMap.add("Hello"); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/d414bb3b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/utils/CountingSemaphore.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/utils/CountingSemaphore.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/utils/CountingSemaphore.java index 4742343..6b6022c 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/utils/CountingSemaphore.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/utils/CountingSemaphore.java @@ -33,7 +33,7 @@ public class CountingSemaphore { private final int initCount; - public CountingSemaphore (final int initCount, final String name, final Object lock) { + public CountingSemaphore(final int initCount, final String name, final Object lock) { super(); this.initCount = initCount; this.name = name; @@ -46,7 +46,7 @@ public class CountingSemaphore { return initCount; } - public int increment () { + public int increment() { synchronized (lock) { final int retVal = counter.incrementAndGet(); LOG.finest(name + "Incremented counter to " + retVal); @@ -55,13 +55,13 @@ public class CountingSemaphore { } } - private void logStatus () { + private void logStatus() { final int yetToRun = counter.get(); final int curRunning = initCount - yetToRun; LOG.fine(name + curRunning + " workers are running & " + yetToRun + " workers are yet to run"); } - public int decrement () { + public int decrement() { synchronized (lock) { final int retVal = counter.decrementAndGet(); LOG.finest(name + "Decremented counter to " + retVal); @@ -79,13 +79,13 @@ public class CountingSemaphore { } } - public int get () { + public int get() { synchronized (lock) { return counter.get(); } } - public void await () { + public void await() { synchronized (lock) { LOG.finest(name + "Waiting for workers to be done"); while (counter.get() > 0) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/d414bb3b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/utils/ResettingCountDownLatch.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/utils/ResettingCountDownLatch.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/utils/ResettingCountDownLatch.java index 5cac1c8..040914b 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/utils/ResettingCountDownLatch.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/utils/ResettingCountDownLatch.java @@ -23,14 +23,14 @@ import java.util.concurrent.CountDownLatch; public class ResettingCountDownLatch { private CountDownLatch latch; - public ResettingCountDownLatch (final int initialCount) { + public ResettingCountDownLatch(final int initialCount) { latch = new CountDownLatch(initialCount); } /** * */ - public void await () { + public void await() { try { latch.await(); } catch (final InterruptedException e) { @@ -38,7 +38,7 @@ public class ResettingCountDownLatch { } } - public void awaitAndReset (final int resetCount) { + public void awaitAndReset(final int resetCount) { try { latch.await(); latch = new CountDownLatch(resetCount); @@ -50,7 +50,7 @@ public class ResettingCountDownLatch { /** * */ - public void countDown () { + public void countDown() { latch.countDown(); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/d414bb3b/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 d4e38da..38d0894 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 @@ -253,7 +253,7 @@ public class NameLookupClient implements Stage, NamingLookup { link.write(new NamingLookupRequest(ids)); final NamingLookupResponse resp; - for (; ; ) { + for (;;) { try { resp = replyQueue.poll(timeout, TimeUnit.MILLISECONDS); break; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/d414bb3b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NameRegistryClient.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NameRegistryClient.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NameRegistryClient.java index a22820b..b23481d 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NameRegistryClient.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NameRegistryClient.java @@ -151,7 +151,7 @@ public class NameRegistryClient implements Stage, NamingRegistry { link.write(new NamingRegisterRequest(new NameAssignmentTuple(id, addr))); - for (; ; ) { + for (;;) { try { this.replyQueue.poll(this.timeout, TimeUnit.MILLISECONDS); break; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/d414bb3b/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/local/CodecFileIterator.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/local/CodecFileIterator.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/local/CodecFileIterator.java index 7b9f1e5..32139c7 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/local/CodecFileIterator.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/local/CodecFileIterator.java @@ -65,7 +65,7 @@ final class CodecFileIterator<T> implements Iterator<T> { } try { final byte[] buf = new byte[this.sz]; - for (int rem = buf.length; rem > 0; ) { + for (int rem = buf.length; rem > 0;) { rem -= this.in.read(buf, buf.length - rem, rem); } this.readNextSize(); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/d414bb3b/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/local/LocalStorageService.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/local/LocalStorageService.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/local/LocalStorageService.java index 7138d3d..3dc55c3 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/local/LocalStorageService.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/local/LocalStorageService.java @@ -40,5 +40,4 @@ public class LocalStorageService implements StorageService { return scratchSpace; } - ; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/d414bb3b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ConfigurationFile.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ConfigurationFile.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ConfigurationFile.java index bb1e12f..cf1cd72 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ConfigurationFile.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ConfigurationFile.java @@ -238,7 +238,7 @@ public class ConfigurationFile { l.add(e.getKey().getFullName() + '=' + escape(val)); // s.append(e.getKey().getFullName()).append('=').append(val).append("\n"); } - return l;//s.toString(); + return l; //s.toString(); } private static StringBuilder join(final StringBuilder sb, final String sep, final ConstructorArg[] types) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/d414bb3b/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 b52aea3..b7c12b4 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 @@ -142,7 +142,7 @@ public class InjectorImpl implements Injector { @SuppressWarnings("unchecked") private <T> T getCachedInstance(ClassNode<T> cn) { if (cn.getFullName().equals("org.apache.reef.tang.Injector")) { - return (T) this;// TODO: We should be insisting on injection futures here! .forkInjector(); + return (T) this; // TODO: We should be insisting on injection futures here! .forkInjector(); } else { T t = (T) instances.get(cn); if (t instanceof InjectionFuture) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/d414bb3b/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 c839367..6d48943 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 @@ -374,7 +374,7 @@ public class Tint { String conf = t.modules.get(f).toPrettyString(); String[] tok = conf.split("\n"); for (final String line : tok) { - out.println(stripPrefix(line, "no.such.prefix"));//t.modules.get(f).toPrettyString()); + out.println(stripPrefix(line, "no.such.prefix")); //t.modules.get(f).toPrettyString()); } // List<Entry<String,String>> lines = t.modules.get(f).toStringPairs(); // for(Entry<String,String> line : lines) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/d414bb3b/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 13e118b..11f706e 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 @@ -209,9 +209,8 @@ public class WakeProfiler implements Aspect { || (o instanceof Stage) || (o instanceof RxStage) || (o instanceof Observer) - || (o instanceof Observable)) + || (o instanceof Observable)); // && !(o instanceof Set) - ; } public String objectGraphToString() { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/d414bb3b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/address/LegacyLocalAddressProvider.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/address/LegacyLocalAddressProvider.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/address/LegacyLocalAddressProvider.java index 6a3f758..5fd05d4 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/address/LegacyLocalAddressProvider.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/address/LegacyLocalAddressProvider.java @@ -98,7 +98,7 @@ public final class LegacyLocalAddressProvider implements LocalAddressProvider { // get unsigned byte. private static int u(byte b) { - return ((int) b);// & 0xff; + return ((int) b); // & 0xff; } @Override http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/d414bb3b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/ports/RandomRangeIterator.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/ports/RandomRangeIterator.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/ports/RandomRangeIterator.java index 12da82d..2cf4a7a 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/ports/RandomRangeIterator.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/ports/RandomRangeIterator.java @@ -57,7 +57,7 @@ final class RandomRangeIterator implements Iterator<Integer> { */ @Override public void remove() { - throw new UnsupportedOperationException (); + throw new UnsupportedOperationException(); } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/d414bb3b/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ParsedHttpRequest.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ParsedHttpRequest.java b/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ParsedHttpRequest.java index 7ad867a..e34d90c 100644 --- a/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ParsedHttpRequest.java +++ b/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ParsedHttpRequest.java @@ -54,7 +54,7 @@ public final class ParsedHttpRequest { this.requestUri = request.getRequestURI() != null ? request.getRequestURI() : ""; this.requestUrl = request.getRequestURL().toString(); - for (final Enumeration en = request.getHeaderNames(); en.hasMoreElements(); ) { + for (final Enumeration en = request.getHeaderNames(); en.hasMoreElements();) { final String headerName = en.nextElement().toString(); this.headers.put(headerName, request.getHeader(headerName)); }
