diff options
author | Harald Musum <musum@yahooinc.com> | 2023-06-15 18:07:08 +0200 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2023-06-15 18:07:08 +0200 |
commit | 73741a912a73e9dac1795af6053d1adbb9001155 (patch) | |
tree | 2179c6159638b60d9760a549b3dace5e5e7d2383 /config-provisioning/src | |
parent | 2b5ab437ed5ba1730fab8da37be87fc74965eb6d (diff) |
Simplify
Diffstat (limited to 'config-provisioning/src')
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/ApplicationId.java | 13 |
1 files changed, 4 insertions, 9 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 a20213edfee..69d25cd118a 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 @@ -58,19 +58,14 @@ public class ApplicationId implements Comparable<ApplicationId> { return new ApplicationId(TenantName.from(tenant), ApplicationName.from(application), InstanceName.from(instance)); } - public static ApplicationId fromSerializedForm(String idString) { - return fromIdString(idString, ":"); - } + public static ApplicationId fromSerializedForm(String idString) { return fromIdString(idString, ":"); } - public static ApplicationId fromFullString(String idString) { - return fromIdString(idString, "\\."); - } + public static ApplicationId fromFullString(String idString) { return fromIdString(idString, "."); } private static ApplicationId fromIdString(String idString, String splitCharacter) { - String[] parts = idString.split(splitCharacter); - String unescapedSplitCharacter = splitCharacter.equals("\\.") ? "." : splitCharacter; + String[] parts = idString.split(Pattern.quote(splitCharacter)); String errorMessage = "Application ids must be on the form tenant" + - unescapedSplitCharacter + "application" + unescapedSplitCharacter + "instance, but was " + idString; + splitCharacter + "application" + splitCharacter + "instance, but was " + idString; if (parts.length < 3) throw new IllegalArgumentException(errorMessage); // TODO: Throw exception when we have verified no-one is abusing this with more than 3 parts in id string |