You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by eb...@apache.org on 2024/10/25 10:06:46 UTC
(commons-configuration) 02/05: Replace org.apache.commons.codec.binary.Base64 with java.util.Base64
This is an automated email from the ASF dual-hosted git repository.
ebourg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-configuration.git
commit 7b434dbdc43851e23c9da7f23cc295470556227b
Author: Emmanuel Bourg <eb...@apache.org>
AuthorDate: Fri Oct 25 10:46:50 2024 +0200
Replace org.apache.commons.codec.binary.Base64 with java.util.Base64
---
.../commons/configuration2/plist/XMLPropertyListConfiguration.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java b/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java
index ccdf334b..492019c9 100644
--- a/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java
@@ -29,6 +29,7 @@ import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Base64;
import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
@@ -42,7 +43,6 @@ import java.util.TimeZone;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.apache.commons.codec.binary.Base64;
import org.apache.commons.configuration2.BaseHierarchicalConfiguration;
import org.apache.commons.configuration2.FileBasedConfiguration;
import org.apache.commons.configuration2.HierarchicalConfiguration;
@@ -202,7 +202,7 @@ public class XMLPropertyListConfiguration extends BaseHierarchicalConfiguration
* @param value the value to be added
*/
public void addDataValue(final String value) {
- addValue(Base64.decodeBase64(value.getBytes(DATA_ENCODING)));
+ addValue(java.util.Base64.getMimeDecoder().decode(value.getBytes(DATA_ENCODING)));
}
/**
@@ -638,7 +638,7 @@ public class XMLPropertyListConfiguration extends BaseHierarchicalConfiguration
final Map<String, Object> map = transformMap((Map<?, ?>) value);
printValue(out, indentLevel, new MapConfiguration(map));
} else if (value instanceof byte[]) {
- final String base64 = new String(Base64.encodeBase64((byte[]) value), DATA_ENCODING);
+ final String base64 = new String(Base64.getMimeEncoder().encode((byte[]) value), DATA_ENCODING);
out.println(padding + "<data>" + StringEscapeUtils.escapeXml10(base64) + "</data>");
} else if (value != null) {
out.println(padding + "<string>" + StringEscapeUtils.escapeXml10(String.valueOf(value)) + "</string>");