From 2b5ab437ed5ba1730fab8da37be87fc74965eb6d Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Thu, 15 Jun 2023 16:46:54 +0200 Subject: Unescape split character and test with both fromSerializedForm and fromFullString --- .../src/main/java/com/yahoo/config/provision/ApplicationId.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'config-provisioning/src/main/java/com/yahoo/config/provision') 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 1a7cc5db580..a20213edfee 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,8 +68,9 @@ public class ApplicationId implements Comparable { private static ApplicationId fromIdString(String idString, String splitCharacter) { String[] parts = idString.split(splitCharacter); + String unescapedSplitCharacter = splitCharacter.equals("\\.") ? "." : splitCharacter; String errorMessage = "Application ids must be on the form tenant" + - splitCharacter + "application" + splitCharacter + "instance, but was " + idString; + unescapedSplitCharacter + "application" + unescapedSplitCharacter + "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 -- cgit v1.2.3