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(); } /**
