aboutsummaryrefslogtreecommitdiffstats
path: root/config-provisioning/src/main/java/com/yahoo/config/provision
diff options
context:
space:
mode:
authorHarald Musum <musum@yahooinc.com>2023-06-15 16:46:54 +0200
committerHarald Musum <musum@yahooinc.com>2023-06-15 16:46:54 +0200
commit2b5ab437ed5ba1730fab8da37be87fc74965eb6d (patch)
treef721a8d45e673677ccc7ad3c0fcbb166c4445d51 /config-provisioning/src/main/java/com/yahoo/config/provision
parent23a0b1ee5b3eba63b6ac74c444a56da03ce49cb1 (diff)
Unescape split character and test with both fromSerializedForm and fromFullString
Diffstat (limited to 'config-provisioning/src/main/java/com/yahoo/config/provision')
-rw-r--r--config-provisioning/src/main/java/com/yahoo/config/provision/ApplicationId.java3
1 files changed, 2 insertions, 1 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 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<ApplicationId> {
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