removed encoding from ContextProperties.getProperties() - moved

encoding to getString()

Author: gdesiato

logicaldoc-util/src/main/java/com/logicaldoc/util/config/ContextProperties.java

@@ -262,11 +262,16 @@ public List<File> getBackups() throws IOException {
 	}
 
 	public String getString(String property) {
-		return getProperty(property);
+		return getString(property, null);
 	}
 
 	public String getString(String property, String defaultValue) {
-		return getProperty(property, defaultValue);
+		String value = getProperty(property, defaultValue);
+		if (StringUtil.isBase64(value)) {
+			byte[] decodedBytes = Base64.getDecoder().decode(value);
+			value = new String(decodedBytes);
+		}
+		return StrSubstitutor.replaceSystemProperties(value);
 	}
 
 	public int getInt(String property) {
@@ -343,7 +348,7 @@ public synchronized Object setProperty(String key, String value) {
 	@Override
 	public String getProperty(String property) {
 		String value = super.getProperty(property);
-		return getPropertyWithDecoding(value);
+		return StrSubstitutor.replaceSystemProperties(value);
 	}
 
 	/**
@@ -357,14 +362,6 @@ public String getProperty(String property) {
 	@Override
 	public String getProperty(String property, String defaultValue) {		
 		String value = super.getProperty(property, defaultValue);
-		return getPropertyWithDecoding(value);
-	}
-
-	private String getPropertyWithDecoding(String value) {
-		if (StringUtil.isBase64(value)) {
-			byte[] decodedBytes = Base64.getDecoder().decode(value);
-			value = new String(decodedBytes);
-		}
 		return StrSubstitutor.replaceSystemProperties(value);
 	}
 

logicaldoc-util/src/test/java/com/logicaldoc/util/config/ContextPropertiesTest.java

@@ -55,12 +55,11 @@ public void testSetAndGetProperty() throws FileNotFoundException, IOException {
 
 		contextProperties.write();
 
-		assertEquals("pippo", contextProperties.getProperty("propA"));
-		assertEquals("pippo\npluto\npaperino", contextProperties.getProperty("propB"));
+		assertEquals("pippo", contextProperties.getString("propA"));
+		assertEquals("pippo\npluto\npaperino", contextProperties.getString("propB"));
 		assertEquals(" Lorem ipsum dolor sit amet, consectetur adipiscing elit.",
-				contextProperties.getProperty("propC"));
-
-		assertEquals("", contextProperties.getProperty("emptyKey"));
+				contextProperties.getString("propC"));
+		assertEquals("", contextProperties.getString("emptyKey"));
 
 		Properties properties = new Properties();
 		try (FileReader reader = new FileReader(abcFile)) {