Follow intellij advise.

2 files changed, 26 insertions, 32 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponses.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponses.java
index 5fae6e23323..f58c6cfdee5 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponses.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponses.java
@@ -45,7 +45,7 @@ public class DelayedConfigResponses {
     private final Map<ApplicationId, BlockingQueue<DelayedConfigResponse>> delayedResponses =
             new ConcurrentHashMap<>();
             
-    public DelayedConfigResponses(RpcServer rpcServer, int numTimerThreads) {
+    DelayedConfigResponses(RpcServer rpcServer, int numTimerThreads) {
         this(rpcServer, numTimerThreads, true);
     }
 
@@ -70,19 +70,20 @@ public class DelayedConfigResponses {
      * The run method of this class is run by a Timer when the timeout expires.
      * The timer associated with this response must be cancelled first.
      */
-    public class DelayedConfigResponse implements Runnable, TargetWatcher {
+    class DelayedConfigResponse implements Runnable, TargetWatcher {
 
         final JRTServerConfigRequest request;
         private final BlockingQueue<DelayedConfigResponse> delayedResponsesQueue;
         private final ApplicationId app;
         private ScheduledFuture<?> future;
 
-        public DelayedConfigResponse(JRTServerConfigRequest req, BlockingQueue<DelayedConfigResponse> delayedResponsesQueue, ApplicationId app) {
+        DelayedConfigResponse(JRTServerConfigRequest req, BlockingQueue<DelayedConfigResponse> delayedResponsesQueue, ApplicationId app) {
             this.request = req;
             this.delayedResponsesQueue = delayedResponsesQueue;
             this.app = app;
         }
 
+        @Override
         public synchronized void run() {
             removeFromQueue();
             removeWatcher();
@@ -99,18 +100,17 @@ public class DelayedConfigResponses {
             delayedResponsesQueue.remove(this);
         }
 
-        public JRTServerConfigRequest getRequest() {
+        JRTServerConfigRequest getRequest() {
             return request;
         }
 
+        @Override
         public String toString() {
             StringBuilder sb = new StringBuilder();
             sb.append("Delayed response for ").append(logPre()).append(request.getShortDescription());
             return sb.toString();
         }
 
-        public ApplicationId getAppId() { return app; }
-        
         String logPre() {
             return TenantRepository.logPre(app);
         }
@@ -128,7 +128,7 @@ public class DelayedConfigResponses {
             return future.cancel(false);
         }
 
-        public synchronized void schedule(long delay) throws InterruptedException {
+        synchronized void schedule(long delay) throws InterruptedException {
             delayedResponsesQueue.put(this);
             future = executorService.schedule(this, delay, TimeUnit.MILLISECONDS);
             addWatcher();
@@ -167,7 +167,7 @@ public class DelayedConfigResponses {
      *
      * @param request a JRTConfigRequest
      */
-    public final void delayResponse(JRTServerConfigRequest request, GetConfigContext context) {
+    final void delayResponse(JRTServerConfigRequest request, GetConfigContext context) {
         if (request.isDelayedResponse()) {
             log.log(LogLevel.DEBUG, context.logPre()+"Request already delayed");
         } else {            
@@ -203,7 +203,7 @@ public class DelayedConfigResponses {
         }
     }
 
-    public void stop() {
+    void stop() {
         executorService.shutdown();
     }
 
@@ -212,7 +212,7 @@ public class DelayedConfigResponses {
      *
      * @return and array of DelayedConfigResponse objects
      */
-    public List<DelayedConfigResponse> drainQueue(ApplicationId app) {
+    List<DelayedConfigResponse> drainQueue(ApplicationId app) {
         ArrayList<DelayedConfigResponse> ret = new ArrayList<>();
         
         if (delayedResponses.containsKey(app)) {
@@ -223,11 +223,12 @@ public class DelayedConfigResponses {
         return ret;
     }
 
+    @Override
     public String toString() {
         return "DelayedConfigResponses. Average Size=" + size();
     }
 
-    public int size() {
+    int size() {
         int totalQueueSize = 0;
         int numQueues = 0;
         for (Map.Entry<ApplicationId, BlockingQueue<DelayedConfigResponse>> e : delayedResponses.entrySet()) {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
index 1cae6ac2244..a7d603fe53f 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
@@ -73,9 +73,9 @@ import java.util.stream.Stream;
 // TODO: Split business logic out of this
 public class RpcServer implements Runnable, ReloadListener, TenantListener {
 
-    public static final String getConfigMethodName = "getConfigV3";
+    static final String getConfigMethodName = "getConfigV3";
     
-    static final int TRACELEVEL = 6;
+    private static final int TRACELEVEL = 6;
     static final int TRACELEVEL_DEBUG = 9;
     private static final String THREADPOOL_NAME = "rpcserver worker pool";
     private static final long SHUTDOWN_TIMEOUT = 60;
@@ -87,7 +87,7 @@ public class RpcServer implements Runnable, ReloadListener, TenantListener {
 
     private static final Logger log = Logger.getLogger(RpcServer.class.getName());
 
-    final DelayedConfigResponses delayedConfigResponses;
+    private final DelayedConfigResponses delayedConfigResponses;
 
     private final HostRegistry<TenantName> hostRegistry;
     private final Map<TenantName, TenantHandlerProvider> tenantProviders = new ConcurrentHashMap<>();
@@ -114,7 +114,7 @@ public class RpcServer implements Runnable, ReloadListener, TenantListener {
         this.superModelRequestHandler = superModelRequestHandler;
         metricUpdaterFactory = metrics;
         supervisor.setMaxOutputBufferSize(config.maxoutputbuffersize());
-        this.metrics = metrics.getOrCreateMetricUpdater(Collections.<String, String>emptyMap());
+        this.metrics = metrics.getOrCreateMetricUpdater(Collections.emptyMap());
         this.hostLivenessTracker = hostLivenessTracker;
         BlockingQueue<Runnable> workQueue = new LinkedBlockingQueue<>(config.maxgetconfigclients());
         int numberOfRpcThreads = (config.numRpcThreads() == 0) ? Runtime.getRuntime().availableProcessors() : config.numRpcThreads();
@@ -161,7 +161,8 @@ public class RpcServer implements Runnable, ReloadListener, TenantListener {
      *
      * @param req a Request
      */
-    public final void printStatistics(Request req) {
+    @SuppressWarnings("UnusedDeclaration")
+    public void printStatistics(Request req) {
         req.returnValues().add(new StringValue("Delayed responses queue size: " + delayedConfigResponses.size()));
     }
 
@@ -300,7 +301,7 @@ public class RpcServer implements Runnable, ReloadListener, TenantListener {
      * Returns the tenant for this request, empty if there is no tenant for this request
      * (which on hosted Vespa means that the requesting host is not currently active for any tenant)
      */
-    public Optional<TenantName> resolveTenant(JRTServerConfigRequest request, Trace trace) {
+    Optional<TenantName> resolveTenant(JRTServerConfigRequest request, Trace trace) {
         if ("*".equals(request.getConfigKey().getConfigId())) return Optional.of(ApplicationId.global().tenant());
         String hostname = request.getClientHostName();
         TenantName tenant = hostRegistry.getKeyForHost(hostname);
@@ -321,12 +322,12 @@ public class RpcServer implements Runnable, ReloadListener, TenantListener {
         return context.requestHandler().resolveConfig(context.applicationId(), request, vespaVersion);
     }
 
-    protected Supervisor getSupervisor() {
+    private Supervisor getSupervisor() {
         return supervisor;
     }
 
-    Boolean addToRequestQueue(JRTServerConfigRequest request) {
-        return addToRequestQueue(request, false, null);
+    private void addToRequestQueue(JRTServerConfigRequest request) {
+        addToRequestQueue(request, false, null);
     }
 
     public Boolean addToRequestQueue(JRTServerConfigRequest request, boolean forceResponse, CompletionService<Boolean> completionService) {
@@ -338,13 +339,7 @@ public class RpcServer implements Runnable, ReloadListener, TenantListener {
             if (completionService == null) {
                 executorService.submit(task);
             } else {
-                completionService.submit(new Callable<Boolean>() {
-                    @Override
-                    public Boolean call() throws Exception {
-                        task.run();
-                        return true;
-                    }
-                });
+                completionService.submit(() -> { task.run();return true;});
             }
             updateWorkQueueMetrics();
             return true;
@@ -363,7 +358,7 @@ public class RpcServer implements Runnable, ReloadListener, TenantListener {
     /**
      * Returns the context for this request, or null if the server is not properly set up with handlers
      */
-    public GetConfigContext createGetConfigContext(Optional<TenantName> optionalTenant, JRTServerConfigRequest request, Trace trace) {
+    GetConfigContext createGetConfigContext(Optional<TenantName> optionalTenant, JRTServerConfigRequest request, Trace trace) {
         if ("*".equals(request.getConfigKey().getConfigId())) {
             return GetConfigContext.create(ApplicationId.global(), superModelRequestHandler, trace);
         }
@@ -394,16 +389,14 @@ public class RpcServer implements Runnable, ReloadListener, TenantListener {
         return tenantProviders.get(tenant).getRequestHandler();
     }
 
-    public void delayResponse(JRTServerConfigRequest request, GetConfigContext context) {
+    void delayResponse(JRTServerConfigRequest request, GetConfigContext context) {
         delayedConfigResponses.delayResponse(request, context);
     }
 
     @Override
     public void onTenantDelete(TenantName tenant) {
         log.log(LogLevel.DEBUG, TenantRepository.logPre(tenant)+"Tenant deleted, removing request handler and cleaning host registry");
-        if (tenantProviders.containsKey(tenant)) {
-            tenantProviders.remove(tenant);
-        }
+        tenantProviders.remove(tenant);
         hostRegistry.removeHostsForKey(tenant);
     }