Code cleanup, no functional changes

7 files changed, 17 insertions, 24 deletions

diff --git a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StatusHandler.java b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StatusHandler.java
index ee2110ece4e..9d448f3a903 100644
--- a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StatusHandler.java
+++ b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StatusHandler.java
@@ -9,8 +9,6 @@ import com.yahoo.vespa.clustercontroller.apputil.communication.http.JDiscHttpReq
 
 public class StatusHandler extends JDiscHttpRequestHandler implements CapabilityRequiringRequestHandler {
 
-    private final com.yahoo.vespa.clustercontroller.core.status.StatusHandler statusHandler;
-
     @Inject
     public StatusHandler(ClusterController fc, JDiscHttpRequestHandler.Context ctx) {
         this(new com.yahoo.vespa.clustercontroller.core.status.StatusHandler(fc), ctx);
@@ -19,10 +17,8 @@ public class StatusHandler extends JDiscHttpRequestHandler implements Capability
     @Override public Capability requiredCapability(RequestView __) { return Capability.CLUSTER_CONTROLLER__STATUS; }
 
     private StatusHandler(com.yahoo.vespa.clustercontroller.core.status.StatusHandler handler,
-                          JDiscHttpRequestHandler.Context ctx)
-    {
+                          JDiscHttpRequestHandler.Context ctx) {
         super(handler, ctx);
-        this.statusHandler = handler;
     }
 
 }
diff --git a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscHttpRequestHandler.java b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscHttpRequestHandler.java
index 939f09c9e33..8314d1b3ad0 100644
--- a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscHttpRequestHandler.java
+++ b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscHttpRequestHandler.java
@@ -70,13 +70,13 @@ public class JDiscHttpRequestHandler extends ThreadedHttpRequestHandler {
     }
 
     static HttpRequest setOperation(HttpRequest request, com.yahoo.jdisc.http.HttpRequest.Method method) {
-        switch (method) {
-            case GET: return request.setHttpOperation(HttpRequest.HttpOp.GET);
-            case POST: return request.setHttpOperation(HttpRequest.HttpOp.POST);
-            case PUT: return request.setHttpOperation(HttpRequest.HttpOp.PUT);
-            case DELETE: return request.setHttpOperation(HttpRequest.HttpOp.DELETE);
-            default: throw new IllegalStateException("Unhandled method " + method);
-        }
+        return switch (method) {
+            case GET -> request.setHttpOperation(HttpRequest.HttpOp.GET);
+            case POST -> request.setHttpOperation(HttpRequest.HttpOp.POST);
+            case PUT -> request.setHttpOperation(HttpRequest.HttpOp.PUT);
+            case DELETE -> request.setHttpOperation(HttpRequest.HttpOp.DELETE);
+            default -> throw new IllegalStateException("Unhandled method " + method);
+        };
     }
 
     private com.yahoo.container.jdisc.HttpResponse copyResponse(final HttpResult result) {
diff --git a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscMetricWrapper.java b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscMetricWrapper.java
index 5a4df289d87..b707623870a 100644
--- a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscMetricWrapper.java
+++ b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscMetricWrapper.java
@@ -4,15 +4,13 @@ package com.yahoo.vespa.clustercontroller.apputil.communication.http;
 import com.yahoo.jdisc.Metric;
 import com.yahoo.vespa.clustercontroller.utils.util.MetricReporter;
 
-import java.util.logging.Logger;
-
 public class JDiscMetricWrapper implements MetricReporter {
 
     private final Object lock = new Object();
     private Metric m;
 
     private static class ContextWrapper implements MetricReporter.Context {
-        Metric.Context wrappedContext;
+        final Metric.Context wrappedContext;
 
         public ContextWrapper(Metric.Context wrapped) {
             this.wrappedContext = wrapped;
diff --git a/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StateRestApiV2HandlerTest.java b/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StateRestApiV2HandlerTest.java
index 7146d95e7ba..d6896aac179 100644
--- a/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StateRestApiV2HandlerTest.java
+++ b/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StateRestApiV2HandlerTest.java
@@ -17,7 +17,6 @@ public class StateRestApiV2HandlerTest {
         ClusterController controller = new ClusterController();
         ClusterInfoConfig config = new ClusterInfoConfig(
                 new ClusterInfoConfig.Builder().clusterId("cluster-id").nodeCount(1));
-        ClusterInfoConfig.Builder clusterConfig = new ClusterInfoConfig.Builder();
         new StateRestApiV2Handler(controller, config, StateRestApiV2Handler.testContext());
     }
 
diff --git a/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StatusHandlerTest.java b/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StatusHandlerTest.java
index d4eb84677dc..4673ee39080 100644
--- a/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StatusHandlerTest.java
+++ b/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StatusHandlerTest.java
@@ -8,7 +8,7 @@ public class StatusHandlerTest {
     @Test
     void testSimple() {
         ClusterController controller = new ClusterController();
-        StatusHandler handler = new StatusHandler(controller, StatusHandler.testContext());
+        new StatusHandler(controller, StatusHandler.testContext());
     }
 
 }
diff --git a/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscHttpRequestHandlerTest.java b/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscHttpRequestHandlerTest.java
index 19a5a2a60f9..23ab03cc673 100644
--- a/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscHttpRequestHandlerTest.java
+++ b/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscHttpRequestHandlerTest.java
@@ -13,7 +13,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 
 /**
- * The handler is mostly tested through the apache tests, using it as endpoint here..
+ * The handler is mostly tested through the apache tests, using it as endpoint here.
  * This test class is just to test some special cases.
  */
 public class JDiscHttpRequestHandlerTest {
@@ -30,7 +30,7 @@ public class JDiscHttpRequestHandlerTest {
     }
 
     @Test
-    void testInvalidMethod() throws Exception {
+    void testInvalidMethod() {
         try {
             HttpRequest request = new HttpRequest();
             JDiscHttpRequestHandler.setOperation(request, com.yahoo.jdisc.http.HttpRequest.Method.CONNECT);
@@ -41,7 +41,7 @@ public class JDiscHttpRequestHandlerTest {
     }
 
     @Test
-    void testNothingButAddCoverage() throws Exception {
+    void testNothingButAddCoverage() {
         new JDiscHttpRequestHandler.EmptyCompletionHandler().failed(null);
     }
 }
diff --git a/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscMetricWrapperTest.java b/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscMetricWrapperTest.java
index a62437d1a8f..a20b4b744f2 100644
--- a/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscMetricWrapperTest.java
+++ b/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscMetricWrapperTest.java
@@ -7,11 +7,11 @@ import org.junit.jupiter.api.Test;
 import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class JDiscMetricWrapperTest {
 
-    class MetricImpl implements Metric {
+    static class MetricImpl implements Metric {
         int calls = 0;
         @Override
         public void set(String s, Number number, Context context) { ++calls; }
@@ -31,13 +31,13 @@ public class JDiscMetricWrapperTest {
         JDiscMetricWrapper wrapper = new JDiscMetricWrapper(impl1);
         wrapper.add("foo", 234, null);
         wrapper.set("bar", 234, null);
-        assertTrue(wrapper.createContext(null) != null);
+        assertNotNull(wrapper.createContext(null));
         assertEquals(3, impl1.calls);
         impl1.calls = 0;
         wrapper.updateMetricImplementation(impl2);
         wrapper.add("foo", 234, wrapper.createContext(null));
         wrapper.set("bar", 234, wrapper.createContext(null));
-        assertTrue(wrapper.createContext(null) != null);
+        assertNotNull(wrapper.createContext(null));
         assertEquals(0, impl1.calls);
         assertEquals(5, impl2.calls);