summaryrefslogtreecommitdiffstats
path: root/clustercontroller-apps
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2022-01-15 00:16:45 +0100
committergjoranv <gv@verizonmedia.com>2022-01-17 17:03:16 +0100
commit1f4036d9bab5370bb78305b1e898aa1a608fb751 (patch)
tree7b2e0c80ebfcc2d9f71f60591dba0f74421709fc /clustercontroller-apps
parent1d2723348ba097db19b77efca99cd7fd09a0f4c3 (diff)
Extend ThreadedHttpReqHndlr instead of deprecated LoggingReqHndlr
Diffstat (limited to 'clustercontroller-apps')
-rw-r--r--clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscHttpRequestHandler.java6
-rw-r--r--clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StateRestApiV2HandlerTest.java2
-rw-r--r--clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StatusHandlerTest.java2
3 files changed, 5 insertions, 5 deletions
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 b0642e11fdf..939f09c9e33 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
@@ -1,7 +1,7 @@
// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.clustercontroller.apputil.communication.http;
-import com.yahoo.container.jdisc.LoggingRequestHandler;
+import com.yahoo.container.jdisc.ThreadedHttpRequestHandler;
import com.yahoo.jdisc.HeaderFields;
import com.yahoo.jdisc.Response;
import com.yahoo.jdisc.handler.CompletionHandler;
@@ -22,12 +22,12 @@ import java.util.logging.Logger;
* @author Harald Musum
* @author Vegard Sjonfjell
*/
-public class JDiscHttpRequestHandler extends LoggingRequestHandler {
+public class JDiscHttpRequestHandler extends ThreadedHttpRequestHandler {
private static final Logger log = Logger.getLogger(JDiscHttpRequestHandler.class.getName());
private final HttpRequestHandler requestHandler;
- public JDiscHttpRequestHandler(HttpRequestHandler handler, LoggingRequestHandler.Context parentCtx) {
+ public JDiscHttpRequestHandler(HttpRequestHandler handler, ThreadedHttpRequestHandler.Context parentCtx) {
super(parentCtx);
this.requestHandler = handler;
}
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 ab05819b625..bf759e3dc76 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
@@ -18,7 +18,7 @@ public class StateRestApiV2HandlerTest {
ClusterInfoConfig config = new ClusterInfoConfig(
new ClusterInfoConfig.Builder().clusterId("cluster-id").nodeCount(1));
ClusterInfoConfig.Builder clusterConfig = new ClusterInfoConfig.Builder();
- new StateRestApiV2Handler(controller, config, StateRestApiV2Handler.testOnlyContext());
+ new StateRestApiV2Handler(controller, config, StateRestApiV2Handler.testContext());
}
@Test
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 765ce109d93..7a204aa791d 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
public void testSimple() {
ClusterController controller = new ClusterController();
- StatusHandler handler = new StatusHandler(controller, StatusHandler.testOnlyContext());
+ StatusHandler handler = new StatusHandler(controller, StatusHandler.testContext());
}
}