diff options
author | Harald Musum <musum@verizonmedia.com> | 2019-08-14 16:11:57 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-14 16:11:57 +0200 |
commit | c00e4c0e0b224622754dbb815014f906b9f2be33 (patch) | |
tree | 1cb1f0f4e4de7d7635b72cac9a97e9f9e39db727 /config-provisioning | |
parent | 49fc9006704ebac3636547151f1af0468e505b93 (diff) |
Revert "Add a full string representation of application ID always including instance name"
Diffstat (limited to 'config-provisioning')
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/ApplicationId.java | 6 | ||||
-rw-r--r-- | config-provisioning/src/test/java/com/yahoo/config/provision/ApplicationIdTest.java | 13 |
2 files changed, 0 insertions, 19 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ApplicationId.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ApplicationId.java index f175af3e2f1..dbc57dd5abd 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/ApplicationId.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ApplicationId.java @@ -68,17 +68,11 @@ public final class ApplicationId implements Comparable<ApplicationId> { return "tenant '" + tenant + "', application '" + application + "', instance '" + instance + "'"; } - /** Returns "dotted" string (tenant.application.instance) with instance name omitted if it is "default" */ public String toShortString() { return tenant().value() + "." + application().value() + ( instance().isDefault() ? "" : "." + instance().value() ); } - /** Returns "dotted" string (tenant.application.instance) with instance name always included */ - public String toFullString() { - return tenant().value() + "." + application().value() + "." + instance().value(); - } - private String toSerializedForm() { return tenant + ":" + application + ":" + instance; } diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/ApplicationIdTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/ApplicationIdTest.java index b331fa89d32..93c01ccffcd 100644 --- a/config-provisioning/src/test/java/com/yahoo/config/provision/ApplicationIdTest.java +++ b/config-provisioning/src/test/java/com/yahoo/config/provision/ApplicationIdTest.java @@ -59,19 +59,6 @@ public class ApplicationIdTest { } @Test - public void require_string_formats_are_correct() { - ApplicationId id1 = applicationId("foo"); - ApplicationId id2 = idFrom("bar", "baz", "default"); - ApplicationId id3 = idFrom("tenant", "baz", "bim"); - assertThat(id1.toShortString(), is("default.foo")); - assertThat(id1.toFullString(), is("default.foo.default")); - assertThat(id2.toShortString(), is("bar.baz")); - assertThat(id2.toFullString(), is("bar.baz.default")); - assertThat(id3.toShortString(), is("tenant.baz.bim")); - assertThat(id3.toFullString(), is("tenant.baz.bim")); - } - - @Test public void require_that_idstring_can_be_parsed() { ApplicationId id = ApplicationId.fromSerializedForm("ten:foo:bim"); assertThat(id.tenant().value(), is("ten")); |