Nonfunctional changes only

4 files changed, 38 insertions, 22 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/searcher/BlendingSearcher.java b/container-search/src/main/java/com/yahoo/prelude/searcher/BlendingSearcher.java
index d70e0e2ff66..28d384b0f63 100644
--- a/container-search/src/main/java/com/yahoo/prelude/searcher/BlendingSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/searcher/BlendingSearcher.java
@@ -17,8 +17,11 @@ import com.yahoo.search.result.HitGroup;
 import com.yahoo.search.searchchain.Execution;
 import com.yahoo.search.searchchain.PhaseNames;
 
-import java.util.*;
-
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
 
 /**
  * Flattens a result consisting of multiple hit groups containing hits
diff --git a/metrics/src/main/java/com/yahoo/metrics/MetricManager.java b/metrics/src/main/java/com/yahoo/metrics/MetricManager.java
index 110e5e137d0..c08c0f23358 100644
--- a/metrics/src/main/java/com/yahoo/metrics/MetricManager.java
+++ b/metrics/src/main/java/com/yahoo/metrics/MetricManager.java
@@ -37,6 +37,7 @@ import java.util.logging.Logger;
  *
  * If multiple locks is taken, the allowed locking order is: 1. Thread monitor. 2. Metric lock. 3. Config lock.
  */
