Merge pull request #24042 from vespa-engine/bratseth/cleanup-671

No functional changes

5 files changed, 7 insertions, 6 deletions

diff --git a/documentapi/src/main/java/com/yahoo/documentapi/SyncSession.java b/documentapi/src/main/java/com/yahoo/documentapi/SyncSession.java
index 01d67c8e1d9..0fd579e2f5d 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/SyncSession.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/SyncSession.java
@@ -14,8 +14,9 @@ import java.time.Duration;
 import static com.yahoo.documentapi.DocumentOperationParameters.parameters;
 
 /**
- * A session for synchronous access to a document repository. This class
+ * A session for synchronous access to a document repository,
  * provides simple document access where throughput is not a concern.
+ * This is multithread safe.
  *
  * @author Simon Thoresen Hult
  * @author bjorncs
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/ANDPolicy.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/ANDPolicy.java
index ec4ec5ae790..c9ba1f5808c 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/ANDPolicy.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/ANDPolicy.java
@@ -59,4 +59,5 @@ public class ANDPolicy implements DocumentProtocolRoutingPolicy {
 
     public void destroy() {
     }
+
 }
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/LocalServicePolicy.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/LocalServicePolicy.java
index 0fe44a74968..e835cc4e5e0 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/LocalServicePolicy.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/LocalServicePolicy.java
@@ -20,7 +20,7 @@ import java.util.Map;
 public class LocalServicePolicy implements DocumentProtocolRoutingPolicy {
 
     private final String localAddress;
-    private Map<String, CacheEntry> cache = new HashMap<>();
+    private final Map<String, CacheEntry> cache = new HashMap<>();
 
     /**
      * Constructs a policy that will choose local services that match the slobrok pattern in which this policy occured.
@@ -32,14 +32,12 @@ public class LocalServicePolicy implements DocumentProtocolRoutingPolicy {
         localAddress = (param != null && param.length() > 0) ? param : null;
     }
 
-    // Inherit doc from RoutingPolicy.
     public void select(RoutingContext ctx) {
         Route route = new Route(ctx.getRoute());
         route.setHop(0, getRecipient(ctx));
         ctx.addChild(route);
     }
 
-    // Inherit doc from RoutingPolicy.
     public void merge(RoutingContext ctx) {
         DocumentProtocol.merge(ctx);
     }
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoundRobinPolicy.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoundRobinPolicy.java
index 5187ee9d255..b7f32ac958e 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoundRobinPolicy.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoundRobinPolicy.java
@@ -22,7 +22,7 @@ import java.util.Map;
  */
 public class RoundRobinPolicy implements DocumentProtocolRoutingPolicy {
 
-    private final Map<String, CacheEntry> cache = new HashMap<String, CacheEntry>();
+    private final Map<String, CacheEntry> cache = new HashMap<>();
 
     // Inherit doc from RoutingPolicy.
     public void select(RoutingContext ctx) {
@@ -117,4 +117,5 @@ public class RoundRobinPolicy implements DocumentProtocolRoutingPolicy {
 
     public void destroy() {
     }
+
 }
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/SubsetServicePolicy.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/SubsetServicePolicy.java
index 72e88e6c0b9..8519f543909 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/SubsetServicePolicy.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/SubsetServicePolicy.java
@@ -21,7 +21,7 @@ import java.util.logging.Logger;
  */
 public class SubsetServicePolicy implements DocumentProtocolRoutingPolicy {
 
-    private static Logger log = Logger.getLogger(SubsetServicePolicy.class.getName());
+    private static final Logger log = Logger.getLogger(SubsetServicePolicy.class.getName());
     private final int subsetSize;
     private final Map<String, CacheEntry> cache = new HashMap<>();