Let controller be strict only with known cloud accounts

2 files changed, 3 insertions, 4 deletions

diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzService.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzService.java
index 6fd0bba46a0..11dcfa3680e 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzService.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzService.java
@@ -24,11 +24,10 @@ public class AthenzService implements AthenzIdentity {
 
     public AthenzService(String fullName) {
         AthenzIdentity identity = AthenzIdentities.from(fullName);
-        if (!(identity instanceof AthenzService)) {
+        if ( ! (identity instanceof AthenzService service)) {
             throw new IllegalArgumentException(String.format("'%s' is not an Athenz service", fullName));
         }
-        AthenzService service = (AthenzService) identity;
-        this.domain = service.getDomain();
+        this.domain = service.domain;
         this.serviceName = service.serviceName;
     }
 
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/utils/AthenzIdentities.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/utils/AthenzIdentities.java
index 05e872e6e8e..253897f2e3d 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/utils/AthenzIdentities.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/utils/AthenzIdentities.java
@@ -37,7 +37,7 @@ public class AthenzIdentities {
             throw new IllegalArgumentException("Invalid Athenz identity: " + fullName);
         }
         AthenzDomain domain = new AthenzDomain(fullName.substring(0, domainIdentityNameSeparatorIndex));
-        String identityName = fullName.substring(domainIdentityNameSeparatorIndex + 1, fullName.length());
+        String identityName = fullName.substring(domainIdentityNameSeparatorIndex + 1);
         return from(domain, identityName);
     }