Nonfunctional changes

9 files changed, 15 insertions, 13 deletions

diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ClientUpdater.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ClientUpdater.java
index 0ed5d04e36e..8b8f75a3f99 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ClientUpdater.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ClientUpdater.java
@@ -15,6 +15,7 @@ import java.util.logging.Logger;
  * @author hmusum
  */
 class ClientUpdater {
+
     private final static Logger log = Logger.getLogger(ClientUpdater.class.getName());
 
     private final ConfigProxyStatistics statistics;
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigSourceClient.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigSourceClient.java
index f636e723828..5bab27c27a5 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigSourceClient.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigSourceClient.java
@@ -11,7 +11,6 @@ import java.util.List;
  * getting config.
  *
  * @author hmusum
- * @since 5.1.9
  */
 interface ConfigSourceClient {
 
@@ -24,4 +23,5 @@ interface ConfigSourceClient {
     String getActiveSourceConnection();
 
     List<String> getSourceConnections();
+
 }
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/DelayedResponse.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/DelayedResponse.java
index 76c5cb424e8..047576ee647 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/DelayedResponse.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/DelayedResponse.java
@@ -15,6 +15,7 @@ import java.util.concurrent.TimeUnit;
  * @see DelayedResponseHandler
  */
 public class DelayedResponse implements Delayed {
+
     private final JRTServerConfigRequest request;
     private final long returnTime;
 
@@ -58,8 +59,7 @@ public class DelayedResponse implements Delayed {
 
     @Override
     public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(request.getShortDescription()).append(", delayLeft=").append(getDelay(TimeUnit.MILLISECONDS)).append(" ms");
-        return sb.toString();
+        return request.getShortDescription() + ", delayLeft=" + getDelay(TimeUnit.MILLISECONDS) + " ms";
     }
+
 }
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/DelayedResponses.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/DelayedResponses.java
index 00f948ef690..953aeefbfd1 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/DelayedResponses.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/DelayedResponses.java
@@ -7,7 +7,6 @@ import java.util.concurrent.DelayQueue;
  * Queue for requests that have no corresponding config in cache and which we are awaiting response from server for
  *
  * @author hmusum
- * @since 5.1.7
  */
 class DelayedResponses {
 
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCache.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCache.java
index 7914b7a80b6..0fe7fe01467 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCache.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCache.java
@@ -21,6 +21,7 @@ import java.util.logging.Logger;
  * @author hmusum
  */
 public class MemoryCache {
+
     private static final Logger log = Logger.getLogger(MemoryCache.class.getName());
 
     // Separator in file names between different fields of config key
@@ -35,6 +36,7 @@ public class MemoryCache {
 
     /**
      * Put in cache, except when config has an error
+     *
      * @param config config to put in cache
      */
     public void put(RawConfig config) {
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java
index 28bcca9db13..6390c9ca165 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java
@@ -132,7 +132,7 @@ public class ProxyServer implements Runnable {
     }
 
     static boolean configOrGenerationHasChanged(RawConfig config, JRTServerConfigRequest request) {
-        return (config != null && (!config.hasEqualConfig(request) || config.hasNewerGeneration(request)));
+        return (config != null && ( ! config.hasEqualConfig(request) || config.hasNewerGeneration(request)));
     }
 
     Mode getMode() {
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java
index 0f80f228b36..b4eda05fde4 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java
@@ -148,7 +148,8 @@ class RpcConfigSourceClient implements ConfigSourceClient {
                 log.log(LogLevel.DEBUG, () -> "Already a subscriber running for: " + configCacheKey);
             } else {
                 log.log(LogLevel.DEBUG, () -> "Could not find good config in cache, creating subscriber for: " + configCacheKey);
-                UpstreamConfigSubscriber subscriber = new UpstreamConfigSubscriber(input, clientUpdater, configSourceSet, timingValues, requesterPool, memoryCache);
+                UpstreamConfigSubscriber subscriber = new UpstreamConfigSubscriber(input, clientUpdater, configSourceSet,
+                                                                                   timingValues, requesterPool, memoryCache);
                 try {
                     subscriber.subscribe();
                     activeSubscribers.put(configCacheKey, subscriber);
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/Subscriber.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/Subscriber.java
index 32b1c661a75..74c99b7670b 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/Subscriber.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/Subscriber.java
@@ -5,7 +5,6 @@ package com.yahoo.vespa.config.proxy;
  * Interface for subscribing to config from upstream config sources.
  *
  * @author hmusum
- * @since 5.5
  */
 public interface Subscriber extends Runnable {
 
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/UpstreamConfigSubscriber.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/UpstreamConfigSubscriber.java
index 528c61fe132..ceaf57e9cf1 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/UpstreamConfigSubscriber.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/UpstreamConfigSubscriber.java
@@ -17,9 +17,9 @@ import java.util.logging.Logger;
 
 /**
  * @author hmusum
- * @since 5.5
  */
 public class UpstreamConfigSubscriber implements Subscriber {
+
     private final static Logger log = Logger.getLogger(UpstreamConfigSubscriber.class.getName());
 
     private final RawConfig config;
@@ -33,8 +33,7 @@ public class UpstreamConfigSubscriber implements Subscriber {
 
     UpstreamConfigSubscriber(RawConfig config, ClientUpdater clientUpdater, ConfigSource configSourceSet,
                              TimingValues timingValues, Map<ConfigSourceSet, JRTConfigRequester> requesterPool,
-                             MemoryCache memoryCache)
-    {
+                             MemoryCache memoryCache) {
         this.config = config;
         this.clientUpdater = clientUpdater;
         this.configSourceSet = configSourceSet;
@@ -46,7 +45,7 @@ public class UpstreamConfigSubscriber implements Subscriber {
     void subscribe() {
         subscriber = new GenericConfigSubscriber(requesterPool);
         ConfigKey<?> key = config.getKey();
-        handle = subscriber.subscribe(new ConfigKey<RawConfig>(key.getName(), key.getConfigId(), key.getNamespace()),
+        handle = subscriber.subscribe(new ConfigKey<>(key.getName(), key.getConfigId(), key.getNamespace()),
                                       config.getDefContent(), configSourceSet, timingValues);
     }
 
@@ -66,7 +65,7 @@ public class UpstreamConfigSubscriber implements Subscriber {
     }
 
     private void updateWithNewConfig(GenericConfigHandle handle) {
-        final RawConfig newConfig = handle.getRawConfig();
+        RawConfig newConfig = handle.getRawConfig();
         if (log.isLoggable(LogLevel.DEBUG)) {
             log.log(LogLevel.DEBUG, "config to be returned for '" + newConfig.getKey() +
                     "', generation=" + newConfig.getGeneration() +
@@ -82,4 +81,5 @@ public class UpstreamConfigSubscriber implements Subscriber {
             subscriber.close();
         }
     }
+
 }