You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by je...@apache.org on 2017/06/12 22:08:13 UTC
hadoop git commit: HADOOP-14501. Switch from aalto-xml to woodstox to
handle odd XML features (jeagles)
Repository: hadoop
Updated Branches:
refs/heads/trunk 86368cc76 -> a81916ea8
HADOOP-14501. Switch from aalto-xml to woodstox to handle odd XML features (jeagles)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a81916ea
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a81916ea
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a81916ea
Branch: refs/heads/trunk
Commit: a81916ea89d59c1642b3462e3d7c6c1acb1e7109
Parents: 86368cc
Author: Jonathan Eagles <je...@yahoo-inc.com>
Authored: Mon Jun 12 17:07:53 2017 -0500
Committer: Jonathan Eagles <je...@yahoo-inc.com>
Committed: Mon Jun 12 17:07:53 2017 -0500
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/pom.xml | 4 +-
.../org/apache/hadoop/conf/Configuration.java | 6 +-
.../apache/hadoop/conf/TestConfiguration.java | 82 ++++++++++++++++++++
hadoop-project/pom.xml | 6 +-
4 files changed, 90 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a81916ea/hadoop-common-project/hadoop-common/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml
index 7ef0462..87b4dc9 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -314,8 +314,8 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>com.fasterxml</groupId>
- <artifactId>aalto-xml</artifactId>
+ <groupId>com.fasterxml.woodstox</groupId>
+ <artifactId>woodstox-core</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a81916ea/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
index 1a6679b..d3dd822 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.conf;
-import com.fasterxml.aalto.stax.InputFactoryImpl;
+import com.ctc.wstx.stax.WstxInputFactory;
import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.JsonGenerator;
import com.google.common.annotations.VisibleForTesting;
@@ -284,7 +284,7 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
* Specify exact input factory to avoid time finding correct one.
* Factory is reusable across un-synchronized threads once initialized
*/
- private static final XMLInputFactory2 factory = new InputFactoryImpl();
+ private static final XMLInputFactory2 XML_INPUT_FACTORY = new WstxInputFactory();
/**
* Class to keep the information about the keys which replace the deprecated
@@ -2646,7 +2646,7 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
if (is == null) {
return null;
}
- return factory.createXMLStreamReader(systemId, is);
+ return XML_INPUT_FACTORY.createXMLStreamReader(systemId, is);
}
private void loadResources(Properties properties,
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a81916ea/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java
index 0c66470..5ced541 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java
@@ -30,6 +30,7 @@ import java.io.StringWriter;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.URI;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -99,6 +100,18 @@ public class TestConfiguration extends TestCase {
out.write("<configuration>\n");
}
+ private void writeHeader() throws IOException{
+ out.write("<?xml version=\"1.0\"?>\n");
+ }
+
+ private void writeHeader(String encoding) throws IOException{
+ out.write("<?xml version=\"1.0\" encoding=\"" + encoding + "\"?>\n");
+ }
+
+ private void writeConfiguration() throws IOException{
+ out.write("<configuration>\n");
+ }
+
private void endConfig() throws IOException{
out.write("</configuration>\n");
out.close();
@@ -120,6 +133,18 @@ public class TestConfiguration extends TestCase {
out.write("</xi:fallback>\n ");
}
+ private void declareEntity(String root, String entity, String value)
+ throws IOException {
+ out.write("<!DOCTYPE " + root
+ + " [\n<!ENTITY " + entity + " \"" + value + "\">\n]>");
+ }
+
+ private void declareSystemEntity(String root, String entity, String value)
+ throws IOException {
+ out.write("<!DOCTYPE " + root
+ + " [\n<!ENTITY " + entity + " SYSTEM \"" + value + "\">\n]>");
+ }
+
public void testInputStreamResource() throws Exception {
StringWriter writer = new StringWriter();
out = new BufferedWriter(writer);
@@ -550,6 +575,63 @@ public class TestConfiguration extends TestCase {
tearDown();
}
+ public void testCharsetInDocumentEncoding() throws Exception {
+ tearDown();
+ out=new BufferedWriter(new OutputStreamWriter(new FileOutputStream(CONFIG),
+ StandardCharsets.ISO_8859_1));
+ writeHeader(StandardCharsets.ISO_8859_1.displayName());
+ writeConfiguration();
+ appendProperty("a", "b");
+ appendProperty("c", "Müller");
+ endConfig();
+
+ // verify that the includes file contains all properties
+ Path fileResource = new Path(CONFIG);
+ conf.addResource(fileResource);
+ assertEquals(conf.get("a"), "b");
+ assertEquals(conf.get("c"), "Müller");
+ tearDown();
+ }
+
+ public void testEntityReference() throws Exception {
+ tearDown();
+ out=new BufferedWriter(new FileWriter(CONFIG));
+ writeHeader();
+ declareEntity("configuration", "d", "d");
+ writeConfiguration();
+ appendProperty("a", "b");
+ appendProperty("c", "&d;");
+ endConfig();
+
+ // verify that the includes file contains all properties
+ Path fileResource = new Path(CONFIG);
+ conf.addResource(fileResource);
+ assertEquals(conf.get("a"), "b");
+ assertEquals(conf.get("c"), "d");
+ tearDown();
+ }
+
+ public void testSystemEntityReference() throws Exception {
+ tearDown();
+ out=new BufferedWriter(new FileWriter(CONFIG2));
+ out.write("d");
+ out.close();
+ out=new BufferedWriter(new FileWriter(CONFIG));
+ writeHeader();
+ declareSystemEntity("configuration", "d", CONFIG2);
+ writeConfiguration();
+ appendProperty("a", "b");
+ appendProperty("c", "&d;");
+ endConfig();
+
+ // verify that the includes file contains all properties
+ Path fileResource = new Path(CONFIG);
+ conf.addResource(fileResource);
+ assertEquals(conf.get("a"), "b");
+ assertEquals(conf.get("c"), "d");
+ tearDown();
+ }
+
public void testIncludesWithFallback() throws Exception {
tearDown();
out=new BufferedWriter(new FileWriter(CONFIG2));
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a81916ea/hadoop-project/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 306dce5..afd2006 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -881,9 +881,9 @@
<version>3.1.4</version>
</dependency>
<dependency>
- <groupId>com.fasterxml</groupId>
- <artifactId>aalto-xml</artifactId>
- <version>1.0.0</version>
+ <groupId>com.fasterxml.woodstox</groupId>
+ <artifactId>woodstox-core</artifactId>
+ <version>5.0.3</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org