+// TODO: Remove on Vespa 7
 public class MetricManager implements Runnable {
 
     private static final int STATE_CREATED = 0;
@@ -46,12 +47,12 @@ public class MetricManager implements Runnable {
     private final CountDownLatch termination = new CountDownLatch(1);
     private final MetricSnapshot activeMetrics = new MetricSnapshot("Active metrics showing updates since " +
                                                                     "last snapshot");
-    private final Map<String, ConsumerSpec> consumerConfig = new HashMap<String, ConsumerSpec>();
-    private final List<UpdateHook> periodicUpdateHooks = new ArrayList<UpdateHook>();
-    private final List<UpdateHook> snapshotUpdateHooks = new ArrayList<UpdateHook>();
+    private final Map<String, ConsumerSpec> consumerConfig = new HashMap<>();
+    private final List<UpdateHook> periodicUpdateHooks = new ArrayList<>();
+    private final List<UpdateHook> snapshotUpdateHooks = new ArrayList<>();
     private final Timer timer;
     private Pair<Integer, Integer> logPeriod;
-    private List<MetricSnapshotSet> snapshots = new ArrayList<MetricSnapshotSet>();
+    private List<MetricSnapshotSet> snapshots = new ArrayList<>();
     private MetricSnapshot totalMetrics = new MetricSnapshot("Empty metrics before init", 0,
                                                              activeMetrics.getMetrics(), false);
     private int state = STATE_CREATED;
@@ -66,17 +67,17 @@ public class MetricManager implements Runnable {
     MetricManager(Timer timer) {
         this.timer = timer;
         initializeSnapshots();
-        logPeriod = new Pair<Integer, Integer>(snapshots.get(0).getPeriod(), 0);
+        logPeriod = new Pair<>(snapshots.get(0).getPeriod(), 0);
     }
 
     void initializeSnapshots() {
         int currentTime = timer.secs();
 
-        List<Pair<Integer, String>> snapshotPeriods = new ArrayList<Pair<Integer, String>>();
-        snapshotPeriods.add(new Pair<Integer, String>(60 * 5, "5 minute"));
-        snapshotPeriods.add(new Pair<Integer, String>(60 * 60, "1 hour"));
-        snapshotPeriods.add(new Pair<Integer, String>(60 * 60 * 24, "1 day"));
-        snapshotPeriods.add(new Pair<Integer, String>(60 * 60 * 24 * 7, "1 week"));
+        List<Pair<Integer, String>> snapshotPeriods = new ArrayList<>();
+        snapshotPeriods.add(new Pair<>(60 * 5, "5 minute"));
+        snapshotPeriods.add(new Pair<>(60 * 60, "1 hour"));
+        snapshotPeriods.add(new Pair<>(60 * 60 * 24, "1 day"));
+        snapshotPeriods.add(new Pair<>(60 * 60 * 24 * 7, "1 week"));
 
         int count = 1;
         for (int i = 0; i < snapshotPeriods.size(); ++i) {
diff --git a/simplemetrics/src/main/java/com/yahoo/metrics/simple/MetricManager.java b/simplemetrics/src/main/java/com/yahoo/metrics/simple/MetricManager.java
index 938c52ecacc..fce5026349e 100644
--- a/simplemetrics/src/main/java/com/yahoo/metrics/simple/MetricManager.java
+++ b/simplemetrics/src/main/java/com/yahoo/metrics/simple/MetricManager.java
@@ -17,7 +17,7 @@ import com.yahoo.log.LogLevel;
  * This is the coordinating class owning the executor and the top level objects
  * for measured metrics.
  *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  */
 public class MetricManager extends AbstractComponent implements Provider<MetricReceiver> {
 
diff --git a/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java b/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java
index d7017b2d8bd..16d860a1d98 100644
--- a/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java
+++ b/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java
@@ -28,11 +28,12 @@ import java.nio.charset.Charset;
 import java.util.Map;
 
 /**
- * Example client using visiting
+ * Client using visiting, used by the vespa-visit command line tool.
  *
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>, based on work by <a href="mailto:humbe@yahoo-inc.com">H&aring;kon Humberset</a>
+ * @author Einar M R Rosenvinge
  */
 public class VdsVisit {
+
     private VdsVisitParameters params;
     private MessageBusParams mbparams = new MessageBusParams(new LoadTypeSet());
     private VisitorSession session;
@@ -42,19 +43,26 @@ public class VdsVisit {
     private ShutdownHookRegistrar shutdownHookRegistrar;
 
     public interface ShutdownHookRegistrar {
-        public void registerShutdownHook(Thread thread);
+
+        void registerShutdownHook(Thread thread);
+
     }
 
     public interface VisitorSessionAccessor {
-        public VisitorSession createVisitorSession(VisitorParameters params) throws ParseException;
-        public void shutdown();
+
+        VisitorSession createVisitorSession(VisitorParameters params) throws ParseException;
+        void shutdown();
+
     }
 
     public interface VisitorSessionAccessorFactory {
-        public VisitorSessionAccessor createVisitorSessionAccessor();
+
+        VisitorSessionAccessor createVisitorSessionAccessor();
+
     }
 
     private static class MessageBusVisitorSessionAccessor implements VisitorSessionAccessor {
+
         private MessageBusDocumentAccess access;
 
         private MessageBusVisitorSessionAccessor(MessageBusParams mbparams) {
@@ -69,9 +77,11 @@ public class VdsVisit {
         public void shutdown() {
             access.shutdown();
         }
+
     }
 
     private static class MessageBusVisitorSessionAccessorFactory implements VisitorSessionAccessorFactory {
+
         MessageBusParams mbparams;
 
         private MessageBusVisitorSessionAccessorFactory(MessageBusParams mbparams) {
@@ -82,13 +92,16 @@ public class VdsVisit {
         public VisitorSessionAccessor createVisitorSessionAccessor() {
             return new MessageBusVisitorSessionAccessor(mbparams);
         }
+
     }
 
     private static class JvmRuntimeShutdownHookRegistrar implements ShutdownHookRegistrar {
+
         @Override
         public void registerShutdownHook(Thread thread) {
             Runtime.getRuntime().addShutdownHook(thread);
         }
+
     }
 
     public VdsVisit() {
@@ -96,9 +109,7 @@ public class VdsVisit {
         this.shutdownHookRegistrar = new JvmRuntimeShutdownHookRegistrar();
     }
 
-    public VdsVisit(VisitorSessionAccessorFactory sessionAccessorFactory,
-                    ShutdownHookRegistrar shutdownHookRegistrar)
-    {
+    public VdsVisit(VisitorSessionAccessorFactory sessionAccessorFactory, ShutdownHookRegistrar shutdownHookRegistrar) {
         this.sessionAccessorFactory = sessionAccessorFactory;
         this.shutdownHookRegistrar = shutdownHookRegistrar;
     }
@@ -350,6 +361,7 @@ public class VdsVisit {
     }
 
     public static class VdsVisitParameters {
+
         private VisitorParameters visitorParameters;
         /** If not specified in options, will get form cluster list */
         private String cluster = null;