From c9f97f7effb5fcd2a8ffe620258cd5629fb7dc73 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Fri, 15 Sep 2017 16:25:49 +0200 Subject: Merge with master --- .../utils/communication/async/AsyncCallback.java | 4 +++- .../utils/communication/async/AsyncOperation.java | 21 ++++++++++++--------- .../communication/async/AsyncOperationImpl.java | 2 ++ .../async/AsyncOperationListenImpl.java | 2 ++ .../utils/communication/async/AsyncUtils.java | 1 + .../communication/async/PipedAsyncOperation.java | 2 ++ .../async/RedirectedAsyncOperation.java | 2 ++ .../async/SuccessfulAsyncCallback.java | 1 + .../utils/communication/http/AsyncHttpClient.java | 6 +++--- .../communication/http/AsyncHttpClientWithBase.java | 2 ++ .../utils/communication/http/HttpRequest.java | 3 +++ .../communication/http/HttpRequestHandler.java | 3 ++- .../utils/communication/http/HttpResult.java | 2 ++ .../communication/http/JsonAsyncHttpClient.java | 2 ++ .../utils/communication/http/JsonHttpResult.java | 1 + .../communication/http/LoggingAsyncHttpClient.java | 2 ++ .../communication/http/ProxyAsyncHttpClient.java | 2 ++ .../utils/communication/http/RequestQueue.java | 2 ++ .../utils/communication/http/SyncHttpClient.java | 6 ++++-- .../utils/communication/http/TimeoutHandler.java | 2 ++ .../utils/communication/http/writer/HttpWriter.java | 1 + .../utils/staterestapi/errors/InternalFailure.java | 1 + .../errors/InvalidContentException.java | 1 + .../errors/InvalidOptionValueException.java | 1 + .../errors/MissingResourceException.java | 2 ++ .../staterestapi/errors/MissingUnitException.java | 1 + .../staterestapi/errors/NotMasterException.java | 1 + .../OperationNotSupportedForUnitException.java | 1 + .../staterestapi/errors/OtherMasterException.java | 2 ++ .../staterestapi/errors/StateRestApiException.java | 2 ++ .../staterestapi/errors/UnknownMasterException.java | 1 + .../staterestapi/requests/SetUnitStateRequest.java | 1 + .../utils/staterestapi/requests/UnitRequest.java | 2 ++ .../staterestapi/requests/UnitStateRequest.java | 3 ++- .../staterestapi/response/CurrentUnitState.java | 4 +++- .../utils/staterestapi/response/SetResponse.java | 7 ++++++- .../utils/staterestapi/response/SubUnitList.java | 6 ++++-- .../utils/staterestapi/response/UnitAttributes.java | 4 +++- .../utils/staterestapi/response/UnitMetrics.java | 4 +++- .../utils/staterestapi/response/UnitResponse.java | 10 ++++++---- .../utils/staterestapi/response/UnitState.java | 6 ++++-- .../utils/staterestapi/server/JsonReader.java | 1 + .../utils/staterestapi/server/JsonWriter.java | 2 ++ .../utils/staterestapi/server/RestApiHandler.java | 1 + .../clustercontroller/utils/test/FakeClock.java | 2 ++ .../clustercontroller/utils/test/SettableClock.java | 2 ++ .../clustercontroller/utils/test/TestTransport.java | 1 + .../utils/util/CertainlyCloneable.java | 2 ++ .../vespa/clustercontroller/utils/util/Clock.java | 2 ++ .../utils/util/ComponentMetricReporter.java | 2 ++ .../utils/util/JSONObjectWrapper.java | 1 + .../utils/util/MetricReporter.java | 5 ++++- .../utils/util/NoMetricReporter.java | 2 ++ 53 files changed, 122 insertions(+), 30 deletions(-) (limited to 'clustercontroller-utils/src/main') diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncCallback.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncCallback.java index 92697e0e277..773aff08c08 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncCallback.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncCallback.java @@ -2,6 +2,8 @@ package com.yahoo.vespa.clustercontroller.utils.communication.async; public interface AsyncCallback { + /** Callback indicating the given operation has completed. */ - public void done(AsyncOperation op); + void done(AsyncOperation op); + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncOperation.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncOperation.java index ef3a2a43e6d..7d6b37a4f93 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncOperation.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncOperation.java @@ -2,11 +2,12 @@ package com.yahoo.vespa.clustercontroller.utils.communication.async; public interface AsyncOperation { + /** * Attempt to cancel the given operation. * @return True if successfully cancelled. False if cancel is not supported, or operation already succeeded. */ - public boolean cancel(); + boolean cancel(); /** * Register a callback to be called when this operation completes. If operation is already completed, this callback @@ -24,35 +25,37 @@ public interface AsyncOperation { /** * Get the name of the operation. Useful to identify what operation this is. */ - public String getName(); + String getName(); /** * Get a description of the operation. May be empty. If operation is complex one might want to use a short name for * simplicity, but have the whole request available if needed. In the HTTP case an application may for instance include * the URL in the name, and add the request headers to the description. */ - public String getDescription(); + String getDescription(); /** * Get the progress as a number between 0 and 1 where 0 means not started and 1 means operation is complete. * A return value of null indicates that the operation is unable to track progress. */ - public Double getProgress(); + Double getProgress(); /** * Get the result of the operation. * Note that some operations may not have a result if the operation failed. */ - public T getResult(); + T getResult(); /** Get the cause of an operation failing. Returns null on successful operations. */ - public Exception getCause(); + Exception getCause(); /** Returns true if operation has been successfully cancelled. */ - public boolean isCanceled(); + boolean isCanceled(); + /** Returns true if operation has completed. Regardless of whether it was a success or a failure. */ - public boolean isDone(); + boolean isDone(); + /** Returns true if the operation was a success. */ - public boolean isSuccess(); + boolean isSuccess(); } 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 b19e970d66b..dde370b637b 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 @@ -4,6 +4,7 @@ package com.yahoo.vespa.clustercontroller.utils.communication.async; import java.util.logging.Logger; public class AsyncOperationImpl implements AsyncOperation { + private static final Logger log = Logger.getLogger(AsyncOperationImpl.class.getName()); private final String name; private final String description; @@ -80,4 +81,5 @@ public class AsyncOperationImpl implements AsyncOperation { public void unregister(AsyncCallback callback) { listenImpl.unregister(callback); } + } 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 119163e2fa4..6d8a24f58e9 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 @@ -8,6 +8,7 @@ import java.util.HashSet; import java.util.logging.Logger; public class AsyncOperationListenImpl { + private static final Logger log = Logger.getLogger(AsyncOperationListenImpl.class.getName()); private final Collection> listeners = new HashSet<>(); private boolean listenersNotified = false; @@ -44,4 +45,5 @@ public class AsyncOperationListenImpl { listenersNotified = true; } } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncUtils.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncUtils.java index 64ca05fe945..881218b9e52 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncUtils.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncUtils.java @@ -8,4 +8,5 @@ public class AsyncUtils { try{ Thread.sleep(1); } catch (InterruptedException e) {} } } + } 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 index 71b32713f20..522a2c368bd 100644 --- 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 @@ -2,6 +2,7 @@ package com.yahoo.vespa.clustercontroller.utils.communication.async; public abstract class PipedAsyncOperation extends RedirectedAsyncOperation { + private T result; public PipedAsyncOperation(AsyncOperation source) { @@ -20,4 +21,5 @@ public abstract class PipedAsyncOperation extends RedirectedAsyncOperation 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 045232ac07c..957c8f8168c 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 @@ -5,6 +5,7 @@ package com.yahoo.vespa.clustercontroller.utils.communication.async; * Utility class in order to wrap com.yahoo.vespa.clustercontroller.utils.communication.async operation callbacks. Useful when translating com.yahoo.vespa.clustercontroller.utils.communication.async operations returning JSON to com.yahoo.vespa.clustercontroller.utils.communication.async operations returning specific values. */ public abstract class RedirectedAsyncOperation implements AsyncOperation { + protected final AsyncOperation source; private final AsyncOperationListenImpl listenImpl; private AsyncCallback beforeCallbackTask; @@ -60,4 +61,5 @@ public abstract class RedirectedAsyncOperation implements AsyncOperation callback) { listenImpl.unregister(callback); } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/SuccessfulAsyncCallback.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/SuccessfulAsyncCallback.java index 1aad7fb9b84..85c6b9070e6 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/SuccessfulAsyncCallback.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/SuccessfulAsyncCallback.java @@ -2,6 +2,7 @@ package com.yahoo.vespa.clustercontroller.utils.communication.async; public abstract class SuccessfulAsyncCallback implements AsyncCallback { + private final AsyncOperationImpl target; public SuccessfulAsyncCallback(final AsyncOperationImpl target) { diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/AsyncHttpClient.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/AsyncHttpClient.java index 0cf872f0db8..6af3e4de759 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/AsyncHttpClient.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/AsyncHttpClient.java @@ -4,13 +4,13 @@ package com.yahoo.vespa.clustercontroller.utils.communication.http; import com.yahoo.vespa.clustercontroller.utils.communication.async.AsyncOperation; /** - * Abstraction of an asynchronious HTTP client, such that applications don't need to depend directly on an HTTP client. + * Abstraction of an asynchronous HTTP client, such that applications don't need to depend directly on an HTTP client. */ public interface AsyncHttpClient { - public AsyncOperation execute(HttpRequest r); + AsyncOperation execute(HttpRequest r); /** Attempt to cancel all pending operations and shut down the client. */ - public void close(); + void close(); } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/AsyncHttpClientWithBase.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/AsyncHttpClientWithBase.java index d9118be3335..d824303df57 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/AsyncHttpClientWithBase.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/AsyncHttpClientWithBase.java @@ -4,6 +4,7 @@ package com.yahoo.vespa.clustercontroller.utils.communication.http; import com.yahoo.vespa.clustercontroller.utils.communication.async.AsyncOperation; public class AsyncHttpClientWithBase implements AsyncHttpClient { + protected final AsyncHttpClient client; private HttpRequest baseRequest = new HttpRequest(); @@ -34,4 +35,5 @@ public class AsyncHttpClientWithBase implements AsyncHttpC public void close() { client.close(); } + } 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 f92c856b6c6..b4de05b0588 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 @@ -7,6 +7,7 @@ import java.util.LinkedList; import java.util.List; public class HttpRequest extends CertainlyCloneable { + public static class KeyValuePair { public String key; public String value; @@ -21,6 +22,7 @@ public class HttpRequest extends CertainlyCloneable { return key; } } + public enum HttpOp { GET, POST, PUT, DELETE } private String host; @@ -145,4 +147,5 @@ public class HttpRequest extends CertainlyCloneable { } return false; } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/HttpRequestHandler.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/HttpRequestHandler.java index 82c0e6b259d..b3e31c751c6 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/HttpRequestHandler.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/HttpRequestHandler.java @@ -3,5 +3,6 @@ package com.yahoo.vespa.clustercontroller.utils.communication.http; public interface HttpRequestHandler { - public HttpResult handleRequest(HttpRequest request) throws Exception; + HttpResult handleRequest(HttpRequest request) throws Exception; + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/HttpResult.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/HttpResult.java index 9f84295d299..e82c44250e6 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/HttpResult.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/HttpResult.java @@ -6,6 +6,7 @@ import java.util.LinkedList; import java.util.List; public class HttpResult { + private static class HttpReturnCode { private final int code; private final String message; @@ -84,4 +85,5 @@ public class HttpResult { public void printContent(StringBuilder sb) { sb.append(content.toString()); } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/JsonAsyncHttpClient.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/JsonAsyncHttpClient.java index 1aa1c002fbd..dac4decc1ee 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/JsonAsyncHttpClient.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/JsonAsyncHttpClient.java @@ -10,6 +10,7 @@ import org.codehaus.jettison.json.JSONObject; * Wrapped for the HTTP client, converting requests to/from JSON. */ public class JsonAsyncHttpClient implements AsyncHttpClient { + private AsyncHttpClient client; private boolean verifyRequestContentAsJson = true; private boolean addJsonContentType = true; @@ -54,4 +55,5 @@ public class JsonAsyncHttpClient implements AsyncHttpClient { public void close() { client.close(); } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/JsonHttpResult.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/JsonHttpResult.java index ab63259c5cd..4ed61864638 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/JsonHttpResult.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/JsonHttpResult.java @@ -6,6 +6,7 @@ import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; public class JsonHttpResult extends HttpResult { + private JSONObject json; private boolean failedParsing = false; diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/LoggingAsyncHttpClient.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/LoggingAsyncHttpClient.java index b74fbca0f03..2d967223f9e 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/LoggingAsyncHttpClient.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/LoggingAsyncHttpClient.java @@ -10,6 +10,7 @@ import java.util.logging.Level; import java.util.logging.Logger; public class LoggingAsyncHttpClient extends AsyncHttpClientWithBase { + private static final Logger log = Logger.getLogger(LoggingAsyncHttpClient.class.getName()); private int requestCounter = 0; @@ -38,4 +39,5 @@ public class LoggingAsyncHttpClient extends AsyncHttpClien } }; } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/ProxyAsyncHttpClient.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/ProxyAsyncHttpClient.java index 536446724e3..3d6658ae366 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/ProxyAsyncHttpClient.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/ProxyAsyncHttpClient.java @@ -4,6 +4,7 @@ package com.yahoo.vespa.clustercontroller.utils.communication.http; import com.yahoo.vespa.clustercontroller.utils.communication.async.AsyncOperation; public class ProxyAsyncHttpClient extends AsyncHttpClientWithBase { + private final String proxyHost; private final int proxyPort; @@ -25,4 +26,5 @@ public class ProxyAsyncHttpClient extends AsyncHttpClientW path.append(r.getPath()); return client.execute(r.setHost(proxyHost).setPort(proxyPort).setPath(path.toString())); } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/RequestQueue.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/RequestQueue.java index 20192e63671..2a3af5724ab 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/RequestQueue.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/RequestQueue.java @@ -11,6 +11,7 @@ import java.util.logging.Logger; * Utility class to schedule HTTP requests and keeping a maximum amount of them pending at a time. */ public class RequestQueue { + private static final Logger log = Logger.getLogger(RequestQueue.class.getName()); private final AsyncHttpClient httpClient; private final LinkedList> requestQueue = new LinkedList<>(); @@ -82,4 +83,5 @@ public class RequestQueue { } } } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/SyncHttpClient.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/SyncHttpClient.java index 99a67cfd60a..b8890550dc6 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/SyncHttpClient.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/SyncHttpClient.java @@ -2,8 +2,10 @@ package com.yahoo.vespa.clustercontroller.utils.communication.http; public interface SyncHttpClient { - public HttpResult execute(HttpRequest r); + + HttpResult execute(HttpRequest r); /** Attempt to cancel all pending operations and shut down the client. */ - public void close(); + void close(); + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/TimeoutHandler.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/TimeoutHandler.java index 148a514d624..eae7e15541b 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/TimeoutHandler.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/TimeoutHandler.java @@ -12,6 +12,7 @@ import java.util.concurrent.TimeoutException; import java.util.logging.Logger; public class TimeoutHandler extends AsyncHttpClientWithBase { + public static class InternalRequest extends AsyncOperationImpl { final AsyncOperation operation; long startTime; @@ -146,4 +147,5 @@ public class TimeoutHandler extends AsyncHttpClientWithBas requests.values().remove(r); } } + } 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 7ec55a3e7a4..d60afe599c3 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 @@ -2,6 +2,7 @@ package com.yahoo.vespa.clustercontroller.utils.communication.http.writer; public class HttpWriter { + private final StringBuilder builder = new StringBuilder(); private String title = "Untitled page"; diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/InternalFailure.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/InternalFailure.java index 503d3e8835b..1b148755aec 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/InternalFailure.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/InternalFailure.java @@ -6,4 +6,5 @@ public class InternalFailure extends StateRestApiException { public InternalFailure(String description) { super("Internal failure. Should not happen: " + description); } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/InvalidContentException.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/InvalidContentException.java index ceba126ac58..c9f69226fa6 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/InvalidContentException.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/InvalidContentException.java @@ -8,4 +8,5 @@ public class InvalidContentException extends StateRestApiException { setHtmlCode(400); setHtmlStatus("Content of HTTP request had invalid data"); } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/InvalidOptionValueException.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/InvalidOptionValueException.java index 1fe5e70f651..f82c6866e82 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/InvalidOptionValueException.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/InvalidOptionValueException.java @@ -8,4 +8,5 @@ public class InvalidOptionValueException extends StateRestApiException { setHtmlCode(400); setHtmlStatus("Option '" + option + "' have invalid value '" + value + "'"); } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/MissingResourceException.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/MissingResourceException.java index 03a14bf9591..8176c0f1485 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/MissingResourceException.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/MissingResourceException.java @@ -5,7 +5,9 @@ package com.yahoo.vespa.clustercontroller.utils.staterestapi.errors; * @author hakonhall */ public class MissingResourceException extends StateRestApiException { + public MissingResourceException(String resource) { super("Missing resource '" + resource + "'"); } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/MissingUnitException.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/MissingUnitException.java index c84fbd3a631..c45ce2527cb 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/MissingUnitException.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/MissingUnitException.java @@ -18,4 +18,5 @@ public class MissingUnitException extends StateRestApiException { setHtmlCode(404); setHtmlStatus(getMessage()); } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/NotMasterException.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/NotMasterException.java index c361b6f59aa..94b5e62355b 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/NotMasterException.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/NotMasterException.java @@ -6,4 +6,5 @@ public abstract class NotMasterException extends StateRestApiException { public NotMasterException(String description) { super(description); } + } 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 0f8522d64eb..838bc4443b4 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 @@ -16,4 +16,5 @@ public class OperationNotSupportedForUnitException extends StateRestApiException setHtmlCode(405); setHtmlStatus("Operation not supported for resource"); } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/OtherMasterException.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/OtherMasterException.java index 3c6ea166bd6..df663521418 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/OtherMasterException.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/OtherMasterException.java @@ -2,6 +2,7 @@ package com.yahoo.vespa.clustercontroller.utils.staterestapi.errors; public class OtherMasterException extends NotMasterException { + private final String masterHost; private final int masterPort; @@ -13,4 +14,5 @@ public class OtherMasterException extends NotMasterException { public String getHost() { return masterHost; } public int getPort() { return masterPort; } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/StateRestApiException.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/StateRestApiException.java index 9c67d36eee3..b41354c77da 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/StateRestApiException.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/StateRestApiException.java @@ -2,6 +2,7 @@ package com.yahoo.vespa.clustercontroller.utils.staterestapi.errors; public abstract class StateRestApiException extends Exception { + private Integer htmlCode; private String htmlStatus; @@ -29,4 +30,5 @@ public abstract class StateRestApiException extends Exception { public Integer getCode() { return htmlCode; } public String getStatus() { return htmlStatus; } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/UnknownMasterException.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/UnknownMasterException.java index eade2e807c9..ede631626a5 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/UnknownMasterException.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/UnknownMasterException.java @@ -10,4 +10,5 @@ public class UnknownMasterException extends NotMasterException { public UnknownMasterException() { super("No known master cluster controller currently exists."); } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/requests/SetUnitStateRequest.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/requests/SetUnitStateRequest.java index 78552f62e06..d583e4ecc27 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/requests/SetUnitStateRequest.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/requests/SetUnitStateRequest.java @@ -61,4 +61,5 @@ public interface SetUnitStateRequest extends UnitRequest { } } ResponseWait getResponseWait(); + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/requests/UnitRequest.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/requests/UnitRequest.java index 2d211d87310..9b46d619651 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/requests/UnitRequest.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/requests/UnitRequest.java @@ -2,5 +2,7 @@ package com.yahoo.vespa.clustercontroller.utils.staterestapi.requests; public interface UnitRequest { + String[] getUnitPath(); + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/requests/UnitStateRequest.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/requests/UnitStateRequest.java index 4275a09c423..9f8842ee77c 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/requests/UnitStateRequest.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/requests/UnitStateRequest.java @@ -2,6 +2,7 @@ package com.yahoo.vespa.clustercontroller.utils.staterestapi.requests; public interface UnitStateRequest extends UnitRequest { - public int getRecursiveLevels(); + + int getRecursiveLevels(); } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/CurrentUnitState.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/CurrentUnitState.java index ed7d0c966df..e7af27fdf06 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/CurrentUnitState.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/CurrentUnitState.java @@ -4,5 +4,7 @@ package com.yahoo.vespa.clustercontroller.utils.staterestapi.response; import java.util.Map; public interface CurrentUnitState { - public Map getStatePerType(); + + Map getStatePerType(); + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/SetResponse.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/SetResponse.java index bda56c4b5a0..0f037397286 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/SetResponse.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/SetResponse.java @@ -3,9 +3,11 @@ package com.yahoo.vespa.clustercontroller.utils.staterestapi.response; /** * The response of a set operation. - * @author dybis + * + * @author Haakon Dybdahl */ public class SetResponse { + private final String reason; private final boolean wasModified; @@ -16,13 +18,16 @@ public class SetResponse { /** * Indicates if data was modified in a set operation. + * * @return true if modified. */ public boolean getWasModified() { return wasModified; } /** * Human readable reason. + * * @return reason as string */ public String getReason() { return reason; } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/SubUnitList.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/SubUnitList.java index 0fbbe5837a1..6a47d5079c3 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/SubUnitList.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/SubUnitList.java @@ -4,7 +4,9 @@ package com.yahoo.vespa.clustercontroller.utils.staterestapi.response; import java.util.Map; public interface SubUnitList { + /** id to link map. */ - public Map getSubUnitLinks(); - public Map getSubUnits(); + Map getSubUnitLinks(); + Map getSubUnits(); + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/UnitAttributes.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/UnitAttributes.java index 9d1e780e2a5..0cb19492747 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/UnitAttributes.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/UnitAttributes.java @@ -4,5 +4,7 @@ package com.yahoo.vespa.clustercontroller.utils.staterestapi.response; import java.util.Map; public interface UnitAttributes { - public Map getAttributeValues(); + + Map getAttributeValues(); + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/UnitMetrics.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/UnitMetrics.java index 770382951f5..8a2e126cdc0 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/UnitMetrics.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/UnitMetrics.java @@ -4,5 +4,7 @@ package com.yahoo.vespa.clustercontroller.utils.staterestapi.response; import java.util.Map; public interface UnitMetrics { - public Map getMetricMap(); + + Map getMetricMap(); + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/UnitResponse.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/UnitResponse.java index 43ce05f22b3..583820f5535 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/UnitResponse.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/UnitResponse.java @@ -4,8 +4,10 @@ package com.yahoo.vespa.clustercontroller.utils.staterestapi.response; import java.util.Map; public interface UnitResponse { - public UnitAttributes getAttributes(); - public CurrentUnitState getCurrentState(); - public Map getSubUnits(); - public UnitMetrics getMetrics(); + + UnitAttributes getAttributes(); + CurrentUnitState getCurrentState(); + Map getSubUnits(); + UnitMetrics getMetrics(); + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/UnitState.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/UnitState.java index 376bb0893a7..fa713acbdcc 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/UnitState.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/UnitState.java @@ -2,6 +2,8 @@ package com.yahoo.vespa.clustercontroller.utils.staterestapi.response; public interface UnitState { - public String getId(); - public String getReason(); + + String getId(); + String getReason(); + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/JsonReader.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/JsonReader.java index 04dcb582389..3d0856669f1 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/JsonReader.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/JsonReader.java @@ -12,6 +12,7 @@ import java.util.HashMap; import java.util.Map; public class JsonReader { + private static class UnitStateImpl implements UnitState { private final String id; private final String reason; diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/JsonWriter.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/JsonWriter.java index 8a08619d3c1..11b0dc33610 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/JsonWriter.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/JsonWriter.java @@ -8,6 +8,7 @@ import org.codehaus.jettison.json.JSONObject; import java.util.Map; public class JsonWriter { + private String pathPrefix = "/"; public JsonWriter() { @@ -100,4 +101,5 @@ public class JsonWriter { jsonObject.put("reason", setResponse.getReason()); return jsonObject; } + } 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 fcdf3214c45..395958063f5 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 @@ -18,6 +18,7 @@ import java.util.logging.Level; import java.util.logging.Logger; public class RestApiHandler implements HttpRequestHandler { + private final static Logger log = Logger.getLogger(RestApiHandler.class.getName()); private final StateRestAPI restApi; diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/test/FakeClock.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/test/FakeClock.java index 1639899cbdf..80f06b62675 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/test/FakeClock.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/test/FakeClock.java @@ -7,6 +7,7 @@ import java.util.logging.Logger; * Unit tests want to fast forward time to avoid waiting for time to pass */ public class FakeClock extends SettableClock { + private static final Logger logger = Logger.getLogger(FakeClock.class.getName()); protected long currentTime = 1; @@ -33,4 +34,5 @@ public class FakeClock extends SettableClock { currentTime = newTime; } } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/test/SettableClock.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/test/SettableClock.java index 51adc60a50b..12b398709f0 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/test/SettableClock.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/test/SettableClock.java @@ -4,6 +4,8 @@ package com.yahoo.vespa.clustercontroller.utils.test; import com.yahoo.vespa.clustercontroller.utils.util.Clock; public abstract class SettableClock extends Clock { + public abstract void set(long newTime); public abstract void adjust(long adjustment); + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/test/TestTransport.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/test/TestTransport.java index 861ee69e9aa..87ecd127e44 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/test/TestTransport.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/test/TestTransport.java @@ -23,6 +23,7 @@ import java.util.logging.Logger; * going through HTTP if you are using the HTTP abstraction layer in communication.http package. */ public class TestTransport { + private static final Logger log = Logger.getLogger(TestTransport.class.getName()); private static class Handler { HttpRequestHandler handler; diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/CertainlyCloneable.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/CertainlyCloneable.java index f19e9c6f57b..f133f2f231c 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/CertainlyCloneable.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/CertainlyCloneable.java @@ -6,6 +6,7 @@ package com.yahoo.vespa.clustercontroller.utils.util; * coverage, this class exist to hide the clone not supported exceptions that should never happen. */ public class CertainlyCloneable implements Cloneable { + @Override public Object clone() { try{ @@ -19,4 +20,5 @@ public class CertainlyCloneable implements Cloneable { protected Object callParentClone() throws CloneNotSupportedException { return super.clone(); } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/Clock.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/Clock.java index 06d9bef2cc6..b21ee3667d7 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/Clock.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/Clock.java @@ -5,7 +5,9 @@ package com.yahoo.vespa.clustercontroller.utils.util; * Wrap access to clock so that we can override it in unit tests */ public class Clock { + public long getTimeInMillis() { return System.currentTimeMillis(); } public int getTimeInSecs() { return (int)(getTimeInMillis() / 1000); } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/ComponentMetricReporter.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/ComponentMetricReporter.java index b55592cadc3..7985f6966d1 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/ComponentMetricReporter.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/ComponentMetricReporter.java @@ -8,6 +8,7 @@ import java.util.Map; import java.util.TreeMap; public class ComponentMetricReporter implements MetricReporter { + private final MetricReporter impl; private final String prefix; private final Map defaultDimensions = new TreeMap<>(); @@ -52,4 +53,5 @@ public class ComponentMetricReporter implements MetricReporter { } return impl.createContext(m); } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/JSONObjectWrapper.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/JSONObjectWrapper.java index 78d215e89b4..22b2797997a 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/JSONObjectWrapper.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/JSONObjectWrapper.java @@ -23,4 +23,5 @@ public class JSONObjectWrapper extends JSONObject { throw new NullPointerException(e.getMessage()); } } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/MetricReporter.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/MetricReporter.java index f9422081f05..a1bd0b61093 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/MetricReporter.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/MetricReporter.java @@ -7,11 +7,14 @@ package com.yahoo.vespa.clustercontroller.utils.util; * reports on to injected jdisc implementation. */ public interface MetricReporter { + void set(java.lang.String s, java.lang.Number number, Context context); void add(java.lang.String s, java.lang.Number number, Context context); Context createContext(java.util.Map dimensions); - static interface Context { + + interface Context { } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/NoMetricReporter.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/NoMetricReporter.java index a99ac04fbf7..3d0989beb90 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/NoMetricReporter.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/NoMetricReporter.java @@ -4,6 +4,7 @@ package com.yahoo.vespa.clustercontroller.utils.util; import java.util.Map; public class NoMetricReporter implements MetricReporter { + @Override public void set(String s, Number number, Context context) {} @@ -12,4 +13,5 @@ public class NoMetricReporter implements MetricReporter { @Override public Context createContext(Map stringMap) { return null; } + } -- cgit v1.2.3