You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by tb...@apache.org on 2013/12/19 16:31:58 UTC
[47/50] [abbrv] git commit: [OLINGO-94] ServiceDocumentConsumer now
uses RestUtil
[OLINGO-94] ServiceDocumentConsumer now uses RestUtil
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/fe0393d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/fe0393d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/fe0393d5
Branch: refs/heads/ODataServlet
Commit: fe0393d544a4b20c31f23d05859eb2b2a5d1d470
Parents: 0a9439c
Author: Christian Amend <ch...@apache.org>
Authored: Wed Dec 18 16:21:22 2013 +0100
Committer: Christian Amend <ch...@apache.org>
Committed: Wed Dec 18 16:21:22 2013 +0100
----------------------------------------------------------------------
.../consumer/AtomServiceDocumentConsumer.java | 23 ++------------------
1 file changed, 2 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fe0393d5/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/AtomServiceDocumentConsumer.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/AtomServiceDocumentConsumer.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/AtomServiceDocumentConsumer.java
index f49134b..4ce8a9c 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/AtomServiceDocumentConsumer.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/AtomServiceDocumentConsumer.java
@@ -22,7 +22,6 @@ import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
-import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -37,6 +36,7 @@ import org.apache.olingo.odata2.api.servicedocument.ExtensionAttribute;
import org.apache.olingo.odata2.api.servicedocument.ExtensionElement;
import org.apache.olingo.odata2.api.servicedocument.Fixed;
import org.apache.olingo.odata2.api.servicedocument.Workspace;
+import org.apache.olingo.odata2.core.commons.XmlHelper;
import org.apache.olingo.odata2.core.ep.util.FormatXml;
import org.apache.olingo.odata2.core.servicedocument.AcceptImpl;
import org.apache.olingo.odata2.core.servicedocument.AtomInfoImpl;
@@ -311,25 +311,6 @@ public class AtomServiceDocumentConsumer {
}
public ServiceDocumentImpl parseXml(final InputStream in) throws EntityProviderException {
- return readServiceDokument(createStreamReader(in));
+ return readServiceDokument(XmlHelper.createStreamReader(in));
}
-
- private XMLStreamReader createStreamReader(final InputStream in) throws EntityProviderException {
- if (in != null) {
- XMLInputFactory factory = XMLInputFactory.newInstance();
- factory.setProperty(XMLInputFactory.IS_VALIDATING, false);
- factory.setProperty(XMLInputFactory.IS_NAMESPACE_AWARE, true);
- XMLStreamReader streamReader;
- try {
- streamReader = factory.createXMLStreamReader(in);
- } catch (XMLStreamException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
- .getSimpleName()), e);
- }
- return streamReader;
- } else {
- throw new EntityProviderException(EntityProviderException.INVALID_STATE.addContent("Null InputStream"));
- }
- }
-
}