PHOENIX-4705 Use XMLInputFactory.newInstance() instead of XMLInputFactory.newFactory()
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/6c1a624f Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/6c1a624f Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/6c1a624f Branch: refs/heads/system-catalog Commit: 6c1a624f351926c6b122c722cf4f9c3418a222ae Parents: 4b84199 Author: James Taylor <jtay...@salesforce.com> Authored: Thu Apr 26 12:37:26 2018 -0700 Committer: James Taylor <jtay...@salesforce.com> Committed: Fri Apr 27 11:41:56 2018 -0700 ---------------------------------------------------------------------- .../pherf/configuration/XMLConfigParser.java | 2 +- .../pherf/result/impl/XMLResultHandler.java | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/6c1a624f/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/XMLConfigParser.java ---------------------------------------------------------------------- diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/XMLConfigParser.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/XMLConfigParser.java index f3ec12f..a0ee471 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/XMLConfigParser.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/XMLConfigParser.java @@ -115,7 +115,7 @@ public class XMLConfigParser { */ // TODO Remove static calls public static DataModel readDataModel(Path file) throws JAXBException, XMLStreamException { - XMLInputFactory xif = XMLInputFactory.newFactory(); + XMLInputFactory xif = XMLInputFactory.newInstance(); xif.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, false); xif.setProperty(XMLInputFactory.SUPPORT_DTD, false); JAXBContext jaxbContext = JAXBContext.newInstance(DataModel.class); http://git-wip-us.apache.org/repos/asf/phoenix/blob/6c1a624f/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/result/impl/XMLResultHandler.java ---------------------------------------------------------------------- diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/result/impl/XMLResultHandler.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/result/impl/XMLResultHandler.java index 05b5a2b..87d6806 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/result/impl/XMLResultHandler.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/result/impl/XMLResultHandler.java @@ -18,8 +18,11 @@ package org.apache.phoenix.pherf.result.impl; -import org.apache.phoenix.pherf.result.*; -import org.apache.phoenix.pherf.result.file.ResultFileDetails; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; import javax.xml.bind.JAXBContext; import javax.xml.bind.Marshaller; @@ -28,11 +31,10 @@ import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamReader; import javax.xml.transform.stream.StreamSource; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; +import org.apache.phoenix.pherf.result.DataModelResult; +import org.apache.phoenix.pherf.result.Result; +import org.apache.phoenix.pherf.result.ResultValue; +import org.apache.phoenix.pherf.result.file.ResultFileDetails; public class XMLResultHandler extends DefaultResultHandler{ @@ -74,7 +76,7 @@ public class XMLResultHandler extends DefaultResultHandler{ } List<Result> readFromResultFile(File resultsFile) throws Exception { - XMLInputFactory xif = XMLInputFactory.newFactory(); + XMLInputFactory xif = XMLInputFactory.newInstance(); xif.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, false); xif.setProperty(XMLInputFactory.SUPPORT_DTD, false); JAXBContext jaxbContext = JAXBContext.newInstance(DataModelResult.class);
