You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2018/09/27 20:37:04 UTC
svn commit: r1842161 - in
/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2:
PropertiesConfiguration.java XMLPropertiesConfiguration.java
interpol/SystemPropertiesLookup.java plist/XMLPropertyListConfiguration.java
Author: ggregory
Date: Thu Sep 27 20:37:04 2018
New Revision: 1842161
URL: http://svn.apache.org/viewvc?rev=1842161&view=rev
Log:
[CONFIGURATION-711] Update Apache Commons Lang from 3.7 to 3.8.1. Use code from Apache Commons Text since it was deprecated in Apache Commons Lang.
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/XMLPropertiesConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/interpol/SystemPropertiesLookup.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java?rev=1842161&r1=1842160&r2=1842161&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java Thu Sep 27 20:37:04 2018
@@ -39,13 +39,13 @@ import org.apache.commons.configuration2
import org.apache.commons.configuration2.io.FileLocatorAware;
import org.apache.commons.configuration2.io.FileLocatorUtils;
import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.text.translate.AggregateTranslator;
import org.apache.commons.lang3.text.translate.CharSequenceTranslator;
import org.apache.commons.lang3.text.translate.EntityArrays;
import org.apache.commons.lang3.text.translate.LookupTranslator;
import org.apache.commons.lang3.text.translate.UnicodeEscaper;
+import org.apache.commons.text.StringEscapeUtils;
/**
* This is the "classic" Properties loader which loads the values from
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/XMLPropertiesConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/XMLPropertiesConfiguration.java?rev=1842161&r1=1842160&r2=1842161&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/XMLPropertiesConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/XMLPropertiesConfiguration.java Thu Sep 27 20:37:04 2018
@@ -17,19 +17,20 @@
package org.apache.commons.configuration2;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
import java.io.PrintWriter;
import java.io.Reader;
import java.io.Writer;
import java.util.Iterator;
import java.util.List;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
import org.apache.commons.configuration2.convert.ListDelimiterHandler;
import org.apache.commons.configuration2.ex.ConfigurationException;
import org.apache.commons.configuration2.io.FileLocator;
import org.apache.commons.configuration2.io.FileLocatorAware;
-import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -219,7 +220,7 @@ public class XMLPropertiesConfiguration
if (getHeader() != null)
{
- writer.println(" <comment>" + StringEscapeUtils.escapeXml(getHeader()) + "</comment>");
+ writer.println(" <comment>" + StringEscapeUtils.escapeXml10(getHeader()) + "</comment>");
}
Iterator<String> keys = getKeys();
@@ -252,7 +253,7 @@ public class XMLPropertiesConfiguration
private void writeProperty(PrintWriter out, String key, Object value)
{
// escape the key
- String k = StringEscapeUtils.escapeXml(key);
+ String k = StringEscapeUtils.escapeXml10(key);
if (value != null)
{
@@ -295,7 +296,7 @@ public class XMLPropertiesConfiguration
{
Element comment = document.createElement("comment");
properties.appendChild(comment);
- comment.setTextContent(StringEscapeUtils.escapeXml(getHeader()));
+ comment.setTextContent(StringEscapeUtils.escapeXml10(getHeader()));
}
Iterator<String> keys = getKeys();
@@ -333,7 +334,7 @@ public class XMLPropertiesConfiguration
properties.appendChild(entry);
// escape the key
- String k = StringEscapeUtils.escapeXml(key);
+ String k = StringEscapeUtils.escapeXml10(key);
entry.setAttribute("key", k);
if (value != null)
@@ -359,7 +360,7 @@ public class XMLPropertiesConfiguration
*/
private String escapeValue(Object value)
{
- String v = StringEscapeUtils.escapeXml(String.valueOf(value));
+ String v = StringEscapeUtils.escapeXml10(String.valueOf(value));
return String.valueOf(getListDelimiterHandler().escape(v,
ListDelimiterHandler.NOOP_TRANSFORMER));
}
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/interpol/SystemPropertiesLookup.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/interpol/SystemPropertiesLookup.java?rev=1842161&r1=1842160&r2=1842161&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/interpol/SystemPropertiesLookup.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/interpol/SystemPropertiesLookup.java Thu Sep 27 20:37:04 2018
@@ -16,7 +16,7 @@
*/
package org.apache.commons.configuration2.interpol;
-import org.apache.commons.lang3.text.StrLookup;
+import org.apache.commons.text.lookup.StringLookupFactory;
/**
* <p>
@@ -44,13 +44,9 @@ import org.apache.commons.lang3.text.Str
*/
public class SystemPropertiesLookup implements Lookup
{
- /** The underlying StrLookup object. */
- private final StrLookup<String> sysLookup = StrLookup
- .systemPropertiesLookup();
-
@Override
public Object lookup(String variable)
{
- return sysLookup.lookup(variable);
+ return StringLookupFactory.INSTANCE.systemPropertyStringLookup().lookup(variable);
}
}
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java?rev=1842161&r1=1842160&r2=1842161&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java Thu Sep 27 20:37:04 2018
@@ -17,8 +17,6 @@
package org.apache.commons.configuration2.plist;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
import java.io.PrintWriter;
import java.io.Reader;
import java.io.UnsupportedEncodingException;
@@ -40,6 +38,9 @@ import java.util.List;
import java.util.Map;
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;
@@ -52,8 +53,8 @@ import org.apache.commons.configuration2
import org.apache.commons.configuration2.io.FileLocatorAware;
import org.apache.commons.configuration2.tree.ImmutableNode;
import org.apache.commons.configuration2.tree.InMemoryNodeModel;
-import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.text.StringEscapeUtils;
import org.xml.sax.Attributes;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;