Refactor tenant

* Split tenant types into separate classes
* Stop using TenantId internally in controller-server
* Test variations of invalid tenant names and normalization

2 files changed, 0 insertions, 9 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/Identifier.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/Identifier.java
index 2fd75e25498..2067a88e5fb 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/Identifier.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/Identifier.java
@@ -99,9 +99,5 @@ public abstract class Identifier {
         throw new IllegalArgumentException(String.format("Invalid id: %s. %s", id, explanation));
     }
 
-    public static void throwInvalidId(String id, String explanation, String idName) {
-        throw new IllegalArgumentException(String.format("Invalid %s id: %s. %s", idName, id, explanation));
-    }
-
 }
 
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/TenantId.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/TenantId.java
index 2c619fb58ef..4974192e213 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/TenantId.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/TenantId.java
@@ -26,9 +26,4 @@ public class TenantId extends NonDefaultIdentifier {
         }
     }
 
-    /** Return true if this is the user tenant of the given user */
-    public boolean isTenantFor(UserId userId) {
-        return id().equals("by-" + userId.id().replace('_', '-'));
-    }
-
 }