Code cleanup, no functional changes

9 files changed, 13 insertions, 46 deletions

diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncOperationImpl.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncOperationImpl.java
index d4c1cf9d948..9a89e5dbc5c 100644
--- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncOperationImpl.java
+++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncOperationImpl.java
@@ -13,7 +13,7 @@ public class AsyncOperationImpl<T> implements AsyncOperation<T> {
     private boolean failed = false;
     private T result;
     private Exception failure;
-    private AsyncOperationListenImpl<T> listenImpl;
+    private final AsyncOperationListenImpl<T> listenImpl;
 
     public AsyncOperationImpl(String name) {
         this(name, null);
diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncOperationListenImpl.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncOperationListenImpl.java
index 2964c81df5e..a2a73e87537 100644
--- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncOperationListenImpl.java
+++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncOperationListenImpl.java
@@ -12,7 +12,7 @@ public class AsyncOperationListenImpl<T> {
     private static final Logger log = Logger.getLogger(AsyncOperationListenImpl.class.getName());
     private final Collection<AsyncCallback<T>> listeners = new HashSet<>();
     private boolean listenersNotified = false;
-    private AsyncOperation<T> op;
+    private final AsyncOperation<T> op;
 
     protected AsyncOperationListenImpl(AsyncOperation<T> op) {
         this.op = op;
diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/PipedAsyncOperation.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/PipedAsyncOperation.java
deleted file mode 100644
index 5dfad3f1e6d..00000000000
--- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/PipedAsyncOperation.java
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.clustercontroller.utils.communication.async;
-
-public abstract class PipedAsyncOperation<S, T> extends RedirectedAsyncOperation<S, T> {
-
-    private T result;
-
-    public PipedAsyncOperation(AsyncOperation<S> source) {
-        super(source);
-        setOnCompleteTask(new AsyncCallback<S>() {
-            @Override
-            public void done(AsyncOperation<S> op) {
-                result = convertResult(op.getResult());
-            }
-        });
-    }
-
-    public abstract T convertResult(S result);
-
-    @Override
-    public T getResult() {
-        return result;
-    }
-
-}
diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/RedirectedAsyncOperation.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/RedirectedAsyncOperation.java
index 46415c03524..54c06c29d6e 100644
--- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/RedirectedAsyncOperation.java
+++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/RedirectedAsyncOperation.java
@@ -8,7 +8,6 @@ public abstract class RedirectedAsyncOperation<S, T> implements AsyncOperation<T
 
     protected final AsyncOperation<S> source;
     private final AsyncOperationListenImpl<T> listenImpl;
-    private AsyncCallback<S> beforeCallbackTask;
 
     public RedirectedAsyncOperation(AsyncOperation<S> source) {
         this.source = source;
@@ -19,12 +18,7 @@ public abstract class RedirectedAsyncOperation<S, T> implements AsyncOperation<T
         });
     }
 
-    public RedirectedAsyncOperation<S, T> setOnCompleteTask(AsyncCallback<S> beforeTask) {
-        beforeCallbackTask = beforeTask;
-        return this;
-    }
     private void notifyDone() {
-        if (beforeCallbackTask != null) beforeCallbackTask.done(source);
         listenImpl.notifyListeners();
     }
 
diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/HttpRequest.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/HttpRequest.java
index 68bd92f647b..29ec4463cf5 100644
--- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/HttpRequest.java
+++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/HttpRequest.java
@@ -9,8 +9,8 @@ import java.util.List;
 public class HttpRequest extends CertainlyCloneable<HttpRequest> {
 
     public static class KeyValuePair {
-        public String key;
-        public String value;
+        public final String key;
+        public final String value;
 
         public KeyValuePair(String k, String v) { this.key = k; this.value = v; }
 
@@ -56,7 +56,6 @@ public class HttpRequest extends CertainlyCloneable<HttpRequest> {
         }
         return defaultValue;
     }
-    public long getTimeoutMillis() { return timeoutMillis; }
     public Object getPostContent() { return postContent; }
     public HttpOp getHttpOperation() { return httpOperation; }
 
diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/writer/HttpWriter.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/writer/HttpWriter.java
index a931b2d40dd..5ac24210a6b 100644
--- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/writer/HttpWriter.java
+++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/writer/HttpWriter.java
@@ -6,7 +6,8 @@ public class HttpWriter {
     private final StringBuilder builder = new StringBuilder();
 
     private String title = "Untitled page";
-    enum State { HEADER, BODY, FINALIZED };
+    enum State { HEADER, BODY, FINALIZED }
+
     private State state = State.HEADER;
 
     public HttpWriter() {
diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/StateRestAPI.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/StateRestAPI.java
index 4861d6cdf51..a6d8007fa0e 100644
--- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/StateRestAPI.java
+++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/StateRestAPI.java
@@ -1,7 +1,4 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-/**
- * Interface to implement for backends that want to have a State Rest API.
- */
 package com.yahoo.vespa.clustercontroller.utils.staterestapi;
 
 import com.yahoo.vespa.clustercontroller.utils.staterestapi.errors.StateRestApiException;
@@ -10,6 +7,9 @@ import com.yahoo.vespa.clustercontroller.utils.staterestapi.requests.UnitStateRe
 import com.yahoo.vespa.clustercontroller.utils.staterestapi.response.SetResponse;
 import com.yahoo.vespa.clustercontroller.utils.staterestapi.response.UnitResponse;
 
+/**
+ * Interface to implement for backends that want to have a State Rest API.
+ */
 public interface StateRestAPI {
 
     UnitResponse getState(UnitStateRequest request) throws StateRestApiException;
diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/OperationNotSupportedForUnitException.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/OperationNotSupportedForUnitException.java
index abc55d68bc6..ffe43878839 100644
--- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/OperationNotSupportedForUnitException.java
+++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/OperationNotSupportedForUnitException.java
@@ -7,9 +7,7 @@ import java.util.List;
 public class OperationNotSupportedForUnitException extends StateRestApiException {
 
     private static String createMessage(List<String> path, String description) {
-        return new StringBuilder()
-                .append(Arrays.toString(path.toArray())).append(": ").append(description)
-                .toString();
+        return Arrays.toString(path.toArray()) + ": " + description;
     }
 
     public OperationNotSupportedForUnitException(List<String> path, String description) {
diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/RestApiHandler.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/RestApiHandler.java
index ceec4f67e1b..3a4fe53ee67 100644
--- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/RestApiHandler.java
+++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/RestApiHandler.java
@@ -141,8 +141,8 @@ public class RestApiHandler implements HttpRequestHandler {
 
     private int getRecursiveLevel(HttpRequest request) throws StateRestApiException {
         String val = request.getOption("recursive", "false");
-        if (val.toLowerCase().equals("false")) { return 0; }
-        if (val.toLowerCase().equals("true")) { return Integer.MAX_VALUE; }
+        if (val.equalsIgnoreCase("false")) { return 0; }
+        if (val.equalsIgnoreCase("true")) { return Integer.MAX_VALUE; }
         int level;
         try{
             level = Integer.parseInt(val);
@@ -178,7 +178,7 @@ public class RestApiHandler implements HttpRequestHandler {
             this.replaceWith = repl;
         }
     }
-    private static List<Escape> escapes = new ArrayList<>();
+    private static final List<Escape> escapes = new ArrayList<>();
     static {
         escapes.add(new Escape("%", "%25"));
         escapes.add(new Escape(" ", "%20"));