summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2021-01-21 15:49:05 +0100
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2021-01-21 16:54:09 +0100
commit6cc469b7950f4f6f2b67596b162cd73e59c22336 (patch)
treeb19e9a8bf8c1bda395da8862494c3edafabf9b4e /controller-server
parentbe7847731521fb516269b65905029c1639d4aec8 (diff)
Deprecate LoggingRequestHandler constructors taking AccessLog
Add replacement constructors without AccessLog. Remove use of deprecated constructors for internal handlers.
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java3
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsHandler.java8
2 files changed, 4 insertions, 7 deletions
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 cedae5b5a46..88191bc836b 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
@@ -63,9 +63,8 @@ public class BillingApiHandler extends LoggingRequestHandler {
private final TenantController tenantController;
public BillingApiHandler(Executor executor,
- AccessLog accessLog,
Controller controller) {
- super(executor, accessLog);
+ super(executor);
this.billingController = controller.serviceRegistry().billingController();
this.applicationController = controller.applications();
this.tenantController = controller.tenants();
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 43a03bf10f3..129f1e109df 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
@@ -5,8 +5,6 @@ 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.logging.AccessLog;
-import java.util.logging.Level;
import com.yahoo.restapi.ErrorResponse;
import com.yahoo.restapi.JacksonJsonResponse;
import com.yahoo.restapi.Path;
@@ -16,6 +14,7 @@ import com.yahoo.vespa.hosted.controller.api.systemflags.v1.FlagsTarget;
import com.yahoo.vespa.hosted.controller.api.systemflags.v1.SystemFlagsDataArchive;
import java.util.concurrent.Executor;
+import java.util.logging.Level;
/**
* Handler implementation for '/system-flags/v1', an API for controlling system-wide feature flags
@@ -32,9 +31,8 @@ public class SystemFlagsHandler extends LoggingRequestHandler {
@Inject
public SystemFlagsHandler(ZoneRegistry zoneRegistry,
ServiceIdentityProvider identityProvider,
- Executor executor,
- AccessLog accessLog) {
- super(executor, accessLog);
+ Executor executor) {
+ super(executor);
this.deployer = new SystemFlagsDeployer(identityProvider, zoneRegistry.system(), FlagsTarget.getAllTargetsInSystem(zoneRegistry));
}