From 5fcf6995198d4ad83d3f39b62a03c1ffac71cc5d Mon Sep 17 00:00:00 2001
From: Jon Marius Venstad <venstad@gmail.com>
Date: Tue, 24 Mar 2020 10:17:48 +0100
Subject: Remove more user tenant leftovers

---
 .../com/yahoo/vespa/hosted/controller/api/identifiers/TenantId.java  | 4 ----
 .../com/yahoo/vespa/hosted/controller/api/identifiers/UserId.java    | 4 ----
 .../vespa/hosted/controller/api/identifiers/IdentifierTest.java      | 5 -----
 3 files changed, 13 deletions(-)

(limited to 'controller-api')

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 4974192e213..3ac24bac7ca 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
@@ -10,10 +10,6 @@ public class TenantId extends NonDefaultIdentifier {
         super(id);
     }
 
-    public boolean isUser() {
-        return id().startsWith("by-");
-    }
-
     @Override
     public void validate() {
         super.validate();
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/UserId.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/UserId.java
index d2effc76827..f1a8e57ab03 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/UserId.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/UserId.java
@@ -10,8 +10,4 @@ public class UserId extends NonDefaultIdentifier {
         super(id);
     }
 
-    public TenantId toTenantId() {
-        return new TenantId("by-" + id().replace('_', '-'));
-    }
-
 }
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 8e278240a02..fdba1ab2680 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
@@ -106,11 +106,6 @@ public class IdentifierTest {
         new InstanceId("MixedCaseInstance");
     }
 
-    @Test
-    public void user_tenant_id_does_not_contain_underscore() {
-        assertEquals("by-under-score-user", new UserId("under_score_user").toTenantId().id());
-    }
-
     @Test
     public void dns_names_has_no_underscore() {
         assertEquals("a-b-c", new ApplicationId("a_b_c").toDns());
-- 
cgit v1.2.3