summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@oath.com>2018-03-14 10:59:24 +0100
committerBjørn Christian Seime <bjorncs@oath.com>2018-03-14 10:59:24 +0100
commit1a976559a253b2a67b58529e2c3e845c5231fcd3 (patch)
tree42c8fcd9321f4aaf9fdce605b650bc8cb45be2bd /controller-server
parentd1d6c0e415ec7afe441e0bee1d3da656e3e7740f (diff)
Remove unused field
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java2
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java5
2 files changed, 2 insertions, 5 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java
index 303f5d5484b..661e7624465 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java
@@ -138,7 +138,7 @@ public class Controller extends AbstractComponent {
rotationsConfig,
nameService, configServerClient, artifactRepository,
routingGenerator, clock);
- tenantController = new TenantController(this, db, curator, entityService, athenzClientFactory);
+ tenantController = new TenantController(this, db, curator, athenzClientFactory);
}
/** Returns the instance controlling tenants */
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java
index 0abf296a9a7..482b6a6f3a9 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java
@@ -11,7 +11,6 @@ import com.yahoo.vespa.hosted.controller.api.identifiers.TenantId;
import com.yahoo.vespa.hosted.controller.api.identifiers.UserId;
import com.yahoo.vespa.hosted.controller.api.integration.athenz.AthenzClientFactory;
import com.yahoo.vespa.hosted.controller.api.integration.athenz.ZmsClient;
-import com.yahoo.vespa.hosted.controller.api.integration.entity.EntityService;
import com.yahoo.vespa.hosted.controller.persistence.ControllerDb;
import com.yahoo.vespa.hosted.controller.persistence.CuratorDb;
import com.yahoo.vespa.hosted.controller.persistence.PersistenceException;
@@ -44,15 +43,13 @@ public class TenantController {
private final CuratorDb curator;
private final AthenzClientFactory athenzClientFactory;
- private final EntityService entityService;
- public TenantController(Controller controller, ControllerDb db, CuratorDb curator, EntityService entityService,
+ public TenantController(Controller controller, ControllerDb db, CuratorDb curator,
AthenzClientFactory athenzClientFactory) {
this.controller = controller;
this.db = db;
this.curator = curator;
this.athenzClientFactory = athenzClientFactory;
- this.entityService = entityService;
}
public List<Tenant> asList() {