You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@reef.apache.org by we...@apache.org on 2015/06/12 07:17:04 UTC
incubator-reef git commit: [REEF-361]: Fix violations of
EmptyStatement,
SimplifyBooleanExpression and SimplifyBooleanReturn checks (Coding category)
Repository: incubator-reef
Updated Branches:
refs/heads/master d414bb3b9 -> b8b8308fd
[REEF-361]: Fix violations of EmptyStatement, SimplifyBooleanExpression and SimplifyBooleanReturn checks (Coding category)
This addressed the issue by:
* removing one empty statement
* simplifying 4 boolean expressions/returns
JIRA:
[REEF-361](https://issues.apache.org/jira/browse/REEF-361)
Pull Request:
This closes #212
Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/b8b8308f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/b8b8308f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/b8b8308f
Branch: refs/heads/master
Commit: b8b8308fdd418fe2462e8576a24e5069e6c78160
Parents: d414bb3
Author: Mariia Mykhailova <mi...@gmail.com>
Authored: Thu Jun 11 15:15:36 2015 -0700
Committer: Markus Weimer <we...@apache.org>
Committed: Fri Jun 12 14:15:36 2015 +0900
----------------------------------------------------------------------
.../reef/io/network/group/impl/driver/TaskNodeImpl.java | 6 +-----
.../org/apache/reef/io/storage/FramingOutputStream.java | 1 -
.../tang/implementation/types/ConstructorDefImpl.java | 2 +-
.../apache/reef/wake/examples/join/NonBlockingJoin.java | 2 +-
.../java/org/apache/reef/wake/profiler/WakeProfiler.java | 10 +---------
5 files changed, 4 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/b8b8308f/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 40ddcdd..02ebd98 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
@@ -461,11 +461,7 @@ public class TaskNodeImpl implements TaskNode {
if (obj != this) {
if (obj instanceof TaskNodeImpl) {
final TaskNodeImpl that = (TaskNodeImpl) obj;
- if (this.taskId.equals(that.taskId) && this.version.get() == that.version.get()) {
- return true;
- } else {
- return false;
- }
+ return (this.taskId.equals(that.taskId) && this.version.get() == that.version.get());
} else {
return false;
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/b8b8308f/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 42c7b6f..5c3b32f 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
@@ -63,7 +63,6 @@ public class FramingOutputStream extends OutputStream implements Accumulable<byt
public void write(int b) throws IOException {
baos.write(b);
offset++;
- ;
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/b8b8308f/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 333e35e..4241490 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,7 +135,7 @@ public class ConstructorDefImpl<T> implements ConstructorDef<T> {
}
}
// If not, then argument j from def is not in our list. Return false.
- if (found == false)
+ if (!found)
return false;
}
// Everything in def's arg list is in ours. Do we have at least one extra
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/b8b8308f/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/examples/join/NonBlockingJoin.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/examples/join/NonBlockingJoin.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/examples/join/NonBlockingJoin.java
index 0617bc4..bb922d3 100644
--- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/examples/join/NonBlockingJoin.java
+++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/examples/join/NonBlockingJoin.java
@@ -58,7 +58,7 @@ public class NonBlockingJoin implements StaticObservable {
out.onNext(t);
}
}
- if (sentCompleted.getAndSet(true) == false) {
+ if (!sentCompleted.getAndSet(true)) {
out.onCompleted();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/b8b8308f/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 11f706e..8b2d345 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
@@ -202,15 +202,7 @@ public class WakeProfiler implements Aspect {
}
private boolean whitelist(Object o) {
- return (true
- || (o instanceof InjectionFuture)
- || (o instanceof Set)
- || (o instanceof EventHandler)
- || (o instanceof Stage)
- || (o instanceof RxStage)
- || (o instanceof Observer)
- || (o instanceof Observable));
-// && !(o instanceof Set)
+ return true;
}
public String objectGraphToString() {