You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@reef.apache.org by we...@apache.org on 2015/07/01 02:48:31 UTC
[1/2] incubator-reef git commit: [REEF-414]: Fix violations of checks
in "Naming" category for private variables/methods
Repository: incubator-reef
Updated Branches:
refs/heads/master 1ea52a7d5 -> 760e82e60
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/MergingEventHandler.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/MergingEventHandler.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/MergingEventHandler.java
index 19169bf..8a99311 100644
--- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/MergingEventHandler.java
+++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/MergingEventHandler.java
@@ -38,7 +38,7 @@ import java.util.logging.Logger;
@Unit
public final class MergingEventHandler<L, R> {
- private static Logger LOG = Logger.getLogger(MergingEventHandler.class.getName());
+ private static final Logger LOG = Logger.getLogger(MergingEventHandler.class.getName());
public final EventHandler<L> left = new Left();
public final EventHandler<R> right = new Right();
private final Object mutex = new Object();
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/StageManager.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/StageManager.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/StageManager.java
index f867ec1..a82e071 100644
--- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/StageManager.java
+++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/StageManager.java
@@ -34,7 +34,7 @@ public final class StageManager implements Stage {
private static final Logger LOG = Logger.getLogger(StageManager.class.getName());
- private static final StageManager instance = new StageManager();
+ private static final StageManager INSTANCE = new StageManager();
private final List<Stage> stages = Collections.synchronizedList(new ArrayList<Stage>());
private final AtomicBoolean closed = new AtomicBoolean(false);
@@ -58,7 +58,7 @@ public final class StageManager implements Stage {
}
public static StageManager instance() {
- return instance;
+ return INSTANCE;
}
public void register(final Stage stage) {
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/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 63eec6b..a46a03b 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
@@ -37,7 +37,7 @@ import java.util.logging.Logger;
public class WakeProfiler implements Aspect {
private static final Logger LOG = Logger.getLogger(WakeProfiler.class.toString());
- private final Map<Object, Vertex<?>> vertex_object = new MonotonicHashMap<>();
+ private final Map<Object, Vertex<?>> vertexObject = new MonotonicHashMap<>();
private final Map<InjectionFuture<?>, Object> futures = new MonotonicHashMap<>();
private final Map<Object, Stats> stats = new MonotonicHashMap<>();
@@ -51,11 +51,11 @@ public class WakeProfiler implements Aspect {
if (t instanceof Set) {
return (Vertex<T>) newSetVertex((Set<?>) t);
} else {
- Vertex<T> v = (Vertex<T>) vertex_object.get(t);
+ Vertex<T> v = (Vertex<T>) vertexObject.get(t);
// Add dummy vertices for objects that were bound volatile.
if (v == null) {
v = new Vertex<>(t);
- vertex_object.put(t, v);
+ vertexObject.put(t, v);
}
return v;
}
@@ -68,26 +68,26 @@ public class WakeProfiler implements Aspect {
@SuppressWarnings("unchecked")
private <T> Vertex<?> newSetVertex(Set<T> s) {
- if (vertex_object.containsKey(s)) {
- return (Vertex<Set<T>>) vertex_object.get(s);
+ if (vertexObject.containsKey(s)) {
+ return (Vertex<Set<T>>) vertexObject.get(s);
}
if (s.size() > -1) {
LOG.fine("new set of size " + s.size());
- Vertex<?>[] s_args = new Vertex[s.size()];
+ Vertex<?>[] sArgs = new Vertex[s.size()];
int k = 0;
for (Object p : s) {
- s_args[k] = getVertex(p);
+ sArgs[k] = getVertex(p);
k++;
}
- Vertex<Set<T>> sv = new Vertex<>(s, null, s_args);
- vertex_object.put(s, sv);
+ Vertex<Set<T>> sv = new Vertex<>(s, null, sArgs);
+ vertexObject.put(s, sv);
return sv;
// } else if(s.size() == 1) {
} else {
Object p = s.iterator().next();
Vertex<?> w = getVertex(p);
// alias the singleton set to its member
- vertex_object.put(s, w);
+ vertexObject.put(s, w);
return w;
}
// } else {
@@ -99,14 +99,14 @@ public class WakeProfiler implements Aspect {
@Override
public <T> T inject(ConstructorDef<T> constructorDef, Constructor<T> constructor, Object[] args) throws InvocationTargetException, IllegalAccessException, IllegalArgumentException, InstantiationException {
// LOG.info("inject" + constructor + "->" + args.length);
- Vertex<?>[] v_args = new Vertex[args.length];
+ Vertex<?>[] vArgs = new Vertex[args.length];
for (int i = 0; i < args.length; i++) {
Object o = args[i];
Vertex<?> v = getVertex(o);
if (o instanceof Set) {
LOG.fine("Got a set arg for " + constructorDef + " length " + ((Set<?>) o).size());
}
- v_args[i] = v;
+ vArgs[i] = v;
}
T ret;
@@ -156,8 +156,8 @@ public class WakeProfiler implements Aspect {
} else {
ret = constructor.newInstance(args);
}
- Vertex<T> v = new Vertex<T>(ret, constructorDef, v_args);
- vertex_object.put(ret, v);
+ Vertex<T> v = new Vertex<T>(ret, constructorDef, vArgs);
+ vertexObject.put(ret, v);
return ret;
}
@@ -200,19 +200,19 @@ public class WakeProfiler implements Aspect {
public String objectGraphToString() {
List<Vertex<?>> vertices = new ArrayList<>();
- Map<Vertex<?>, Integer> off_vertex = new MonotonicHashMap<>();
+ Map<Vertex<?>, Integer> offVertex = new MonotonicHashMap<>();
StringBuffer sb = new StringBuffer("{\"nodes\":[\n");
List<String> nodes = new ArrayList<String>();
LinkedList<Vertex<?>> workQueue = new LinkedList<>();
- for (Object o : vertex_object.keySet()) {
+ for (Object o : vertexObject.keySet()) {
if (whitelist(o)) {
workQueue.add(getVertex(o));
}
}
for (Object o : futures.values()) {
- if ((!vertex_object.containsKey(o)) && whitelist(o)) {
+ if ((!vertexObject.containsKey(o)) && whitelist(o)) {
workQueue.add(getVertex(o));
}
}
@@ -250,7 +250,7 @@ public class WakeProfiler implements Aspect {
s = removeEnhancements(o.getClass().getSimpleName());
}
if (s != null) {
- off_vertex.put(v, vertices.size());
+ offVertex.put(v, vertices.size());
vertices.add(v);
if (tooltip == null) {
nodes.add("{\"name\":\"" + jsonEscape(s) + "\"}");
@@ -269,19 +269,19 @@ public class WakeProfiler implements Aspect {
LOG.fine("pointed to object " + w.getObject());
if (w.getObject() instanceof InjectionFuture) {
Vertex<?> futureTarget = getFuture((InjectionFuture<?>) w.getObject()); //futures.get(w.getObject());
- Integer off = off_vertex.get(futureTarget);
+ Integer off = offVertex.get(futureTarget);
LOG.fine("future target " + futureTarget + " off = " + off);
if (off != null) {
- links.add("{\"target\":" + off_vertex.get(v) + ",\"source\":" + off + ",\"value\":" + 1.0 + ",\"back\":true}");
+ links.add("{\"target\":" + offVertex.get(v) + ",\"source\":" + off + ",\"value\":" + 1.0 + ",\"back\":true}");
}
} else {
- Integer off = off_vertex.get(w);
+ Integer off = offVertex.get(w);
if (off != null) {
Stats s = stats.get(w.getObject());
if (s != null) {
- links.add("{\"source\":" + off_vertex.get(v) + ",\"target\":" + off + ",\"value\":" + (s.messageCount.get() + 3.0) + "}");
+ links.add("{\"source\":" + offVertex.get(v) + ",\"target\":" + off + ",\"value\":" + (s.messageCount.get() + 3.0) + "}");
} else {
- links.add("{\"source\":" + off_vertex.get(v) + ",\"target\":" + off + ",\"value\":" + 1.0 + "}");
+ links.add("{\"source\":" + offVertex.get(v) + ",\"target\":" + off + ",\"value\":" + 1.0 + "}");
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/NetUtils.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/NetUtils.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/NetUtils.java
index f1c5542..c4a86d4 100644
--- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/NetUtils.java
+++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/NetUtils.java
@@ -26,14 +26,14 @@ import org.apache.reef.wake.remote.address.LocalAddressProviderFactory;
*/
@Deprecated
public final class NetUtils {
- private static final LocalAddressProvider localAddressProvider = LocalAddressProviderFactory.getInstance();
+ private static final LocalAddressProvider LOCAL_ADDRESS_PROVIDER = LocalAddressProviderFactory.getInstance();
/**
* @deprecated Use <code>org.apache.reef.wake.remote.address.LocalAddressProvider#getLocalAddress()</code> instead.
*/
@Deprecated
public static String getLocalAddress() {
- return localAddressProvider.getLocalAddress();
+ return LOCAL_ADDRESS_PROVIDER.getLocalAddress();
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/DefaultRemoteManagerImplementation.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/DefaultRemoteManagerImplementation.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/DefaultRemoteManagerImplementation.java
index b5b66d8..6dd7c98 100644
--- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/DefaultRemoteManagerImplementation.java
+++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/DefaultRemoteManagerImplementation.java
@@ -47,7 +47,7 @@ public class DefaultRemoteManagerImplementation implements RemoteManager {
private static final Logger LOG = Logger.getLogger(HandlerContainer.class.getName());
- private static final AtomicInteger counter = new AtomicInteger(0);
+ private static final AtomicInteger COUNTER = new AtomicInteger(0);
/**
* The timeout used for the execute running in close().
@@ -128,7 +128,7 @@ public class DefaultRemoteManagerImplementation implements RemoteManager {
StageManager.instance().register(this);
LOG.log(Level.FINEST, "RemoteManager {0} instantiated id {1} counter {2} listening on {3}:{4}. Binding address provided by {5}",
- new Object[]{this.name, this.myIdentifier, counter.incrementAndGet(),
+ new Object[]{this.name, this.myIdentifier, COUNTER.incrementAndGet(),
this.transport.getLocalAddress().toString(),
this.transport.getListeningPort(), localAddressProvider}
);
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/AvroEvaluatorListSerializer.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/AvroEvaluatorListSerializer.java b/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/AvroEvaluatorListSerializer.java
index da614e0..476b976 100644
--- a/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/AvroEvaluatorListSerializer.java
+++ b/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/AvroEvaluatorListSerializer.java
@@ -50,18 +50,18 @@ public class AvroEvaluatorListSerializer implements EvaluatorListSerializer {
final Map<String, EvaluatorDescriptor> evaluatorMap,
final int totalEvaluators, final String startTime) {
- final List<AvroEvaluatorEntry> EvaluatorEntities = new ArrayList<>();
+ final List<AvroEvaluatorEntry> evaluatorEntities = new ArrayList<>();
for (final Map.Entry<String, EvaluatorDescriptor> entry : evaluatorMap.entrySet()) {
final EvaluatorDescriptor descriptor = entry.getValue();
- EvaluatorEntities.add(AvroEvaluatorEntry.newBuilder()
- .setId(entry.getKey())
- .setName(descriptor.getNodeDescriptor().getName())
- .build());
+ evaluatorEntities.add(AvroEvaluatorEntry.newBuilder()
+ .setId(entry.getKey())
+ .setName(descriptor.getNodeDescriptor().getName())
+ .build());
}
return AvroEvaluatorList.newBuilder()
- .setEvaluators(EvaluatorEntities)
+ .setEvaluators(evaluatorEntities)
.setTotal(totalEvaluators)
.setStartTime(startTime != null ? startTime : new Date().toString())
.build();
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/HttpServerReefEventHandler.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/HttpServerReefEventHandler.java b/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/HttpServerReefEventHandler.java
index 5bb62a5..e3447c5 100644
--- a/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/HttpServerReefEventHandler.java
+++ b/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/HttpServerReefEventHandler.java
@@ -49,7 +49,7 @@ public final class HttpServerReefEventHandler implements HttpHandler {
private static final Logger LOG = Logger.getLogger(HttpServerReefEventHandler.class.getName());
- private static final String ver = "v1";
+ private static final String VER = "v1";
private final String driverStdoutFile;
private final String driverStderrFile;
@@ -122,7 +122,7 @@ public final class HttpServerReefEventHandler implements HttpHandler {
case "evaluators": {
final String queryStr = parsedHttpRequest.getQueryString();
if (queryStr == null || queryStr.isEmpty()) {
- if (version.equals(ver)) {
+ if (version.equals(VER)) {
writeEvaluatorsJsonOutput(response);
} else {
writeEvaluatorsWebOutput(response);
@@ -133,7 +133,7 @@ public final class HttpServerReefEventHandler implements HttpHandler {
break;
}
case "driver":
- if (version.equals(ver)) {
+ if (version.equals(VER)) {
writeDriverJsonInformation(response);
} else {
writeDriverWebInformation(response);
@@ -199,7 +199,7 @@ public final class HttpServerReefEventHandler implements HttpHandler {
switch (queryTarget) {
case "id":
- if (version.equals(ver)) {
+ if (version.equals(VER)) {
writeEvaluatorInfoJsonOutput(response, entry.getValue());
} else {
writeEvaluatorInfoWebOutput(response, entry.getValue());
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ReefEventStateManager.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ReefEventStateManager.java b/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ReefEventStateManager.java
index d19c153..fc8b859 100644
--- a/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ReefEventStateManager.java
+++ b/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ReefEventStateManager.java
@@ -48,9 +48,9 @@ public final class ReefEventStateManager {
private static final Logger LOG = Logger.getLogger(ReefEventStateManager.class.getName());
/**
- * date format.
+ * Date format.
*/
- private static final Format format = new SimpleDateFormat("yyyy MM dd HH:mm:ss");
+ private static final Format FORMAT = new SimpleDateFormat("yyyy MM dd HH:mm:ss");
/**
* Map of evaluators.
@@ -125,7 +125,7 @@ public final class ReefEventStateManager {
*/
private String convertTime(final long time) {
final Date date = new Date(time);
- return format.format(date).toString();
+ return FORMAT.format(date).toString();
}
/**
[2/2] incubator-reef git commit: [REEF-414]: Fix violations of checks
in "Naming" category for private variables/methods
Posted by we...@apache.org.
[REEF-414]: Fix violations of checks in "Naming" category for private variables/methods
This addressed the issue by renaming private variables accordingly to
checkstyle suggestions
JIRA:
[REEF-414](https://issues.apache.org/jira/browse/REEF-414)
Pull Request:
This closes #252
Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/760e82e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/760e82e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/760e82e6
Branch: refs/heads/master
Commit: 760e82e602b36986d13720f2acadf997677124f5
Parents: 1ea52a7
Author: Mariia Mykhailova <mi...@gmail.com>
Authored: Fri Jun 26 16:01:32 2015 -0700
Committer: Markus Weimer <we...@apache.org>
Committed: Tue Jun 30 17:37:46 2015 -0700
----------------------------------------------------------------------
.../common/client/JobStatusMessageHandler.java | 2 +-
.../driver/catalog/ResourceCatalogImpl.java | 12 ++---
.../evaluator/EvaluatorControlHandler.java | 4 +-
.../common/evaluator/task/TaskRuntime.java | 32 +++++++-------
.../java/org/apache/reef/util/MemoryUtils.java | 6 +--
.../org/apache/reef/util/SingletonAsserter.java | 4 +-
.../src/main/resources/checkstyle.xml | 16 ++-----
.../reef/examples/group/bgd/SlaveTask.java | 8 ++--
.../bgd/loss/WeightedLogisticLossFunction.java | 4 +-
.../network/group/impl/GroupChangesCodec.java | 6 +--
.../network/group/impl/driver/FlatTopology.java | 2 +-
.../group/impl/driver/GroupCommDriverImpl.java | 4 +-
.../group/impl/driver/GroupCommService.java | 6 +--
.../network/group/impl/driver/TaskNodeImpl.java | 14 +++---
.../impl/driver/TopologyUpdateWaitHandler.java | 2 +-
.../network/group/impl/driver/TreeTopology.java | 2 +-
.../impl/task/CommunicationGroupClientImpl.java | 4 +-
.../group/impl/task/OperatorTopologyImpl.java | 10 ++---
.../impl/task/OperatorTopologyStructImpl.java | 10 ++---
.../group/impl/utils/ConcurrentCountingMap.java | 3 +-
.../network/group/impl/utils/CountingMap.java | 3 +-
.../reef/io/network/group/impl/utils/Utils.java | 2 +-
.../reef/io/network/impl/NetworkService.java | 12 ++---
.../org/apache/reef/io/network/util/Utils.java | 6 +--
.../client/yarnrest/ApplicationResponse.java | 2 +-
.../client/yarnrest/ApplicationState.java | 2 +-
.../runtime/local/process/RunnableProcess.java | 4 +-
.../driver/MesosResourceReleaseHandler.java | 8 ++--
.../driver/MesosResourceRequestHandler.java | 8 ++--
.../mesos/driver/MesosRuntimeStartHandler.java | 8 ++--
.../mesos/driver/MesosRuntimeStopHandler.java | 8 ++--
.../runtime/mesos/driver/REEFScheduler.java | 4 +-
.../runtime/mesos/evaluator/REEFExecutor.java | 4 +-
.../yarn/driver/YarnResourceRequestHandler.java | 4 +-
.../formats/ConfigurationModuleBuilder.java | 8 ++--
.../implementation/java/ClassHierarchyImpl.java | 4 +-
.../tang/implementation/java/InjectorImpl.java | 24 +++++-----
.../implementation/java/JavaNodeFactory.java | 32 +++++++-------
.../protobuf/ProtocolBufferClassHierarchy.java | 17 --------
.../reef/tang/util/ReflectionUtilities.java | 16 +++----
.../java/org/apache/reef/tang/util/Tint.java | 42 +++++++++---------
.../org/apache/reef/wake/IdentifierParser.java | 6 +--
.../reef/wake/impl/DefaultThreadFactory.java | 6 +--
.../reef/wake/impl/MergingEventHandler.java | 2 +-
.../org/apache/reef/wake/impl/StageManager.java | 4 +-
.../apache/reef/wake/profiler/WakeProfiler.java | 46 ++++++++++----------
.../org/apache/reef/wake/remote/NetUtils.java | 4 +-
.../DefaultRemoteManagerImplementation.java | 4 +-
.../webserver/AvroEvaluatorListSerializer.java | 12 ++---
.../webserver/HttpServerReefEventHandler.java | 8 ++--
.../reef/webserver/ReefEventStateManager.java | 6 +--
51 files changed, 219 insertions(+), 248 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/JobStatusMessageHandler.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/JobStatusMessageHandler.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/JobStatusMessageHandler.java
index 78ddeb9..3496812 100644
--- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/JobStatusMessageHandler.java
+++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/JobStatusMessageHandler.java
@@ -34,7 +34,7 @@ import java.util.logging.Logger;
@ClientSide
@Private
final class JobStatusMessageHandler implements EventHandler<RemoteMessage<ReefServiceProtos.JobStatusProto>> {
- private final Logger LOG = Logger.getLogger(JobStatusMessageHandler.class.getName());
+ private static final Logger LOG = Logger.getLogger(JobStatusMessageHandler.class.getName());
private final RunningJobs runningJobs;
@Inject
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/catalog/ResourceCatalogImpl.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/catalog/ResourceCatalogImpl.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/catalog/ResourceCatalogImpl.java
index 77f3762..18a08e7 100644
--- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/catalog/ResourceCatalogImpl.java
+++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/catalog/ResourceCatalogImpl.java
@@ -69,18 +69,18 @@ public final class ResourceCatalogImpl implements ResourceCatalog {
}
public synchronized void handle(final NodeDescriptorEvent node) {
- final String rack_name = node.getRackName().orElse(DEFAULT_RACK);
+ final String rackName = node.getRackName().orElse(DEFAULT_RACK);
LOG.log(Level.FINEST, "Catalog new node: id[{0}], rack[{1}], host[{2}], port[{3}], memory[{4}]",
- new Object[]{node.getIdentifier(), rack_name, node.getHostName(), node.getPort(),
+ new Object[]{node.getIdentifier(), rackName, node.getHostName(), node.getPort(),
node.getMemorySize()}
);
- if (!this.racks.containsKey(rack_name)) {
- final RackDescriptorImpl rack = new RackDescriptorImpl(rack_name);
- this.racks.put(rack_name, rack);
+ if (!this.racks.containsKey(rackName)) {
+ final RackDescriptorImpl rack = new RackDescriptorImpl(rackName);
+ this.racks.put(rackName, rack);
}
- final RackDescriptorImpl rack = this.racks.get(rack_name);
+ final RackDescriptorImpl rack = this.racks.get(rackName);
final InetSocketAddress address = new InetSocketAddress(node.getHostName(), node.getPort());
final NodeDescriptorImpl nodeDescriptor = new NodeDescriptorImpl(node.getIdentifier(), address, rack, node.getMemorySize());
this.nodes.put(nodeDescriptor.getId(), nodeDescriptor);
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorControlHandler.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorControlHandler.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorControlHandler.java
index e648b87..979690f 100644
--- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorControlHandler.java
+++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorControlHandler.java
@@ -37,7 +37,7 @@ import java.util.logging.Logger;
@Private
public final class EvaluatorControlHandler {
- private static Logger LOG = Logger.getLogger(EvaluatorControlHandler.class.getName());
+ private static final Logger LOG = Logger.getLogger(EvaluatorControlHandler.class.getName());
private final EvaluatorStatusManager stateManager;
private final RemoteManager remoteManager;
private final String evaluatorId;
@@ -70,7 +70,7 @@ public final class EvaluatorControlHandler {
}
if (!this.stateManager.isRunning()) {
LOG.log(Level.WARNING, "Trying to send an EvaluatorControlProto to Evaluator [{0}] that is in state [{1}], not [RUNNING]. The control message was: {2}",
- new Object[]{this.evaluatorId, this.stateManager, evaluatorControlProto});
+ new Object[]{this.evaluatorId, this.stateManager, evaluatorControlProto});
return;
}
this.wrapped.get().onNext(evaluatorControlProto);
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskRuntime.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskRuntime.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskRuntime.java
index de63d60..2a80bb1 100644
--- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskRuntime.java
+++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskRuntime.java
@@ -52,9 +52,9 @@ public final class TaskRuntime implements Runnable {
*/
private final Task task;
- private final InjectionFuture<EventHandler<CloseEvent>> f_closeHandler;
- private final InjectionFuture<EventHandler<SuspendEvent>> f_suspendHandler;
- private final InjectionFuture<EventHandler<DriverMessage>> f_messageHandler;
+ private final InjectionFuture<EventHandler<CloseEvent>> fCloseHandler;
+ private final InjectionFuture<EventHandler<SuspendEvent>> fSuspendHandler;
+ private final InjectionFuture<EventHandler<DriverMessage>> fMessageHandler;
private final TaskLifeCycleHandlers taskLifeCycleHandlers;
/**
@@ -75,11 +75,11 @@ public final class TaskRuntime implements Runnable {
final HeartBeatManager heartBeatManager,
final Task task,
final TaskStatus currentStatus,
- @Parameter(TaskConfigurationOptions.CloseHandler.class) final InjectionFuture<EventHandler<CloseEvent>> f_closeHandler,
- @Parameter(TaskConfigurationOptions.SuspendHandler.class) final InjectionFuture<EventHandler<SuspendEvent>> f_suspendHandler,
- @Parameter(TaskConfigurationOptions.MessageHandler.class) final InjectionFuture<EventHandler<DriverMessage>> f_messageHandler,
+ @Parameter(TaskConfigurationOptions.CloseHandler.class) final InjectionFuture<EventHandler<CloseEvent>> fCloseHandler,
+ @Parameter(TaskConfigurationOptions.SuspendHandler.class) final InjectionFuture<EventHandler<SuspendEvent>> fSuspendHandler,
+ @Parameter(TaskConfigurationOptions.MessageHandler.class) final InjectionFuture<EventHandler<DriverMessage>> fMessageHandler,
final TaskLifeCycleHandlers taskLifeCycleHandlers) {
- this(heartBeatManager, task, currentStatus, f_closeHandler, f_suspendHandler, f_messageHandler, null, taskLifeCycleHandlers);
+ this(heartBeatManager, task, currentStatus, fCloseHandler, fSuspendHandler, fMessageHandler, null, taskLifeCycleHandlers);
}
// TODO: Document
@@ -88,9 +88,9 @@ public final class TaskRuntime implements Runnable {
final HeartBeatManager heartBeatManager,
final Task task,
final TaskStatus currentStatus,
- @Parameter(TaskConfigurationOptions.CloseHandler.class) final InjectionFuture<EventHandler<CloseEvent>> f_closeHandler,
- @Parameter(TaskConfigurationOptions.SuspendHandler.class) final InjectionFuture<EventHandler<SuspendEvent>> f_suspendHandler,
- @Parameter(TaskConfigurationOptions.MessageHandler.class) final InjectionFuture<EventHandler<DriverMessage>> f_messageHandler,
+ @Parameter(TaskConfigurationOptions.CloseHandler.class) final InjectionFuture<EventHandler<CloseEvent>> fCloseHandler,
+ @Parameter(TaskConfigurationOptions.SuspendHandler.class) final InjectionFuture<EventHandler<SuspendEvent>> fSuspendHandler,
+ @Parameter(TaskConfigurationOptions.MessageHandler.class) final InjectionFuture<EventHandler<DriverMessage>> fMessageHandler,
@Parameter(TaskConfigurationOptions.Memento.class) final String memento,
final TaskLifeCycleHandlers taskLifeCycleHandlers) {
@@ -101,9 +101,9 @@ public final class TaskRuntime implements Runnable {
this.memento = null == memento ? Optional.<byte[]>empty() :
Optional.of(DatatypeConverter.parseBase64Binary(memento));
- this.f_closeHandler = f_closeHandler;
- this.f_suspendHandler = f_suspendHandler;
- this.f_messageHandler = f_messageHandler;
+ this.fCloseHandler = fCloseHandler;
+ this.fSuspendHandler = fSuspendHandler;
+ this.fMessageHandler = fMessageHandler;
this.currentStatus = currentStatus;
}
@@ -283,7 +283,7 @@ public final class TaskRuntime implements Runnable {
private void closeTask(final byte[] message) throws TaskCloseHandlerFailure {
LOG.log(Level.FINEST, "Invoking close handler.");
try {
- this.f_closeHandler.get().onNext(new CloseEventImpl(message));
+ this.fCloseHandler.get().onNext(new CloseEventImpl(message));
} catch (final Throwable throwable) {
throw new TaskCloseHandlerFailure(throwable);
}
@@ -294,7 +294,7 @@ public final class TaskRuntime implements Runnable {
*/
private void deliverMessageToTask(final byte[] message) throws TaskMessageHandlerFailure {
try {
- this.f_messageHandler.get().onNext(new DriverMessageImpl(message));
+ this.fMessageHandler.get().onNext(new DriverMessageImpl(message));
} catch (final Throwable throwable) {
throw new TaskMessageHandlerFailure(throwable);
}
@@ -305,7 +305,7 @@ public final class TaskRuntime implements Runnable {
*/
private void suspendTask(final byte[] message) throws TaskSuspendHandlerFailure {
try {
- this.f_suspendHandler.get().onNext(new SuspendEventImpl(message));
+ this.fSuspendHandler.get().onNext(new SuspendEventImpl(message));
} catch (final Throwable throwable) {
throw new TaskSuspendHandlerFailure(throwable);
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/lang/java/reef-common/src/main/java/org/apache/reef/util/MemoryUtils.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/util/MemoryUtils.java b/lang/java/reef-common/src/main/java/org/apache/reef/util/MemoryUtils.java
index 3e83319..981e8c7 100644
--- a/lang/java/reef-common/src/main/java/org/apache/reef/util/MemoryUtils.java
+++ b/lang/java/reef-common/src/main/java/org/apache/reef/util/MemoryUtils.java
@@ -29,7 +29,7 @@ import java.util.List;
*/
public final class MemoryUtils {
- private static final int MBs = 1024 * 1024;
+ private static final int MBS = 1024 * 1024;
private MemoryUtils() {
}
@@ -61,7 +61,7 @@ public final class MemoryUtils {
final List<MemoryPoolMXBean> memoryPoolMXBeans = ManagementFactory.getMemoryPoolMXBeans();
for (final MemoryPoolMXBean bean : memoryPoolMXBeans) {
if (bean.getName().toLowerCase().indexOf(name) != -1) {
- return bean.getUsage().getUsed() / MBs;
+ return bean.getUsage().getUsed() / MBS;
}
}
return 0;
@@ -83,7 +83,7 @@ public final class MemoryUtils {
final List<MemoryPoolMXBean> memoryPoolMXBeans = ManagementFactory.getMemoryPoolMXBeans();
for (final MemoryPoolMXBean bean : memoryPoolMXBeans) {
if (bean.getName().toLowerCase().indexOf(name) != -1) {
- return bean.getPeakUsage().getUsed() / MBs;
+ return bean.getPeakUsage().getUsed() / MBS;
}
}
return 0;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/lang/java/reef-common/src/main/java/org/apache/reef/util/SingletonAsserter.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/util/SingletonAsserter.java b/lang/java/reef-common/src/main/java/org/apache/reef/util/SingletonAsserter.java
index 14e4b4e..5c6d0a9 100644
--- a/lang/java/reef-common/src/main/java/org/apache/reef/util/SingletonAsserter.java
+++ b/lang/java/reef-common/src/main/java/org/apache/reef/util/SingletonAsserter.java
@@ -27,7 +27,7 @@ import java.util.Set;
*/
public final class SingletonAsserter {
- private static final Set<Class> classes = Collections.synchronizedSet(new HashSet<Class>());
+ private static final Set<Class> CLASSES = Collections.synchronizedSet(new HashSet<Class>());
/**
* This class operates purely in static mode.
@@ -36,6 +36,6 @@ public final class SingletonAsserter {
}
public static boolean assertSingleton(final Class clazz) {
- return classes.add(clazz);
+ return CLASSES.add(clazz);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/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 027d87e..63d7e52 100644
--- a/lang/java/reef-common/src/main/resources/checkstyle.xml
+++ b/lang/java/reef-common/src/main/resources/checkstyle.xml
@@ -92,22 +92,14 @@
<module name="ConstantName">
<property name="severity" value="warning"/>
</module>
- <module name="LocalFinalVariableName">
- <property name="severity" value="warning"/>
- </module>
- <module name="LocalVariableName">
- <property name="severity" value="warning"/>
- </module>
- <module name="MemberName">
- <property name="severity" value="warning"/>
- </module>
+ <module name="LocalFinalVariableName"/>
+ <module name="LocalVariableName"/>
+ <module name="MemberName"/>
<module name="MethodName">
<property name="severity" value="warning"/>
</module>
<module name="PackageName"/>
- <module name="ParameterName">
- <property name="severity" value="warning"/>
- </module>
+ <module name="ParameterName"/>
<module name="StaticVariableName">
<property name="severity" value="warning"/>
</module>
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/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 9d753e1..1aea74d 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
@@ -42,7 +42,7 @@ public class SlaveTask implements Task {
private static final Logger LOG = Logger.getLogger(SlaveTask.class.getName());
- private final double FAILURE_PROB;
+ private final double failureProb;
private final CommunicationGroupClient communicationGroup;
private final Broadcast.Receiver<ControlMessages> controlMessageBroadcaster;
@@ -70,8 +70,8 @@ public class SlaveTask implements Task {
this.dataSet = dataSet;
this.lossFunction = lossFunction;
- this.FAILURE_PROB = pFailure;
- LOG.info("Using pFailure=" + this.FAILURE_PROB);
+ this.failureProb = pFailure;
+ LOG.info("Using pFailure=" + this.failureProb);
this.ts = ts;
this.communicationGroup = groupCommClient.getCommunicationGroup(AllCommunicationGroup.class);
@@ -141,7 +141,7 @@ public class SlaveTask implements Task {
}
private void failPerhaps() {
- if (Math.random() < FAILURE_PROB) {
+ if (Math.random() < failureProb) {
throw new RuntimeException("Simulated Failure");
}
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/loss/WeightedLogisticLossFunction.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/loss/WeightedLogisticLossFunction.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/loss/WeightedLogisticLossFunction.java
index 7d54acd..1766441 100644
--- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/loss/WeightedLogisticLossFunction.java
+++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/loss/WeightedLogisticLossFunction.java
@@ -60,8 +60,8 @@ public final class WeightedLogisticLossFunction implements LossFunction {
if (predictedTimesLabel >= 0) {
probability = 1 / (1 + Math.exp(-predictedTimesLabel));
} else {
- final double ExpVal = Math.exp(predictedTimesLabel);
- probability = ExpVal / (1 + ExpVal);
+ final double expVal = Math.exp(predictedTimesLabel);
+ probability = expVal / (1 + expVal);
}
return (probability - 1) * y * weight;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/GroupChangesCodec.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/GroupChangesCodec.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/GroupChangesCodec.java
index 946d5d2..e7f2a36 100644
--- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/GroupChangesCodec.java
+++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/GroupChangesCodec.java
@@ -26,6 +26,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
public class GroupChangesCodec implements Codec<GroupChanges> {
+ private static final Logger LOG = Logger.getLogger(GroupChangesCodec.class.getName());
@Inject
public GroupChangesCodec() {
@@ -56,14 +57,11 @@ public class GroupChangesCodec implements Codec<GroupChanges> {
}
private static void test(final GroupChanges changes, final GroupChanges changes1) {
-
- final Logger LOG = Logger.getLogger(GroupChangesCodec.class.getName());
-
final boolean c1 = changes.exist();
final boolean c2 = changes1.exist();
if (c1 != c2) {
- LOG.log(Level.SEVERE, "Something is wrong: {0} != {1}", new Object[] {c1, c2});
+ LOG.log(Level.SEVERE, "Something is wrong: {0} != {1}", new Object[]{c1, c2});
} else {
LOG.log(Level.INFO, "Codec is fine");
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/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 98f3008..497d032 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
@@ -280,7 +280,7 @@ public class FlatTopology implements Topology {
for (final TaskNode node : toBeUpdatedNodes) {
node.updatingTopology();
senderStage.onNext(Utils.bldVersionedGCM(groupName, operName, ReefNetworkGroupCommProtos.GroupCommMessage.Type.UpdateTopology, driverId, 0, node.getTaskId(),
- node.getVersion(), Utils.EmptyByteArr));
+ node.getVersion(), Utils.EMPTY_BYTE_ARR));
}
nodeTopologyUpdateWaitStage.onNext(toBeUpdatedNodes);
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/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 4710c31..089bfb3 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
@@ -81,7 +81,7 @@ public class GroupCommDriverImpl implements GroupCommServiceDriver {
/**
* TANG instance.
*/
- private static final Tang tang = Tang.Factory.getTang();
+ private static final Tang TANG = Tang.Factory.getTang();
private final AtomicInteger contextIds = new AtomicInteger(0);
@@ -256,7 +256,7 @@ public class GroupCommDriverImpl implements GroupCommServiceDriver {
BindNSToTask.class)
.set(ServiceConfiguration.ON_TASK_STOP,
UnbindNSFromTask.class).build();
- final Configuration retVal = tang.newConfigurationBuilder(serviceConfiguration)
+ final Configuration retVal = TANG.newConfigurationBuilder(serviceConfiguration)
.bindNamedParameter(NetworkServiceParameters.NetworkServiceCodec.class,
GroupCommunicationMessageCodec.class)
.bindNamedParameter(NetworkServiceParameters.NetworkServiceHandler.class,
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/GroupCommService.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/GroupCommService.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/GroupCommService.java
index cbc57d9..60a43a3 100644
--- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/GroupCommService.java
+++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/GroupCommService.java
@@ -46,7 +46,7 @@ import java.util.logging.Logger;
public class GroupCommService {
private static final Logger LOG = Logger.getLogger(GroupCommService.class.getName());
- private static final ConfigurationSerializer confSer = new AvroConfigurationSerializer();
+ private static final ConfigurationSerializer CONF_SER = new AvroConfigurationSerializer();
private final GroupCommServiceDriver groupCommDriver;
@@ -63,7 +63,7 @@ public class GroupCommService {
jcb.bindSetEntry(ServiceEvaluatorFailedHandlers.class, FailedEvaluatorHandler.class);
jcb.bindNamedParameter(EvaluatorDispatcherThreads.class, "1");
final Configuration retVal = jcb.build();
- LOG.exiting("GroupCommService", "getConfiguration", confSer.toString(retVal));
+ LOG.exiting("GroupCommService", "getConfiguration", CONF_SER.toString(retVal));
return retVal;
}
@@ -72,7 +72,7 @@ public class GroupCommService {
final Configuration baseConf = getConfiguration();
final Configuration retConf = Tang.Factory.getTang().newConfigurationBuilder(baseConf)
.bindNamedParameter(TreeTopologyFanOut.class, Integer.toString(fanOut)).build();
- LOG.exiting("GroupCommService", "getConfiguration", confSer.toString(retConf));
+ LOG.exiting("GroupCommService", "getConfiguration", CONF_SER.toString(retConf));
return retConf;
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/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 02ebd98..1589bd7 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
@@ -137,7 +137,7 @@ public class TaskNodeImpl implements TaskNode {
if (parent != null && parent.isRunning()) {
final GroupCommunicationMessage gcm = Utils.bldVersionedGCM(groupName, operName, ReefNetworkGroupCommProtos.GroupCommMessage.Type.ParentAdd, parent.getTaskId(),
parent.getVersion(), taskId,
- version, Utils.EmptyByteArr);
+ version, Utils.EMPTY_BYTE_ARR);
taskNodeStatus.expectAckFor(gcm.getType(), gcm.getSrcid());
senderStage.onNext(gcm);
parent.onChildRunning(taskId);
@@ -148,7 +148,7 @@ public class TaskNodeImpl implements TaskNode {
if (child.isRunning()) {
final GroupCommunicationMessage gcm = Utils.bldVersionedGCM(groupName, operName, ReefNetworkGroupCommProtos.GroupCommMessage.Type.ChildAdd, child.getTaskId(),
child.getVersion(), taskId, version,
- Utils.EmptyByteArr);
+ Utils.EMPTY_BYTE_ARR);
taskNodeStatus.expectAckFor(gcm.getType(), gcm.getSrcid());
senderStage.onNext(gcm);
child.onParentRunning();
@@ -169,7 +169,7 @@ public class TaskNodeImpl implements TaskNode {
final String parentTaskId = parent.getTaskId();
final GroupCommunicationMessage gcm = Utils.bldVersionedGCM(groupName, operName, ReefNetworkGroupCommProtos.GroupCommMessage.Type.ParentAdd, parentTaskId,
parentVersion, taskId, version.get(),
- Utils.EmptyByteArr);
+ Utils.EMPTY_BYTE_ARR);
taskNodeStatus.expectAckFor(gcm.getType(), gcm.getSrcid());
senderStage.onNext(gcm);
} else {
@@ -188,7 +188,7 @@ public class TaskNodeImpl implements TaskNode {
taskNodeStatus.updateFailureOf(parent.getTaskId());
final GroupCommunicationMessage gcm = Utils.bldVersionedGCM(groupName, operName, ReefNetworkGroupCommProtos.GroupCommMessage.Type.ParentDead, parentTaskId,
parentVersion, taskId, version.get(),
- Utils.EmptyByteArr);
+ Utils.EMPTY_BYTE_ARR);
taskNodeStatus.expectAckFor(gcm.getType(), gcm.getSrcid());
senderStage.onNext(gcm);
} else {
@@ -205,7 +205,7 @@ public class TaskNodeImpl implements TaskNode {
final int childVersion = childTask.getVersion();
final GroupCommunicationMessage gcm = Utils.bldVersionedGCM(groupName, operName, ReefNetworkGroupCommProtos.GroupCommMessage.Type.ChildAdd, childId,
childVersion, taskId, version.get(),
- Utils.EmptyByteArr);
+ Utils.EMPTY_BYTE_ARR);
taskNodeStatus.expectAckFor(gcm.getType(), gcm.getSrcid());
senderStage.onNext(gcm);
} else {
@@ -225,7 +225,7 @@ public class TaskNodeImpl implements TaskNode {
taskNodeStatus.updateFailureOf(childId);
final GroupCommunicationMessage gcm = Utils.bldVersionedGCM(groupName, operName, ReefNetworkGroupCommProtos.GroupCommMessage.Type.ChildDead, childId,
childVersion, taskId, version.get(),
- Utils.EmptyByteArr);
+ Utils.EMPTY_BYTE_ARR);
taskNodeStatus.expectAckFor(gcm.getType(), gcm.getSrcid());
senderStage.onNext(gcm);
} else {
@@ -328,7 +328,7 @@ public class TaskNodeImpl implements TaskNode {
LOG.entering("TaskNodeImpl", "sendTopoSetupMsg", getQualifiedName() + taskId);
LOG.fine(getQualifiedName() + "is an active participant in the topology");
senderStage.onNext(Utils.bldVersionedGCM(groupName, operName, ReefNetworkGroupCommProtos.GroupCommMessage.Type.TopologySetup, driverId, 0, taskId,
- version.get(), Utils.EmptyByteArr));
+ version.get(), Utils.EMPTY_BYTE_ARR));
taskNodeStatus.onTopologySetupMessageSent();
final boolean sentAlready = !topoSetupSent.compareAndSet(false, true);
if (sentAlready) {
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TopologyUpdateWaitHandler.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TopologyUpdateWaitHandler.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TopologyUpdateWaitHandler.java
index 1a5c48f..ad3e385 100644
--- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TopologyUpdateWaitHandler.java
+++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TopologyUpdateWaitHandler.java
@@ -87,7 +87,7 @@ public class TopologyUpdateWaitHandler implements EventHandler<List<TaskNode>> {
LOG.fine(qualifiedName + "All affected parts of the topology are in TopologyUpdate phase. Will send a note to ("
+ dstId + "," + dstVersion + ")");
senderStage.onNext(Utils.bldVersionedGCM(groupName, operName, ReefNetworkGroupCommProtos.GroupCommMessage.Type.TopologyUpdated, driverId, driverVersion, dstId,
- dstVersion, Utils.EmptyByteArr));
+ dstVersion, Utils.EMPTY_BYTE_ARR));
LOG.exiting("TopologyUpdateWaitHandler", "onNext", qualifiedName);
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/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 df700d1..780a02d 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
@@ -313,7 +313,7 @@ public class TreeTopology implements Topology {
node.updatingTopology();
LOG.fine(getQualifiedName() + "Asking " + node + " to UpdateTopology");
senderStage.onNext(Utils.bldVersionedGCM(groupName, operName, ReefNetworkGroupCommProtos.GroupCommMessage.Type.UpdateTopology, driverId, 0, node.getTaskId(),
- node.getVersion(), Utils.EmptyByteArr));
+ node.getVersion(), Utils.EMPTY_BYTE_ARR));
}
nodeTopologyUpdateWaitStage.onNext(toBeUpdatedNodes);
LOG.exiting("TreeTopology", "onUpdateTopology", getQualifiedName() + msg);
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/CommunicationGroupClientImpl.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/CommunicationGroupClientImpl.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/CommunicationGroupClientImpl.java
index a30bb8b..1eacb03 100644
--- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/CommunicationGroupClientImpl.java
+++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/CommunicationGroupClientImpl.java
@@ -206,7 +206,7 @@ public class CommunicationGroupClientImpl implements CommunicationGroupServiceCl
LOG.finest("Sending TopologyChanges msg to driver");
try {
sender.send(Utils.bldVersionedGCM(groupName, operName, ReefNetworkGroupCommProtos.GroupCommMessage.Type.TopologyChanges, taskId, op.getVersion(), driverId,
- 0, Utils.EmptyByteArr));
+ 0, Utils.EMPTY_BYTE_ARR));
} catch (final NetworkException e) {
throw new RuntimeException("NetworkException while sending GetTopologyChanges", e);
}
@@ -248,7 +248,7 @@ public class CommunicationGroupClientImpl implements CommunicationGroupServiceCl
final Class<? extends Name<String>> operName = op.getOperName();
try {
sender.send(Utils.bldVersionedGCM(groupName, operName, ReefNetworkGroupCommProtos.GroupCommMessage.Type.UpdateTopology, taskId, op.getVersion(), driverId,
- 0, Utils.EmptyByteArr));
+ 0, Utils.EMPTY_BYTE_ARR));
} catch (final NetworkException e) {
throw new RuntimeException("NetworkException while sending UpdateTopology", e);
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/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 9a4acd2..50faa82 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
@@ -325,23 +325,23 @@ public class OperatorTopologyImpl implements OperatorTopology {
switch (msg.getType()) {
case UpdateTopology:
sender.send(Utils.bldVersionedGCM(groupName, operName, ReefNetworkGroupCommProtos.GroupCommMessage.Type.TopologySetup, selfId, this.version, driverId,
- srcVersion, Utils.EmptyByteArr));
+ srcVersion, Utils.EMPTY_BYTE_ARR));
break;
case ParentAdd:
sender.send(Utils.bldVersionedGCM(groupName, operName, ReefNetworkGroupCommProtos.GroupCommMessage.Type.ParentAdded, selfId, this.version, srcId,
- srcVersion, Utils.EmptyByteArr), driverId);
+ srcVersion, Utils.EMPTY_BYTE_ARR), driverId);
break;
case ParentDead:
sender.send(Utils.bldVersionedGCM(groupName, operName, ReefNetworkGroupCommProtos.GroupCommMessage.Type.ParentRemoved, selfId, this.version, srcId,
- srcVersion, Utils.EmptyByteArr), driverId);
+ srcVersion, Utils.EMPTY_BYTE_ARR), driverId);
break;
case ChildAdd:
sender.send(Utils.bldVersionedGCM(groupName, operName, ReefNetworkGroupCommProtos.GroupCommMessage.Type.ChildAdded, selfId, this.version, srcId,
- srcVersion, Utils.EmptyByteArr), driverId);
+ srcVersion, Utils.EMPTY_BYTE_ARR), driverId);
break;
case ChildDead:
sender.send(Utils.bldVersionedGCM(groupName, operName, ReefNetworkGroupCommProtos.GroupCommMessage.Type.ChildRemoved, selfId, this.version, srcId,
- srcVersion, Utils.EmptyByteArr), driverId);
+ srcVersion, Utils.EMPTY_BYTE_ARR), driverId);
break;
default:
throw new RuntimeException("Received a non control message for acknowledgement");
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/OperatorTopologyStructImpl.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/OperatorTopologyStructImpl.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/OperatorTopologyStructImpl.java
index a82124b..c0b3c10 100644
--- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/OperatorTopologyStructImpl.java
+++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/OperatorTopologyStructImpl.java
@@ -178,7 +178,7 @@ public class OperatorTopologyStructImpl implements OperatorTopologyStruct {
if (data.length > SMALL_MSG_LENGTH) {
LOG.finest(getQualifiedName() + "Msg too big. Sending readiness to send " + msgType + " msg to " + nodeId);
sender.send(Utils.bldVersionedGCM(groupName, operName, msgType, selfId, version, nodeId, node.getVersion(),
- Utils.EmptyByteArr));
+ Utils.EMPTY_BYTE_ARR));
final byte[] tmpVal = receiveFromNode(node, true);
if (tmpVal != null) {
LOG.finest(getQualifiedName() + "Got readiness to accept " + msgType + " msg from " + nodeId
@@ -265,12 +265,12 @@ public class OperatorTopologyStructImpl implements OperatorTopologyStruct {
if (retVal != null && retVal.length == 0) {
LOG.finest(getQualifiedName() + "Got msg that parent " + parent.getId()
+ " has large data and is ready to send data. Sending Ack to receive data");
- sendToNode(Utils.EmptyByteArr, ReefNetworkGroupCommProtos.GroupCommMessage.Type.Broadcast, parent);
+ sendToNode(Utils.EMPTY_BYTE_ARR, ReefNetworkGroupCommProtos.GroupCommMessage.Type.Broadcast, parent);
retVal = receiveFromNode(parent, true);
if (retVal != null) {
LOG.finest(getQualifiedName() + "Received large msg from Parent " + parent.getId()
+ ". Will return it after ACKing it");
- sendToNode(Utils.EmptyByteArr, ReefNetworkGroupCommProtos.GroupCommMessage.Type.Broadcast, parent);
+ sendToNode(Utils.EMPTY_BYTE_ARR, ReefNetworkGroupCommProtos.GroupCommMessage.Type.Broadcast, parent);
}
}
LOG.exiting("OperatorTopologyStructImpl", "recvFromParent",
@@ -299,12 +299,12 @@ public class OperatorTopologyStructImpl implements OperatorTopologyStruct {
if (retVal != null && retVal.length == 0) {
LOG.finest(getQualifiedName() + "Got msg that child " + child.getId()
+ " has large data and is ready to send data. Sending Ack to receive data");
- sendToNode(Utils.EmptyByteArr, ReefNetworkGroupCommProtos.GroupCommMessage.Type.Reduce, child);
+ sendToNode(Utils.EMPTY_BYTE_ARR, ReefNetworkGroupCommProtos.GroupCommMessage.Type.Reduce, child);
retVal = receiveFromNode(child, true);
if (retVal != null) {
LOG.finest(getQualifiedName() + "Received large msg from child " + child.getId()
+ ". Will reduce it after ACKing it");
- sendToNode(Utils.EmptyByteArr, ReefNetworkGroupCommProtos.GroupCommMessage.Type.Reduce, child);
+ sendToNode(Utils.EMPTY_BYTE_ARR, ReefNetworkGroupCommProtos.GroupCommMessage.Type.Reduce, child);
} else {
LOG.finest(getQualifiedName() + "Will not reduce it");
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/utils/ConcurrentCountingMap.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/utils/ConcurrentCountingMap.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/utils/ConcurrentCountingMap.java
index 988dad2..d484170 100644
--- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/utils/ConcurrentCountingMap.java
+++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/utils/ConcurrentCountingMap.java
@@ -31,7 +31,7 @@ import java.util.logging.Logger;
* Equivalent to Map<K,Map<V,Integer>>
*/
public class ConcurrentCountingMap<K, V> {
-
+ private static final Logger LOG = Logger.getLogger(ConcurrentCountingMap.class.getName());
private final ConcurrentMap<K, CountingMap<V>> map = new ConcurrentHashMap<>();
public boolean remove(final K key, final V value) {
@@ -91,7 +91,6 @@ public class ConcurrentCountingMap<K, V> {
}
public static void main(final String[] args) {
- final Logger LOG = Logger.getLogger(ConcurrentCountingMap.class.getName());
final ConcurrentCountingMap<ReefNetworkGroupCommProtos.GroupCommMessage.Type, String> strMap = new ConcurrentCountingMap<>();
LOG.log(Level.INFO, "OUT: {0}", strMap.isEmpty());
strMap.add(ReefNetworkGroupCommProtos.GroupCommMessage.Type.ChildAdd, "ST0");
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/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 2742282..0ade442 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
@@ -31,7 +31,7 @@ import java.util.logging.Logger;
* and removing key on count==0
*/
public class CountingMap<L> {
-
+ private static final Logger LOG = Logger.getLogger(CountingMap.class.getName());
private final Map<L, Integer> map = new HashMap<>();
public boolean containsKey(final L value) {
@@ -78,7 +78,6 @@ public class CountingMap<L> {
}
public static void main(final String[] args) {
- final Logger LOG = Logger.getLogger(CountingMap.class.getName());
final CountingMap<String> strMap = new CountingMap<>();
strMap.add("Hello");
LOG.log(Level.INFO, "OUT: {0}", strMap);
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/utils/Utils.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/utils/Utils.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/utils/Utils.java
index 64efcad..633c740 100644
--- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/utils/Utils.java
+++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/utils/Utils.java
@@ -30,7 +30,7 @@ import java.util.Iterator;
*/
public final class Utils {
- public static final byte[] EmptyByteArr = new byte[0];
+ public static final byte[] EMPTY_BYTE_ARR = new byte[0];
public static GroupCommunicationMessage bldVersionedGCM(final Class<? extends Name<String>> groupName,
final Class<? extends Name<String>> operName,
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/lang/java/reef-io/src/main/java/org/apache/reef/io/network/impl/NetworkService.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/impl/NetworkService.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/impl/NetworkService.java
index 6c02309..1e3887e 100644
--- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/impl/NetworkService.java
+++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/impl/NetworkService.java
@@ -56,14 +56,14 @@ public final class NetworkService<T> implements Stage, ConnectionFactory<T> {
private static final Logger LOG = Logger.getLogger(NetworkService.class.getName());
- private static final int retryCount;
- private static final int retryTimeout;
+ private static final int RETRY_COUNT;
+ private static final int RETRY_TIMEOUT;
static {
try {
final Injector injector = Tang.Factory.getTang().newInjector();
- retryCount = injector.getNamedInstance(NameResolverRetryCount.class);
- retryTimeout = injector.getNamedInstance(NameResolverRetryTimeout.class);
+ RETRY_COUNT = injector.getNamedInstance(NameResolverRetryCount.class);
+ RETRY_TIMEOUT = injector.getNamedInstance(NameResolverRetryTimeout.class);
} catch (final InjectionException ex) {
final String msg = "Exception while trying to find default values for retryCount & Timeout";
LOG.log(Level.SEVERE, msg, ex);
@@ -102,7 +102,7 @@ public final class NetworkService<T> implements Stage, ConnectionFactory<T> {
final EventHandler<Exception> exHandler,
final LocalAddressProvider localAddressProvider) {
this(factory, nsPort, nameServerAddr, nameServerPort,
- retryCount, retryTimeout, codec, tpFactory, recvHandler, exHandler, localAddressProvider);
+ RETRY_COUNT, RETRY_TIMEOUT, codec, tpFactory, recvHandler, exHandler, localAddressProvider);
}
/**
@@ -118,7 +118,7 @@ public final class NetworkService<T> implements Stage, ConnectionFactory<T> {
final EventHandler<Message<T>> recvHandler,
final EventHandler<Exception> exHandler) {
this(factory, nsPort, nameServerAddr, nameServerPort,
- retryCount, retryTimeout, codec, tpFactory, recvHandler, exHandler, LocalAddressProviderFactory.getInstance());
+ RETRY_COUNT, RETRY_TIMEOUT, codec, tpFactory, recvHandler, exHandler, LocalAddressProviderFactory.getInstance());
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/lang/java/reef-io/src/main/java/org/apache/reef/io/network/util/Utils.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/util/Utils.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/util/Utils.java
index 84936ac..e0433a3 100644
--- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/util/Utils.java
+++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/util/Utils.java
@@ -100,7 +100,7 @@ public final class Utils {
final ReefNetworkGroupCommProtos.GroupCommMessage.Type msgType,
final Identifier from, final Identifier to, final byte[]... elements) {
- final ReefNetworkGroupCommProtos.GroupCommMessage.Builder GCMBuilder =
+ final ReefNetworkGroupCommProtos.GroupCommMessage.Builder gcmBuilder =
ReefNetworkGroupCommProtos.GroupCommMessage.newBuilder()
.setType(msgType)
.setSrcid(from.toString())
@@ -111,10 +111,10 @@ public final class Utils {
for (final byte[] element : elements) {
bodyBuilder.setData(ByteString.copyFrom(element));
- GCMBuilder.addMsgs(bodyBuilder.build());
+ gcmBuilder.addMsgs(bodyBuilder.build());
}
- return GCMBuilder.build();
+ return gcmBuilder.build();
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/ApplicationResponse.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/ApplicationResponse.java b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/ApplicationResponse.java
index 11d70fc..25041fd 100644
--- a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/ApplicationResponse.java
+++ b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/ApplicationResponse.java
@@ -34,7 +34,7 @@ import java.io.StringWriter;
@JsonIgnoreProperties(ignoreUnknown = true)
public final class ApplicationResponse {
- private static String APPLICATION_RESPONSE = "applicationResponse";
+ private static final String APPLICATION_RESPONSE = "applicationResponse";
private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
private ApplicationState app;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/ApplicationState.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/ApplicationState.java b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/ApplicationState.java
index 670a711..6d42efe 100644
--- a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/ApplicationState.java
+++ b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/ApplicationState.java
@@ -35,7 +35,7 @@ import java.io.StringWriter;
@JsonIgnoreProperties(ignoreUnknown = true)
public final class ApplicationState {
- private static String APPLICATION_STATE = "applicationState";
+ private static final String APPLICATION_STATE = "applicationState";
private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
private String progress;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/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 19a3d4a..b8008f0 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
@@ -233,8 +233,8 @@ public final class RunnableProcess implements Runnable {
* @throws IOException if the file can't be read.
*/
private long readPID() throws IOException {
- final String PIDFileName = this.folder.getAbsolutePath() + "/" + PIDStoreStartHandler.PID_FILE_NAME;
- try (final BufferedReader r = new BufferedReader(new FileReader(PIDFileName))) {
+ final String pidFileName = this.folder.getAbsolutePath() + "/" + PIDStoreStartHandler.PID_FILE_NAME;
+ try (final BufferedReader r = new BufferedReader(new FileReader(pidFileName))) {
return Long.valueOf(r.readLine());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/MesosResourceReleaseHandler.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/MesosResourceReleaseHandler.java b/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/MesosResourceReleaseHandler.java
index 35c9461..84e0a93 100644
--- a/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/MesosResourceReleaseHandler.java
+++ b/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/MesosResourceReleaseHandler.java
@@ -28,15 +28,15 @@ import javax.inject.Inject;
@DriverSide
@Private
final class MesosResourceReleaseHandler implements ResourceReleaseHandler {
- private final REEFScheduler REEFScheduler;
+ private final REEFScheduler reefScheduler;
@Inject
- MesosResourceReleaseHandler(final REEFScheduler REEFScheduler) {
- this.REEFScheduler = REEFScheduler;
+ MesosResourceReleaseHandler(final REEFScheduler reefScheduler) {
+ this.reefScheduler = reefScheduler;
}
@Override
public void onNext(final ResourceReleaseEvent resourceReleaseEvent) {
- REEFScheduler.onResourceRelease(resourceReleaseEvent);
+ reefScheduler.onResourceRelease(resourceReleaseEvent);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/MesosResourceRequestHandler.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/MesosResourceRequestHandler.java b/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/MesosResourceRequestHandler.java
index 6a594d6..47a996e 100644
--- a/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/MesosResourceRequestHandler.java
+++ b/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/MesosResourceRequestHandler.java
@@ -28,15 +28,15 @@ import javax.inject.Inject;
@DriverSide
@Private
final class MesosResourceRequestHandler implements ResourceRequestHandler {
- private final REEFScheduler REEFScheduler;
+ private final REEFScheduler reefScheduler;
@Inject
- MesosResourceRequestHandler(final REEFScheduler REEFScheduler) {
- this.REEFScheduler = REEFScheduler;
+ MesosResourceRequestHandler(final REEFScheduler reefScheduler) {
+ this.reefScheduler = reefScheduler;
}
@Override
public void onNext(final ResourceRequestEvent resourceRequestEvent) {
- REEFScheduler.onResourceRequest(resourceRequestEvent);
+ reefScheduler.onResourceRequest(resourceRequestEvent);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/MesosRuntimeStartHandler.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/MesosRuntimeStartHandler.java b/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/MesosRuntimeStartHandler.java
index 6ddf3b2..d442a4d 100644
--- a/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/MesosRuntimeStartHandler.java
+++ b/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/MesosRuntimeStartHandler.java
@@ -24,15 +24,15 @@ import org.apache.reef.wake.time.runtime.event.RuntimeStart;
import javax.inject.Inject;
final class MesosRuntimeStartHandler implements EventHandler<RuntimeStart> {
- private final REEFScheduler REEFScheduler;
+ private final REEFScheduler reefScheduler;
@Inject
- MesosRuntimeStartHandler(final REEFScheduler REEFScheduler) {
- this.REEFScheduler = REEFScheduler;
+ MesosRuntimeStartHandler(final REEFScheduler reefScheduler) {
+ this.reefScheduler = reefScheduler;
}
@Override
public void onNext(final RuntimeStart runtimeStart){
- this.REEFScheduler.onStart();
+ this.reefScheduler.onStart();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/MesosRuntimeStopHandler.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/MesosRuntimeStopHandler.java b/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/MesosRuntimeStopHandler.java
index 273c658..80648d0 100644
--- a/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/MesosRuntimeStopHandler.java
+++ b/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/MesosRuntimeStopHandler.java
@@ -24,15 +24,15 @@ import org.apache.reef.wake.time.runtime.event.RuntimeStop;
import javax.inject.Inject;
final class MesosRuntimeStopHandler implements EventHandler<RuntimeStop> {
- private final REEFScheduler REEFScheduler;
+ private final REEFScheduler reefScheduler;
@Inject
- MesosRuntimeStopHandler(final REEFScheduler REEFScheduler) {
- this.REEFScheduler = REEFScheduler;
+ MesosRuntimeStopHandler(final REEFScheduler reefScheduler) {
+ this.reefScheduler = reefScheduler;
}
@Override
public void onNext(final RuntimeStop runtimeStop) {
- this.REEFScheduler.onStop();
+ this.reefScheduler.onStop();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/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 4a0136a..3ab11aa 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
@@ -451,13 +451,13 @@ final class REEFScheduler implements Scheduler {
}
private String getExecutorLaunchCommand(final String executorID, final int memorySize) {
- final String DEFAULT_JAVA_PATH = System.getenv("JAVA_HOME") + "/bin/" + "java";
+ final String defaultJavaPath = System.getenv("JAVA_HOME") + "/bin/" + "java";
final String classPath = "-classpath " + StringUtils.join(this.classpath.getEvaluatorClasspath(), ":");
final String logging = "-Djava.util.logging.config.class=org.apache.reef.util.logging.Config";
final String mesosExecutorId = "-mesos_executor_id " + executorID;
return (new StringBuilder()
- .append(DEFAULT_JAVA_PATH + " ")
+ .append(defaultJavaPath + " ")
.append("-XX:PermSize=128m" + " ")
.append("-XX:MaxPermSize=128m" + " ")
.append("-Xmx" + String.valueOf(memorySize) + "m" + " ")
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/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 c634fc3..f1e1252 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
@@ -243,7 +243,7 @@ public final class REEFExecutor implements Executor {
*/
public static void main(final String[] args) throws Exception {
final Injector injector = Tang.Factory.getTang().newInjector(parseCommandLine(args));
- final REEFExecutor REEFExecutor = injector.getInstance(REEFExecutor.class);
- REEFExecutor.onStart();
+ final REEFExecutor reefExecutor = injector.getInstance(REEFExecutor.class);
+ reefExecutor.onStart();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YarnResourceRequestHandler.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YarnResourceRequestHandler.java b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YarnResourceRequestHandler.java
index f178d16..873ab65 100644
--- a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YarnResourceRequestHandler.java
+++ b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YarnResourceRequestHandler.java
@@ -62,13 +62,13 @@ public final class YarnResourceRequestHandler implements ResourceRequestHandler
// set the priority for the request
final Priority pri = getPriority(resourceRequestEvent);
final Resource resource = getResource(resourceRequestEvent);
- final boolean relax_locality = resourceRequestEvent.getRelaxLocality().orElse(true);
+ final boolean relaxLocality = resourceRequestEvent.getRelaxLocality().orElse(true);
final AMRMClient.ContainerRequest[] containerRequests =
new AMRMClient.ContainerRequest[resourceRequestEvent.getResourceCount()];
for (int i = 0; i < resourceRequestEvent.getResourceCount(); i++) {
- containerRequests[i] = new AMRMClient.ContainerRequest(resource, nodes, racks, pri, relax_locality);
+ containerRequests[i] = new AMRMClient.ContainerRequest(resource, nodes, racks, pri, relaxLocality);
}
this.yarnContainerRequestHandler.onContainerRequest(containerRequests);
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ConfigurationModuleBuilder.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ConfigurationModuleBuilder.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ConfigurationModuleBuilder.java
index 25cbe71..1d5139f 100644
--- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ConfigurationModuleBuilder.java
+++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ConfigurationModuleBuilder.java
@@ -37,9 +37,9 @@ import java.util.Set;
public abstract class ConfigurationModuleBuilder {
- private static final Set<Class<?>> paramBlacklist = new MonotonicHashSet<Class<?>>(
+ private static final Set<Class<?>> PARAM_BLACKLIST = new MonotonicHashSet<Class<?>>(
Param.class, Impl.class);
- private static final Set<Class<?>> paramTypes = new MonotonicHashSet<Class<?>>(
+ private static final Set<Class<?>> PARAM_TYPES = new MonotonicHashSet<Class<?>>(
RequiredImpl.class, OptionalImpl.class, RequiredParameter.class,
OptionalParameter.class);
final JavaConfigurationBuilder b = Tang.Factory.getTang()
@@ -62,12 +62,12 @@ public abstract class ConfigurationModuleBuilder {
protected ConfigurationModuleBuilder() {
for (Field f : getClass().getDeclaredFields()) {
Class<?> t = f.getType();
- if (paramBlacklist.contains(t)) {
+ if (PARAM_BLACKLIST.contains(t)) {
throw new ClassHierarchyException(
"Found a field of type " + t + " which should be a Required/Optional Parameter/Implementation instead"
);
}
- if (paramTypes.contains(t)) {
+ if (PARAM_TYPES.contains(t)) {
if (!Modifier.isPublic(f.getModifiers())) {
throw new ClassHierarchyException(
"Found a non-public configuration option in " + getClass() + ": "
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/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 8c898e9..10618a9 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
@@ -333,8 +333,8 @@ public class ClassHierarchyImpl implements JavaClassHierarchy {
// Finally, do things that might introduce cycles that invlove c.
// This has to be below registerClass, which ensures that any cycles
// this stuff introduces are broken.
- for (Class<?> inner_class : c.getDeclaredClasses()) {
- register(ReflectionUtilities.getFullName(inner_class));
+ for (Class<?> innerClass : c.getDeclaredClasses()) {
+ register(ReflectionUtilities.getFullName(innerClass));
}
if (n instanceof ClassNode) {
ClassNode<?> cls = (ClassNode<?>) n;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/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 8887cb1..fdbe880 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
@@ -109,9 +109,9 @@ public class InjectorImpl implements Injector {
throw new IllegalStateException();
}
try {
- ClassNode<?> new_cn = (ClassNode<?>) i.namespace.getNode(cn
+ ClassNode<?> newCn = (ClassNode<?>) i.namespace.getNode(cn
.getFullName());
- i.instances.put(new_cn, old.instances.get(cn));
+ i.instances.put(newCn, old.instances.get(cn));
} catch (BindException e) {
throw new IllegalStateException("Could not resolve name "
+ cn.getFullName() + " when copying injector");
@@ -122,9 +122,9 @@ public class InjectorImpl implements Injector {
for (NamedParameterNode<?> np : old.namedParameterInstances.keySet()) {
// if (!builder.namedParameters.containsKey(np)) {
Object o = old.namedParameterInstances.get(np);
- NamedParameterNode<?> new_np = (NamedParameterNode<?>) i.namespace
+ NamedParameterNode<?> newNp = (NamedParameterNode<?>) i.namespace
.getNode(np.getFullName());
- i.namedParameterInstances.put(new_np, o);
+ i.namedParameterInstances.put(newNp, o);
}
// Fork the aspect (if any)
if (old.aspect != null) {
@@ -171,7 +171,7 @@ public class InjectorImpl implements Injector {
final List<ClassNode<T>> candidateImplementations,
final Map<Node, InjectionPlan<?>> memo) {
- final List<InjectionPlan<T>> sub_ips = new ArrayList<>();
+ final List<InjectionPlan<T>> subIps = new ArrayList<>();
for (final ClassNode<T> thisCN : candidateImplementations) {
final List<Constructor<T>> constructors = new ArrayList<>();
final List<ConstructorDef<T>> constructorList = new ArrayList<>();
@@ -243,11 +243,11 @@ public class InjectorImpl implements Injector {
}
}
if (constructors.size() > 0) {
- sub_ips.add(wrapInjectionPlans(thisCN, constructors, false,
- liveIndices.size() == 1 ? liveIndices.get(0) : -1));
+ subIps.add(wrapInjectionPlans(thisCN, constructors, false,
+ liveIndices.size() == 1 ? liveIndices.get(0) : -1));
}
}
- return sub_ips;
+ return subIps;
}
@SuppressWarnings("unchecked")
@@ -276,11 +276,11 @@ public class InjectorImpl implements Injector {
// other impls to the list of things to consider.
final List<ClassNode<T>> candidateImplementations = new ArrayList<>();
candidateImplementations.add(cn);
- final List<InjectionPlan<T>> sub_ips = filterCandidateConstructors(candidateImplementations, memo);
- if (sub_ips.size() == 1) {
- return wrapInjectionPlans(cn, sub_ips, false, -1);
+ final List<InjectionPlan<T>> subIps = filterCandidateConstructors(candidateImplementations, memo);
+ if (subIps.size() == 1) {
+ return wrapInjectionPlans(cn, subIps, false, -1);
} else {
- return wrapInjectionPlans(cn, sub_ips, true, -1);
+ return wrapInjectionPlans(cn, subIps, true, -1);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/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 ee359a7..f0c2877 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
@@ -166,43 +166,43 @@ public final class JavaNodeFactory {
}
final boolean hasStringDefault, hasClassDefault, hasStringSetDefault, hasClassSetDefault;
- int default_count = 0;
+ int defaultCount = 0;
if (!namedParameter.default_value().isEmpty()) {
hasStringDefault = true;
- default_count++;
+ defaultCount++;
} else {
hasStringDefault = false;
}
if (namedParameter.default_class() != Void.class) {
hasClassDefault = true;
- default_count++;
+ defaultCount++;
} else {
hasClassDefault = false;
}
if (namedParameter.default_values() != null && namedParameter.default_values().length > 0) {
hasStringSetDefault = true;
- default_count++;
+ defaultCount++;
} else {
hasStringSetDefault = false;
}
if (namedParameter.default_classes() != null && namedParameter.default_classes().length > 0) {
hasClassSetDefault = true;
- default_count++;
+ defaultCount++;
} else {
hasClassSetDefault = false;
}
- if (default_count > 1) {
+ if (defaultCount > 1) {
throw new ClassHierarchyException("Named parameter " + fullName + " defines more than one of default_value, default_class, default_values and default_classes");
}
final String[] defaultInstanceAsStrings;
- if (default_count == 0) {
+ if (defaultCount == 0) {
defaultInstanceAsStrings = new String[]{};
} else if (hasClassDefault) {
- final Class<?> default_class = namedParameter.default_class();
- assertIsSubclassOf(clazz, default_class, argClass);
- defaultInstanceAsStrings = new String[]{ReflectionUtilities.getFullName(default_class)};
+ final Class<?> defaultClass = namedParameter.default_class();
+ assertIsSubclassOf(clazz, defaultClass, argClass);
+ defaultInstanceAsStrings = new String[]{ReflectionUtilities.getFullName(defaultClass)};
} else if (hasStringDefault) {
// Don't know if the string is a class or literal here, so don't bother validating.
defaultInstanceAsStrings = new String[]{namedParameter.default_value()};
@@ -228,7 +228,7 @@ public final class JavaNodeFactory {
fullArgName, simpleArgName, isSet, isList, documentation, shortName, defaultInstanceAsStrings);
}
- private static void assertIsSubclassOf(Class<?> named_parameter, Class<?> default_class,
+ private static void assertIsSubclassOf(Class<?> namedParameter, Class<?> defaultClass,
Type argClass) {
boolean isSubclass = false;
boolean isGenericSubclass = false;
@@ -239,7 +239,7 @@ public final class JavaNodeFactory {
/// If we have a Name that takes EventHandler<A>, we want to be able to pass in an EventHandler<Object>.
- for (final Type c : ReflectionUtilities.classAndAncestors(default_class)) {
+ for (final Type c : ReflectionUtilities.classAndAncestors(defaultClass)) {
if (ReflectionUtilities.getRawClass(c).equals(argRawClass)) {
isSubclass = true;
if (argClass instanceof ParameterizedType &&
@@ -267,12 +267,12 @@ public final class JavaNodeFactory {
}
if (!(isSubclass)) {
- throw new ClassHierarchyException(named_parameter + " defines a default class "
- + ReflectionUtilities.getFullName(default_class) + " with a raw type that does not extend of its target's raw type " + argRawClass);
+ 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)) {
- throw new ClassHierarchyException(named_parameter + " defines a default class "
- + ReflectionUtilities.getFullName(default_class) + " with a type that does not extend its target's type " + argClass);
+ throw new ClassHierarchyException(namedParameter + " defines a default class "
+ + ReflectionUtilities.getFullName(defaultClass) + " with a type that does not extend its target's type " + argClass);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/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 e21eb4e..e1bd96c 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
@@ -37,7 +37,6 @@ import java.util.List;
@Deprecated
public class ProtocolBufferClassHierarchy implements ClassHierarchy {
- private static final String regex = "[\\.\\$\\+]";
private final PackageNode namespace;
private HashMap<String, Node> lookupTable = new HashMap<>();
@@ -360,22 +359,6 @@ public class ProtocolBufferClassHierarchy implements ClassHierarchy {
public Node getNode(String fullName) throws NameResolutionException {
Node ret = lookupTable.get(fullName);
-/* String[] tok = fullName.split(regex);
-
- Node ret = namespace.get(fullName);
- for (int i = 0; i < tok.length; i++) {
- Node n = namespace.get(getNthPrefix(fullName, i));
- if (n != null) {
- for (i++; i < tok.length; i++) {
- n = n.get(tok[i]);
- if (n == null) {
- throw new NameResolutionException(fullName, getNthPrefix(fullName,
- i - 1));
- }
- }
- return n;
- }
- } */
if (ret != null) {
return ret;
} else {
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/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 65f2e92..ecfb11c 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
@@ -35,15 +35,15 @@ public final class ReflectionUtilities {
/**
* A map from numeric classes to the number of bits used by their representations.
*/
- private static final Map<Class<?>, Integer> sizeof = new HashMap<>();
+ private static final Map<Class<?>, Integer> SIZEOF = new HashMap<>();
static {
- sizeof.put(Byte.class, Byte.SIZE);
- sizeof.put(Short.class, Short.SIZE);
- sizeof.put(Integer.class, Integer.SIZE);
- sizeof.put(Long.class, Long.SIZE);
- sizeof.put(Float.class, Float.SIZE);
- sizeof.put(Double.class, Double.SIZE);
+ SIZEOF.put(Byte.class, Byte.SIZE);
+ SIZEOF.put(Short.class, Short.SIZE);
+ SIZEOF.put(Integer.class, Integer.SIZE);
+ SIZEOF.put(Long.class, Long.SIZE);
+ SIZEOF.put(Float.class, Float.SIZE);
+ SIZEOF.put(Double.class, Double.SIZE);
}
/**
@@ -148,7 +148,7 @@ public final class ReflectionUtilities {
from = boxClass(from);
if (Number.class.isAssignableFrom(to)
&& Number.class.isAssignableFrom(from)) {
- return sizeof.get(from) <= sizeof.get(to);
+ return SIZEOF.get(from) <= SIZEOF.get(to);
}
return to.isAssignableFrom(from);
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/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 5870d1d..e95ef60 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
@@ -158,10 +158,10 @@ public class Tint {
@Override
public boolean visit(NamedParameterNode<?> node) {
- String node_s = node.getFullName();
+ String nodeS = node.getFullName();
for (String s : node.getDefaultInstanceAsStrings()) {
- if (!usages.contains(s, node_s)) {
- usages.put(s, node_s);
+ if (!usages.contains(s, nodeS)) {
+ usages.put(s, nodeS);
}
}
return true;
@@ -174,12 +174,12 @@ public class Tint {
@Override
public boolean visit(ClassNode<?> node) {
- String node_s = node.getFullName();
+ String nodeS = node.getFullName();
for (ConstructorDef<?> d : node.getInjectableConstructors()) {
for (ConstructorArg a : d.getArgs()) {
if (a.getNamedParameterName() != null &&
- !usages.contains(a.getNamedParameterName(), node_s)) {
- usages.put(a.getNamedParameterName(), node_s);
+ !usages.contains(a.getNamedParameterName(), nodeS)) {
+ usages.put(a.getNamedParameterName(), nodeS);
}
}
}
@@ -210,12 +210,12 @@ public class Tint {
for (Field f : modules.keySet()) {
ConfigurationModule m = modules.get(f);
- String f_s = ReflectionUtilities.getFullName(f);
+ String fS = ReflectionUtilities.getFullName(f);
Set<NamedParameterNode<?>> nps = m.getBoundNamedParameters();
for (NamedParameterNode<?> np : nps) {
- String np_s = np.getFullName();
- if (!setters.contains(np_s, f_s)) {
- setters.put(np_s, f_s);
+ String npS = np.getFullName();
+ if (!setters.contains(npS, fS)) {
+ setters.put(npS, fS);
}
}
}
@@ -436,9 +436,9 @@ public class Tint {
if (di != null) {
String diName = di.value() == Void.class ? di.name() : ReflectionUtilities.getFullName(di.value());
ClassNode<?> cn = (ClassNode<?>) ch.getNode(cmb);
- String cn_s = cn.getFullName();
- if (!usages.contains(diName, cn_s)) {
- usages.put(diName, cn_s);
+ String cnS = cn.getFullName();
+ if (!usages.contains(diName, cnS)) {
+ usages.put(diName, cnS);
if (!knownClasses.contains(cn)) {
knownClasses.add(cn);
}
@@ -467,20 +467,20 @@ public class Tint {
// System.err.println("OK: " + f);
try {
f.setAccessible(true);
- String f_s = ReflectionUtilities.getFullName(f);
+ String fS = ReflectionUtilities.getFullName(f);
if (!modules.containsKey(f)) {
modules.put(f, (ConfigurationModule) (f.get(null)));
try {
modules.get(f).assertStaticClean();
} catch (ClassHierarchyException e) {
- System.err.println(f_s + ": " + e.getMessage());
+ System.err.println(fS + ": " + e.getMessage());
}
for (Entry<String, String> e : modules.get(f).toStringPairs()) {
//System.err.println("e: " + e.getKey() + "=" + e.getValue());
try {
Node n = ch.getNode(e.getKey());
- if (!setters.contains(e.getKey(), f_s)) {
- setters.put(e.getKey(), f_s);
+ if (!setters.contains(e.getKey(), fS)) {
+ setters.put(e.getKey(), fS);
}
if (n instanceof ClassNode) {
ClassNode<?> cn = (ClassNode<?>) n;
@@ -564,14 +564,14 @@ public class Tint {
@Override
public boolean visit(ClassNode<?> node) {
- String node_s = node.getFullName();
- if (userKeys.contains(node_s)) {
+ String nodeS = node.getFullName();
+ if (userKeys.contains(nodeS)) {
names.add(node);
}
- if (setterKeys.contains(node_s)) {
+ if (setterKeys.contains(nodeS)) {
names.add(node);
}
- if (usedKeys.contains(node_s)) {
+ if (usedKeys.contains(nodeS)) {
if (!names.contains(node)) {
names.add(node);
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/IdentifierParser.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/IdentifierParser.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/IdentifierParser.java
index d7c9335..437dd9a 100644
--- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/IdentifierParser.java
+++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/IdentifierParser.java
@@ -28,7 +28,7 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
public class IdentifierParser implements ExternalConstructor<Identifier> {
- private static final IdentifierFactory factory;
+ private static final IdentifierFactory FACTORY;
// TODO: Modify tang to allow this to use a factory pattern.
static {
@@ -37,14 +37,14 @@ public class IdentifierParser implements ExternalConstructor<Identifier> {
map.put("socket", SocketRemoteIdentifier.class);
map.put("file", FileIdentifier.class);
- factory = new DefaultIdentifierFactory(map);
+ FACTORY = new DefaultIdentifierFactory(map);
}
final Identifier id;
@Inject
IdentifierParser(String s) {
- id = factory.getNewInstance(s);
+ id = FACTORY.getNewInstance(s);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/760e82e6/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/DefaultThreadFactory.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/DefaultThreadFactory.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/DefaultThreadFactory.java
index e020a7f..839a13f 100644
--- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/DefaultThreadFactory.java
+++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/impl/DefaultThreadFactory.java
@@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicInteger;
* A default thread factory implementation that names created threads.
*/
public final class DefaultThreadFactory implements ThreadFactory {
- private static final AtomicInteger poolNumber = new AtomicInteger(1);
+ private static final AtomicInteger POOL_NUMBER = new AtomicInteger(1);
private final ThreadGroup group;
private final AtomicInteger threadNumber = new AtomicInteger(1);
private final String prefix;
@@ -39,7 +39,7 @@ public final class DefaultThreadFactory implements ThreadFactory {
public DefaultThreadFactory(String prefix) {
SecurityManager s = System.getSecurityManager();
this.group = (s != null) ? s.getThreadGroup() : Thread.currentThread().getThreadGroup();
- this.prefix = prefix + "-pool-" + poolNumber.getAndIncrement() + "-thread-";
+ this.prefix = prefix + "-pool-" + POOL_NUMBER.getAndIncrement() + "-thread-";
this.uncaughtExceptionHandler = null;
}
@@ -52,7 +52,7 @@ public final class DefaultThreadFactory implements ThreadFactory {
public DefaultThreadFactory(String prefix, Thread.UncaughtExceptionHandler uncaughtExceptionHandler) {
SecurityManager s = System.getSecurityManager();
this.group = (s != null) ? s.getThreadGroup() : Thread.currentThread().getThreadGroup();
- this.prefix = prefix + "-pool-" + poolNumber.getAndIncrement() + "-thread-";
+ this.prefix = prefix + "-pool-" + POOL_NUMBER.getAndIncrement() + "-thread-";
this.uncaughtExceptionHandler = uncaughtExceptionHandler;
}