You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@reef.apache.org by do...@apache.org on 2015/11/05 03:38:26 UTC
[1/2] incubator-reef git commit: [REEF-900] Fix trivial issues in
Java code detected by PMD
Repository: incubator-reef
Updated Branches:
refs/heads/master d856969f6 -> ad831a1d1
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/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 f6877be..85b130a 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
@@ -169,10 +169,8 @@ public class ClassHierarchyImpl implements JavaClassHierarchy {
} catch (final UnsupportedOperationException e) {
try {
final Node impl = getNode(value);
- if (impl instanceof ClassNode) {
- if (isImplementation(iface, (ClassNode<?>) impl)) {
- return (T) impl;
- }
+ if (impl instanceof ClassNode && isImplementation(iface, (ClassNode<?>) impl)) {
+ return (T) impl;
}
throw new ParseException("Name<" + iface.getFullName() + "> " + np.getFullName() +
" cannot take non-subclass " + impl.getFullName(), e);
@@ -216,11 +214,10 @@ public class ClassHierarchyImpl implements JavaClassHierarchy {
@SuppressWarnings("unchecked") final NamedParameterNode<T> np = JavaNodeFactory.createNamedParameterNode(
parent, (Class<? extends Name<T>>) clazz, argType);
- if (parameterParser.canParse(ReflectionUtilities.getFullName(argType))) {
- if (clazz.getAnnotation(NamedParameter.class).default_class() != Void.class) {
- throw new ClassHierarchyException("Named parameter " + ReflectionUtilities.getFullName(clazz) +
- " defines default implementation for parsable type " + ReflectionUtilities.getFullName(argType));
- }
+ if (parameterParser.canParse(ReflectionUtilities.getFullName(argType)) &&
+ clazz.getAnnotation(NamedParameter.class).default_class() != Void.class) {
+ throw new ClassHierarchyException("Named parameter " + ReflectionUtilities.getFullName(clazz) +
+ " defines default implementation for parsable type " + ReflectionUtilities.getFullName(argType));
}
final String shortName = np.getShortName();
@@ -349,14 +346,12 @@ public class ClassHierarchyImpl implements JavaClassHierarchy {
.getNamedParameterName());
try {
// 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(
- "Named parameter type mismatch in " + cls.getFullName() + ". Constructor expects a "
- + arg.getType() + " but " + np.getName() + " is a "
- + np.getFullArgName());
- }
+ if (!np.isSet() && !np.isList() &&
+ !ReflectionUtilities.isCoercable(classForName(arg.getType()), classForName(np.getFullArgName()))) {
+ throw new ClassHierarchyException(
+ "Named parameter type mismatch in " + cls.getFullName() + ". Constructor expects a "
+ + arg.getType() + " but " + np.getName() + " is a "
+ + np.getFullArgName());
}
} catch (final ClassNotFoundException e) {
throw new ClassHierarchyException("Constructor refers to unknown class "
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/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 9aaafe0..8bf34c6 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
@@ -290,7 +290,7 @@ public class InjectorImpl implements Injector {
final int selectedIndex) {
if (list.size() == 0) {
return new Subplan<>(infeasibleNode);
- } else if ((!forceAmbiguous) && list.size() == 1) {
+ } else if (!forceAmbiguous && list.size() == 1) {
return list.get(0);
} else {
return new Subplan<>(infeasibleNode, selectedIndex, list.toArray(new InjectionPlan[0]));
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/JavaNodeFactory.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/JavaNodeFactory.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/JavaNodeFactory.java
index 01a1766..27bb1fb 100644
--- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/JavaNodeFactory.java
+++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/JavaNodeFactory.java
@@ -47,8 +47,7 @@ public final class JavaNodeFactory {
final String simpleName = ReflectionUtilities.getSimpleName(clazz);
final String fullName = ReflectionUtilities.getFullName(clazz);
final boolean isStatic = Modifier.isStatic(clazz.getModifiers());
- final boolean parentIsUnit = ((parent instanceof ClassNode) && !isStatic) ?
- ((ClassNode<?>) parent).isUnit() : false;
+ final boolean parentIsUnit = parent instanceof ClassNode && !isStatic && ((ClassNode<?>) parent).isUnit();
if (clazz.isLocalClass() || clazz.isMemberClass()) {
if (!isStatic) {
@@ -82,8 +81,7 @@ public final class JavaNodeFactory {
final MonotonicSet<ConstructorDef<T>> injectableConstructors = new MonotonicSet<>();
final ArrayList<ConstructorDef<T>> allConstructors = new ArrayList<>();
for (int k = 0; k < constructors.length; k++) {
- final boolean constructorAnnotatedInjectable = (constructors[k]
- .getAnnotation(Inject.class) != null);
+ final boolean constructorAnnotatedInjectable = constructors[k].getAnnotation(Inject.class) != null;
if (constructorAnnotatedInjectable && constructors[k].isSynthetic()) {
// Not sure if we *can* unit test this one.
throw new ClassHierarchyException(
@@ -274,12 +272,12 @@ public final class JavaNodeFactory {
}
}
- if (!(isSubclass)) {
+ if (!isSubclass) {
throw new ClassHierarchyException(namedParameter + " defines a default class "
+ ReflectionUtilities.getFullName(defaultClass)
+ " with a raw type that does not extend of its target's raw type " + argRawClass);
}
- if (!(isGenericSubclass)) {
+ if (!isGenericSubclass) {
throw new ClassHierarchyException(namedParameter + " defines a default class "
+ ReflectionUtilities.getFullName(defaultClass)
+ " with a type that does not extend its target's type " + argClass);
@@ -325,7 +323,7 @@ public final class JavaNodeFactory {
for (int j = 0; j < paramAnnotations[i].length; j++) {
final Annotation annotation = paramAnnotations[i][j];
if (annotation instanceof Parameter) {
- if ((!isClassInjectionCandidate) || !injectable) {
+ if (!isClassInjectionCandidate || !injectable) {
throw new ClassHierarchyException(constructor + " is not injectable, but it has an @Parameter annotation.");
}
named = (Parameter) annotation;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/protobuf/ProtocolBufferClassHierarchy.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/protobuf/ProtocolBufferClassHierarchy.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/protobuf/ProtocolBufferClassHierarchy.java
index 83c7608..7a8c46b 100644
--- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/protobuf/ProtocolBufferClassHierarchy.java
+++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/protobuf/ProtocolBufferClassHierarchy.java
@@ -284,7 +284,7 @@ public class ProtocolBufferClassHierarchy implements ClassHierarchy {
}
private static ConstructorDef<?> parseConstructorDef(
- final org.apache.reef.tang.proto.ClassHierarchyProto.ConstructorDef def,
+ final ClassHierarchyProto.ConstructorDef def,
final boolean isInjectable) {
final List<ConstructorArg> args = new ArrayList<>();
for (final ClassHierarchyProto.ConstructorArg arg : def.getArgsList()) {
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/AbstractMonotonicMultiMap.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/AbstractMonotonicMultiMap.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/AbstractMonotonicMultiMap.java
index cb84e9e..3c2535d 100644
--- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/AbstractMonotonicMultiMap.java
+++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/AbstractMonotonicMultiMap.java
@@ -112,17 +112,15 @@ public abstract class AbstractMonotonicMultiMap<K, V> implements Collection<Entr
@Override
public boolean hasNext() {
- return it.hasNext() || (cur != null && cur.hasNext());
+ return it.hasNext() || cur != null && cur.hasNext();
}
@Override
public Entry<K, V> next() {
- if (cur == null) {
- if (it.hasNext()) {
- final Entry<K, Set<V>> e = it.next();
- curKey = e.getKey();
- cur = e.getValue().iterator();
- }
+ if (cur == null && it.hasNext()) {
+ final Entry<K, Set<V>> e = it.next();
+ curKey = e.getKey();
+ cur = e.getValue().iterator();
}
final K k = curKey;
final V v = cur.next();
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/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 2cc02a5..16c268b 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
@@ -298,7 +298,7 @@ public final class ReflectionUtilities {
public static Type getNamedParameterTargetOrNull(final Class<?> clazz)
throws ClassHierarchyException {
final Annotation npAnnotation = clazz.getAnnotation(NamedParameter.class);
- final boolean hasSuperClass = (clazz.getSuperclass() != Object.class);
+ final boolean hasSuperClass = clazz.getSuperclass() != Object.class;
boolean isInjectable = false;
boolean hasConstructor = false;
@@ -333,7 +333,7 @@ public final class ReflectionUtilities {
final Class<?>[] allInterfaces = clazz.getInterfaces();
- final boolean hasMultipleInterfaces = (allInterfaces.length > 1);
+ final boolean hasMultipleInterfaces = allInterfaces.length > 1;
boolean implementsName;
Type parameterClass = null;
try {
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/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 0c1b104..0108901 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
@@ -427,7 +427,7 @@ public class Tint {
}
private boolean classFilter(final boolean checkTang, final String s) {
- return (checkTang || !s.startsWith("org.apache.reef.tang"));
+ return checkTang || !s.startsWith("org.apache.reef.tang");
}
private void processDefaultAnnotation(final Class<?> cmb) {
@@ -571,10 +571,8 @@ public class Tint {
if (setterKeys.contains(nodeS)) {
names.add(node);
}
- if (usedKeys.contains(nodeS)) {
- if (!names.contains(node)) {
- names.add(node);
- }
+ if (usedKeys.contains(nodeS) && !names.contains(node)) {
+ names.add(node);
}
return true;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/TracingMonotonicTreeMap.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/TracingMonotonicTreeMap.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/TracingMonotonicTreeMap.java
index e46808d..8561a3b 100644
--- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/TracingMonotonicTreeMap.java
+++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/TracingMonotonicTreeMap.java
@@ -44,7 +44,7 @@ public final class TracingMonotonicTreeMap<K, V> implements TracingMonotonicMap<
}
@Override
- public Set<java.util.Map.Entry<K, V>> entrySet() {
+ public Set<Entry<K, V>> entrySet() {
throw new UnsupportedOperationException();
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-tests/src/main/java/org/apache/reef/tests/fail/driver/FailDriver.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tests/src/main/java/org/apache/reef/tests/fail/driver/FailDriver.java b/lang/java/reef-tests/src/main/java/org/apache/reef/tests/fail/driver/FailDriver.java
index 22265d3..71847b5 100644
--- a/lang/java/reef-tests/src/main/java/org/apache/reef/tests/fail/driver/FailDriver.java
+++ b/lang/java/reef-tests/src/main/java/org/apache/reef/tests/fail/driver/FailDriver.java
@@ -307,8 +307,8 @@ public final class FailDriver {
@Override
public void onNext(final TaskMessage msg) {
checkMsgOrder(msg);
- assert (Arrays.equals(HELLO_STR, msg.get()));
- assert (state == DriverState.SEND_MSG);
+ assert Arrays.equals(HELLO_STR, msg.get());
+ assert state == DriverState.SEND_MSG;
state = DriverState.SUSPEND;
clock.scheduleAlarm(MSG_DELAY, new AlarmHandler());
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-tests/src/main/java/org/apache/reef/tests/fail/driver/FailDriverDelayedMsg.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tests/src/main/java/org/apache/reef/tests/fail/driver/FailDriverDelayedMsg.java b/lang/java/reef-tests/src/main/java/org/apache/reef/tests/fail/driver/FailDriverDelayedMsg.java
index 12737c8..0294da5 100644
--- a/lang/java/reef-tests/src/main/java/org/apache/reef/tests/fail/driver/FailDriverDelayedMsg.java
+++ b/lang/java/reef-tests/src/main/java/org/apache/reef/tests/fail/driver/FailDriverDelayedMsg.java
@@ -113,7 +113,7 @@ public final class FailDriverDelayedMsg {
@Override
public void onNext(final TaskMessage msg) {
LOG.log(Level.INFO, "ENTER: FailDriverDelayedMsg.send(TaskMessage): {0}", msg);
- assert (Arrays.equals(HELLO_STR, msg.get()));
+ assert Arrays.equals(HELLO_STR, msg.get());
FailDriverDelayedMsg.this.task.close();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-tests/src/test/java/org/apache/reef/tests/LocalTestEnvironment.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/LocalTestEnvironment.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/LocalTestEnvironment.java
index 5311b5e..3ac2e8c 100644
--- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/LocalTestEnvironment.java
+++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/LocalTestEnvironment.java
@@ -46,7 +46,7 @@ public final class LocalTestEnvironment extends TestEnvironmentBase implements T
@Override
public synchronized Configuration getRuntimeConfiguration() {
- assert (this.ready);
+ assert this.ready;
final String rootFolder = System.getProperty("org.apache.reef.runtime.local.folder");
final JavaConfigurationBuilder jcb = Tang.Factory.getTang().newConfigurationBuilder();
jcb.bindNamedParameter(TempFileRootFolder.class, "./target/reef/temp");
@@ -66,7 +66,7 @@ public final class LocalTestEnvironment extends TestEnvironmentBase implements T
@Override
public synchronized void tearDown() {
- assert (this.ready);
+ assert this.ready;
this.ready = false;
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-tests/src/test/java/org/apache/reef/tests/MesosTestEnvironment.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/MesosTestEnvironment.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/MesosTestEnvironment.java
index 7f7d4f2..51b67bf 100644
--- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/MesosTestEnvironment.java
+++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/MesosTestEnvironment.java
@@ -37,7 +37,7 @@ public final class MesosTestEnvironment extends TestEnvironmentBase implements T
@Override
public synchronized Configuration getRuntimeConfiguration() {
- assert (this.ready);
+ assert this.ready;
try {
if (System.getenv("REEF_TEST_MESOS_MASTER_IP").equals("")) {
throw new RuntimeException("REEF_TEST_MESOS_MASTER_IP unspecified");
@@ -54,7 +54,7 @@ public final class MesosTestEnvironment extends TestEnvironmentBase implements T
@Override
public synchronized void tearDown() {
- assert (this.ready);
+ assert this.ready;
this.ready = false;
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-tests/src/test/java/org/apache/reef/tests/YarnTestEnvironment.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/YarnTestEnvironment.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/YarnTestEnvironment.java
index f598c41..aa401e8 100644
--- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/YarnTestEnvironment.java
+++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/YarnTestEnvironment.java
@@ -37,7 +37,7 @@ public final class YarnTestEnvironment extends TestEnvironmentBase implements Te
@Override
public synchronized Configuration getRuntimeConfiguration() {
- assert (this.ready);
+ assert this.ready;
try {
return YarnClientConfiguration.CONF.build();
} catch (final BindException ex) {
@@ -47,7 +47,7 @@ public final class YarnTestEnvironment extends TestEnvironmentBase implements Te
@Override
public synchronized void tearDown() {
- assert (this.ready);
+ assert this.ready;
this.ready = false;
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-tests/src/test/java/org/apache/reef/tests/subcontexts/SubContextDriver.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/subcontexts/SubContextDriver.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/subcontexts/SubContextDriver.java
index bead848..4ffc6db 100644
--- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/subcontexts/SubContextDriver.java
+++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/subcontexts/SubContextDriver.java
@@ -89,7 +89,7 @@ final class SubContextDriver {
if (activeContext.getId().equals(CONTEXT_1_IDENTIFIER)) {
synchronized (SubContextDriver.this) {
- assert (SubContextDriver.this.state == State.CONTEXT_1_SUBMITTED);
+ assert SubContextDriver.this.state == State.CONTEXT_1_SUBMITTED;
}
LOG.log(Level.FINE, "Submitting sub context");
@@ -124,7 +124,7 @@ final class SubContextDriver {
if (closedContext.getId().equals(CONTEXT_2_IDENTIFIER)) {
synchronized (SubContextDriver.this) {
- assert (SubContextDriver.this.state == State.CONTEXT_2_SUBMITTED);
+ assert SubContextDriver.this.state == State.CONTEXT_2_SUBMITTED;
}
closedContext.getParentContext().close();
@@ -133,7 +133,7 @@ final class SubContextDriver {
} else if (closedContext.getId().equals(CONTEXT_1_IDENTIFIER)) {
synchronized (SubContextDriver.this) {
- assert (SubContextDriver.this.state == State.CONTEXT_2_CLOSED);
+ assert SubContextDriver.this.state == State.CONTEXT_2_CLOSED;
}
throw new IllegalStateException("Received a closed context for the root context");
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/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 633cf74..b60fdcc 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
@@ -117,7 +117,7 @@ public final class Optional<T> implements Serializable {
}
final Optional that = (Optional) obj;
- return this.value == that.value || (this.value != null && this.value.equals(that.value));
+ return this.value == that.value || this.value != null && this.value.equals(that.value);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/examples/accumulate/CombinerStage.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/examples/accumulate/CombinerStage.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/examples/accumulate/CombinerStage.java
index 3771b1e..95311b7 100644
--- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/examples/accumulate/CombinerStage.java
+++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/examples/accumulate/CombinerStage.java
@@ -58,7 +58,7 @@ public class CombinerStage<K extends Comparable<K>, V> implements Stage {
old = register.get(pair.getKey());
newVal = c.combine(pair.getKey(), old, pair.getValue());
if (old == null) {
- succ = (null == register.putIfAbsent(pair.getKey(), newVal));
+ succ = null == register.putIfAbsent(pair.getKey(), newVal);
} else {
succ = register.replace(pair.getKey(), old, newVal);
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/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 451e6cd..260dc20 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
@@ -200,14 +200,12 @@ public final class ThreadPoolStage<T> extends AbstractEStage<T> {
*/
@Override
public void close() throws Exception {
- if (closed.compareAndSet(false, true)) {
- if (numThreads > 0) {
- executor.shutdown();
- if (!executor.awaitTermination(shutdownTimeout, TimeUnit.MILLISECONDS)) {
- LOG.log(Level.WARNING, "Executor did not terminate in " + shutdownTimeout + "ms.");
- final List<Runnable> droppedRunnables = executor.shutdownNow();
- LOG.log(Level.WARNING, "Executor dropped " + droppedRunnables.size() + " tasks.");
- }
+ if (closed.compareAndSet(false, true) && numThreads > 0) {
+ executor.shutdown();
+ if (!executor.awaitTermination(shutdownTimeout, TimeUnit.MILLISECONDS)) {
+ LOG.log(Level.WARNING, "Executor did not terminate in " + shutdownTimeout + "ms.");
+ final List<Runnable> droppedRunnables = executor.shutdownNow();
+ LOG.log(Level.WARNING, "Executor dropped " + droppedRunnables.size() + " tasks.");
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/metrics/EWMA.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/metrics/EWMA.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/metrics/EWMA.java
index b10b215..595897e 100644
--- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/metrics/EWMA.java
+++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/metrics/EWMA.java
@@ -60,7 +60,7 @@ public class EWMA {
final long count = uncounted.getAndSet(0);
final double instantRate = count / interval;
if (initialized) {
- rate += (alpha * (instantRate - rate));
+ rate += alpha * (instantRate - rate);
} else {
rate = instantRate;
initialized = true;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/metrics/Meter.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/metrics/Meter.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/metrics/Meter.java
index 8bf1022..2551641 100644
--- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/metrics/Meter.java
+++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/metrics/Meter.java
@@ -92,7 +92,7 @@ public class Meter {
if (getCount() == 0) {
return 0.0;
} else {
- final double elapsed = (getTick() - startTime);
+ final double elapsed = getTick() - startTime;
return getCount() / elapsed * TimeUnit.SECONDS.toNanos(1);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/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 a2ecb36..4db9f89 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
@@ -210,7 +210,7 @@ public class WakeProfiler implements Aspect {
}
}
for (final Object o : futures.values()) {
- if ((!vertexObject.containsKey(o)) && whitelist(o)) {
+ if (!vertexObject.containsKey(o) && whitelist(o)) {
workQueue.add(getVertex(o));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/address/HostnameBasedLocalAddressProvider.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/address/HostnameBasedLocalAddressProvider.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/address/HostnameBasedLocalAddressProvider.java
index 0247a7c..c8b484c 100644
--- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/address/HostnameBasedLocalAddressProvider.java
+++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/address/HostnameBasedLocalAddressProvider.java
@@ -53,7 +53,7 @@ public final class HostnameBasedLocalAddressProvider implements LocalAddressProv
throw new RuntimeException(message, ex);
}
}
- assert (null != cached);
+ assert null != cached;
return cached;
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/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 59e1553..50c5e5b 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
@@ -101,7 +101,7 @@ public final class LegacyLocalAddressProvider implements LocalAddressProvider {
// get unsigned byte.
private static int u(final byte b) {
- return ((int) b); // & 0xff;
+ return (int) b; // & 0xff;
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/address/LocalAddressProviderFactory.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/address/LocalAddressProviderFactory.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/address/LocalAddressProviderFactory.java
index b6d558a..a449276 100644
--- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/address/LocalAddressProviderFactory.java
+++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/address/LocalAddressProviderFactory.java
@@ -56,7 +56,7 @@ public final class LocalAddressProviderFactory {
* Makes the instance.
*/
private static void makeInstance() {
- assert (null == instance);
+ assert null == instance;
try {
LOGGER.log(Level.FINER, "Instantiating default LocalAddressProvider for legacy users.");
instance = Tang.Factory.getTang().newInjector().getInstance(LocalAddressProvider.class);
@@ -64,6 +64,6 @@ public final class LocalAddressProviderFactory {
} catch (final InjectionException e) {
throw new RuntimeException("Unable to instantiate default LocalAddressProvider for legacy users.", e);
}
- assert (null != instance);
+ assert null != instance;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/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 9514c51..4ebbfe8 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
@@ -155,7 +155,7 @@ public final class RuntimeClock implements Clock {
long time = timer.getCurrent();
for (final Time t : this.schedule) {
if (t instanceof ClientAlarm) {
- assert (time <= t.getTimeStamp());
+ assert time <= t.getTimeStamp();
time = t.getTimeStamp();
}
}
@@ -230,7 +230,7 @@ public final class RuntimeClock implements Clock {
this.schedule.wait();
}
- assert (this.schedule.first() != null);
+ assert this.schedule.first() != null;
// Wait until the first scheduled time is ready
for (long duration = this.timer.getDuration(this.schedule.first().getTimeStamp());
@@ -242,7 +242,7 @@ public final class RuntimeClock implements Clock {
}
// Remove the event from the schedule and process it:
time = this.schedule.pollFirst();
- assert (time != null);
+ assert time != null;
}
if (time instanceof Alarm) {
[2/2] incubator-reef git commit: [REEF-900] Fix trivial issues in
Java code detected by PMD
Posted by do...@apache.org.
[REEF-900] Fix trivial issues in Java code detected by PMD
This fixes the following issues:
* Nested if statements could be combined
* Avoid duplicate imports
* Useless parentheses (enforced by Checkstyle UnnecessaryParentheses)
* Avoid modifiers which are implied by the context
* Avoid unnecessary temporaries
JIRA:
[REEF-900](https://issues.apache.org/jira/browse/REEF-900)
Pull request:
This closes #612
Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/ad831a1d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/ad831a1d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/ad831a1d
Branch: refs/heads/master
Commit: ad831a1d1056026539a931adc5c4d7e4311a1655
Parents: d856969
Author: Mariia Mykhailova <ma...@apache.org>
Authored: Wed Nov 4 16:37:43 2015 -0800
Committer: Dongjoon Hyun <do...@apache.org>
Committed: Thu Nov 5 11:27:35 2015 +0900
----------------------------------------------------------------------
.../apache/reef/vortex/api/VortexFuture.java | 4 +--
.../reef/vortex/driver/RunningWorkers.java | 28 ++++++++-----------
.../reef/vortex/driver/VortexWorkerManager.java | 6 ++--
.../reef/javabridge/generic/JobClient.java | 1 -
.../reef/javabridge/generic/JobDriver.java | 5 ++--
.../org/apache/reef/client/LauncherStatus.java | 2 +-
.../reef/driver/catalog/ResourceCatalog.java | 2 +-
.../DriverRestartEvaluatorRecoverySeconds.java | 2 +-
.../reef/evaluator/context/ContextMessage.java | 2 +-
.../evaluator/ServiceRuntimeException.java | 4 +--
.../runtime/common/client/RunningJobImpl.java | 4 +--
.../runtime/common/client/RunningJobsImpl.java | 4 +--
.../driver/context/ContextRepresenters.java | 6 ++--
.../common/driver/context/EvaluatorContext.java | 2 +-
.../evaluator/AllocatedEvaluatorImpl.java | 2 +-
.../driver/evaluator/EvaluatorManager.java | 6 ++--
.../evaluator/EvaluatorStatusManager.java | 12 ++++----
.../common/driver/evaluator/Evaluators.java | 2 +-
.../resourcemanager/ResourceManagerStatus.java | 6 ++--
.../common/driver/task/TaskRepresenter.java | 15 +++++-----
.../common/evaluator/EvaluatorRuntime.java | 2 +-
.../reef/runtime/common/files/JobJarMaker.java | 2 +-
.../common/launch/CLRLaunchCommandBuilder.java | 4 +--
.../common/launch/JavaLaunchCommandBuilder.java | 2 +-
.../java/org/apache/reef/task/TaskMessage.java | 2 +-
.../src/main/resources/checkstyle-strict.xml | 3 +-
.../src/main/resources/checkstyle.xml | 3 +-
.../reef/examples/group/bgd/BGDDriver.java | 2 +-
.../reef/examples/group/bgd/MasterTask.java | 8 +++---
.../reef/examples/group/bgd/SlaveTask.java | 4 +--
.../examples/group/bgd/utils/StepSizes.java | 2 +-
.../utils/math/AbstractImmutableVector.java | 2 +-
.../reef/examples/group/utils/math/Window.java | 4 +--
.../examples/hellohttp/HttpShellJobDriver.java | 14 +++++-----
.../scheduler/driver/SchedulerDriver.java | 2 +-
.../network/group/impl/driver/FlatTopology.java | 5 +---
.../group/impl/driver/GroupCommDriverImpl.java | 2 +-
.../network/group/impl/driver/TaskNodeImpl.java | 6 ++--
.../group/impl/driver/TaskNodeStatusImpl.java | 1 -
.../network/group/impl/driver/TreeTopology.java | 6 ++--
.../group/impl/task/OperatorTopologyImpl.java | 24 ++++++++--------
.../network/group/impl/utils/CountingMap.java | 6 ++--
.../org/apache/reef/io/storage/FramingTest.java | 2 +-
.../hdinsight/client/yarnrest/StringEntry.java | 4 +--
.../client/PreparedDriverFolderLauncher.java | 2 +-
.../runtime/local/driver/ContainerManager.java | 7 ++---
.../runtime/local/process/RunnableProcess.java | 2 +-
.../runtime/mesos/driver/REEFScheduler.java | 4 +--
.../runtime/mesos/evaluator/REEFExecutor.java | 4 +--
.../yarn/driver/YarnContainerManager.java | 2 +-
.../java/org/apache/reef/tang/Injector.java | 4 +--
.../reef/tang/formats/ConfigurationModule.java | 6 ++--
.../ConfigurationBuilderImpl.java | 6 ++--
.../implementation/java/ClassHierarchyImpl.java | 29 ++++++++------------
.../tang/implementation/java/InjectorImpl.java | 2 +-
.../implementation/java/JavaNodeFactory.java | 12 ++++----
.../protobuf/ProtocolBufferClassHierarchy.java | 2 +-
.../tang/util/AbstractMonotonicMultiMap.java | 12 ++++----
.../reef/tang/util/ReflectionUtilities.java | 4 +--
.../java/org/apache/reef/tang/util/Tint.java | 8 ++----
.../reef/tang/util/TracingMonotonicTreeMap.java | 2 +-
.../reef/tests/fail/driver/FailDriver.java | 4 +--
.../tests/fail/driver/FailDriverDelayedMsg.java | 2 +-
.../apache/reef/tests/LocalTestEnvironment.java | 4 +--
.../apache/reef/tests/MesosTestEnvironment.java | 4 +--
.../apache/reef/tests/YarnTestEnvironment.java | 4 +--
.../tests/subcontexts/SubContextDriver.java | 6 ++--
.../java/org/apache/reef/util/Optional.java | 2 +-
.../wake/examples/accumulate/CombinerStage.java | 2 +-
.../apache/reef/wake/impl/ThreadPoolStage.java | 14 ++++------
.../java/org/apache/reef/wake/metrics/EWMA.java | 2 +-
.../org/apache/reef/wake/metrics/Meter.java | 2 +-
.../apache/reef/wake/profiler/WakeProfiler.java | 2 +-
.../HostnameBasedLocalAddressProvider.java | 2 +-
.../address/LegacyLocalAddressProvider.java | 2 +-
.../address/LocalAddressProviderFactory.java | 4 +--
.../reef/wake/time/runtime/RuntimeClock.java | 6 ++--
77 files changed, 185 insertions(+), 212 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-applications/reef-vortex/src/main/java/org/apache/reef/vortex/api/VortexFuture.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-applications/reef-vortex/src/main/java/org/apache/reef/vortex/api/VortexFuture.java b/lang/java/reef-applications/reef-vortex/src/main/java/org/apache/reef/vortex/api/VortexFuture.java
index 09c9caf..e855279 100644
--- a/lang/java/reef-applications/reef-vortex/src/main/java/org/apache/reef/vortex/api/VortexFuture.java
+++ b/lang/java/reef-applications/reef-vortex/src/main/java/org/apache/reef/vortex/api/VortexFuture.java
@@ -65,7 +65,7 @@ public final class VortexFuture<TOutput> implements Future<TOutput> {
if (userResult != null) {
return userResult;
} else {
- assert(userException != null);
+ assert userException != null;
throw new ExecutionException(userException);
}
}
@@ -83,7 +83,7 @@ public final class VortexFuture<TOutput> implements Future<TOutput> {
if (userResult != null) {
return userResult;
} else {
- assert(userException != null);
+ assert userException != null;
throw new ExecutionException(userException);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-applications/reef-vortex/src/main/java/org/apache/reef/vortex/driver/RunningWorkers.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-applications/reef-vortex/src/main/java/org/apache/reef/vortex/driver/RunningWorkers.java b/lang/java/reef-applications/reef-vortex/src/main/java/org/apache/reef/vortex/driver/RunningWorkers.java
index 01be3a6..eebac5f 100644
--- a/lang/java/reef-applications/reef-vortex/src/main/java/org/apache/reef/vortex/driver/RunningWorkers.java
+++ b/lang/java/reef-applications/reef-vortex/src/main/java/org/apache/reef/vortex/driver/RunningWorkers.java
@@ -151,15 +151,13 @@ final class RunningWorkers {
final Serializable result) {
lock.lock();
try {
- if (!terminated) {
- if (runningWorkers.containsKey(workerId)) { // Preemption can come before
- final VortexWorkerManager worker = this.runningWorkers.get(workerId);
- final Tasklet tasklet = worker.taskletCompleted(taskletId, result);
- this.schedulingPolicy.taskletCompleted(worker, tasklet);
+ if (!terminated && runningWorkers.containsKey(workerId)) { // Preemption can come before
+ final VortexWorkerManager worker = this.runningWorkers.get(workerId);
+ final Tasklet tasklet = worker.taskletCompleted(taskletId, result);
+ this.schedulingPolicy.taskletCompleted(worker, tasklet);
- // Notify (possibly) waiting scheduler
- noWorkerOrResource.signal();
- }
+ // Notify (possibly) waiting scheduler
+ noWorkerOrResource.signal();
}
} finally {
lock.unlock();
@@ -176,15 +174,13 @@ final class RunningWorkers {
final Exception exception) {
lock.lock();
try {
- if (!terminated) {
- if (runningWorkers.containsKey(workerId)) { // Preemption can come before
- final VortexWorkerManager worker = this.runningWorkers.get(workerId);
- final Tasklet tasklet = worker.taskletThrewException(taskletId, exception);
- this.schedulingPolicy.taskletFailed(worker, tasklet);
+ if (!terminated && runningWorkers.containsKey(workerId)) { // Preemption can come before
+ final VortexWorkerManager worker = this.runningWorkers.get(workerId);
+ final Tasklet tasklet = worker.taskletThrewException(taskletId, exception);
+ this.schedulingPolicy.taskletFailed(worker, tasklet);
- // Notify (possibly) waiting scheduler
- noWorkerOrResource.signal();
- }
+ // Notify (possibly) waiting scheduler
+ noWorkerOrResource.signal();
}
} finally {
lock.unlock();
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-applications/reef-vortex/src/main/java/org/apache/reef/vortex/driver/VortexWorkerManager.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-applications/reef-vortex/src/main/java/org/apache/reef/vortex/driver/VortexWorkerManager.java b/lang/java/reef-applications/reef-vortex/src/main/java/org/apache/reef/vortex/driver/VortexWorkerManager.java
index 3b11ad6..f019668 100644
--- a/lang/java/reef-applications/reef-vortex/src/main/java/org/apache/reef/vortex/driver/VortexWorkerManager.java
+++ b/lang/java/reef-applications/reef-vortex/src/main/java/org/apache/reef/vortex/driver/VortexWorkerManager.java
@@ -44,7 +44,7 @@ class VortexWorkerManager {
<TInput extends Serializable, TOutput extends Serializable>
void launchTasklet(final Tasklet<TInput, TOutput> tasklet) {
- assert(!runningTasklets.containsKey(tasklet.getId()));
+ assert !runningTasklets.containsKey(tasklet.getId());
runningTasklets.put(tasklet.getId(), tasklet);
final TaskletExecutionRequest<TInput, TOutput> taskletExecutionRequest
= new TaskletExecutionRequest<>(tasklet.getId(), tasklet.getUserFunction(), tasklet.getInput());
@@ -53,14 +53,14 @@ class VortexWorkerManager {
<TOutput extends Serializable> Tasklet taskletCompleted(final Integer taskletId, final TOutput result) {
final Tasklet<?, TOutput> tasklet = runningTasklets.remove(taskletId);
- assert(tasklet != null); // Tasklet should complete/error only once
+ assert tasklet != null; // Tasklet should complete/error only once
tasklet.completed(result);
return tasklet;
}
Tasklet taskletThrewException(final Integer taskletId, final Exception exception) {
final Tasklet tasklet = runningTasklets.remove(taskletId);
- assert(tasklet != null); // Tasklet should complete/error only once
+ assert tasklet != null; // Tasklet should complete/error only once
tasklet.threwException(exception);
return tasklet;
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobClient.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobClient.java b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobClient.java
index db9d4b0..d25f19c 100644
--- a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobClient.java
+++ b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobClient.java
@@ -19,7 +19,6 @@
package org.apache.reef.javabridge.generic;
import org.apache.reef.client.*;
-import org.apache.reef.client.DriverRestartConfiguration;
import org.apache.reef.io.network.naming.NameServerConfiguration;
import org.apache.reef.javabridge.NativeInterop;
import org.apache.reef.runtime.yarn.driver.YarnDriverRestartConfiguration;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/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 03ce202..ce6e8cf 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
@@ -30,7 +30,6 @@ import org.apache.reef.io.network.naming.NameServer;
import org.apache.reef.javabridge.*;
import org.apache.reef.driver.restart.DriverRestartCompleted;
import org.apache.reef.runtime.common.driver.DriverStatusManager;
-import org.apache.reef.driver.evaluator.EvaluatorProcess;
import org.apache.reef.runtime.common.files.REEFFileNames;
import org.apache.reef.tang.annotations.Unit;
import org.apache.reef.util.Optional;
@@ -179,8 +178,8 @@ public final class JobDriver {
LOG.log(Level.INFO, "CLRBufferedLogHandler init complete.");
}
- final String portNumber = httpServer == null ? null : Integer.toString((httpServer.getPort()));
- if (portNumber != null){
+ final String portNumber = httpServer == null ? null : Integer.toString(httpServer.getPort());
+ if (portNumber != null) {
try {
final File outputFileName = new File(reefFileNames.getDriverHttpEndpoint());
BufferedWriter out = new BufferedWriter(
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-common/src/main/java/org/apache/reef/client/LauncherStatus.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/client/LauncherStatus.java b/lang/java/reef-common/src/main/java/org/apache/reef/client/LauncherStatus.java
index debda62..434d22b 100644
--- a/lang/java/reef-common/src/main/java/org/apache/reef/client/LauncherStatus.java
+++ b/lang/java/reef-common/src/main/java/org/apache/reef/client/LauncherStatus.java
@@ -64,7 +64,7 @@ public final class LauncherStatus {
@Override
public boolean equals(final Object other) {
return this == other ||
- (other instanceof LauncherStatus && ((LauncherStatus) other).state == this.state);
+ other instanceof LauncherStatus && ((LauncherStatus) other).state == this.state;
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-common/src/main/java/org/apache/reef/driver/catalog/ResourceCatalog.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/driver/catalog/ResourceCatalog.java b/lang/java/reef-common/src/main/java/org/apache/reef/driver/catalog/ResourceCatalog.java
index 1f4e5e8..d238474 100644
--- a/lang/java/reef-common/src/main/java/org/apache/reef/driver/catalog/ResourceCatalog.java
+++ b/lang/java/reef-common/src/main/java/org/apache/reef/driver/catalog/ResourceCatalog.java
@@ -59,7 +59,7 @@ public interface ResourceCatalog {
/**
* Resource descriptor interface.
*/
- public interface Descriptor {
+ interface Descriptor {
String getName();
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/DriverRestartEvaluatorRecoverySeconds.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/DriverRestartEvaluatorRecoverySeconds.java b/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/DriverRestartEvaluatorRecoverySeconds.java
index 14c2390..374e2f7 100644
--- a/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/DriverRestartEvaluatorRecoverySeconds.java
+++ b/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/DriverRestartEvaluatorRecoverySeconds.java
@@ -37,7 +37,7 @@ public final class DriverRestartEvaluatorRecoverySeconds implements Name<Integer
/**
* The driver waits forever until all expected evaluators report back or fail.
*/
- public static final String INFINITE = new Long(Integer.MAX_VALUE).toString();
+ public static final String INFINITE = Long.toString(Integer.MAX_VALUE);
/**
* Default restart wait for the driver is 3 minutes.
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-common/src/main/java/org/apache/reef/evaluator/context/ContextMessage.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/evaluator/context/ContextMessage.java b/lang/java/reef-common/src/main/java/org/apache/reef/evaluator/context/ContextMessage.java
index 5df4fe6..8f9692e 100644
--- a/lang/java/reef-common/src/main/java/org/apache/reef/evaluator/context/ContextMessage.java
+++ b/lang/java/reef-common/src/main/java/org/apache/reef/evaluator/context/ContextMessage.java
@@ -46,7 +46,7 @@ public final class ContextMessage implements Message {
* @return a new EvaluatorMessage with the given content.
*/
public static ContextMessage from(final String messageSourceID, final byte[] theBytes) {
- assert (theBytes != null && messageSourceID != null);
+ assert theBytes != null && messageSourceID != null;
return new ContextMessage(messageSourceID, theBytes);
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-common/src/main/java/org/apache/reef/exception/evaluator/ServiceRuntimeException.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/exception/evaluator/ServiceRuntimeException.java b/lang/java/reef-common/src/main/java/org/apache/reef/exception/evaluator/ServiceRuntimeException.java
index e564e70..28eac01 100644
--- a/lang/java/reef-common/src/main/java/org/apache/reef/exception/evaluator/ServiceRuntimeException.java
+++ b/lang/java/reef-common/src/main/java/org/apache/reef/exception/evaluator/ServiceRuntimeException.java
@@ -41,7 +41,7 @@ public class ServiceRuntimeException extends RuntimeException {
* declare throws clauses, and legacy interfaces that do not. This constructor
* wraps ServiceExceptions, and is the preferred way to deal with such situations.
*
- * @param cause
+ * @param cause ServiceException to wrap
*/
public ServiceRuntimeException(final ServiceException cause) {
super("Wrapped ServiceException", cause);
@@ -61,7 +61,7 @@ public class ServiceRuntimeException extends RuntimeException {
public ServiceRuntimeException(final Throwable cause) {
super(cause);
- this.isWrappedServiceException = (cause instanceof ServiceException);
+ this.isWrappedServiceException = cause instanceof ServiceException;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/RunningJobImpl.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/RunningJobImpl.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/RunningJobImpl.java
index 4beea17..21cfbe5 100644
--- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/RunningJobImpl.java
+++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/RunningJobImpl.java
@@ -141,10 +141,10 @@ public final class RunningJobImpl implements RunningJob, EventHandler<JobStatusP
/**
* Inform the client of a failed job.
*
- * @param jobStatusProto
+ * @param jobStatusProto status of the failed job
*/
private synchronized void onJobFailure(final JobStatusProto jobStatusProto) {
- assert (jobStatusProto.getState() == ReefServiceProtos.State.FAILED);
+ assert jobStatusProto.getState() == ReefServiceProtos.State.FAILED;
final String id = this.jobId;
final Optional<byte[]> data = jobStatusProto.hasException() ?
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/RunningJobsImpl.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/RunningJobsImpl.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/RunningJobsImpl.java
index fd89e98..9eeef09 100644
--- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/RunningJobsImpl.java
+++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/RunningJobsImpl.java
@@ -81,8 +81,8 @@ final class RunningJobsImpl implements RunningJobs {
}
this.get(jobIdentifier).onNext(status);
- if ((status.getState() != ReefServiceProtos.State.RUNNING) &&
- (status.getState() != ReefServiceProtos.State.INIT)) {
+ if (status.getState() != ReefServiceProtos.State.RUNNING &&
+ status.getState() != ReefServiceProtos.State.INIT) {
this.remove(status.getIdentifier());
}
LOG.log(Level.FINE, "Done processing message from Job " + jobIdentifier);
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/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 a1293dc..a01c073 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
@@ -144,7 +144,7 @@ public final class ContextRepresenters {
}
private synchronized void onContextFailed(final ReefServiceProtos.ContextStatusProto contextStatusProto) {
- assert (ReefServiceProtos.ContextStatusProto.State.FAIL == contextStatusProto.getContextState());
+ assert ReefServiceProtos.ContextStatusProto.State.FAIL == contextStatusProto.getContextState();
final String contextID = contextStatusProto.getContextId();
LOG.log(Level.FINE, "Context {0} failed", contextID);
// It could have failed right away.
@@ -157,7 +157,7 @@ public final class ContextRepresenters {
}
private synchronized void onContextDone(final ReefServiceProtos.ContextStatusProto contextStatusProto) {
- assert (ReefServiceProtos.ContextStatusProto.State.DONE == contextStatusProto.getContextState());
+ assert ReefServiceProtos.ContextStatusProto.State.DONE == contextStatusProto.getContextState();
final String contextID = contextStatusProto.getContextId();
if (isUnknownContextId(contextID)) {
throw new RuntimeException("Received DONE for context " + contextID + " which is unknown.");
@@ -184,7 +184,7 @@ public final class ContextRepresenters {
*/
private synchronized void onContextReady(final ReefServiceProtos.ContextStatusProto contextStatusProto,
final boolean notifyClientOnNewActiveContext) {
- assert (ReefServiceProtos.ContextStatusProto.State.READY == contextStatusProto.getContextState());
+ assert ReefServiceProtos.ContextStatusProto.State.READY == contextStatusProto.getContextState();
final String contextID = contextStatusProto.getContextId();
// This could be the first message we get from that context
if (this.isUnknownContextId(contextID)) {
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/EvaluatorContext.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/EvaluatorContext.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/EvaluatorContext.java
index ee0232d..a25e116 100644
--- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/EvaluatorContext.java
+++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/EvaluatorContext.java
@@ -250,7 +250,7 @@ public final class EvaluatorContext implements ActiveContext {
public synchronized FailedContext getFailedContext(
final ReefServiceProtos.ContextStatusProto contextStatusProto) {
- assert (ReefServiceProtos.ContextStatusProto.State.FAIL == contextStatusProto.getContextState());
+ assert ReefServiceProtos.ContextStatusProto.State.FAIL == contextStatusProto.getContextState();
final String id = this.getId();
final Optional<String> description = Optional.empty();
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/AllocatedEvaluatorImpl.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/AllocatedEvaluatorImpl.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/AllocatedEvaluatorImpl.java
index 25c097b..c6d9b5d 100644
--- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/AllocatedEvaluatorImpl.java
+++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/AllocatedEvaluatorImpl.java
@@ -330,7 +330,7 @@ public final class AllocatedEvaluatorImpl implements AllocatedEvaluator {
return serviceConfiguration;
}
- if ((!serviceConfiguration.isPresent()) && this.evaluatorConfigurationProviders.isEmpty()) {
+ if (!serviceConfiguration.isPresent() && this.evaluatorConfigurationProviders.isEmpty()) {
// No configurations to merge.
LOG.info("No service configuration given and no ConfigurationProviders set.");
return Optional.empty();
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorManager.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorManager.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorManager.java
index ebd7d7f..a149309 100644
--- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorManager.java
+++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorManager.java
@@ -262,7 +262,7 @@ public final class EvaluatorManager implements Identifiable, AutoCloseable {
*/
public boolean isClosed() {
return this.messageDispatcher.isEmpty() &&
- (this.stateManager.isDoneOrFailedOrKilled());
+ this.stateManager.isDoneOrFailedOrKilled();
}
/**
@@ -412,7 +412,7 @@ public final class EvaluatorManager implements Identifiable, AutoCloseable {
* @param message
*/
private synchronized void onEvaluatorDone(final ReefServiceProtos.EvaluatorStatusProto message) {
- assert (message.getState() == ReefServiceProtos.State.DONE);
+ assert message.getState() == ReefServiceProtos.State.DONE;
LOG.log(Level.FINEST, "Evaluator {0} done.", getId());
this.stateManager.setDone();
this.messageDispatcher.onEvaluatorCompleted(new CompletedEvaluatorImpl(this.evaluatorId));
@@ -425,7 +425,7 @@ public final class EvaluatorManager implements Identifiable, AutoCloseable {
* @param evaluatorStatusProto
*/
private synchronized void onEvaluatorFailed(final ReefServiceProtos.EvaluatorStatusProto evaluatorStatusProto) {
- assert (evaluatorStatusProto.getState() == ReefServiceProtos.State.FAILED);
+ assert evaluatorStatusProto.getState() == ReefServiceProtos.State.FAILED;
final EvaluatorException evaluatorException;
if (evaluatorStatusProto.hasError()) {
final Optional<Throwable> exception =
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorStatusManager.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorStatusManager.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorStatusManager.java
index 3e44fda..14e89b0 100644
--- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorStatusManager.java
+++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorStatusManager.java
@@ -100,9 +100,9 @@ final class EvaluatorStatusManager {
}
private static boolean isDoneOrFailedOrKilled(final EvaluatorState state) {
- return (state == EvaluatorState.DONE ||
- state == EvaluatorState.FAILED ||
- state == EvaluatorState.KILLED);
+ return state == EvaluatorState.DONE ||
+ state == EvaluatorState.FAILED ||
+ state == EvaluatorState.KILLED;
}
synchronized void setRunning() {
@@ -134,9 +134,9 @@ final class EvaluatorStatusManager {
}
synchronized boolean isAllocatedOrSubmittedOrRunning() {
- return (this.state == EvaluatorState.ALLOCATED ||
- this.state == EvaluatorState.SUBMITTED ||
- this.state == EvaluatorState.RUNNING);
+ return this.state == EvaluatorState.ALLOCATED ||
+ this.state == EvaluatorState.SUBMITTED ||
+ this.state == EvaluatorState.RUNNING;
}
synchronized boolean isSubmitted() {
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/Evaluators.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/Evaluators.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/Evaluators.java
index dd6e3ff..8acf102 100644
--- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/Evaluators.java
+++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/Evaluators.java
@@ -51,7 +51,7 @@ public final class Evaluators implements AutoCloseable {
@Inject
Evaluators() {
LOG.log(Level.FINE, "Instantiated 'Evaluators'");
- assert (SingletonAsserter.assertSingleton(Evaluators.class));
+ assert SingletonAsserter.assertSingleton(Evaluators.class);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/resourcemanager/ResourceManagerStatus.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/resourcemanager/ResourceManagerStatus.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/resourcemanager/ResourceManagerStatus.java
index 79448a2..37fb39e 100644
--- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/resourcemanager/ResourceManagerStatus.java
+++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/resourcemanager/ResourceManagerStatus.java
@@ -117,18 +117,18 @@ public final class ResourceManagerStatus implements EventHandler<RuntimeStatusEv
private synchronized void onRMFailure(final RuntimeStatusEvent runtimeStatusEvent) {
- assert (runtimeStatusEvent.getState() == ReefServiceProtos.State.FAILED);
+ assert runtimeStatusEvent.getState() == ReefServiceProtos.State.FAILED;
this.resourceManagerErrorHandler.onNext(runtimeStatusEvent.getError().get());
}
private synchronized void onRMDone(final RuntimeStatusEvent runtimeStatusEvent) {
- assert (runtimeStatusEvent.getState() == ReefServiceProtos.State.DONE);
+ assert runtimeStatusEvent.getState() == ReefServiceProtos.State.DONE;
LOG.log(Level.INFO, "Resource Manager shutdown happened. Triggering Driver shutdown.");
this.driverStatusManager.onComplete();
}
private synchronized void onRMRunning(final RuntimeStatusEvent runtimeStatusEvent) {
- assert (runtimeStatusEvent.getState() == ReefServiceProtos.State.RUNNING);
+ assert runtimeStatusEvent.getState() == ReefServiceProtos.State.RUNNING;
if (this.isIdle()) {
this.driverIdleManager.get().onPotentiallyIdle(IDLE_MESSAGE);
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/task/TaskRepresenter.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/task/TaskRepresenter.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/task/TaskRepresenter.java
index 3f70817..281df11 100644
--- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/task/TaskRepresenter.java
+++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/task/TaskRepresenter.java
@@ -118,7 +118,7 @@ public final class TaskRepresenter {
}
private void onTaskInit(final ReefServiceProtos.TaskStatusProto taskStatusProto) {
- assert ((ReefServiceProtos.State.INIT == taskStatusProto.getState()));
+ assert ReefServiceProtos.State.INIT == taskStatusProto.getState();
if (this.isKnown()) {
LOG.log(Level.WARNING, "Received a INIT message for task with id {0}" +
" which we have seen before. Ignoring the second message", this.taskId);
@@ -131,8 +131,7 @@ public final class TaskRepresenter {
}
private void onTaskRunning(final ReefServiceProtos.TaskStatusProto taskStatusProto) {
-
- assert (taskStatusProto.getState() == ReefServiceProtos.State.RUNNING);
+ assert taskStatusProto.getState() == ReefServiceProtos.State.RUNNING;
if (this.isNotRunning()) {
throw new IllegalStateException("Received a task status message from task " + this.taskId +
@@ -156,23 +155,23 @@ public final class TaskRepresenter {
}
private void onTaskSuspend(final ReefServiceProtos.TaskStatusProto taskStatusProto) {
- assert (ReefServiceProtos.State.SUSPEND == taskStatusProto.getState());
- assert (this.isKnown());
+ assert ReefServiceProtos.State.SUSPEND == taskStatusProto.getState();
+ assert this.isKnown();
this.messageDispatcher.onTaskSuspended(
new SuspendedTaskImpl(this.context, getResult(taskStatusProto), this.taskId));
this.setState(ReefServiceProtos.State.SUSPEND);
}
private void onTaskDone(final ReefServiceProtos.TaskStatusProto taskStatusProto) {
- assert (ReefServiceProtos.State.DONE == taskStatusProto.getState());
- assert (this.isKnown());
+ assert ReefServiceProtos.State.DONE == taskStatusProto.getState();
+ assert this.isKnown();
this.messageDispatcher.onTaskCompleted(
new CompletedTaskImpl(this.context, getResult(taskStatusProto), this.taskId));
this.setState(ReefServiceProtos.State.DONE);
}
private void onTaskFailed(final ReefServiceProtos.TaskStatusProto taskStatusProto) {
- assert (ReefServiceProtos.State.FAILED == taskStatusProto.getState());
+ assert ReefServiceProtos.State.FAILED == taskStatusProto.getState();
final Optional<ActiveContext> evaluatorContext = Optional.<ActiveContext>of(this.context);
final Optional<byte[]> bytes = Optional.ofNullable(getResult(taskStatusProto));
final Optional<Throwable> exception = this.exceptionCodec.fromBytes(bytes);
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/EvaluatorRuntime.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/EvaluatorRuntime.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/EvaluatorRuntime.java
index ec4b6db..b931186 100644
--- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/EvaluatorRuntime.java
+++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/EvaluatorRuntime.java
@@ -170,7 +170,7 @@ final class EvaluatorRuntime implements EventHandler<EvaluatorControlProto> {
synchronized (EvaluatorRuntime.this.heartBeatManager) {
try {
LOG.log(Level.FINEST, "runtime start");
- assert (ReefServiceProtos.State.INIT == EvaluatorRuntime.this.state);
+ assert ReefServiceProtos.State.INIT == EvaluatorRuntime.this.state;
EvaluatorRuntime.this.state = ReefServiceProtos.State.RUNNING;
EvaluatorRuntime.this.contextManager.start();
EvaluatorRuntime.this.heartBeatManager.sendHeartbeat();
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/files/JobJarMaker.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/files/JobJarMaker.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/files/JobJarMaker.java
index d700b2a..8dcc69a 100644
--- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/files/JobJarMaker.java
+++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/files/JobJarMaker.java
@@ -74,7 +74,7 @@ public final class JobJarMaker {
);
} else {
try {
- java.nio.file.Files.copy(sourceFile.toPath(), destinationFile.toPath());
+ Files.copy(sourceFile.toPath(), destinationFile.toPath());
} catch (final IOException e) {
final String message = new StringBuilder("Copy of file [")
.append(sourceFile.getAbsolutePath())
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/CLRLaunchCommandBuilder.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/CLRLaunchCommandBuilder.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/CLRLaunchCommandBuilder.java
index 0ffc559..09c6646 100644
--- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/CLRLaunchCommandBuilder.java
+++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/CLRLaunchCommandBuilder.java
@@ -48,10 +48,10 @@ public class CLRLaunchCommandBuilder implements LaunchCommandBuilder {
}
result.add(f.getPath());
result.add(evaluatorConfigurationPath);
- if ((null != this.standardOutPath) && (!standardOutPath.isEmpty())) {
+ if (null != this.standardOutPath && !standardOutPath.isEmpty()) {
result.add(">" + this.standardOutPath);
}
- if ((null != this.standardErrPath) && (!standardErrPath.isEmpty())) {
+ if (null != this.standardErrPath && !standardErrPath.isEmpty()) {
result.add("2>" + this.standardErrPath);
}
LOG.log(Level.FINE, "Launch Exe: {0}", StringUtils.join(result, ' '));
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/JavaLaunchCommandBuilder.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/JavaLaunchCommandBuilder.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/JavaLaunchCommandBuilder.java
index 10589cd..9484249 100644
--- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/JavaLaunchCommandBuilder.java
+++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/JavaLaunchCommandBuilder.java
@@ -81,7 +81,7 @@ public final class JavaLaunchCommandBuilder implements LaunchCommandBuilder {
add(javaPath);
}
- if ((assertionsEnabled != null && assertionsEnabled)
+ if (assertionsEnabled != null && assertionsEnabled
|| EnvironmentUtils.areAssertionsEnabled()) {
addOption("-ea");
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-common/src/main/java/org/apache/reef/task/TaskMessage.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/task/TaskMessage.java b/lang/java/reef-common/src/main/java/org/apache/reef/task/TaskMessage.java
index 039d1dc..3f3b26a 100644
--- a/lang/java/reef-common/src/main/java/org/apache/reef/task/TaskMessage.java
+++ b/lang/java/reef-common/src/main/java/org/apache/reef/task/TaskMessage.java
@@ -46,7 +46,7 @@ public final class TaskMessage implements Message {
* @return a new TaskMessage with the given content.
*/
public static TaskMessage from(final String messageSourceID, final byte[] theBytes) {
- assert (theBytes != null && messageSourceID != null);
+ assert theBytes != null && messageSourceID != null;
return new TaskMessage(messageSourceID, theBytes);
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-common/src/main/resources/checkstyle-strict.xml
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/main/resources/checkstyle-strict.xml b/lang/java/reef-common/src/main/resources/checkstyle-strict.xml
index 1e7e94a..ad2b485 100644
--- a/lang/java/reef-common/src/main/resources/checkstyle-strict.xml
+++ b/lang/java/reef-common/src/main/resources/checkstyle-strict.xml
@@ -188,7 +188,8 @@
<!-- See REEF-838 -->
<module name="DiamondOperatorForVariableDefinition"/>
- <module name="FinalParameters"/>
+ <module name="FinalParameters"/>
+ <module name="UnnecessaryParentheses"/>
<!-- Checks for class design -->
<!-- See http://checkstyle.sf.net/config_design.html -->
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/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 66aeee2..62694c4 100644
--- a/lang/java/reef-common/src/main/resources/checkstyle.xml
+++ b/lang/java/reef-common/src/main/resources/checkstyle.xml
@@ -189,7 +189,8 @@
<!-- See REEF-838 -->
<module name="DiamondOperatorForVariableDefinition" />
- <module name="FinalParameters"/>
+ <module name="FinalParameters"/>
+ <module name="UnnecessaryParentheses"/>
<!-- Checks for class design -->
<!-- See http://checkstyle.sf.net/config_design.html -->
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/BGDDriver.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/BGDDriver.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/BGDDriver.java
index 9ecf508..8b382fc 100644
--- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/BGDDriver.java
+++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/BGDDriver.java
@@ -194,7 +194,7 @@ public class BGDDriver {
private void submitTask(final ActiveContext activeContext) {
- assert (groupCommDriver.isConfigured(activeContext));
+ assert groupCommDriver.isConfigured(activeContext);
final Configuration partialTaskConfiguration;
if (activeContext.getId().equals(communicationsGroupMasterContextId) && !masterTaskSubmitted()) {
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/MasterTask.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/MasterTask.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/MasterTask.java
index 451701c..0db38e5 100644
--- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/MasterTask.java
+++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/MasterTask.java
@@ -97,7 +97,7 @@ public class MasterTask implements Task {
double gradientNorm = Double.MAX_VALUE;
for (int iteration = 1; !converged(iteration, gradientNorm); ++iteration) {
- try (final Timer t = new Timer("Current Iteration(" + (iteration) + ")")) {
+ try (final Timer t = new Timer("Current Iteration(" + iteration + ")")) {
final Pair<Double, Vector> lossAndGradient = computeLossAndGradient();
losses.add(lossAndGradient.getFirst());
final Vector descentDirection = getDescentDirection(lossAndGradient.getSecond());
@@ -155,7 +155,7 @@ public class MasterTask implements Task {
}
sendModel = chkAndUpdate();
- } while (allDead || (!ignoreAndContinue && sendModel));
+ } while (allDead || !ignoreAndContinue && sendModel);
return lineSearchResults;
}
@@ -180,7 +180,7 @@ public class MasterTask implements Task {
LOG.log(Level.INFO, "OUT: #Examples: {0}", numExamples);
final double lossPerExample = lossAndGradient.getFirst().getFirst() / numExamples;
LOG.log(Level.INFO, "OUT: Loss: {0}", lossPerExample);
- final double objFunc = ((lambda / 2) * model.norm2Sqr()) + lossPerExample;
+ final double objFunc = (lambda / 2) * model.norm2Sqr() + lossPerExample;
LOG.log(Level.INFO, "OUT: Objective Func Value: {0}", objFunc);
final Vector gradient = lossAndGradient.getSecond();
gradient.scale(1.0 / numExamples);
@@ -192,7 +192,7 @@ public class MasterTask implements Task {
}
}
sendModel = chkAndUpdate();
- } while (allDead || (!ignoreAndContinue && sendModel));
+ } while (allDead || !ignoreAndContinue && sendModel);
return returnValue;
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/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 460100c..5420468 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
@@ -112,9 +112,9 @@ public class SlaveTask implements Task {
case ComputeGradientWithMinEta:
failPerhaps();
final double minEta = minEtaBroadcaster.receive();
- assert (descentDirection != null);
+ assert descentDirection != null;
this.descentDirection.scale(minEta);
- assert (model != null);
+ assert model != null;
this.model.add(descentDirection);
lossAndGradientReducer.send(computeLossAndGradient());
break;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/utils/StepSizes.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/utils/StepSizes.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/utils/StepSizes.java
index 24432f6..afc0235 100644
--- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/utils/StepSizes.java
+++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/utils/StepSizes.java
@@ -33,7 +33,7 @@ public class StepSizes {
@Inject
public StepSizes() {
this.t = new double[gridSize];
- final int mid = (gridSize / 2);
+ final int mid = gridSize / 2;
t[mid] = 1;
for (int i = mid - 1; i >= 0; i--) {
t[i] = t[i + 1] / 2.0;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/utils/math/AbstractImmutableVector.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/utils/math/AbstractImmutableVector.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/utils/math/AbstractImmutableVector.java
index da9c7e5..090fa39 100644
--- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/utils/math/AbstractImmutableVector.java
+++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/utils/math/AbstractImmutableVector.java
@@ -37,7 +37,7 @@ abstract class AbstractImmutableVector implements ImmutableVector {
@Override
public double dot(final Vector that) {
- assert (this.size() == that.size());
+ assert this.size() == that.size();
double result = 0.0;
for (int index = 0; index < this.size(); ++index) {
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/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 e170ada..b17639d 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
@@ -59,8 +59,8 @@ public class Window {
if (list.isEmpty()) {
return d;
}
- final int start = (list.size() < maxSize) ? 0 : 1;
- final int numElems = (list.size() < maxSize) ? list.size() + 1 : maxSize;
+ final int start = list.size() < maxSize ? 0 : 1;
+ final int numElems = list.size() < maxSize ? list.size() + 1 : maxSize;
for (int i = start; i < list.size(); i++) {
d += list.get(i);
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HttpShellJobDriver.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HttpShellJobDriver.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HttpShellJobDriver.java
index d91e4db..89cfa8e 100644
--- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HttpShellJobDriver.java
+++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HttpShellJobDriver.java
@@ -129,7 +129,7 @@ public final class HttpShellJobDriver {
private void submit(final String command) {
LOG.log(Level.INFO, "Submit command {0} to {1} evaluators. state: {2}",
new Object[]{command, this.contexts.size(), this.state});
- assert (this.state == State.READY);
+ assert this.state == State.READY;
this.expectCount = this.contexts.size();
this.state = State.WAIT_TASKS;
this.cmd = null;
@@ -165,7 +165,7 @@ public final class HttpShellJobDriver {
* Request the evaluators.
*/
private synchronized void requestEvaluators() {
- assert (this.state == State.INIT);
+ assert this.state == State.INIT;
LOG.log(Level.INFO, "Schedule on {0} Evaluators.", this.numEvaluators);
this.evaluatorRequestor.submit(
EvaluatorRequest.newBuilder()
@@ -200,7 +200,7 @@ public final class HttpShellJobDriver {
synchronized (HttpShellJobDriver.this) {
LOG.log(Level.INFO, "Allocated Evaluator: {0} expect {1} running {2}",
new Object[]{eval.getId(), HttpShellJobDriver.this.expectCount, HttpShellJobDriver.this.contexts.size()});
- assert (HttpShellJobDriver.this.state == State.WAIT_EVALUATORS);
+ assert HttpShellJobDriver.this.state == State.WAIT_EVALUATORS;
try {
eval.submitContext(ContextConfiguration.CONF.set(
ContextConfiguration.IDENTIFIER, eval.getId() + "_context").build());
@@ -239,7 +239,7 @@ public final class HttpShellJobDriver {
synchronized (HttpShellJobDriver.this) {
LOG.log(Level.INFO, "Context available: {0} expect {1} state {2}",
new Object[]{context.getId(), HttpShellJobDriver.this.expectCount, HttpShellJobDriver.this.state});
- assert (HttpShellJobDriver.this.state == State.WAIT_EVALUATORS);
+ assert HttpShellJobDriver.this.state == State.WAIT_EVALUATORS;
HttpShellJobDriver.this.contexts.put(context.getId(), context);
if (--HttpShellJobDriver.this.expectCount <= 0) {
HttpShellJobDriver.this.state = State.READY;
@@ -328,12 +328,12 @@ public final class HttpShellJobDriver {
final String command = CODEC.decode(message);
LOG.log(Level.INFO, "Client message: {0} state: {1}",
new Object[]{command, HttpShellJobDriver.this.state});
- assert (HttpShellJobDriver.this.cmd == null);
+ assert HttpShellJobDriver.this.cmd == null;
if (HttpShellJobDriver.this.state == State.READY) {
HttpShellJobDriver.this.submit(command);
} else {
// not ready yet - save the command for better times.
- assert (HttpShellJobDriver.this.state == State.WAIT_EVALUATORS);
+ assert HttpShellJobDriver.this.state == State.WAIT_EVALUATORS;
HttpShellJobDriver.this.cmd = command;
}
}
@@ -347,7 +347,7 @@ public final class HttpShellJobDriver {
@Override
public void onNext(final StartTime startTime) {
LOG.log(Level.INFO, "{0} StartTime: {1}", new Object[]{state, startTime});
- assert (state == State.INIT);
+ assert state == State.INIT;
requestEvaluators();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/driver/SchedulerDriver.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/driver/SchedulerDriver.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/driver/SchedulerDriver.java
index 3af1efa..3b8bad7 100644
--- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/driver/SchedulerDriver.java
+++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/driver/SchedulerDriver.java
@@ -95,7 +95,7 @@ public final class SchedulerDriver {
@Override
public void onNext(final StartTime startTime) {
LOG.log(Level.INFO, "Driver started at {0}", startTime);
- assert (state == State.INIT);
+ assert state == State.INIT;
state = State.WAIT_EVALUATORS;
requestEvaluator(1); // Allocate an initial evaluator to avoid idle state.
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/FlatTopology.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/FlatTopology.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/FlatTopology.java
index aaef4fd..a83134e 100644
--- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/FlatTopology.java
+++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/FlatTopology.java
@@ -71,7 +71,7 @@ public class FlatTopology implements Topology {
private final ConcurrentMap<String, TaskNode> nodes = new ConcurrentSkipListMap<>();
/**
- * @Deprecated in 0.14. Use Tang to obtain an instance of this instead.
+ * @deprecated in 0.14. Use Tang to obtain an instance of this instead.
*/
@Deprecated
public FlatTopology(final EStage<GroupCommunicationMessage> senderStage,
@@ -232,8 +232,6 @@ public class FlatTopology implements Topology {
this.root = node;
for (final Map.Entry<String, TaskNode> nodeEntry : nodes.entrySet()) {
- final String id = nodeEntry.getKey();
-
final TaskNode leaf = nodeEntry.getValue();
root.addChild(leaf);
leaf.setParent(root);
@@ -250,7 +248,6 @@ public class FlatTopology implements Topology {
root = null;
for (final Map.Entry<String, TaskNode> nodeEntry : nodes.entrySet()) {
- final String id = nodeEntry.getKey();
final TaskNode leaf = nodeEntry.getValue();
leaf.setParent(null);
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/GroupCommDriverImpl.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/GroupCommDriverImpl.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/GroupCommDriverImpl.java
index ea84367..5a6a7a9 100644
--- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/GroupCommDriverImpl.java
+++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/GroupCommDriverImpl.java
@@ -134,7 +134,7 @@ public class GroupCommDriverImpl implements GroupCommServiceDriver {
final LocalAddressProvider localAddressProvider,
final TransportFactory tpFactory,
final NameServer nameService) {
- assert (SingletonAsserter.assertSingleton(getClass()));
+ assert SingletonAsserter.assertSingleton(getClass());
this.fanOut = fanOut;
this.nameService = nameService;
this.nameServiceAddr = localAddressProvider.getLocalAddress();
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/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 7b68682..bf91805 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
@@ -334,8 +334,8 @@ public class TaskNodeImpl implements TaskNode {
public void checkAndSendTopologySetupMessage() {
LOG.entering("TaskNodeImpl", "checkAndSendTopologySetupMessage", getQualifiedName());
if (!topoSetupSent.get()
- && (parentActive() && activeNeighborOfParent())
- && (allChildrenActive() && activeNeighborOfAllChildren())) {
+ && parentActive() && activeNeighborOfParent()
+ && allChildrenActive() && activeNeighborOfAllChildren()) {
sendTopoSetupMsg();
}
LOG.exiting("TaskNodeImpl", "checkAndSendTopologySetupMessage", getQualifiedName());
@@ -490,7 +490,7 @@ public class TaskNodeImpl implements TaskNode {
if (obj != this) {
if (obj instanceof TaskNodeImpl) {
final TaskNodeImpl that = (TaskNodeImpl) obj;
- return (this.taskId.equals(that.taskId) && this.version.get() == that.version.get());
+ 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/ad831a1d/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TaskNodeStatusImpl.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TaskNodeStatusImpl.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TaskNodeStatusImpl.java
index cde7fcf..574a326 100644
--- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TaskNodeStatusImpl.java
+++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TaskNodeStatusImpl.java
@@ -148,7 +148,6 @@ public class TaskNodeStatusImpl implements TaskNodeStatus {
@Override
public void processAcknowledgement(final GroupCommunicationMessage gcm) {
LOG.entering("TaskNodeStatusImpl", "processMsg", new Object[]{getQualifiedName(), gcm});
- final String self = gcm.getSrcid();
final Type msgType = gcm.getType();
final Type msgAcked = getAckedMsg(msgType);
final String sourceId = gcm.getDestid();
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TreeTopology.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TreeTopology.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TreeTopology.java
index 4686491..9d45f0d 100644
--- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TreeTopology.java
+++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TreeTopology.java
@@ -78,7 +78,7 @@ public class TreeTopology implements Topology {
private final ConfigurationSerializer confSer = new AvroConfigurationSerializer();
/**
- * @Deprecated in 0.14. Use Tang to obtain an instance of this instead.
+ * @deprecated in 0.14. Use Tang to obtain an instance of this instead.
*/
@Deprecated
public TreeTopology(final EStage<GroupCommunicationMessage> senderStage,
@@ -262,8 +262,7 @@ public class TreeTopology implements Topology {
private void setRootNode(final String newRootId) {
LOG.entering("TreeTopology", "setRootNode", new Object[]{getQualifiedName(), newRootId});
- final TaskNode node = new TaskNodeImpl(senderStage, groupName, operName, newRootId, driverId, true);
- this.root = node;
+ this.root = new TaskNodeImpl(senderStage, groupName, operName, newRootId, driverId, true);
this.logicalRoot = this.root;
this.prev = this.root;
@@ -282,7 +281,6 @@ public class TreeTopology implements Topology {
root = null;
for (final Map.Entry<String, TaskNode> nodeEntry : nodes.entrySet()) {
- final String id = nodeEntry.getKey();
final TaskNode leaf = nodeEntry.getValue();
leaf.setParent(null);
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/OperatorTopologyImpl.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/OperatorTopologyImpl.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/OperatorTopologyImpl.java
index b38e1e6..8b5ba52 100644
--- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/OperatorTopologyImpl.java
+++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/OperatorTopologyImpl.java
@@ -201,7 +201,7 @@ public class OperatorTopologyImpl implements OperatorTopology {
throws ParentDeadException {
LOG.entering("OperatorTopologyImpl", "sendToParent", new Object[] {getQualifiedName(), msgType});
refreshEffectiveTopology();
- assert (effectiveTopology != null);
+ assert effectiveTopology != null;
effectiveTopology.sendToParent(data, msgType);
LOG.exiting("OperatorTopologyImpl", "sendToParent", getQualifiedName());
}
@@ -211,7 +211,7 @@ public class OperatorTopologyImpl implements OperatorTopology {
throws ParentDeadException {
LOG.entering("OperatorTopologyImpl", "sendToChildren", new Object[]{getQualifiedName(), msgType});
refreshEffectiveTopology();
- assert (effectiveTopology != null);
+ assert effectiveTopology != null;
effectiveTopology.sendToChildren(data, msgType);
LOG.exiting("OperatorTopologyImpl", "sendToChildren", getQualifiedName());
}
@@ -222,7 +222,7 @@ public class OperatorTopologyImpl implements OperatorTopology {
throws ParentDeadException {
LOG.entering("OperatorTopologyImpl", "sendToChildren", new Object[]{getQualifiedName(), msgType});
refreshEffectiveTopology();
- assert (effectiveTopology != null);
+ assert effectiveTopology != null;
effectiveTopology.sendToChildren(dataMap, msgType);
LOG.exiting("OperatorTopologyImpl", "sendToChildren", getQualifiedName());
}
@@ -232,7 +232,7 @@ public class OperatorTopologyImpl implements OperatorTopology {
throws ParentDeadException {
LOG.entering("OperatorTopologyImpl", "recvFromParent", new Object[] {getQualifiedName(), msgType});
refreshEffectiveTopology();
- assert (effectiveTopology != null);
+ assert effectiveTopology != null;
final byte[] retVal = effectiveTopology.recvFromParent(msgType);
LOG.exiting("OperatorTopologyImpl", "recvFromParent", getQualifiedName());
return retVal;
@@ -243,7 +243,7 @@ public class OperatorTopologyImpl implements OperatorTopology {
throws ParentDeadException {
LOG.entering("OperatorTopologyImpl", "recvFromChildren", getQualifiedName());
refreshEffectiveTopology();
- assert (effectiveTopology != null);
+ assert effectiveTopology != null;
final T retVal = effectiveTopology.recvFromChildren(redFunc, dataCodec);
LOG.exiting("OperatorTopologyImpl", "recvFromChildren", getQualifiedName());
return retVal;
@@ -253,7 +253,7 @@ public class OperatorTopologyImpl implements OperatorTopology {
public byte[] recvFromChildren() throws ParentDeadException {
LOG.entering("OperatorTopologyImpl", "recvFromChildren", getQualifiedName());
refreshEffectiveTopology();
- assert (effectiveTopology != null);
+ assert effectiveTopology != null;
final byte[] retVal = effectiveTopology.recvFromChildren();
LOG.exiting("OperatorTopologyImpl", "recvFromChildren", getQualifiedName());
return retVal;
@@ -271,7 +271,7 @@ public class OperatorTopologyImpl implements OperatorTopology {
synchronized (topologyLock) {
LOG.finest(getQualifiedName() + "Acquired topoLock");
- assert (effectiveTopology != null);
+ assert effectiveTopology != null;
final Set<GroupCommunicationMessage> deletionDeltasSet = new HashSet<>();
copyDeletionDeltas(deletionDeltasSet);
@@ -310,7 +310,7 @@ public class OperatorTopologyImpl implements OperatorTopology {
synchronized (topologyLock) {
LOG.finest(getQualifiedName() + "Acquired topoLock");
try {
- assert (baseTopology != null);
+ assert baseTopology != null;
LOG.finest(getQualifiedName() + "Updating base topology. So setting dirty bit");
baseTopology.setChanges(true);
@@ -392,8 +392,8 @@ public class OperatorTopologyImpl implements OperatorTopology {
private void updateEffTopologyFromBaseTopology() {
LOG.entering("OperatorTopologyImpl", "updateEffTopologyFromBaseTopology", getQualifiedName());
- assert (baseTopology != null);
- LOG.finest(getQualifiedName() + "Updaing effective topology");
+ assert baseTopology != null;
+ LOG.finest(getQualifiedName() + "Updating effective topology");
if (baseTopology.hasChanges()) {
//Create effectiveTopology from baseTopology
effectiveTopology = new OperatorTopologyStructImpl(baseTopology);
@@ -474,8 +474,8 @@ public class OperatorTopologyImpl implements OperatorTopology {
private final class BaseTopologyUpdateHandler implements EventHandler<GroupCommunicationMessage> {
@Override
public void onNext(final GroupCommunicationMessage msg) {
- assert (msg.getType() == ReefNetworkGroupCommProtos.GroupCommMessage.Type.UpdateTopology);
- assert (effectiveTopology != null);
+ assert msg.getType() == ReefNetworkGroupCommProtos.GroupCommMessage.Type.UpdateTopology;
+ assert effectiveTopology != null;
LOG.entering("OperatorTopologyImpl.BaseTopologyUpdateHandler", "onNext", new Object[]{getQualifiedName(), msg});
LOG.finest(getQualifiedName() + "Waiting to acquire topoLock");
synchronized (topologyLock) {
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/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 0ade442..d6d4537 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
@@ -24,11 +24,11 @@ import java.util.logging.Level;
import java.util.logging.Logger;
/**
- * Utility class to provide a map that allows to.
+ * Utility class to provide a map that allows to
* add multiple keys and automatically
* incrementing the count on each add
* decrementing the count on each remove
- * and removing key on count==0
+ * and removing key on count==0.
*/
public class CountingMap<L> {
private static final Logger LOG = Logger.getLogger(CountingMap.class.getName());
@@ -54,7 +54,7 @@ public class CountingMap<L> {
}
public void add(final L value) {
- int cnt = (map.containsKey(value)) ? map.get(value) : 0;
+ int cnt = map.containsKey(value) ? map.get(value) : 0;
map.put(value, ++cnt);
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-io/src/test/java/org/apache/reef/io/storage/FramingTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/test/java/org/apache/reef/io/storage/FramingTest.java b/lang/java/reef-io/src/test/java/org/apache/reef/io/storage/FramingTest.java
index 33caa7c..ec425e0 100644
--- a/lang/java/reef-io/src/test/java/org/apache/reef/io/storage/FramingTest.java
+++ b/lang/java/reef-io/src/test/java/org/apache/reef/io/storage/FramingTest.java
@@ -47,7 +47,7 @@ public class FramingTest {
} else {
o.nextFrame();
}
- offset += (4 + i);
+ offset += 4 + i;
Assert.assertEquals(offset, o.getCurrentOffset());
a.add(b);
Assert.assertEquals(offset, o2.getCurrentOffset());
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/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 2fa7b91..d5487a6 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
@@ -86,8 +86,8 @@ public final class StringEntry {
final StringEntry that = (StringEntry) o;
- return (this.key == that.key || (this.key != null && this.key.equals(that.key)))
- && (this.value == that.value || (this.value != null && this.value.equals(that.value)));
+ return (this.key == that.key || this.key != null && this.key.equals(that.key))
+ && (this.value == that.value || this.value != null && this.value.equals(that.value));
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/PreparedDriverFolderLauncher.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/PreparedDriverFolderLauncher.java b/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/PreparedDriverFolderLauncher.java
index cfa748d..c53dc7e 100644
--- a/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/PreparedDriverFolderLauncher.java
+++ b/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/PreparedDriverFolderLauncher.java
@@ -74,7 +74,7 @@ public class PreparedDriverFolderLauncher {
* @param clientRemoteId
*/
public void launch(final File driverFolder, final String jobId, final String clientRemoteId) {
- assert (driverFolder.isDirectory());
+ assert driverFolder.isDirectory();
final List<String> command = makeLaunchCommand(jobId, clientRemoteId);
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/driver/ContainerManager.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/driver/ContainerManager.java b/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/driver/ContainerManager.java
index 3c61faa..db59e4b 100644
--- a/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/driver/ContainerManager.java
+++ b/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/driver/ContainerManager.java
@@ -281,10 +281,9 @@ final class ContainerManager implements AutoCloseable {
// remove the any modifier
final String newRackName = rackName.substring(0,
rackName.length() - 1);
- if (possibleRackName.startsWith(newRackName)) {
- if (freeNodesPerRack.get(possibleRackName).size() > 0) {
- return Optional.of(possibleRackName);
- }
+ if (possibleRackName.startsWith(newRackName) &&
+ freeNodesPerRack.get(possibleRackName).size() > 0) {
+ return Optional.of(possibleRackName);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/process/RunnableProcess.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/process/RunnableProcess.java b/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/process/RunnableProcess.java
index 9d2597e..323dcb0 100644
--- a/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/process/RunnableProcess.java
+++ b/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/process/RunnableProcess.java
@@ -100,7 +100,7 @@ public final class RunnableProcess implements Runnable {
this.command = new ArrayList<>(command);
this.id = id;
this.folder = folder;
- assert (this.folder.isDirectory());
+ assert this.folder.isDirectory();
this.folder.mkdirs();
this.standardOutFileName = standardOutFileName;
this.standardErrorFileName = standardErrorFileName;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/REEFScheduler.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/REEFScheduler.java b/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/REEFScheduler.java
index 533454b..68476a0 100644
--- a/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/REEFScheduler.java
+++ b/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/REEFScheduler.java
@@ -460,7 +460,7 @@ final class REEFScheduler implements Scheduler {
final String logging = "-Djava.util.logging.config.class=org.apache.reef.util.logging.Config";
final String mesosExecutorId = "-mesos_executor_id " + executorID;
- return (new StringBuilder()
+ return new StringBuilder()
.append(defaultJavaPath + " ")
.append("-XX:PermSize=128m" + " ")
.append("-XX:MaxPermSize=128m" + " ")
@@ -469,7 +469,7 @@ final class REEFScheduler implements Scheduler {
.append(logging + " ")
.append(REEFExecutor.class.getName() + " ")
.append(mesosExecutorId + " ")
- .toString());
+ .toString();
}
private String getReefTarUri(final String jobIdentifier) {
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/evaluator/REEFExecutor.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/evaluator/REEFExecutor.java b/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/evaluator/REEFExecutor.java
index dcc4a26..df0d928 100644
--- a/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/evaluator/REEFExecutor.java
+++ b/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/evaluator/REEFExecutor.java
@@ -195,13 +195,13 @@ public final class REEFExecutor implements Executor {
public void onEvaluatorRelease(final EvaluatorRelease evaluatorRelease) {
LOG.log(Level.INFO, "Release!!!! {0}", evaluatorRelease.toString());
- assert(evaluatorRelease.getIdentifier().toString().equals(this.mesosExecutorId));
+ assert evaluatorRelease.getIdentifier().toString().equals(this.mesosExecutorId);
this.onStop();
}
public void onEvaluatorLaunch(final EvaluatorLaunch evaluatorLaunch) {
LOG.log(Level.INFO, "Launch!!!! {0}", evaluatorLaunch.toString());
- assert(evaluatorLaunch.getIdentifier().toString().equals(this.mesosExecutorId));
+ assert evaluatorLaunch.getIdentifier().toString().equals(this.mesosExecutorId);
final ExecutorService evaluatorLaunchExecutorService = Executors.newSingleThreadExecutor();
evaluatorLaunchExecutorService.submit(new Thread() {
public void run() {
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/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 4b7ce49..ad3c498 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
@@ -493,7 +493,7 @@ final class YarnContainerManager
final boolean rackCondition = request.getRacks() == null
|| request.getRacks().contains(this.nodeIdToRackName.get(container.getNodeId().toString()));
- return resourceCondition && (request.getRelaxLocality() || (rackCondition && nodeCondition));
+ return resourceCondition && (request.getRelaxLocality() || rackCondition && nodeCondition);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/Injector.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/Injector.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/Injector.java
index fb472a4..76021ff 100644
--- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/Injector.java
+++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/Injector.java
@@ -28,7 +28,7 @@ public interface Injector {
/**
* Gets an instance of iface, or the implementation that has been bound to it.
- * If an instance has alread been created in this (or a parent) scope, then
+ * If an instance has already been created in this (or a parent) scope, then
* the existing instance will be returned. Otherwise, a new instance will be
* returned, and registered in the current scope.
*
@@ -46,7 +46,7 @@ public interface Injector {
* Gets the value stored for the given named parameter.
*
* @param <U>
- * @param name
+ * @param iface
* @return an Instance of the class configured as the implementation for the
* given interface class.
* @throws InjectionException
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ConfigurationModule.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ConfigurationModule.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ConfigurationModule.java
index 41f24aa..fbc9d8a 100644
--- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ConfigurationModule.java
+++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ConfigurationModule.java
@@ -246,10 +246,8 @@ public class ConfigurationModule {
c.builder.b.bindSetEntry((Class) clazz, paramStr);
foundOne = true;
}
- if (!foundOne) {
- if (!(p instanceof OptionalParameter)) {
- throw new IllegalStateException();
- }
+ if (!foundOne && !(p instanceof OptionalParameter)) {
+ throw new IllegalStateException();
}
}
return c.builder.b.build();
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/ad831a1d/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/ConfigurationBuilderImpl.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/ConfigurationBuilderImpl.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/ConfigurationBuilderImpl.java
index a8cfab2..ca15e04 100644
--- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/ConfigurationBuilderImpl.java
+++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/ConfigurationBuilderImpl.java
@@ -65,7 +65,7 @@ public class ConfigurationBuilderImpl implements ConfigurationBuilder {
throws BindException {
this.namespace = Tang.Factory.getTang().getDefaultClassHierarchy(jars, parsers);
for (final Configuration tc : confs) {
- addConfiguration(((ConfigurationImpl) tc));
+ addConfiguration((ConfigurationImpl) tc);
}
}
@@ -98,8 +98,8 @@ public class ConfigurationBuilderImpl implements ConfigurationBuilder {
private <T> void addConfiguration(final ClassHierarchy ns, final ConfigurationBuilderImpl builder)
throws BindException {
namespace = namespace.merge(ns);
- if ((namespace instanceof ClassHierarchyImpl || builder.namespace instanceof ClassHierarchyImpl)) {
- if ((namespace instanceof ClassHierarchyImpl && builder.namespace instanceof ClassHierarchyImpl)) {
+ if (namespace instanceof ClassHierarchyImpl || builder.namespace instanceof ClassHierarchyImpl) {
+ if (namespace instanceof ClassHierarchyImpl && builder.namespace instanceof ClassHierarchyImpl) {
((ClassHierarchyImpl) namespace).getParameterParser()
.mergeIn(((ClassHierarchyImpl) builder.namespace).getParameterParser());
} else {