Cleanup; No functional changes

9 files changed, 15 insertions, 12 deletions

diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/CachedThreadPoolWithFallback.java b/vespajlib/src/main/java/com/yahoo/concurrent/CachedThreadPoolWithFallback.java
index 13d2463cf2c..c693d46975f 100644
--- a/vespajlib/src/main/java/com/yahoo/concurrent/CachedThreadPoolWithFallback.java
+++ b/vespajlib/src/main/java/com/yahoo/concurrent/CachedThreadPoolWithFallback.java
@@ -13,9 +13,9 @@ import java.util.concurrent.TimeUnit;
 /**
  * An executor that will first try a bounded cached thread pool before falling back to an unbounded
  * single threaded thread pool that will take over dispatching to the primary pool.
- *
  */
 public class CachedThreadPoolWithFallback implements AutoCloseable, Executor {
+
     private final ExecutorService primary;
     private final ExecutorService secondary;
 
diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/DaemonThreadFactory.java b/vespajlib/src/main/java/com/yahoo/concurrent/DaemonThreadFactory.java
index 3e84970764a..c1a3ee30b9a 100644
--- a/vespajlib/src/main/java/com/yahoo/concurrent/DaemonThreadFactory.java
+++ b/vespajlib/src/main/java/com/yahoo/concurrent/DaemonThreadFactory.java
@@ -11,7 +11,8 @@ import java.util.concurrent.ThreadFactory;
  * @author Einar M R Rosenvinge
  */
 public class DaemonThreadFactory implements ThreadFactory {
-    private ThreadFactory defaultThreadFactory = Executors.defaultThreadFactory();
+
+    private final ThreadFactory defaultThreadFactory = Executors.defaultThreadFactory();
     private String prefix = null;
 
     /**
diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/LocalInstance.java b/vespajlib/src/main/java/com/yahoo/concurrent/LocalInstance.java
index e52e80963f3..98a509a89c2 100644
--- a/vespajlib/src/main/java/com/yahoo/concurrent/LocalInstance.java
+++ b/vespajlib/src/main/java/com/yahoo/concurrent/LocalInstance.java
@@ -10,14 +10,12 @@ import com.yahoo.concurrent.ThreadLocalDirectory.Updater;
  * {@link ThreadLocal} in ThreadLocalDirectory if possible, but has no user
  * available methods.
  *
- * @param <AGGREGATOR>
- *            the structure to insert produced data into
- * @param <SAMPLE>
- *            type of produced data to insert from each participating thread
- *
+ * @param <AGGREGATOR> the structure to insert produced data into
+ * @param <SAMPLE> type of produced data to insert from each participating thread
  * @author Steinar Knutsen
  */
 public final class LocalInstance<AGGREGATOR, SAMPLE> {
+
     /**
      * The current generation of data produced from a single thread, where
      * generation is the period between two subsequent calls to
diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/Receiver.java b/vespajlib/src/main/java/com/yahoo/concurrent/Receiver.java
index ace822e071f..7f8aa4b8725 100644
--- a/vespajlib/src/main/java/com/yahoo/concurrent/Receiver.java
+++ b/vespajlib/src/main/java/com/yahoo/concurrent/Receiver.java
@@ -27,7 +27,7 @@ import com.yahoo.collections.Tuple2;
  * there is no support for recycling it.
  * </p>
  *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  */
 public class Receiver<T> {
     /**
diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/ThreadFactoryFactory.java b/vespajlib/src/main/java/com/yahoo/concurrent/ThreadFactoryFactory.java
index 10c057421af..1779179efcd 100644
--- a/vespajlib/src/main/java/com/yahoo/concurrent/ThreadFactoryFactory.java
+++ b/vespajlib/src/main/java/com/yahoo/concurrent/ThreadFactoryFactory.java
@@ -19,6 +19,7 @@ public class ThreadFactoryFactory {
         }
         return p.getFactory(false);
     }
+
     static public synchronized ThreadFactory getDaemonThreadFactory(String name) {
         PooledFactory p = factory.get(name);
         if (p == null) {
@@ -27,6 +28,7 @@ public class ThreadFactoryFactory {
         }
         return p.getFactory(true);
     }
+
     private static class PooledFactory {
         private static class Factory implements ThreadFactory {
             final ThreadGroup group;
@@ -65,6 +67,6 @@ public class ThreadFactoryFactory {
         private final String name;
         private final AtomicInteger poolId = new AtomicInteger(1);
     }
-    static private Map<String, PooledFactory> factory = new HashMap<>();
+    static private final Map<String, PooledFactory> factory = new HashMap<>();
 
 }
diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/ThreadRobustList.java b/vespajlib/src/main/java/com/yahoo/concurrent/ThreadRobustList.java
index 18fec46a888..619e2beb6f4 100644
--- a/vespajlib/src/main/java/com/yahoo/concurrent/ThreadRobustList.java
+++ b/vespajlib/src/main/java/com/yahoo/concurrent/ThreadRobustList.java
@@ -14,8 +14,7 @@ import java.util.NoSuchElementException;
  * This is useful for traced information as there may be timed out threads
  * working on the structure after it is returned upwards for consumption.
  *
- * @since 4.2
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  * @author bratseth
  */
 public class ThreadRobustList<T> implements Iterable<T> {
diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/classlock/ClassLock.java b/vespajlib/src/main/java/com/yahoo/concurrent/classlock/ClassLock.java
index fc43fcc3116..d05cb14c64f 100644
--- a/vespajlib/src/main/java/com/yahoo/concurrent/classlock/ClassLock.java
+++ b/vespajlib/src/main/java/com/yahoo/concurrent/classlock/ClassLock.java
@@ -7,6 +7,7 @@ package com.yahoo.concurrent.classlock;
  * @author valerijf
  */
 public class ClassLock implements AutoCloseable {
+
     private final Class<?> clazz;
     private final ClassLocking classLocking;
 
@@ -24,4 +25,5 @@ public class ClassLock implements AutoCloseable {
     public void close() {
         classLocking.unlock(clazz, this);
     }
+
 }
diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/classlock/ClassLocking.java b/vespajlib/src/main/java/com/yahoo/concurrent/classlock/ClassLocking.java
index f06ef662de5..7c9403965ac 100644
--- a/vespajlib/src/main/java/com/yahoo/concurrent/classlock/ClassLocking.java
+++ b/vespajlib/src/main/java/com/yahoo/concurrent/classlock/ClassLocking.java
@@ -12,6 +12,7 @@ import java.util.function.BooleanSupplier;
  * @author valerijf
  */
 public class ClassLocking {
+
     private final Map<String, ClassLock> classLocks = new HashMap<>();
     private final Object monitor = new Object();
 
@@ -71,4 +72,5 @@ public class ClassLocking {
             monitor.notifyAll();
         }
     }
+
 }
diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/classlock/LockInterruptException.java b/vespajlib/src/main/java/com/yahoo/concurrent/classlock/LockInterruptException.java
index ea61e87cd80..0e9ece62883 100644
--- a/vespajlib/src/main/java/com/yahoo/concurrent/classlock/LockInterruptException.java
+++ b/vespajlib/src/main/java/com/yahoo/concurrent/classlock/LockInterruptException.java
@@ -4,6 +4,5 @@ package com.yahoo.concurrent.classlock;
 /**
  * @author valerijf
  */
-@SuppressWarnings("serial")
 public class LockInterruptException extends RuntimeException {
 }