1 files changed, 50 insertions, 53 deletions

diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/configuration/PlaceholderConfiguration.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/configuration/PlaceholderConfiguration.java
index 326ed142..a3719168 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/configuration/PlaceholderConfiguration.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/configuration/PlaceholderConfiguration.java
@@ -3,19 +3,19 @@
  * PDF-AS has been contracted by the E-Government Innovation Center EGIZ, a
  * joint initiative of the Federal Chancellery Austria and Graz University of
  * Technology.
- * 
+ *
  * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
  * the European Commission - subsequent versions of the EUPL (the "Licence");
  * You may not use this work except in compliance with the Licence.
  * You may obtain a copy of the Licence at:
  * http://www.osor.eu/eupl/
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the Licence is distributed on an "AS IS" basis,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the Licence for the specific language governing permissions and
  * limitations under the Licence.
- * 
+ *
  * This product combines work with different licenses. See the "NOTICE" text
  * file for details on the various modules and licenses.
  * The "NOTICE" text file is part of the distribution. Any derivative works
@@ -25,60 +25,57 @@ package at.gv.egiz.pdfas.lib.impl.configuration;
 
 import at.gv.egiz.pdfas.common.settings.ISettings;
 import at.gv.egiz.pdfas.lib.api.IConfigurationConstants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
-import java.util.Map;
+@Slf4j
+public class PlaceholderConfiguration extends SpecificBaseConfiguration
+    implements IConfigurationConstants {
 
+  public PlaceholderConfiguration(ISettings configuration) {
+    super(configuration);
+  }
 
-public class PlaceholderConfiguration extends SpecificBaseConfiguration 
-		implements IConfigurationConstants {
+  public boolean isGlobalPlaceholderEnabled() {
+    if (configuration.hasValue(PLACEHOLDER_SEARCH_ENABLED)) {
+      final String value = configuration.getValue(PLACEHOLDER_SEARCH_ENABLED);
+      if (value.equalsIgnoreCase(TRUE)) {
+        return true;
+      }
+    }
+    return false;
+  }
 
-	private static final Logger logger = LoggerFactory.getLogger(PlaceholderConfiguration.class);
+  /**
+   * Match selected Profile for Placeholder Enables to activate placeholder
+   * search/match for different profiles
+   *
+   * @return
+   */
+  public boolean isProfileConfigurationEnabled(String profileID) {
+    log.trace("Check if placeHolders are enabled for profile: {}", profileID);
+    
+    final String profileMatch = SIG_OBJECT + SEPERATOR + profileID + SEPERATOR
+        + PLACEHOLDER_SEARCH_ENABLED;
+    final String value = configuration.getValue(profileMatch);
+    if (TRUE.equalsIgnoreCase(value)) {
+      log.debug("Placeholders enabled for profile: {} ", profileID);
+      return true;
+      
+    }    
+    return false;
+    
+  }
 
-	public PlaceholderConfiguration(ISettings configuration) {
-		super(configuration);
-	}
+  /**
+   * Get placeholderId for a specific profile.
+   * 
+   * @param selectedProfileID ProfileName
+   * @return Placeholder Id
+   */
+  public String getProfilePlaceholderID(String selectedProfileID) {
+    log.info("SelectedProfileID in ProfileConfEnabled: " + selectedProfileID);
+    final String profileMatch = SIG_OBJECT + SEPERATOR + selectedProfileID + SEPERATOR + PLACEHOLDER_ID;
+    return configuration.getValue(profileMatch);
 
-	public boolean isGlobalPlaceholderEnabled() {
-		if (configuration.hasValue(PLACEHOLDER_SEARCH_ENABLED)) {
-			String value = configuration.getValue(PLACEHOLDER_SEARCH_ENABLED);
-			if (value.equalsIgnoreCase(TRUE)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Match selected Profile for Placeholder
-	 * Enables to activate placeholder search/match for different profiles
-	 * @return
-	 */
-	public boolean isProfileConfigurationEnabled(String selectedProfileID)
-	{
-		logger.info("SelectedProfileID in ProfileConfEnabled: "+selectedProfileID);
-		String profileMatch = SIG_OBJECT+SEPERATOR+selectedProfileID+SEPERATOR+PLACEHOLDER_SEARCH_ENABLED;
-		if (configuration.getValuesPrefix(profileMatch)!=null) {
-			Map<String, String> map = configuration.getValuesPrefix(profileMatch);
-           String value =  map.get(profileMatch);
-			if (value.equalsIgnoreCase(TRUE)) {
-				logger.info("Configuration has Value: "+value);
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public String getProfilePlaceholderID(String selectedProfileID)
-	{
-		logger.info("SelectedProfileID in ProfileConfEnabled: "+selectedProfileID);
-		String profileMatch = SIG_OBJECT+SEPERATOR+selectedProfileID+SEPERATOR+PLACEHOLDER_ID;
-		if (configuration.getValuesPrefix(profileMatch)!=null) {
-			Map<String, String> map = configuration.getValuesPrefix(profileMatch);
-			return map.get(profileMatch);
-		}
-		return null;
-	}
+  }
 }
-