JavaIsJavaScript
diff --git a/‎src/main/java/de/rwth/idsg/steve/utils/PropertiesFileLoader.java‎
Lines changed: 16 additions & 9 deletions b/‎src/main/java/de/rwth/idsg/steve/utils/PropertiesFileLoader.java‎
Lines changed: 16 additions & 9 deletions
@@ -1,7 +1,7 @@
 package de.rwth.idsg.steve.utils;
 
 import com.google.common.base.Strings;
-import lombok.extern.log4j.Log4j2;
+import lombok.extern.slf4j.Slf4j;
 
 import java.io.FileNotFoundException;
 import java.io.InputStream;
@@ -13,7 +13,7 @@
  * @author Sevket Goekay <goekay@dbis.rwth-aachen.de>
  * @since 01.10.2015
  */
-@Log4j2
+@Slf4j
 public class PropertiesFileLoader {
 
     private Properties prop;
@@ -45,12 +45,7 @@ public String getString(String key) {
             throw new IllegalArgumentException("The property '" + key + "' has no value set");
         }
 
-        String trimmed = s.trim();
-        if (!trimmed.equals(s)) {
-            log.warn("The property '{}' has leading or trailing spaces which were removed!", key);
-        }
-
-        return trimmed;
+        return trim(key, s);
     }
 
     public boolean getBoolean(String key) {
@@ -70,7 +65,7 @@ public String getOptionalString(String key) {
         if (Strings.isNullOrEmpty(s)) {
             return null;
         }
-        return s;
+        return trim(key, s);
     }
 
     public Boolean getOptionalBoolean(String key) {
@@ -90,4 +85,16 @@ public Integer getOptionalInt(String key) {
             return Integer.parseInt(s);
         }
     }
+
+    // -------------------------------------------------------------------------
+    // Private helpers
+    // -------------------------------------------------------------------------
+
+    private static String trim(String key, String value) {
+        String trimmed = value.trim();
+        if (!trimmed.equals(value)) {
+            log.warn("The property '{}' has leading or trailing spaces which were removed!", key);
+        }
+        return trimmed;
+    }
 }