diff options
58 files changed, 153 insertions, 111 deletions
diff --git a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/IdentityProviderRequestHandler.java b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/IdentityProviderRequestHandler.java index 4d37d263fab..941d8d46dcd 100644 --- a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/IdentityProviderRequestHandler.java +++ b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/IdentityProviderRequestHandler.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.google.inject.Inject; -import com.yahoo.container.jdisc.LoggingRequestHandler; +import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; import com.yahoo.restapi.RestApi; import com.yahoo.restapi.RestApiException; import com.yahoo.restapi.RestApiRequestHandler; @@ -27,7 +27,7 @@ public class IdentityProviderRequestHandler extends RestApiRequestHandler<Identi private final InstanceValidator instanceValidator; @Inject - public IdentityProviderRequestHandler(LoggingRequestHandler.Context context, + public IdentityProviderRequestHandler(ThreadedHttpRequestHandler.Context context, IdentityDocumentGenerator documentGenerator, InstanceValidator instanceValidator) { super(context, IdentityProviderRequestHandler::createRestApi); diff --git a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/ca/restapi/CertificateAuthorityApiHandler.java b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/ca/restapi/CertificateAuthorityApiHandler.java index fdb598639a7..85fdd6e6d43 100644 --- a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/ca/restapi/CertificateAuthorityApiHandler.java +++ b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/ca/restapi/CertificateAuthorityApiHandler.java @@ -4,7 +4,7 @@ package com.yahoo.vespa.hosted.ca.restapi; import com.google.inject.Inject; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; -import com.yahoo.container.jdisc.LoggingRequestHandler; +import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; import com.yahoo.container.jdisc.secretstore.SecretStore; import com.yahoo.jdisc.http.server.jetty.RequestUtils; @@ -50,7 +50,7 @@ import java.util.stream.Stream; * * @author mpolden */ -public class CertificateAuthorityApiHandler extends LoggingRequestHandler { +public class CertificateAuthorityApiHandler extends ThreadedHttpRequestHandler { private final SecretStore secretStore; private final Certificates certificates; 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()); } } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java index 982d886cbea..d6b4d9295f1 100755 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java @@ -173,8 +173,9 @@ public abstract class ContainerCluster<CONTAINER extends Container> addCommonVespaBundles(); - // TODO Vespa 8: remove LoggingRequestHandler.Context (replaced by ThreadedHttpRequestHandler.Context) - addSimpleComponent(com.yahoo.container.jdisc.LoggingRequestHandler.Context.class); + // TODO Vespa 8: remove LoggingRequestHandler.Context component if we can break binary compatibility + // (ThreadedHttpRequestHandler.Context is source compatible.) + addSimpleComponent("com.yahoo.container.jdisc.LoggingRequestHandler$Context"); addComponent(new StatisticsComponent()); addSimpleComponent(AccessLog.class); diff --git a/configserver-flags/src/main/java/com/yahoo/vespa/configserver/flags/http/FlagsHandler.java b/configserver-flags/src/main/java/com/yahoo/vespa/configserver/flags/http/FlagsHandler.java index 17ebeaf78a5..f77c0cbf932 100644 --- a/configserver-flags/src/main/java/com/yahoo/vespa/configserver/flags/http/FlagsHandler.java +++ b/configserver-flags/src/main/java/com/yahoo/vespa/configserver/flags/http/FlagsHandler.java @@ -4,8 +4,7 @@ package com.yahoo.vespa.configserver.flags.http; import com.google.inject.Inject; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; -import com.yahoo.container.jdisc.LoggingRequestHandler; -import java.util.logging.Level; +import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; import com.yahoo.restapi.ErrorResponse; import com.yahoo.restapi.Path; import com.yahoo.vespa.configserver.flags.FlagsDb; @@ -18,18 +17,19 @@ import com.yahoo.yolean.Exceptions; import java.io.UncheckedIOException; import java.net.URI; import java.util.Objects; +import java.util.logging.Level; /** * Handles /flags/v1 requests * * @author hakonhall */ -public class FlagsHandler extends LoggingRequestHandler { +public class FlagsHandler extends ThreadedHttpRequestHandler { private final FlagsDb flagsDb; @Inject - public FlagsHandler(LoggingRequestHandler.Context context, FlagsDb flagsDb) { + public FlagsHandler(ThreadedHttpRequestHandler.Context context, FlagsDb flagsDb) { super(context); this.flagsDb = flagsDb; } diff --git a/configserver-flags/src/test/java/com/yahoo/vespa/configserver/flags/http/FlagsHandlerTest.java b/configserver-flags/src/test/java/com/yahoo/vespa/configserver/flags/http/FlagsHandlerTest.java index b078b9a42f9..3ca0567a1c5 100644 --- a/configserver-flags/src/test/java/com/yahoo/vespa/configserver/flags/http/FlagsHandlerTest.java +++ b/configserver-flags/src/test/java/com/yahoo/vespa/configserver/flags/http/FlagsHandlerTest.java @@ -41,7 +41,7 @@ public class FlagsHandlerTest { private static final String FLAGS_V1_URL = "https://foo.com:4443/flags/v1"; private final FlagsDb flagsDb = new FlagsDbImpl(new MockCurator()); - private final FlagsHandler handler = new FlagsHandler(FlagsHandler.testOnlyContext(), flagsDb); + private final FlagsHandler handler = new FlagsHandler(FlagsHandler.testContext(), flagsDb); @Test public void testV1() { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpHandler.java index 9f4f8b5f9ce..190005771c7 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpHandler.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpHandler.java @@ -9,8 +9,8 @@ import com.yahoo.config.provision.exception.ActivationConflictException; import com.yahoo.config.provision.exception.LoadBalancerServiceException; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; -import com.yahoo.container.jdisc.LoggingRequestHandler; import com.yahoo.vespa.config.server.application.ConfigNotConvergedException; +import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; import com.yahoo.yolean.Exceptions; import java.io.PrintWriter; @@ -25,7 +25,7 @@ import java.util.logging.Level; * * @author hmusum */ -public class HttpHandler extends LoggingRequestHandler { +public class HttpHandler extends ThreadedHttpRequestHandler { public HttpHandler(HttpHandler.Context ctx) { super(ctx); diff --git a/configserver/src/main/java/com/yahoo/vespa/serviceview/StateRequestHandler.java b/configserver/src/main/java/com/yahoo/vespa/serviceview/StateRequestHandler.java index d81297a87e9..d3c19bb0ba5 100644 --- a/configserver/src/main/java/com/yahoo/vespa/serviceview/StateRequestHandler.java +++ b/configserver/src/main/java/com/yahoo/vespa/serviceview/StateRequestHandler.java @@ -3,7 +3,7 @@ package com.yahoo.vespa.serviceview; import com.google.inject.Inject; import com.yahoo.cloud.config.ConfigserverConfig; -import com.yahoo.container.jdisc.LoggingRequestHandler; +import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; import com.yahoo.restapi.RestApi; import com.yahoo.restapi.RestApiRequestHandler; import com.yahoo.restapi.UriBuilder; @@ -57,7 +57,7 @@ public class StateRequestHandler extends RestApiRequestHandler<StateRequestHandl } @Inject - public StateRequestHandler(LoggingRequestHandler.Context context, + public StateRequestHandler(ThreadedHttpRequestHandler.Context context, ConfigserverConfig configserverConfig) { super(context, StateRequestHandler::createRestApiDefinition); this.restApiPort = configserverConfig.httpport(); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpGetConfigHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpGetConfigHandlerTest.java index 8816e695e64..279f3a237e8 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpGetConfigHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpGetConfigHandlerTest.java @@ -63,7 +63,7 @@ public class HttpGetConfigHandlerTest { .withOrchestrator(new OrchestratorMock()) .withConfigserverConfig(configserverConfig) .build(); - handler = new HttpGetConfigHandler(HttpGetConfigHandler.testOnlyContext(), tenantRepository); + handler = new HttpGetConfigHandler(HttpGetConfigHandler.testContext(), tenantRepository); applicationRepository.deploy(testApp, prepareParams()); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpHandlerTest.java index 8f092ec9d54..40671294b4c 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpHandlerTest.java @@ -45,7 +45,7 @@ public class HttpHandlerTest { private static class HttpTestHandler extends HttpHandler { private final RuntimeException exception; HttpTestHandler(RuntimeException exception) { - super(HttpHandler.testOnlyContext()); + super(HttpHandler.testContext()); this.exception = exception; } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpListConfigsHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpListConfigsHandlerTest.java index 45c74f0d49f..520b4d0edc5 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpListConfigsHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpListConfigsHandlerTest.java @@ -70,7 +70,7 @@ public class HttpListConfigsHandlerTest { .build(); applicationRepository.deploy(testApp, prepareParams()); - HttpListConfigsHandler.Context ctx = HttpListConfigsHandler.testOnlyContext(); + HttpListConfigsHandler.Context ctx = HttpListConfigsHandler.testContext(); handler = new HttpListConfigsHandler(ctx, tenantRepository); namedHandler = new HttpListNamedConfigsHandler(ctx, tenantRepository); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/status/StatusHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/status/StatusHandlerTest.java index 18fa307a9d3..ed739d73860 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/status/StatusHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/status/StatusHandlerTest.java @@ -29,7 +29,7 @@ public class StatusHandlerTest { public void require_that_handler_works() throws IOException { ModelFactoryRegistry modelFactoryRegistry = new ModelFactoryRegistry(List.of(new VespaModelFactory(new NullConfigModelRegistry()))); ConfigserverConfig configserverConfig = new ConfigserverConfig.Builder().build(); - StatusHandler handler = new StatusHandler(StatusHandler.testOnlyContext(), modelFactoryRegistry, configserverConfig); + StatusHandler handler = new StatusHandler(StatusHandler.testContext(), modelFactoryRegistry, configserverConfig); HttpResponse response = handler.handle(HttpRequest.createTestRequest("/status", GET)); JsonNode jsonNode = mapper.readTree(SessionHandlerTest.getRenderedString(response)); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationContentHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationContentHandlerTest.java index 322a2b924bd..1d891c0547c 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationContentHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationContentHandlerTest.java @@ -69,7 +69,7 @@ public class ApplicationContentHandlerTest extends ContentHandlerTestBase { .build(); applicationRepository.deploy(testApp, prepareParams(appId1)); - handler = new ApplicationHandler(ApplicationHandler.testOnlyContext(), + handler = new ApplicationHandler(ApplicationHandler.testContext(), Zone.defaultZone(), applicationRepository); pathPrefix = createPath(appId1, Zone.defaultZone()); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java index 36930e27de4..005dd715dd4 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java @@ -756,7 +756,7 @@ public class ApplicationHandlerTest { "/environment/" + zone.environment().value() + "/region/" + zone.region().value() + "/instance/" + applicationId.instance().value() + "\"]"; - ListApplicationsHandler listApplicationsHandler = new ListApplicationsHandler(ListApplicationsHandler.testOnlyContext(), + ListApplicationsHandler listApplicationsHandler = new ListApplicationsHandler(ListApplicationsHandler.testContext(), tenantRepository, Zone.defaultZone()); ListApplicationsHandlerTest.assertResponse(listApplicationsHandler, @@ -808,7 +808,7 @@ public class ApplicationHandlerTest { } private ApplicationHandler createApplicationHandler(ApplicationRepository applicationRepository) { - return new ApplicationHandler(ApplicationHandler.testOnlyContext(), Zone.defaultZone(), applicationRepository); + return new ApplicationHandler(ApplicationHandler.testContext(), Zone.defaultZone(), applicationRepository); } private PrepareParams prepareParams(ApplicationId applicationId) { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HostHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HostHandlerTest.java index 6bbbc451094..fbc5e87c329 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HostHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HostHandlerTest.java @@ -62,7 +62,7 @@ public class HostHandlerTest { .withOrchestrator(new OrchestratorMock()) .withConfigserverConfig(configserverConfig) .build(); - handler = new HostHandler(HostHandler.testOnlyContext(), applicationRepository); + handler = new HostHandler(HostHandler.testContext(), applicationRepository); } @Test diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpGetConfigHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpGetConfigHandlerTest.java index 3d207f9f64a..9aae64cb884 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpGetConfigHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpGetConfigHandlerTest.java @@ -72,7 +72,7 @@ public class HttpGetConfigHandlerTest { .withOrchestrator(new OrchestratorMock()) .withConfigserverConfig(configserverConfig) .build(); - handler = new HttpGetConfigHandler(HttpGetConfigHandler.testOnlyContext(), tenantRepository); + handler = new HttpGetConfigHandler(HttpGetConfigHandler.testContext(), tenantRepository); applicationRepository.deploy(testApp, prepareParams()); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpListConfigsHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpListConfigsHandlerTest.java index 141f8a52f13..2ee1064f614 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpListConfigsHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpListConfigsHandlerTest.java @@ -76,10 +76,10 @@ public class HttpListConfigsHandlerTest { .withConfigserverConfig(configserverConfig) .build(); applicationRepository.deploy(testApp, prepareParams()); - handler = new HttpListConfigsHandler(HttpListConfigsHandler.testOnlyContext(), + handler = new HttpListConfigsHandler(HttpListConfigsHandler.testContext(), tenantRepository, Zone.defaultZone()); - namedHandler = new HttpListNamedConfigsHandler(HttpListConfigsHandler.testOnlyContext(), + namedHandler = new HttpListNamedConfigsHandler(HttpListConfigsHandler.testContext(), tenantRepository, Zone.defaultZone()); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandlerTest.java index e2ad65786a4..76790e6264d 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandlerTest.java @@ -55,7 +55,7 @@ public class ListApplicationsHandlerTest { tenantRepository.addTenant(foobar); applicationRepo = tenantRepository.getTenant(mytenant).getApplicationRepo(); applicationRepo2 = tenantRepository.getTenant(foobar).getApplicationRepo(); - handler = new ListApplicationsHandler(ListApplicationsHandler.testOnlyContext(), + handler = new ListApplicationsHandler(ListApplicationsHandler.testContext(), tenantRepository, new Zone(Environment.dev, RegionName.from("us-east"))); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java index c6f84c2d6ae..ecb8d7603f6 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java @@ -164,7 +164,7 @@ public class SessionActiveHandlerTest { } private SessionActiveHandler createHandler() { - return new SessionActiveHandler(SessionActiveHandler.testOnlyContext(), + return new SessionActiveHandler(SessionActiveHandler.testContext(), applicationRepository, Zone.defaultZone()); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionContentHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionContentHandlerTest.java index f13ec6cd5c8..ec96be0d0c8 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionContentHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionContentHandlerTest.java @@ -183,7 +183,7 @@ public class SessionContentHandlerTest extends ContentHandlerTestBase { private SessionContentHandler createHandler() { return new SessionContentHandler( - SessionContentHandler.testOnlyContext(), + SessionContentHandler.testContext(), new ApplicationRepository.Builder() .withTenantRepository(tenantRepository) .withProvisioner(new MockProvisioner()) diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java index 4cb69ce5d20..702dd2792da 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java @@ -195,7 +195,7 @@ public class SessionCreateHandlerTest extends SessionHandlerTest { } private SessionCreateHandler createHandler() { - return new SessionCreateHandler(SessionCreateHandler.testOnlyContext(), + return new SessionCreateHandler(SessionCreateHandler.testContext(), applicationRepository, configserverConfig); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java index 4a19e8d16fb..3d2e108a75e 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java @@ -247,7 +247,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest { public void test_out_of_capacity_response() throws IOException { long sessionId = applicationRepository.createSession(applicationId(), timeoutBudget, app); String exceptionMessage = "Out of capacity"; - FailingSessionPrepareHandler handler = new FailingSessionPrepareHandler(SessionPrepareHandler.testOnlyContext(), + FailingSessionPrepareHandler handler = new FailingSessionPrepareHandler(SessionPrepareHandler.testContext(), applicationRepository, configserverConfig, new OutOfCapacityException(exceptionMessage)); @@ -262,7 +262,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest { public void test_that_nullpointerexception_gives_internal_server_error() throws IOException { long sessionId = applicationRepository.createSession(applicationId(), timeoutBudget, app); String exceptionMessage = "nullpointer thrown in test handler"; - FailingSessionPrepareHandler handler = new FailingSessionPrepareHandler(SessionPrepareHandler.testOnlyContext(), + FailingSessionPrepareHandler handler = new FailingSessionPrepareHandler(SessionPrepareHandler.testContext(), applicationRepository, configserverConfig, new NullPointerException(exceptionMessage)); @@ -277,7 +277,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest { public void test_application_lock_failure() throws IOException { String exceptionMessage = "Timed out after waiting PT1M to acquire lock '/provision/v1/locks/foo/bar/default'"; long sessionId = applicationRepository.createSession(applicationId(), timeoutBudget, app); - FailingSessionPrepareHandler handler = new FailingSessionPrepareHandler(SessionPrepareHandler.testOnlyContext(), + FailingSessionPrepareHandler handler = new FailingSessionPrepareHandler(SessionPrepareHandler.testContext(), applicationRepository, configserverConfig, new ApplicationLockException(new UncheckedTimeoutException(exceptionMessage))); @@ -314,7 +314,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest { } private SessionHandler createHandler() { - return new SessionPrepareHandler(SessionPrepareHandler.testOnlyContext(), applicationRepository, configserverConfig); + return new SessionPrepareHandler(SessionPrepareHandler.testContext(), applicationRepository, configserverConfig); } private HttpResponse request(HttpRequest.Method put, long l) { diff --git a/container-core/src/main/java/com/yahoo/container/handler/test/MockService.java b/container-core/src/main/java/com/yahoo/container/handler/test/MockService.java index b8175802ff7..805da3a0a0f 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/test/MockService.java +++ b/container-core/src/main/java/com/yahoo/container/handler/test/MockService.java @@ -4,7 +4,7 @@ package com.yahoo.container.handler.test; import com.yahoo.api.annotations.Beta; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; -import com.yahoo.container.jdisc.LoggingRequestHandler; +import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; import com.yahoo.filedistribution.fileacquirer.FileAcquirer; import com.yahoo.jdisc.Metric; @@ -39,7 +39,7 @@ import java.util.concurrent.TimeUnit; * @author Ulf Lilleengen */ @Beta -public class MockService extends LoggingRequestHandler { +public class MockService extends ThreadedHttpRequestHandler { private final MockServiceHandler handler; diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/LoggingRequestHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/LoggingRequestHandler.java index b6e370dd911..c6735559429 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/LoggingRequestHandler.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/LoggingRequestHandler.java @@ -25,8 +25,11 @@ import java.util.logging.Level; * ThreadedHttpRequestHandler with access logging. * * @author Steinar Knutsen + * + * @deprecated Use {@link ThreadedHttpRequestHandler}, which provides the same level of functionality. */ // TODO Vespa 8: Remove deprecated constructors +@Deprecated public abstract class LoggingRequestHandler extends ThreadedHttpRequestHandler { // TODO: Deprecate @@ -58,7 +61,6 @@ public abstract class LoggingRequestHandler extends ThreadedHttpRequestHandler { } - // TODO: Deprecate public static Context testOnlyContext() { return new Context(new Executor() { @Override diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java index 722f1850013..8986fa596b8 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java @@ -3,6 +3,7 @@ package com.yahoo.container.jdisc; import com.google.inject.Inject; import com.yahoo.container.logging.AccessLog; +import com.yahoo.container.logging.AccessLogEntry; import com.yahoo.jdisc.Metric; import com.yahoo.jdisc.Request; import com.yahoo.jdisc.handler.BufferedContentChannel; @@ -10,7 +11,10 @@ import com.yahoo.jdisc.handler.CompletionHandler; import com.yahoo.jdisc.handler.ContentChannel; import com.yahoo.jdisc.handler.UnsafeContentInputStream; import com.yahoo.jdisc.handler.ResponseHandler; +import com.yahoo.jdisc.http.server.jetty.AccessLoggingRequestHandler; +import com.yahoo.yolean.Exceptions; +import java.util.Optional; import java.util.logging.Level; import java.io.IOException; @@ -244,7 +248,7 @@ public abstract class ThreadedHttpRequestHandler extends ThreadedRequestHandler HttpResponse response, HttpRequest httpRequest, ContentChannelOutputStream rendererWiring) { - return null; + return new ResponseLogger(httpRequest, response); } protected com.yahoo.jdisc.http.HttpRequest asHttpRequest(Request request) { @@ -287,4 +291,39 @@ public abstract class ThreadedHttpRequestHandler extends ThreadedRequestHandler } + + private class ResponseLogger implements LoggingCompletionHandler { + + private final com.yahoo.jdisc.http.HttpRequest jdiscRequest; + private final HttpResponse httpResponse; + + ResponseLogger(HttpRequest httpRequest, HttpResponse httpResponse) { + this.jdiscRequest = httpRequest.getJDiscRequest(); + this.httpResponse = httpResponse; + } + + @Override + public void markCommitStart() { } + + @Override + public void completed() { + writeToAccessLog(); + } + + @Override + public void failed(Throwable throwable) { + writeToAccessLog(); + log.log(Level.FINE, () -> "Got exception when writing to client: " + Exceptions.toMessageString(throwable)); + } + + private void writeToAccessLog() { + Optional<AccessLogEntry> jdiscReqAccessLogEntry = AccessLoggingRequestHandler.getAccessLogEntry(jdiscRequest); + AccessLogEntry entry; + if (jdiscReqAccessLogEntry.isPresent()) { + entry = jdiscReqAccessLogEntry.get(); + httpResponse.populateAccessLogEntry(entry); + } + } + } + } diff --git a/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java b/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java index 9b9224e70ef..7b5187bdae2 100644 --- a/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java +++ b/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java @@ -43,6 +43,7 @@ import static com.yahoo.component.chain.ChainsConfigurer.prepareChainRegistry; * @author Tony Vaagenes * @author Steinar Knutsen */ +@SuppressWarnings("deprecation") // super class is deprecated public abstract class AbstractProcessingHandler<COMPONENT extends Processor> extends LoggingRequestHandler { private final static CompoundName freezeListenerKey =new CompoundName("processing.freezeListener"); diff --git a/container-core/src/main/java/com/yahoo/restapi/RestApiRequestHandler.java b/container-core/src/main/java/com/yahoo/restapi/RestApiRequestHandler.java index b126fbd16e4..001d00c2b37 100644 --- a/container-core/src/main/java/com/yahoo/restapi/RestApiRequestHandler.java +++ b/container-core/src/main/java/com/yahoo/restapi/RestApiRequestHandler.java @@ -3,7 +3,7 @@ package com.yahoo.restapi; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; -import com.yahoo.container.jdisc.LoggingRequestHandler; +import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; import com.yahoo.container.jdisc.RequestHandlerSpec; import com.yahoo.jdisc.Metric; @@ -12,7 +12,7 @@ import java.util.concurrent.Executor; /** * @author bjorncs */ -public abstract class RestApiRequestHandler<T extends RestApiRequestHandler<T>> extends LoggingRequestHandler { +public abstract class RestApiRequestHandler<T extends RestApiRequestHandler<T>> extends ThreadedHttpRequestHandler { private final RestApi restApi; @@ -24,7 +24,7 @@ public abstract class RestApiRequestHandler<T extends RestApiRequestHandler<T>> * Caller must ensure that provider instance does not try to access any uninitialized fields. */ @SuppressWarnings("unchecked") - protected RestApiRequestHandler(LoggingRequestHandler.Context context, RestApiProvider<T> provider) { + protected RestApiRequestHandler(ThreadedHttpRequestHandler.Context context, RestApiProvider<T> provider) { super(context); this.restApi = provider.createRestApi((T)this); } @@ -38,7 +38,7 @@ public abstract class RestApiRequestHandler<T extends RestApiRequestHandler<T>> this.restApi = provider.createRestApi((T)this); } - protected RestApiRequestHandler(LoggingRequestHandler.Context context, RestApi restApi) { + protected RestApiRequestHandler(ThreadedHttpRequestHandler.Context context, RestApi restApi) { super(context); this.restApi = restApi; } diff --git a/container-core/src/main/java/com/yahoo/restapi/RestApiTestDriver.java b/container-core/src/main/java/com/yahoo/restapi/RestApiTestDriver.java index ad943407743..bd693e47eda 100644 --- a/container-core/src/main/java/com/yahoo/restapi/RestApiTestDriver.java +++ b/container-core/src/main/java/com/yahoo/restapi/RestApiTestDriver.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; -import com.yahoo.container.jdisc.LoggingRequestHandler; +import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; import com.yahoo.jdisc.http.server.jetty.testutils.TestDriver; import com.yahoo.jdisc.test.MockMetric; @@ -34,11 +34,11 @@ public class RestApiTestDriver implements AutoCloseable { public static Builder newBuilder(RestApiRequestHandler<?> handler) { return new Builder(handler); } - @FunctionalInterface public interface RestApiRequestHandlerFactory { RestApiRequestHandler<?> create(LoggingRequestHandler.Context context); } + @FunctionalInterface public interface RestApiRequestHandlerFactory { RestApiRequestHandler<?> create(ThreadedHttpRequestHandler.Context context); } public static Builder newBuilder(RestApiRequestHandlerFactory factory) { return new Builder(factory); } - public static LoggingRequestHandler.Context createHandlerTestContext() { - return new LoggingRequestHandler.Context(Executors.newSingleThreadExecutor(), new MockMetric()); + public static ThreadedHttpRequestHandler.Context createHandlerTestContext() { + return new ThreadedHttpRequestHandler.Context(Executors.newSingleThreadExecutor(), new MockMetric()); } public OptionalInt listenPort() { diff --git a/container-core/src/test/java/com/yahoo/container/jdisc/LoggingRequestHandlerTestCase.java b/container-core/src/test/java/com/yahoo/container/jdisc/LoggingRequestHandlerTestCase.java index 4563000793d..5f46184bf89 100644 --- a/container-core/src/test/java/com/yahoo/container/jdisc/LoggingRequestHandlerTestCase.java +++ b/container-core/src/test/java/com/yahoo/container/jdisc/LoggingRequestHandlerTestCase.java @@ -97,7 +97,7 @@ public class LoggingRequestHandlerTestCase { } } - static final class AccessLogTestHandler extends LoggingRequestHandler { + static final class AccessLogTestHandler extends ThreadedHttpRequestHandler { public AccessLogTestHandler(Executor executor) { super(executor); diff --git a/container-search-gui/src/main/java/com/yahoo/search/query/gui/GUIHandler.java b/container-search-gui/src/main/java/com/yahoo/search/query/gui/GUIHandler.java index cc473a030c4..b2b9dd47514 100644 --- a/container-search-gui/src/main/java/com/yahoo/search/query/gui/GUIHandler.java +++ b/container-search-gui/src/main/java/com/yahoo/search/query/gui/GUIHandler.java @@ -8,7 +8,7 @@ import com.google.inject.Inject; import com.yahoo.container.QrSearchersConfig; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; -import com.yahoo.container.jdisc.LoggingRequestHandler; +import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; import com.yahoo.prelude.IndexModel; import com.yahoo.prelude.querytransform.RecallSearcher; import com.yahoo.restapi.Path; @@ -36,7 +36,7 @@ import java.util.logging.Level; * * @author Henrik Høiness */ -public class GUIHandler extends LoggingRequestHandler { +public class GUIHandler extends ThreadedHttpRequestHandler { private static final ObjectMapper jsonMapper = new ObjectMapper(); diff --git a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java index 8925c647ad2..b65953935f0 100644 --- a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java +++ b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java @@ -1,8 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.handler; -import ai.vespa.cloud.Environment; -import ai.vespa.cloud.Zone; import com.google.inject.Inject; import com.yahoo.collections.Tuple2; import com.yahoo.component.ComponentSpecification; @@ -75,6 +73,7 @@ import java.util.logging.Logger; * @author Steinar Knutsen * @author bratseth */ +@SuppressWarnings("deprecation") // super class is deprecated public class SearchHandler extends LoggingRequestHandler { private static final Logger log = Logger.getLogger(SearchHandler.class.getName()); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/auditlog/AuditLoggingRequestHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/auditlog/AuditLoggingRequestHandler.java index 6d0b8d751ed..cb2fca3e411 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/auditlog/AuditLoggingRequestHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/auditlog/AuditLoggingRequestHandler.java @@ -3,7 +3,7 @@ package com.yahoo.vespa.hosted.controller.auditlog; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; -import com.yahoo.container.jdisc.LoggingRequestHandler; +import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; import com.yahoo.jdisc.handler.ContentChannel; /** @@ -12,7 +12,7 @@ import com.yahoo.jdisc.handler.ContentChannel; * * @author mpolden */ -public abstract class AuditLoggingRequestHandler extends LoggingRequestHandler { +public abstract class AuditLoggingRequestHandler extends ThreadedHttpRequestHandler { private final AuditLogger auditLogger; diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java index d54c3c770ba..b170a1cbb68 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java @@ -23,7 +23,7 @@ import com.yahoo.config.provision.zone.ZoneId; import com.yahoo.container.handler.metrics.JsonResponse; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; -import com.yahoo.container.jdisc.LoggingRequestHandler; +import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; import com.yahoo.io.IOUtils; import com.yahoo.restapi.ByteArrayResponse; import com.yahoo.restapi.ErrorResponse; @@ -172,7 +172,7 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler { private final TestConfigSerializer testConfigSerializer; @Inject - public ApplicationApiHandler(LoggingRequestHandler.Context parentCtx, + public ApplicationApiHandler(ThreadedHttpRequestHandler.Context parentCtx, Controller controller, AccessControlRequests accessControlRequests) { super(parentCtx, controller.auditLogger()); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java index 3afc2c8fc15..45c4978ab9f 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java @@ -4,7 +4,7 @@ package com.yahoo.vespa.hosted.controller.restapi.billing; import com.yahoo.config.provision.TenantName; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; -import com.yahoo.container.jdisc.LoggingRequestHandler; +import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; import com.yahoo.restapi.ErrorResponse; import com.yahoo.restapi.JacksonJsonResponse; import com.yahoo.restapi.MessageResponse; @@ -49,7 +49,7 @@ import java.util.stream.Collectors; * @author andreer * @author olaa */ -public class BillingApiHandler extends LoggingRequestHandler { +public class BillingApiHandler extends ThreadedHttpRequestHandler { private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd"); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerV2.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerV2.java index f18d38e971b..07e3fbe1bb2 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerV2.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerV2.java @@ -3,7 +3,7 @@ package com.yahoo.vespa.hosted.controller.restapi.billing; import com.yahoo.config.provision.TenantName; import com.yahoo.container.jdisc.HttpResponse; -import com.yahoo.container.jdisc.LoggingRequestHandler; +import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; import com.yahoo.restapi.MessageResponse; import com.yahoo.restapi.RestApi; import com.yahoo.restapi.RestApiException; @@ -48,7 +48,7 @@ public class BillingApiHandlerV2 extends RestApiRequestHandler<BillingApiHandler private final BillingController billing; private final Clock clock; - public BillingApiHandlerV2(LoggingRequestHandler.Context context, Controller controller) { + public BillingApiHandlerV2(ThreadedHttpRequestHandler.Context context, Controller controller) { super(context, BillingApiHandlerV2::createRestApi); this.applications = controller.applications(); this.tenants = controller.tenants(); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/ChangeManagementApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/ChangeManagementApiHandler.java index 0ea8d09ba09..e1fc68974cc 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/ChangeManagementApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/ChangeManagementApiHandler.java @@ -6,7 +6,7 @@ import com.yahoo.config.provision.HostName; import com.yahoo.config.provision.zone.ZoneId; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; -import com.yahoo.container.jdisc.LoggingRequestHandler; +import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; import com.yahoo.restapi.ErrorResponse; import com.yahoo.restapi.Path; import com.yahoo.restapi.SlimeJsonResponse; @@ -37,7 +37,7 @@ public class ChangeManagementApiHandler extends AuditLoggingRequestHandler { private final ChangeManagementAssessor assessor; private final Controller controller; - public ChangeManagementApiHandler(LoggingRequestHandler.Context ctx, Controller controller) { + public ChangeManagementApiHandler(ThreadedHttpRequestHandler.Context ctx, Controller controller) { super(ctx, controller.auditLogger()); this.assessor = new ChangeManagementAssessor(controller.serviceRegistry().configServer().nodeRepository()); this.controller = controller; diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiHandler.java index 7c1f049548a..951a22c5ee7 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiHandler.java @@ -6,7 +6,7 @@ import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.zone.ZoneId; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; -import com.yahoo.container.jdisc.LoggingRequestHandler; +import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; import com.yahoo.io.IOUtils; import com.yahoo.restapi.ErrorResponse; import com.yahoo.restapi.MessageResponse; @@ -51,7 +51,7 @@ public class ControllerApiHandler extends AuditLoggingRequestHandler { private final ControllerMaintenance maintenance; private final Controller controller; - public ControllerApiHandler(LoggingRequestHandler.Context parentCtx, Controller controller, ControllerMaintenance maintenance) { + public ControllerApiHandler(ThreadedHttpRequestHandler.Context parentCtx, Controller controller, ControllerMaintenance maintenance) { super(parentCtx, controller.auditLogger()); this.controller = controller; this.maintenance = maintenance; diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/BadgeApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/BadgeApiHandler.java index 3047d1ed234..eb74f931b2c 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/BadgeApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/BadgeApiHandler.java @@ -4,7 +4,7 @@ package com.yahoo.vespa.hosted.controller.restapi.deployment; import com.yahoo.config.provision.ApplicationId; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; -import com.yahoo.container.jdisc.LoggingRequestHandler; +import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; import com.yahoo.jdisc.http.HttpRequest.Method; import com.yahoo.restapi.ErrorResponse; import com.yahoo.restapi.Path; @@ -36,7 +36,7 @@ import static java.nio.charset.StandardCharsets.UTF_8; * @author jonmv */ @SuppressWarnings("unused") // Handler -public class BadgeApiHandler extends LoggingRequestHandler { +public class BadgeApiHandler extends ThreadedHttpRequestHandler { private final static Logger log = Logger.getLogger(BadgeApiHandler.class.getName()); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java index b5008a44c6d..5a6d929b054 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java @@ -6,7 +6,7 @@ import com.yahoo.config.application.api.DeploymentSpec; import com.yahoo.config.provision.ApplicationId; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; -import com.yahoo.container.jdisc.LoggingRequestHandler; +import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; import com.yahoo.restapi.ErrorResponse; import com.yahoo.restapi.Path; import com.yahoo.restapi.SlimeJsonResponse; @@ -47,11 +47,11 @@ import static java.util.stream.Collectors.toUnmodifiableMap; * @author bratseth */ @SuppressWarnings("unused") // Injected -public class DeploymentApiHandler extends LoggingRequestHandler { +public class DeploymentApiHandler extends ThreadedHttpRequestHandler { private final Controller controller; - public DeploymentApiHandler(LoggingRequestHandler.Context parentCtx, Controller controller) { + public DeploymentApiHandler(ThreadedHttpRequestHandler.Context parentCtx, Controller controller) { super(parentCtx); this.controller = controller; } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/horizon/HorizonApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/horizon/HorizonApiHandler.java index 44871cc58ce..708891c8251 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/horizon/HorizonApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/horizon/HorizonApiHandler.java @@ -6,7 +6,7 @@ import com.yahoo.config.provision.SystemName; import com.yahoo.config.provision.TenantName; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; -import com.yahoo.container.jdisc.LoggingRequestHandler; +import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; import com.yahoo.restapi.ErrorResponse; import com.yahoo.restapi.Path; import com.yahoo.vespa.flags.BooleanFlag; @@ -36,7 +36,7 @@ import java.util.stream.Collectors; * * @author valerijf */ -public class HorizonApiHandler extends LoggingRequestHandler { +public class HorizonApiHandler extends ThreadedHttpRequestHandler { private final SystemName systemName; private final HorizonClient client; @@ -46,7 +46,7 @@ public class HorizonApiHandler extends LoggingRequestHandler { EnumSet.of(RoleDefinition.hostedOperator, RoleDefinition.hostedSupporter); @Inject - public HorizonApiHandler(LoggingRequestHandler.Context parentCtx, Controller controller, FlagSource flagSource) { + public HorizonApiHandler(ThreadedHttpRequestHandler.Context parentCtx, Controller controller, FlagSource flagSource) { super(parentCtx); this.systemName = controller.system(); this.client = controller.serviceRegistry().horizonClient(); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsHandler.java index 4e0ace507c3..e0097c295c7 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsHandler.java @@ -4,7 +4,7 @@ package com.yahoo.vespa.hosted.controller.restapi.systemflags; import com.google.inject.Inject; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; -import com.yahoo.container.jdisc.LoggingRequestHandler; +import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; import com.yahoo.restapi.ErrorResponse; import com.yahoo.restapi.JacksonJsonResponse; import com.yahoo.restapi.Path; @@ -22,7 +22,7 @@ import java.util.logging.Level; * @author bjorncs */ @SuppressWarnings("unused") // Request handler listed in controller's services.xml -public class SystemFlagsHandler extends LoggingRequestHandler { +public class SystemFlagsHandler extends ThreadedHttpRequestHandler { private static final String API_PREFIX = "/system-flags/v1"; diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java index 7e9ae036cc7..33e6632b8e1 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java @@ -7,7 +7,7 @@ import com.yahoo.config.provision.InstanceName; import com.yahoo.config.provision.TenantName; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; -import com.yahoo.container.jdisc.LoggingRequestHandler; +import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; import com.yahoo.io.IOUtils; import com.yahoo.restapi.ErrorResponse; import com.yahoo.restapi.MessageResponse; @@ -62,7 +62,7 @@ import java.util.stream.Collectors; * @author jonmv */ @SuppressWarnings("unused") // Handler -public class UserApiHandler extends LoggingRequestHandler { +public class UserApiHandler extends ThreadedHttpRequestHandler { private final static Logger log = Logger.getLogger(UserApiHandler.class.getName()); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/zone/v1/ZoneApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/zone/v1/ZoneApiHandler.java index 0ac4380f560..5b165a9ef37 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/zone/v1/ZoneApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/zone/v1/ZoneApiHandler.java @@ -6,7 +6,7 @@ import com.yahoo.config.provision.RegionName; import com.yahoo.config.provision.zone.ZoneApi; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; -import com.yahoo.container.jdisc.LoggingRequestHandler; +import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; import com.yahoo.slime.Cursor; import com.yahoo.slime.Slime; import com.yahoo.vespa.hosted.controller.api.integration.ServiceRegistry; @@ -27,11 +27,11 @@ import java.util.stream.Collectors; * @author mpolden */ @SuppressWarnings("unused") -public class ZoneApiHandler extends LoggingRequestHandler { +public class ZoneApiHandler extends ThreadedHttpRequestHandler { private final ZoneRegistry zoneRegistry; - public ZoneApiHandler(LoggingRequestHandler.Context parentCtx, ServiceRegistry serviceRegistry) { + public ZoneApiHandler(ThreadedHttpRequestHandler.Context parentCtx, ServiceRegistry serviceRegistry) { super(parentCtx); this.zoneRegistry = serviceRegistry.zoneRegistry(); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiHandler.java index 510635b005b..a7416cfa0ed 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiHandler.java @@ -5,7 +5,7 @@ import com.yahoo.config.provision.zone.ZoneId; import com.yahoo.config.provision.zone.ZoneList; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; -import com.yahoo.container.jdisc.LoggingRequestHandler; +import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; import com.yahoo.restapi.ErrorResponse; import com.yahoo.restapi.Path; import com.yahoo.restapi.SlimeJsonResponse; @@ -34,7 +34,7 @@ public class ZoneApiHandler extends AuditLoggingRequestHandler { private final ZoneRegistry zoneRegistry; private final ConfigServerRestExecutor proxy; - public ZoneApiHandler(LoggingRequestHandler.Context parentCtx, ServiceRegistry serviceRegistry, + public ZoneApiHandler(ThreadedHttpRequestHandler.Context parentCtx, ServiceRegistry serviceRegistry, ConfigServerRestExecutor proxy, Controller controller) { super(parentCtx, controller.auditLogger()); this.zoneRegistry = serviceRegistry.zoneRegistry(); diff --git a/jdisc-cloud-aws/src/main/java/com/yahoo/jdisc/cloud/aws/AwsParameterStoreValidationHandler.java b/jdisc-cloud-aws/src/main/java/com/yahoo/jdisc/cloud/aws/AwsParameterStoreValidationHandler.java index 387088d10b4..299bf2facc5 100644 --- a/jdisc-cloud-aws/src/main/java/com/yahoo/jdisc/cloud/aws/AwsParameterStoreValidationHandler.java +++ b/jdisc-cloud-aws/src/main/java/com/yahoo/jdisc/cloud/aws/AwsParameterStoreValidationHandler.java @@ -4,14 +4,14 @@ package com.yahoo.jdisc.cloud.aws; import com.google.inject.Inject; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; -import com.yahoo.container.jdisc.LoggingRequestHandler; +import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; import com.yahoo.io.IOUtils; +import com.yahoo.jdisc.cloud.aws.AwsParameterStore.AwsSettings; import com.yahoo.restapi.ErrorResponse; import com.yahoo.restapi.SlimeJsonResponse; import com.yahoo.slime.Slime; import com.yahoo.slime.SlimeUtils; import com.yahoo.yolean.Exceptions; -import com.yahoo.jdisc.cloud.aws.AwsParameterStore.AwsSettings; import java.io.IOException; import java.io.InputStream; @@ -25,7 +25,7 @@ import java.util.logging.Logger; * * @author ogronnesby */ -public class AwsParameterStoreValidationHandler extends LoggingRequestHandler { +public class AwsParameterStoreValidationHandler extends ThreadedHttpRequestHandler { private static final Logger log = Logger.getLogger(AwsParameterStoreValidationHandler.class.getName()); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LoadBalancersV1ApiHandler.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LoadBalancersV1ApiHandler.java index aa6209ae80d..1ba686772c7 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LoadBalancersV1ApiHandler.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LoadBalancersV1ApiHandler.java @@ -2,7 +2,7 @@ package com.yahoo.vespa.hosted.provision.restapi; import com.yahoo.container.jdisc.HttpResponse; -import com.yahoo.container.jdisc.LoggingRequestHandler; +import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; import com.yahoo.restapi.RestApi; import com.yahoo.restapi.RestApiRequestHandler; import com.yahoo.vespa.hosted.provision.NodeRepository; @@ -18,7 +18,7 @@ public class LoadBalancersV1ApiHandler extends RestApiRequestHandler<LoadBalance private final NodeRepository nodeRepository; @Inject - public LoadBalancersV1ApiHandler(LoggingRequestHandler.Context parentCtx, NodeRepository nodeRepository) { + public LoadBalancersV1ApiHandler(ThreadedHttpRequestHandler.Context parentCtx, NodeRepository nodeRepository) { super(parentCtx, LoadBalancersV1ApiHandler::createRestApiDefinition); this.nodeRepository = nodeRepository; } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java index 15e1061f5e1..1304b85be6b 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java @@ -11,7 +11,7 @@ import com.yahoo.config.provision.NodeType; import com.yahoo.config.provision.TenantName; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; -import com.yahoo.container.jdisc.LoggingRequestHandler; +import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; import com.yahoo.io.IOUtils; import com.yahoo.restapi.ErrorResponse; import com.yahoo.restapi.MessageResponse; @@ -67,7 +67,7 @@ import static com.yahoo.slime.SlimeUtils.optionalString; * * @author bratseth */ -public class NodesV2ApiHandler extends LoggingRequestHandler { +public class NodesV2ApiHandler extends ThreadedHttpRequestHandler { private final Orchestrator orchestrator; private final NodeRepository nodeRepository; @@ -75,7 +75,7 @@ public class NodesV2ApiHandler extends LoggingRequestHandler { private final NodeFlavors nodeFlavors; @Inject - public NodesV2ApiHandler(LoggingRequestHandler.Context parentCtx, Orchestrator orchestrator, + public NodesV2ApiHandler(ThreadedHttpRequestHandler.Context parentCtx, Orchestrator orchestrator, NodeRepository nodeRepository, MetricsDb metricsDb, NodeFlavors flavors) { super(parentCtx); this.orchestrator = orchestrator; diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/ApplicationSuspensionRequestHandler.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/ApplicationSuspensionRequestHandler.java index 012018f3889..2ebe377c238 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/ApplicationSuspensionRequestHandler.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/ApplicationSuspensionRequestHandler.java @@ -5,7 +5,7 @@ import com.google.inject.Inject; import com.yahoo.config.provision.ApplicationId; import com.yahoo.container.jdisc.EmptyResponse; import com.yahoo.container.jdisc.HttpResponse; -import com.yahoo.container.jdisc.LoggingRequestHandler; +import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; import com.yahoo.jdisc.http.HttpResponse.Status; import com.yahoo.restapi.RestApi; import com.yahoo.restapi.RestApiException; @@ -31,7 +31,7 @@ public class ApplicationSuspensionRequestHandler extends RestApiRequestHandler<A private final Orchestrator orchestrator; @Inject - public ApplicationSuspensionRequestHandler(LoggingRequestHandler.Context context, Orchestrator orchestrator) { + public ApplicationSuspensionRequestHandler(ThreadedHttpRequestHandler.Context context, Orchestrator orchestrator) { super(context, ApplicationSuspensionRequestHandler::createRestApiDefinition); this.orchestrator = orchestrator; } diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HealthRequestHandler.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HealthRequestHandler.java index bdfd2c16df2..09311e6f3e0 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HealthRequestHandler.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HealthRequestHandler.java @@ -3,7 +3,7 @@ package com.yahoo.vespa.orchestrator.resources; import com.google.inject.Inject; import com.yahoo.config.provision.ApplicationId; -import com.yahoo.container.jdisc.LoggingRequestHandler; +import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; import com.yahoo.restapi.RestApi; import com.yahoo.restapi.RestApiRequestHandler; import com.yahoo.vespa.applicationmodel.ServiceStatusInfo; @@ -27,7 +27,7 @@ public class HealthRequestHandler extends RestApiRequestHandler<HealthRequestHan private final HealthMonitorApi healthMonitorApi; @Inject - public HealthRequestHandler(LoggingRequestHandler.Context context, + public HealthRequestHandler(ThreadedHttpRequestHandler.Context context, HealthMonitorApi healthMonitorApi) { super(context, HealthRequestHandler::createRestApiDefinition); this.healthMonitorApi = healthMonitorApi; diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HostRequestHandler.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HostRequestHandler.java index e1cf7989a91..f90258d97d7 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HostRequestHandler.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HostRequestHandler.java @@ -3,7 +3,7 @@ package com.yahoo.vespa.orchestrator.resources; import com.google.inject.Inject; import com.yahoo.concurrent.UncheckedTimeoutException; -import com.yahoo.container.jdisc.LoggingRequestHandler; +import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; import com.yahoo.jdisc.Response; import com.yahoo.restapi.JacksonJsonResponse; import com.yahoo.restapi.RestApi; @@ -42,7 +42,7 @@ public class HostRequestHandler extends RestApiRequestHandler<HostRequestHandler private final Orchestrator orchestrator; @Inject - public HostRequestHandler(LoggingRequestHandler.Context context, Orchestrator orchestrator) { + public HostRequestHandler(ThreadedHttpRequestHandler.Context context, Orchestrator orchestrator) { super(context, HostRequestHandler::createRestApiDefinition); this.orchestrator = orchestrator; } diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HostSuspensionRequestHandler.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HostSuspensionRequestHandler.java index 05df303e3e7..eff4ab3364b 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HostSuspensionRequestHandler.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HostSuspensionRequestHandler.java @@ -3,7 +3,7 @@ package com.yahoo.vespa.orchestrator.resources; import com.google.inject.Inject; import com.yahoo.concurrent.UncheckedTimeoutException; -import com.yahoo.container.jdisc.LoggingRequestHandler; +import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; import com.yahoo.jdisc.Response; import com.yahoo.restapi.JacksonJsonResponse; import com.yahoo.restapi.RestApi; @@ -32,7 +32,7 @@ public class HostSuspensionRequestHandler extends RestApiRequestHandler<HostSusp private final Orchestrator orchestrator; @Inject - public HostSuspensionRequestHandler(LoggingRequestHandler.Context context, Orchestrator orchestrator) { + public HostSuspensionRequestHandler(ThreadedHttpRequestHandler.Context context, Orchestrator orchestrator) { super(context, HostSuspensionRequestHandler::createRestApiDefinition); this.orchestrator = orchestrator; } diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/InstanceRequestHandler.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/InstanceRequestHandler.java index 9dd69773595..df836bf7933 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/InstanceRequestHandler.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/InstanceRequestHandler.java @@ -7,7 +7,7 @@ import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.google.inject.Inject; import com.yahoo.config.provision.ApplicationId; -import com.yahoo.container.jdisc.LoggingRequestHandler; +import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; import com.yahoo.jrt.slobrok.api.Mirror; import com.yahoo.restapi.RestApi; import com.yahoo.restapi.RestApiException; @@ -56,7 +56,7 @@ public class InstanceRequestHandler extends RestApiRequestHandler<InstanceReques private final ServiceMonitor serviceMonitor; @Inject - public InstanceRequestHandler(LoggingRequestHandler.Context context, + public InstanceRequestHandler(ThreadedHttpRequestHandler.Context context, ServiceMonitor serviceMonitor, StatusService statusService, SlobrokApi slobrokApi, diff --git a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestRunnerHandler.java b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestRunnerHandler.java index 62601e4dfa0..a383d435a26 100644 --- a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestRunnerHandler.java +++ b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestRunnerHandler.java @@ -6,7 +6,7 @@ import com.yahoo.component.provider.ComponentRegistry; import com.yahoo.container.jdisc.EmptyResponse; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; -import com.yahoo.container.jdisc.LoggingRequestHandler; +import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; import com.yahoo.exception.ExceptionUtils; import com.yahoo.restapi.MessageResponse; import com.yahoo.restapi.SlimeJsonResponse; @@ -30,7 +30,7 @@ import static com.yahoo.jdisc.Response.Status; * @author jvenstad * @author mortent */ -public class TestRunnerHandler extends LoggingRequestHandler { +public class TestRunnerHandler extends ThreadedHttpRequestHandler { private final TestRunner testRunner; diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/RestApi.java b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/RestApi.java index 8cc054eb96c..bc1e58a4990 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/RestApi.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/RestApi.java @@ -4,7 +4,7 @@ package com.yahoo.document.restapi.resource; import com.google.inject.Inject; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; -import com.yahoo.container.jdisc.LoggingRequestHandler; +import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; import com.yahoo.jdisc.Metric; /** @@ -12,7 +12,7 @@ import com.yahoo.jdisc.Metric; * * @author jonmv */ -public class RestApi extends LoggingRequestHandler { +public class RestApi extends ThreadedHttpRequestHandler { @Inject public RestApi() { diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandler.java b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandler.java index 4b01835ea3c..9a1aaa33720 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandler.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandler.java @@ -5,7 +5,7 @@ import com.yahoo.collections.Tuple2; import com.yahoo.container.handler.threadpool.ContainerThreadPool; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; -import com.yahoo.container.jdisc.LoggingRequestHandler; +import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; import com.yahoo.container.jdisc.messagebus.SessionCache; import com.yahoo.document.config.DocumentmanagerConfig; import com.yahoo.documentapi.metrics.DocumentApiMetrics; @@ -34,7 +34,7 @@ import java.util.zip.GZIPInputStream; * * @author Steinar Knutsen */ -public class FeedHandler extends LoggingRequestHandler { +public class FeedHandler extends ThreadedHttpRequestHandler { protected final ReplyHandler feedReplyHandler; private static final List<Integer> serverSupportedVersions = Collections.unmodifiableList(Arrays.asList(3)); diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandlerV3.java b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandlerV3.java index 8ec05f158c9..620c8400434 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandlerV3.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandlerV3.java @@ -4,7 +4,7 @@ package com.yahoo.vespa.http.server; import com.yahoo.concurrent.ThreadFactoryFactory; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; -import com.yahoo.container.jdisc.LoggingRequestHandler; +import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; import com.yahoo.container.jdisc.messagebus.SessionCache; import com.yahoo.document.DocumentTypeManager; import com.yahoo.document.config.DocumentmanagerConfig; @@ -33,7 +33,7 @@ import java.util.logging.Logger; * * @author dybis */ -public class FeedHandlerV3 extends LoggingRequestHandler { +public class FeedHandlerV3 extends ThreadedHttpRequestHandler { private DocumentTypeManager docTypeManager; private final Map<String, ClientFeederV3> clientFeederByClientId = new HashMap<>(); |