Rename AthensDomain -> AthenzDomain

8 files changed, 27 insertions, 27 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/AthensDomainsResponse.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/AthensDomainsResponse.java
index 400b973a4e1..ef3c0621203 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/AthensDomainsResponse.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/AthensDomainsResponse.java
@@ -2,7 +2,7 @@
 package com.yahoo.vespa.hosted.controller.api.application.v4.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.yahoo.vespa.hosted.controller.api.identifiers.AthensDomain;
+import com.yahoo.vespa.hosted.controller.api.identifiers.AthenzDomain;
 
 import java.util.List;
 
@@ -10,8 +10,8 @@ import java.util.List;
  * @author gv
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class AthensDomainsResponse extends JsonResponse<List<AthensDomain>> {
-    public AthensDomainsResponse(List<AthensDomain> athensDomainList) {
+public class AthensDomainsResponse extends JsonResponse<List<AthenzDomain>> {
+    public AthensDomainsResponse(List<AthenzDomain> athensDomainList) {
         super(athensDomainList);
     }
 }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantCreateOptions.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantCreateOptions.java
index 4032a960b3c..69658ca4052 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantCreateOptions.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantCreateOptions.java
@@ -3,7 +3,7 @@ package com.yahoo.vespa.hosted.controller.api.application.v4.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.yahoo.vespa.hosted.controller.api.identifiers.AthensDomain;
+import com.yahoo.vespa.hosted.controller.api.identifiers.AthenzDomain;
 import com.yahoo.vespa.hosted.controller.api.identifiers.Property;
 import com.yahoo.vespa.hosted.controller.api.identifiers.PropertyId;
 import com.yahoo.vespa.hosted.controller.api.identifiers.UserGroup;
@@ -14,7 +14,7 @@ import com.yahoo.vespa.hosted.controller.api.identifiers.UserGroup;
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(value = JsonInclude.Include.NON_NULL)
 public class TenantCreateOptions {
-    public AthensDomain athensDomain;
+    public AthenzDomain athensDomain;
     public Property property;
     public PropertyId propertyId;
     public UserGroup userGroup;
@@ -27,7 +27,7 @@ public class TenantCreateOptions {
         this.propertyId = propertyId;
     }
 
-    public TenantCreateOptions(AthensDomain athensDomain, Property property, PropertyId propertyId) {
+    public TenantCreateOptions(AthenzDomain athensDomain, Property property, PropertyId propertyId) {
         this.athensDomain = athensDomain;
         this.property = property;
         this.propertyId = propertyId;
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantMetaData.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantMetaData.java
index 5ded1d8030e..a8544226f39 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantMetaData.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantMetaData.java
@@ -4,7 +4,7 @@ package com.yahoo.vespa.hosted.controller.api.application.v4.model;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.yahoo.vespa.hosted.controller.api.identifiers.AthensDomain;
+import com.yahoo.vespa.hosted.controller.api.identifiers.AthenzDomain;
 import com.yahoo.vespa.hosted.controller.api.identifiers.Property;
 import com.yahoo.vespa.hosted.controller.api.identifiers.UserGroup;
 
@@ -17,7 +17,7 @@ import java.util.Optional;
 @JsonInclude(value = Include.NON_EMPTY)
 public class TenantMetaData {
     public TenantType type;
-    public Optional<AthensDomain> athensDomain;
+    public Optional<AthenzDomain> athensDomain;
     public Optional<Property> property;
     public Optional<UserGroup> userGroup;
 
@@ -25,7 +25,7 @@ public class TenantMetaData {
     public TenantMetaData() {}
 
     public TenantMetaData(TenantType type,
-                          Optional<AthensDomain> athensDomain,
+                          Optional<AthenzDomain> athensDomain,
                           Optional<Property> property,
                           Optional<UserGroup> userGroup) {
         this.type = type;
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantMigrateOptions.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantMigrateOptions.java
index 9c748eafd38..7e30ae6c2c2 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantMigrateOptions.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantMigrateOptions.java
@@ -3,7 +3,7 @@ package com.yahoo.vespa.hosted.controller.api.application.v4.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.yahoo.vespa.hosted.controller.api.identifiers.AthensDomain;
+import com.yahoo.vespa.hosted.controller.api.identifiers.AthenzDomain;
 
 /**
  * @author bjorncs
@@ -12,11 +12,11 @@ import com.yahoo.vespa.hosted.controller.api.identifiers.AthensDomain;
 @JsonInclude(value = JsonInclude.Include.NON_NULL)
 public class TenantMigrateOptions {
 
-    public AthensDomain athensDomain;
+    public AthenzDomain athensDomain;
 
     public TenantMigrateOptions() {}
 
-    public TenantMigrateOptions(AthensDomain athensDomain) {
+    public TenantMigrateOptions(AthenzDomain athensDomain) {
         this.athensDomain = athensDomain;
     }
 }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantUpdateOptions.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantUpdateOptions.java
index 9b2f24e2f62..f0d218fa3ad 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantUpdateOptions.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantUpdateOptions.java
@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.yahoo.vespa.hosted.controller.api.identifiers.AthensDomain;
+import com.yahoo.vespa.hosted.controller.api.identifiers.AthenzDomain;
 import com.yahoo.vespa.hosted.controller.api.identifiers.Property;
 import com.yahoo.vespa.hosted.controller.api.identifiers.UserGroup;
 
@@ -21,12 +21,12 @@ import java.util.Optional;
 public class TenantUpdateOptions {
     public final Property property;
     public final Optional<UserGroup> userGroup;
-    public final Optional<AthensDomain> athensDomain;
+    public final Optional<AthenzDomain> athensDomain;
 
     @JsonCreator
     public TenantUpdateOptions(@JsonProperty("property") Property property,
                                @JsonProperty("userGroup") Optional<UserGroup> userGroup,
-                               @JsonProperty("athensDomain") Optional<AthensDomain> athensDomain) {
+                               @JsonProperty("athensDomain") Optional<AthenzDomain> athensDomain) {
         this.userGroup = userGroup;
         this.property = property;
         this.athensDomain = athensDomain;
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantWithApplications.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantWithApplications.java
index de731d5c971..e34e9e74065 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantWithApplications.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantWithApplications.java
@@ -3,7 +3,7 @@ package com.yahoo.vespa.hosted.controller.api.application.v4.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.yahoo.vespa.hosted.controller.api.identifiers.AthensDomain;
+import com.yahoo.vespa.hosted.controller.api.identifiers.AthenzDomain;
 import com.yahoo.vespa.hosted.controller.api.identifiers.Property;
 import com.yahoo.vespa.hosted.controller.api.identifiers.UserGroup;
 
@@ -17,7 +17,7 @@ import java.util.List;
 public class TenantWithApplications {
     // TODO: use TenantMetaData instead of individual fields (requires dashboard updates)
     public TenantType type;
-    public AthensDomain athensDomain;
+    public AthenzDomain athensDomain;
     public Property property;
     public UserGroup userGroup;
     public List<ApplicationReference> applications;
@@ -26,7 +26,7 @@ public class TenantWithApplications {
 
     public TenantWithApplications(
             TenantType type,
-            AthensDomain athensDomain,
+            AthenzDomain athensDomain,
             Property property,
             UserGroup userGroup,
             List<ApplicationReference> applications) {
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/AthensDomain.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/AthenzDomain.java
index 5dade6f1a64..42240a72339 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/AthensDomain.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/AthenzDomain.java
@@ -2,12 +2,12 @@
 package com.yahoo.vespa.hosted.controller.api.identifiers;
 
 /**
+ * @author bjorncs
  * @author smorgrav
  */
-// TODO Rename to AthenzDomain
-public class AthensDomain extends Identifier {
+public class AthenzDomain extends Identifier {
 
-    public AthensDomain(String id) {
+    public AthenzDomain(String id) {
         super(id);
     }
 
@@ -15,8 +15,8 @@ public class AthensDomain extends Identifier {
         return !id().contains(".");
     }
 
-    public AthensDomain getParent() {
-        return new AthensDomain(id().substring(0, lastDot()));
+    public AthenzDomain getParent() {
+        return new AthenzDomain(id().substring(0, lastDot()));
     }
 
     public String getNameSuffix() {
diff --git a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/identifiers/IdentifierTest.java b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/identifiers/IdentifierTest.java
index f27bcb0c3af..05ab94fc118 100644
--- a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/identifiers/IdentifierTest.java
+++ b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/identifiers/IdentifierTest.java
@@ -119,18 +119,18 @@ public class IdentifierTest {
 
     @Test
     public void athens_parent_domain_is_without_name_suffix() {
-        assertEquals(new AthensDomain("yby.john"), new AthensDomain("yby.john.myapp").getParent());
+        assertEquals(new AthenzDomain("yby.john"), new AthenzDomain("yby.john.myapp").getParent());
     }
 
     @Test
     public void athens_domain_name_is_last_suffix() {
-        assertEquals("myapp", new AthensDomain("yby.john.myapp").getNameSuffix());
+        assertEquals("myapp", new AthenzDomain("yby.john.myapp").getNameSuffix());
     }
 
     @Test
     public void domain_without_dot_is_toplevel() {
-        assertTrue(new AthensDomain("toplevel").isTopLevelDomain());
-        assertFalse(new AthensDomain("not.toplevel").isTopLevelDomain());
+        assertTrue(new AthenzDomain("toplevel").isTopLevelDomain());
+        assertFalse(new AthenzDomain("not.toplevel").isTopLevelDomain());
     }
 
     @Test