Code cleanup, no functional changes

3 files changed, 9 insertions, 15 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;