code fixes

Author: car031

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

@@ -7,7 +7,7 @@
 import java.io.InputStream;
 import java.net.URL;
 import java.net.URLDecoder;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -33,6 +33,8 @@
  */
 public class ContextProperties extends OrderedProperties {
 
+	private static final String UTF_8 = "UTF-8";
+
 	private static final String BASE64_PREFIX = "_b64_";
 
 	private static final String UNABLE_TO_READ_FROM = "Unable to read from %s";
@@ -112,7 +114,7 @@ public ContextProperties(URL fileUrl) throws IOException {
 	 */
 	private void load(URL fileUrl) throws IOException {
 		try {
-			file = new File(URLDecoder.decode(fileUrl.getPath(), "UTF-8"));
+			file = new File(URLDecoder.decode(fileUrl.getPath(), UTF_8));
 		} catch (Exception e) {
 			throw new IOException(String.format(UNABLE_TO_READ_FROM, file.getPath()), e);
 		}
@@ -270,7 +272,7 @@ public String getString(String property, String defaultValue) {
 		String value = getProperty(property, defaultValue);
 		if (value.startsWith(BASE64_PREFIX))
 			value = new String(Base64.getDecoder().decode(value.substring(BASE64_PREFIX.length())),
-					Charset.forName("UTF-8"));
+					StandardCharsets.UTF_8);
 		return StrSubstitutor.replaceSystemProperties(value);
 	}
 
@@ -334,7 +336,7 @@ public float getFloat(String property, float defaultValue) {
 	@Override
 	public synchronized Object setProperty(String key, String value) {
 		if (value.contains("\n"))
-			value = BASE64_PREFIX + Base64.getEncoder().encodeToString(value.getBytes(Charset.forName("UTF-8")));
+			value = BASE64_PREFIX + Base64.getEncoder().encodeToString(value.getBytes(StandardCharsets.UTF_8));
 		return super.setProperty(key, value);
 	}
 

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

@@ -3,7 +3,6 @@
 import static org.junit.Assert.assertEquals;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -37,7 +36,7 @@ public void testWrite() throws IOException {
 	}
 
 	@Test
-	public void testSetAndGetProperty() throws FileNotFoundException, IOException {
+	public void testSetAndGetProperty() throws IOException {
 		File abcFile = new File("target/abc.properties");
 		ContextProperties contextProperties = new ContextProperties(abcFile);
 
@@ -57,8 +56,7 @@ public void testSetAndGetProperty() throws FileNotFoundException, IOException {
 
 		assertEquals("pippo", contextProperties.getString("propA"));
 		assertEquals("pippo\npluto\npaperino", contextProperties.getString("propB"));
-		assertEquals(" Lorem ipsum dolor sit amet, consectetur adipiscing elit.",
-				contextProperties.getString("propC"));
+		assertEquals(" Lorem ipsum dolor sit amet, consectetur adipiscing elit.", contextProperties.getString("propC"));
 		assertEquals("", contextProperties.getString("emptyKey"));
 
 		Properties properties = new Properties();
@@ -70,7 +68,7 @@ public void testSetAndGetProperty() throws FileNotFoundException, IOException {
 
 		// testing explicit encoding and decoding (Properties class)
 		assertEquals("pippo", properties.getProperty("propA"));
-		assertEquals("_b64_"+Base64.getEncoder().encodeToString("""
+		assertEquals("_b64_" + Base64.getEncoder().encodeToString("""
 									pippo
 									pluto
 									paperino""".getBytes()), properties.getProperty("propB"));