1 files changed, 4 insertions, 15 deletions
diff --git a/src/main/java/at/gv/egiz/moazs/preprocess/ConfigProfileGenerator.java b/src/main/java/at/gv/egiz/moazs/preprocess/ConfigProfileGenerator.java
index be14852..fa1ccd6 100644
--- a/src/main/java/at/gv/egiz/moazs/preprocess/ConfigProfileGenerator.java
+++ b/src/main/java/at/gv/egiz/moazs/preprocess/ConfigProfileGenerator.java
@@ -1,6 +1,7 @@
 package at.gv.egiz.moazs.preprocess;
 
 import at.gv.egiz.moazs.MoaZSException;
+import at.gv.egiz.moazs.util.StringUtils;
 import at.gv.zustellung.app2mzs.xsd.ConfigType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -58,9 +59,9 @@ public class ConfigProfileGenerator {
 
         var groupedKeys = properties.getPropertyNames()
                 .filter(this::isConfigurationProfileProperty)
-                .map(this::removePrefix)
-                .filter(this::hasPrefix)
-                .collect(groupingBy(this::keepPrefix, mapping(this::removePrefix, toSet())));
+                .map(StringUtils::removePrefix)
+                .filter(StringUtils::hasPrefix)
+                .collect(groupingBy(StringUtils::keepPrefix, mapping(StringUtils::removePrefix, toSet())));
 
         var profiles = groupedKeys.entrySet().stream()
                 .collect(toUnmodifiableMap(Entry::getKey, this::createConfigFromEnv));
@@ -78,22 +79,10 @@ public class ConfigProfileGenerator {
         return defaultProfile == null ? profiles : mergeProfiles(profiles, defaultProfile);
     }
 
-    private boolean hasPrefix(String name) {
-        return name.indexOf('.') != -1;
-    }
-
     private boolean isConfigurationProfileProperty(String propName) {
         return propName.startsWith(profilePrefix + ".");
     }
 
-    private String keepPrefix(String name) {
-        return name.substring(0, name.indexOf('.'));
-    }
-
-    private String removePrefix(String name) {
-        return name.substring(name.indexOf('.') + 1);
-    }
-
     private ConfigType createConfigFromEnv(Entry<String, Set<String>> entry) {
 
         var profile = entry.getKey();