From 4065e15aa1f0b099a900b056ae26c5b3d143d03b Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Fri, 16 Jun 2023 13:09:41 +0200 Subject: [PATCH] Apply code suggestion from review Co-authored-by: Sebastian Stenzel --- .../java/org/cryptomator/common/PropertiesPreprocessor.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/cryptomator/common/PropertiesPreprocessor.java b/src/main/java/org/cryptomator/common/PropertiesPreprocessor.java index d28fdd2ed..342ad3e9d 100644 --- a/src/main/java/org/cryptomator/common/PropertiesPreprocessor.java +++ b/src/main/java/org/cryptomator/common/PropertiesPreprocessor.java @@ -9,7 +9,7 @@ import java.util.regex.Pattern; public class PropertiesPreprocessor { private static final Logger LOG = LoggerFactory.getLogger(PropertiesPreprocessor.class); - private static final Pattern TEMPLATE = Pattern.compile("@\\((.+)\\)"); + private static final Pattern TEMPLATE = Pattern.compile("@\\{(\\w+)}"); private static final LoggingEnvironment ENV = new LoggingEnvironment(System.getenv(), LOG); public static void run() { @@ -29,12 +29,12 @@ public class PropertiesPreprocessor { private static String process(String value) { return TEMPLATE.matcher(value).replaceAll(match -> // - switch (match.group().substring(2, match.group().length() - 1)) { + switch (match.group(1)) { case "appdir" -> ENV.get("APPDIR"); case "appdata" -> ENV.get("APPDATA"); case "userhome" -> System.getProperty("user.home"); default -> { - LOG.warn("Found unknown keyword {} in property value {}. Keyword is not replaced.", match.group(), value); + LOG.warn("Found unknown variable @{{}} in property value {}.", match.group(), value); yield match.group(); } });