aboutsummaryrefslogtreecommitdiffstats
path: root/clustercontroller-apputil
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2017-08-30 18:18:04 +0200
committerJon Bratseth <bratseth@yahoo-inc.com>2017-08-30 18:18:04 +0200
commit85afc7537760d00578bf4d528554fd2889995c13 (patch)
tree924d6bbf66f8e06ab67d0830f38135b7cfc78baf /clustercontroller-apputil
parent3bd91edd24abc7530f7362ac9ca6b2f703680bae (diff)
Nonfunctional changes
Diffstat (limited to 'clustercontroller-apputil')
-rw-r--r--clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/ApacheAsyncHttpClient.java4
-rw-r--r--clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/ApacheHttpInstance.java2
-rw-r--r--clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscHttpRequestHandler.java3
-rw-r--r--clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscMetricWrapper.java2
-rw-r--r--clustercontroller-apputil/src/test/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscMetricWrapperTest.java2
5 files changed, 12 insertions, 1 deletions
diff --git a/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/ApacheAsyncHttpClient.java b/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/ApacheAsyncHttpClient.java
index 89127b99d7c..11d746ef3ce 100644
--- a/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/ApacheAsyncHttpClient.java
+++ b/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/ApacheAsyncHttpClient.java
@@ -21,10 +21,13 @@ import java.util.logging.Logger;
* This class gets around these issues by creating one instance per unique setting, and ensuring only one request use a given instance at a time.
*/
public class ApacheAsyncHttpClient implements AsyncHttpClient<HttpResult> {
+
private static final Logger log = Logger.getLogger(ApacheAsyncHttpClient.class.getName());
+
public interface SyncHttpClientFactory {
SyncHttpClient createInstance(String proxyHost, int proxyPort, long timeoutMs);
}
+
public static class Settings {
String proxyHost;
int proxyPort;
@@ -176,4 +179,5 @@ public class ApacheAsyncHttpClient implements AsyncHttpClient<HttpResult> {
apacheInstances.clear();
}
}
+
}
diff --git a/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/ApacheHttpInstance.java b/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/ApacheHttpInstance.java
index 02195701243..3eafd2ae1d5 100644
--- a/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/ApacheHttpInstance.java
+++ b/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/ApacheHttpInstance.java
@@ -30,6 +30,7 @@ import org.apache.http.params.HttpParams;
* Synchronous http client using Apache commons.
*/
public class ApacheHttpInstance implements SyncHttpClient {
+
private static final Logger log = Logger.getLogger(ApacheHttpInstance.class.getName());
DefaultHttpClient client;
@@ -128,4 +129,5 @@ public class ApacheHttpInstance implements SyncHttpClient {
public void close() {
client.getConnectionManager().shutdown();
}
+
}
diff --git a/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscHttpRequestHandler.java b/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscHttpRequestHandler.java
index aa44845561e..1069bd79b4f 100644
--- a/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscHttpRequestHandler.java
+++ b/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscHttpRequestHandler.java
@@ -19,7 +19,7 @@ import java.util.logging.Logger;
/**
* Note. This class is tested through apache http instance test, using this as other endpoint.
- * @author humbe
+ * @author Haakon Humberset
* @author Harald Musum
* @author Vegard Sjonfjell
*/
@@ -124,4 +124,5 @@ public class JDiscHttpRequestHandler extends LoggingRequestHandler {
}
return headers;
}
+
}
diff --git a/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscMetricWrapper.java b/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscMetricWrapper.java
index 0f203dac3bf..559eaee4821 100644
--- a/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscMetricWrapper.java
+++ b/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscMetricWrapper.java
@@ -7,6 +7,7 @@ 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;
@@ -47,4 +48,5 @@ public class JDiscMetricWrapper implements MetricReporter {
return new ContextWrapper(m.createContext(stringMap));
}
}
+
}
diff --git a/clustercontroller-apputil/src/test/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscMetricWrapperTest.java b/clustercontroller-apputil/src/test/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscMetricWrapperTest.java
index 278f6a9e1fa..13abfa0ecd5 100644
--- a/clustercontroller-apputil/src/test/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscMetricWrapperTest.java
+++ b/clustercontroller-apputil/src/test/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscMetricWrapperTest.java
@@ -10,6 +10,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
public class JDiscMetricWrapperTest {
+
class MetricImpl implements Metric {
int calls = 0;
@Override
@@ -41,4 +42,5 @@ public class JDiscMetricWrapperTest {
assertEquals(5, impl2.calls);
}
+
}