Rename AthensDbMock -> AthenzDbMock

8 files changed, 32 insertions, 32 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/mock/AthenzClientFactoryMock.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/mock/AthenzClientFactoryMock.java
index 92c7ba5a007..6fb03754e5e 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/mock/AthenzClientFactoryMock.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/mock/AthenzClientFactoryMock.java
@@ -17,17 +17,17 @@ public class AthenzClientFactoryMock extends AbstractComponent implements Athenz
 
     private static final Logger log = Logger.getLogger(AthenzClientFactoryMock.class.getName());
 
-    private final AthensDbMock athens;
+    private final AthenzDbMock athens;
 
     public AthenzClientFactoryMock() {
-        this(new AthensDbMock());
+        this(new AthenzDbMock());
     }
 
-    public AthenzClientFactoryMock(AthensDbMock athens) {
+    public AthenzClientFactoryMock(AthenzDbMock athens) {
         this.athens = athens;
     }
 
-    public AthensDbMock getSetup() {
+    public AthenzDbMock getSetup() {
         return athens;
     }
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/mock/AthensDbMock.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/mock/AthenzDbMock.java
index f58d283e609..017e8c7be44 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/mock/AthensDbMock.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/mock/AthenzDbMock.java
@@ -14,11 +14,11 @@ import java.util.Set;
 /**
  * @author bjorncs
  */
-public class AthensDbMock {
+public class AthenzDbMock {
 
     public final Map<AthenzDomain, Domain> domains = new HashMap<>();
 
-    public AthensDbMock addDomain(Domain domain) {
+    public AthenzDbMock addDomain(Domain domain) {
         domains.put(domain.name, domain);
         return this;
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/mock/ZmsClientMock.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/mock/ZmsClientMock.java
index b24a1bc0c8e..d1ada1836f8 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/mock/ZmsClientMock.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/mock/ZmsClientMock.java
@@ -24,9 +24,9 @@ public class ZmsClientMock implements ZmsClient {
 
     private static final Logger log = Logger.getLogger(ZmsClientMock.class.getName());
 
-    private final AthensDbMock athens;
+    private final AthenzDbMock athens;
 
-    public ZmsClientMock(AthensDbMock athens) {
+    public ZmsClientMock(AthenzDbMock athens) {
         this.athens = athens;
     }
 
@@ -39,7 +39,7 @@ public class ZmsClientMock implements ZmsClient {
     @Override
     public void deleteTenant(AthenzDomain tenantDomain) {
         log("deleteTenant(tenantDomain='%s')", tenantDomain);
-        AthensDbMock.Domain domain = getDomainOrThrow(tenantDomain, false);
+        AthenzDbMock.Domain domain = getDomainOrThrow(tenantDomain, false);
         domain.isVespaTenant = false;
         domain.applications.clear();
         domain.tenantAdmins.clear();
@@ -48,9 +48,9 @@ public class ZmsClientMock implements ZmsClient {
     @Override
     public void addApplication(AthenzDomain tenantDomain, ApplicationId applicationName) {
         log("addApplication(tenantDomain='%s', applicationName='%s')", tenantDomain, applicationName);
-        AthensDbMock.Domain domain = getDomainOrThrow(tenantDomain, true);
+        AthenzDbMock.Domain domain = getDomainOrThrow(tenantDomain, true);
         if (!domain.applications.containsKey(applicationName)) {
-            domain.applications.put(applicationName, new AthensDbMock.Application());
+            domain.applications.put(applicationName, new AthenzDbMock.Application());
         }
     }
 
@@ -64,8 +64,8 @@ public class ZmsClientMock implements ZmsClient {
     public boolean hasApplicationAccess(AthenzPrincipal principal, ApplicationAction action, AthenzDomain tenantDomain, ApplicationId applicationName) {
         log("hasApplicationAccess(principal='%s', action='%s', tenantDomain='%s', applicationName='%s')",
                  principal, action, tenantDomain, applicationName);
-        AthensDbMock.Domain domain = getDomainOrThrow(tenantDomain, true);
-        AthensDbMock.Application application = domain.applications.get(applicationName);
+        AthenzDbMock.Domain domain = getDomainOrThrow(tenantDomain, true);
+        AthenzDbMock.Application application = domain.applications.get(applicationName);
         if (application == null) {
             throw zmsException(400, "Application '%s' not found", applicationName);
         }
@@ -101,8 +101,8 @@ public class ZmsClientMock implements ZmsClient {
         throw new UnsupportedOperationException();
     }
 
-    private AthensDbMock.Domain getDomainOrThrow(AthenzDomain domainName, boolean verifyVespaTenant) {
-        AthensDbMock.Domain domain = Optional.ofNullable(athens.domains.get(domainName))
+    private AthenzDbMock.Domain getDomainOrThrow(AthenzDomain domainName, boolean verifyVespaTenant) {
+        AthenzDbMock.Domain domain = Optional.ofNullable(athens.domains.get(domainName))
                 .orElseThrow(() -> zmsException(400, "Domain '%s' not found", domainName));
         if (verifyVespaTenant && !domain.isVespaTenant) {
             throw zmsException(400, "Domain not a Vespa tenant: '%s'", domainName);
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/mock/ZtsClientMock.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/mock/ZtsClientMock.java
index f25d57b1a0a..ebcfac416b5 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/mock/ZtsClientMock.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/mock/ZtsClientMock.java
@@ -17,9 +17,9 @@ import static java.util.stream.Collectors.toList;
 public class ZtsClientMock implements ZtsClient {
     private static final Logger log = Logger.getLogger(ZtsClientMock.class.getName());
 
-    private final AthensDbMock athens;
+    private final AthenzDbMock athens;
 
-    public ZtsClientMock(AthensDbMock athens) {
+    public ZtsClientMock(AthenzDbMock athens) {
         this.athens = athens;
     }
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
index 8b2dfb30b1f..23e32130153 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
@@ -34,7 +34,7 @@ import com.yahoo.vespa.hosted.controller.application.DeploymentJobs.JobReport;
 import com.yahoo.vespa.hosted.controller.application.DeploymentJobs.JobType;
 import com.yahoo.vespa.hosted.controller.application.JobStatus;
 import com.yahoo.vespa.hosted.controller.athenz.NToken;
-import com.yahoo.vespa.hosted.controller.athenz.mock.AthensDbMock;
+import com.yahoo.vespa.hosted.controller.athenz.mock.AthenzDbMock;
 import com.yahoo.vespa.hosted.controller.deployment.ApplicationPackageBuilder;
 import com.yahoo.vespa.hosted.controller.deployment.BuildSystem;
 import com.yahoo.vespa.hosted.controller.deployment.DeploymentTester;
@@ -362,7 +362,7 @@ public class ControllerTest {
 
         // Create Athens domain mock
         AthenzDomain athensDomain = new AthenzDomain("vespa.john");
-        AthensDbMock.Domain mockDomain = new AthensDbMock.Domain(athensDomain);
+        AthenzDbMock.Domain mockDomain = new AthenzDbMock.Domain(athensDomain);
         tester.athensDb().addDomain(mockDomain);
 
         // Create OpsDb tenant
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java
index 116c48341f3..f21539348bb 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java
@@ -28,7 +28,7 @@ import com.yahoo.vespa.hosted.controller.api.integration.github.GitHubMock;
 import com.yahoo.vespa.hosted.controller.api.integration.jira.JiraMock;
 import com.yahoo.vespa.hosted.controller.api.integration.routing.MemoryGlobalRoutingService;
 import com.yahoo.vespa.hosted.controller.application.ApplicationPackage;
-import com.yahoo.vespa.hosted.controller.athenz.mock.AthensDbMock;
+import com.yahoo.vespa.hosted.controller.athenz.mock.AthenzDbMock;
 import com.yahoo.vespa.hosted.controller.athenz.mock.AthenzClientFactoryMock;
 import com.yahoo.vespa.hosted.controller.integration.MockMetricsService;
 import com.yahoo.vespa.hosted.controller.persistence.ControllerDb;
@@ -53,7 +53,7 @@ import static org.junit.Assert.assertTrue;
 public final class ControllerTester {
 
     private final ControllerDb db;
-    private final AthensDbMock athensDb;
+    private final AthenzDbMock athensDb;
     private final ManualClock clock;
     private final ConfigServerClientMock configServer;
     private final ZoneRegistryMock zoneRegistry;
@@ -64,16 +64,16 @@ public final class ControllerTester {
     private Controller controller;
 
     public ControllerTester() {
-        this(new MemoryControllerDb(), new AthensDbMock(), new ManualClock(), new ConfigServerClientMock(),
+        this(new MemoryControllerDb(), new AthenzDbMock(), new ManualClock(), new ConfigServerClientMock(),
              new ZoneRegistryMock(), new GitHubMock(), new MockCuratorDb(), new MemoryNameService());
     }
 
     public ControllerTester(ManualClock clock) {
-        this(new MemoryControllerDb(), new AthensDbMock(), clock, new ConfigServerClientMock(),
+        this(new MemoryControllerDb(), new AthenzDbMock(), clock, new ConfigServerClientMock(),
              new ZoneRegistryMock(), new GitHubMock(), new MockCuratorDb(), new MemoryNameService());
     }
 
-    private ControllerTester(ControllerDb db, AthensDbMock athensDb, ManualClock clock,
+    private ControllerTester(ControllerDb db, AthenzDbMock athensDb, ManualClock clock,
                              ConfigServerClientMock configServer, ZoneRegistryMock zoneRegistry,
                              GitHubMock gitHub, CuratorDb curator, MemoryNameService nameService) {
         this.db = db;
@@ -94,7 +94,7 @@ public final class ControllerTester {
 
     public ManualClock clock() { return clock; }
 
-    public AthensDbMock athensDb() { return athensDb; }
+    public AthenzDbMock athensDb() { return athensDb; }
 
     public MemoryNameService nameService() { return nameService; }
 
@@ -149,7 +149,7 @@ public final class ControllerTester {
 
     public AthenzDomain createDomain(String domainName) {
         AthenzDomain domain = new AthenzDomain(domainName);
-        athensDb.addDomain(new AthensDbMock.Domain(domain));
+        athensDb.addDomain(new AthenzDbMock.Domain(domain));
         return domain;
     }
 
@@ -199,7 +199,7 @@ public final class ControllerTester {
     private static Controller createController(ControllerDb db, CuratorDb curator,
                                                ConfigServerClientMock configServerClientMock, ManualClock clock,
                                                GitHubMock gitHubClientMock, ZoneRegistryMock zoneRegistryMock,
-                                               AthensDbMock athensDb, MemoryNameService nameService) {
+                                               AthenzDbMock athensDb, MemoryNameService nameService) {
         Controller controller = new Controller(db,
                                                curator,
                                                new MemoryRotationRepository(),
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerControllerTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerControllerTester.java
index b8329751fc4..ffa1bb13ce0 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerControllerTester.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerControllerTester.java
@@ -24,7 +24,7 @@ import com.yahoo.vespa.hosted.controller.api.identifiers.UserId;
 import com.yahoo.vespa.hosted.controller.application.ApplicationPackage;
 import com.yahoo.vespa.hosted.controller.application.DeploymentJobs;
 import com.yahoo.vespa.hosted.controller.athenz.AthenzPrincipal;
-import com.yahoo.vespa.hosted.controller.athenz.mock.AthensDbMock;
+import com.yahoo.vespa.hosted.controller.athenz.mock.AthenzDbMock;
 import com.yahoo.vespa.hosted.controller.athenz.mock.AthenzClientFactoryMock;
 import com.yahoo.vespa.hosted.controller.maintenance.JobControl;
 import com.yahoo.vespa.hosted.controller.maintenance.Upgrader;
@@ -98,7 +98,7 @@ public class ContainerControllerTester {
         AthenzClientFactoryMock mock = (AthenzClientFactoryMock) containerTester.container().components()
                 .getComponent(AthenzClientFactoryMock.class.getName());
         AthenzDomain athensDomain = new AthenzDomain(domainName);
-        AthensDbMock.Domain domain = new AthensDbMock.Domain(athensDomain);
+        AthenzDbMock.Domain domain = new AthenzDbMock.Domain(athensDomain);
         domain.markAsVespaTenant();
         domain.admin(new AthenzPrincipal(new AthenzDomain("domain"), new UserId(userName)));
         mock.getSetup().addDomain(domain);
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
index 33b27c887ee..e1fc0dfe960 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
@@ -19,7 +19,7 @@ import com.yahoo.vespa.hosted.controller.application.DeploymentJobs;
 import com.yahoo.vespa.hosted.controller.application.DeploymentMetrics;
 import com.yahoo.vespa.hosted.controller.athenz.AthenzPrincipal;
 import com.yahoo.vespa.hosted.controller.athenz.AthenzUtils;
-import com.yahoo.vespa.hosted.controller.athenz.mock.AthensDbMock;
+import com.yahoo.vespa.hosted.controller.athenz.mock.AthenzDbMock;
 import com.yahoo.vespa.hosted.controller.athenz.mock.AthenzClientFactoryMock;
 import com.yahoo.vespa.hosted.controller.deployment.ApplicationPackageBuilder;
 import com.yahoo.vespa.hosted.controller.restapi.ContainerControllerTester;
@@ -674,7 +674,7 @@ public class ApplicationApiTest extends ControllerContainerTest {
         AthenzClientFactoryMock mock = (AthenzClientFactoryMock) container.components()
                 .getComponent(AthenzClientFactoryMock.class.getName());
         AthenzDomain athensDomain = new AthenzDomain(domainName);
-        AthensDbMock.Domain domain = new AthensDbMock.Domain(athensDomain);
+        AthenzDbMock.Domain domain = new AthenzDbMock.Domain(athensDomain);
         domain.markAsVespaTenant();
         domain.admin(AthenzUtils.createPrincipal(new UserId(userName)));
         mock.getSetup().addDomain(domain);
@@ -688,7 +688,7 @@ public class ApplicationApiTest extends ControllerContainerTest {
     private void addScrewdriverUserToDomain(String screwdriverUserId, String domainName) {
         AthenzClientFactoryMock mock = (AthenzClientFactoryMock) container.components()
                 .getComponent(AthenzClientFactoryMock.class.getName());
-        AthensDbMock.Domain domain = mock.getSetup().domains.get(new AthenzDomain(domainName));
+        AthenzDbMock.Domain domain = mock.getSetup().domains.get(new AthenzDomain(domainName));
         domain.admin(new AthenzPrincipal(new AthenzDomain(athensScrewdriverDomain), new UserId(screwdriverUserId)));
     }