diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2020-03-24 10:17:48 +0100 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2020-03-24 10:17:48 +0100 |
| commit | 5fcf6995198d4ad83d3f39b62a03c1ffac71cc5d (patch) | |
| tree | d089970f96237289a58ac08edd546334a0e42730 /controller-api | |
| parent | 4a63d2244a39342f941a2b1bb3e6af6b2e4fa72e (diff) | |
Remove more user tenant leftovers
Diffstat (limited to 'controller-api')
3 files changed, 0 insertions, 13 deletions
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 @@ -107,11 +107,6 @@ public class IdentifierTest { } @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()); } |