diff options
author | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-03-28 13:00:40 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-03-28 13:00:40 +0200 |
commit | cd85b0b4b36092550a5c2f6608cab61324817c31 (patch) | |
tree | 92dd2d7320535962239a69a1ea981be4cb8e216d /config-provisioning | |
parent | 722220fe05994f51b0d55b7a3aacd8f2d5cd5f33 (diff) |
Remove old legacy
Diffstat (limited to 'config-provisioning')
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/ApplicationId.java | 37 | ||||
-rw-r--r-- | config-provisioning/src/test/java/com/yahoo/config/provision/ApplicationIdTest.java | 10 |
2 files changed, 20 insertions, 27 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 2ece6d12f7d..e1f8ef9b672 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 @@ -40,28 +40,27 @@ public final class ApplicationId implements Comparable<ApplicationId> { return new ApplicationId(TenantName.from(tenant), ApplicationName.from(application), InstanceName.from(instance)); } - /** Creates an application id from a string on the form application:environment:region:instance */ + /** + * Creates an application id from a string on the form application:environment:region:instance + * + * @deprecated don't pass TenantName + */ + @Deprecated // TODO: Remove when no version older than 6.90 is in use public static ApplicationId fromSerializedForm(TenantName tenant, String idString) { String[] parts = idString.split(":"); - if (parts.length < 3) { - throw new IllegalArgumentException("Illegal id string '" + idString + "'. Id string must consist of at least three parts separated by ':'"); - } + if (parts.length < 3) + throw new IllegalArgumentException("Application ids must be on the form tenant:application:instance, but was " + idString); - // Legacy id from 5.50 and backwards - if (parts.length < 4) { - return new Builder() - .tenant(parts[0]) - .applicationName(parts[1]) - .instanceName(parts[2]) - .build(); - - } else { - return new Builder() - .applicationName(parts[0]) - .instanceName(parts[3]) - .tenant(tenant) - .build(); - } + return new Builder().tenant(parts[0]).applicationName(parts[1]).instanceName(parts[2]).build(); + } + + + public static ApplicationId fromSerializedForm(String idString) { + String[] parts = idString.split(":"); + if (parts.length < 3) + throw new IllegalArgumentException("Application ids must be on the form tenant:application:instance, but was " + idString); + + return new Builder().tenant(parts[0]).applicationName(parts[1]).instanceName(parts[2]).build(); } @Override 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 33f5d0ce00a..c4ec02f3a9c 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 @@ -60,21 +60,15 @@ public class ApplicationIdTest { @Test public void require_that_idstring_can_be_parsed() { - ApplicationId id = ApplicationId.fromSerializedForm(TenantName.from("bim"), "foo:prod:baz:bim"); - assertThat(id.application().value(), is("foo")); - assertThat(id.instance().value(), is("bim")); - assertThat(id.tenant().value(), is("bim")); - - id = ApplicationId.fromSerializedForm(TenantName.from("unused"), "ten:foo:bim"); + ApplicationId id = ApplicationId.fromSerializedForm("ten:foo:bim"); assertThat(id.tenant().value(), is("ten")); assertThat(id.application().value(), is("foo")); assertThat(id.instance().value(), is("bim")); } - // TODO: Probably more test cases to break parsing. @Test(expected = IllegalArgumentException.class) public void require_that_invalid_idstring_throws_exception() { - ApplicationId.fromSerializedForm(TenantName.defaultName(), "foo:baz"); + ApplicationId.fromSerializedForm("foo:baz"); } @Test |