From 3ff15111ce265956777dcb861867388b87fda1a8 Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@vespa.ai>
Date: Tue, 13 Jun 2023 17:06:09 +0200
Subject: Non-functional changes only

---
 .../com/yahoo/concurrent/ThreadFactoryFactory.java | 22 ++++++++++++++--------
 .../src/main/java/com/yahoo/io/BufferChain.java    |  2 +-
 .../java/com/yahoo/io/WritableByteTransmitter.java |  2 +-
 3 files changed, 16 insertions(+), 10 deletions(-)

(limited to 'vespajlib')

diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/ThreadFactoryFactory.java b/vespajlib/src/main/java/com/yahoo/concurrent/ThreadFactoryFactory.java
index a2478046a9e..4db74cc37a0 100644
--- a/vespajlib/src/main/java/com/yahoo/concurrent/ThreadFactoryFactory.java
+++ b/vespajlib/src/main/java/com/yahoo/concurrent/ThreadFactoryFactory.java
@@ -11,6 +11,8 @@ import java.util.concurrent.atomic.AtomicInteger;
  */
 public class ThreadFactoryFactory {
 
+    static private final Map<String, PooledFactory> factory = new HashMap<>();
+
     static public synchronized ThreadFactory getThreadFactory(String name) {
         PooledFactory p = factory.get(name);
         if (p == null) {
@@ -30,16 +32,21 @@ public class ThreadFactoryFactory {
     }
 
     private static class PooledFactory {
+
+        private final String name;
+        private final AtomicInteger poolId = new AtomicInteger(1);
+
         private static class Factory implements ThreadFactory {
+
             final ThreadGroup group;
             final AtomicInteger threadNumber = new AtomicInteger(1);
             final String namePrefix;
             final boolean isDaemon;
 
             @SuppressWarnings("removal")
-            Factory(final String name, boolean isDaemon) {
+            Factory(String name, boolean isDaemon) {
                 this.isDaemon = isDaemon;
-                final SecurityManager s = System.getSecurityManager();
+                SecurityManager s = System.getSecurityManager();
                 group = (s != null)
                         ? s.getThreadGroup()
                         : Thread.currentThread().getThreadGroup();
@@ -47,8 +54,8 @@ public class ThreadFactoryFactory {
             }
 
             @Override
-            public Thread newThread(final Runnable r) {
-                final Thread t = new Thread(group, r, namePrefix + threadNumber.getAndIncrement(), 0);
+            public Thread newThread(Runnable r) {
+                Thread t = new Thread(group, r, namePrefix + threadNumber.getAndIncrement(), 0);
                 if (t.isDaemon() != isDaemon) {
                     t.setDaemon(isDaemon);
                 }
@@ -58,16 +65,15 @@ public class ThreadFactoryFactory {
                 return t;
             }
         }
+
         PooledFactory(String name) {
             this.name = name;
         }
+
         ThreadFactory getFactory(boolean isDaemon) {
             return new Factory(name + "-" + poolId.getAndIncrement() + "-thread-", isDaemon);
-
         }
-        private final String name;
-        private final AtomicInteger poolId = new AtomicInteger(1);
+
     }
-    static private final Map<String, PooledFactory> factory = new HashMap<>();
 
 }
diff --git a/vespajlib/src/main/java/com/yahoo/io/BufferChain.java b/vespajlib/src/main/java/com/yahoo/io/BufferChain.java
index cee7a3c25dd..8fbf13e32ba 100644
--- a/vespajlib/src/main/java/com/yahoo/io/BufferChain.java
+++ b/vespajlib/src/main/java/com/yahoo/io/BufferChain.java
@@ -127,7 +127,7 @@ public final class BufferChain {
     }
 
     public void flush() throws IOException {
-        for (final ByteBuffer b : buffers) {
+        for (ByteBuffer b : buffers) {
             endpoint.send(b);
         }
         buffers.clear();
diff --git a/vespajlib/src/main/java/com/yahoo/io/WritableByteTransmitter.java b/vespajlib/src/main/java/com/yahoo/io/WritableByteTransmitter.java
index 78551b5a578..3b0c1b55af7 100644
--- a/vespajlib/src/main/java/com/yahoo/io/WritableByteTransmitter.java
+++ b/vespajlib/src/main/java/com/yahoo/io/WritableByteTransmitter.java
@@ -5,7 +5,7 @@ import java.io.IOException;
 import java.nio.ByteBuffer;
 
 /**
- * Marker interface for use with the BufferChain data store.
+ * For use with the BufferChain data store.
  *
  * @author Steinar Knutsen
  */
-- 
cgit v1.2.3