Repository: olingo-odata2 Updated Branches: refs/heads/OLINGO-231_PocForAndroid 28333efff -> 39beefb49
[OLINGO-231] Added XMLStreamExceptions Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/39beefb4 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/39beefb4 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/39beefb4 Branch: refs/heads/OLINGO-231_PocForAndroid Commit: 39beefb498671d0d8e081697b21e484b9ab4ea44 Parents: 28333ef Author: Michael Bolz <[email protected]> Authored: Tue Apr 29 15:55:01 2014 +0200 Committer: Michael Bolz <[email protected]> Committed: Tue Apr 29 15:55:01 2014 +0200 ---------------------------------------------------------------------- .../odata2/android/xml/AndroidXmlReader.java | 130 ++++++------------- .../olingo/odata2/api/xml/XMLStreamReader.java | 44 +++---- .../olingo/odata2/api/xml/XMLStreamWriter.java | 33 +++-- .../consumer/AtomServiceDocumentConsumer.java | 4 +- .../core/ep/consumer/XmlEntryConsumer.java | 6 +- .../core/ep/consumer/XmlFeedConsumer.java | 4 +- .../core/ep/consumer/XmlMetadataConsumer.java | 7 +- .../core/xml/AbstractXmlStreamFactory.java | 8 +- .../odata2/core/xml/JavaxStaxReaderWrapper.java | 9 +- .../odata2/core/xml/JavaxStaxWriterWrapper.java | 15 +-- 10 files changed, 105 insertions(+), 155 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/39beefb4/odata2-android/src/main/java/org/apache/olingo/odata2/android/xml/AndroidXmlReader.java ---------------------------------------------------------------------- diff --git a/odata2-android/src/main/java/org/apache/olingo/odata2/android/xml/AndroidXmlReader.java b/odata2-android/src/main/java/org/apache/olingo/odata2/android/xml/AndroidXmlReader.java index cf8addd..cb4bacc 100644 --- a/odata2-android/src/main/java/org/apache/olingo/odata2/android/xml/AndroidXmlReader.java +++ b/odata2-android/src/main/java/org/apache/olingo/odata2/android/xml/AndroidXmlReader.java @@ -16,18 +16,15 @@ import android.util.Xml; public class AndroidXmlReader implements XMLStreamReader { - private final InputStream xmlContentStream; private final XmlPullParser parser; public AndroidXmlReader(Object content) { if(content instanceof InputStream) { - parser = Xml.newPullParser(); - this.xmlContentStream = (InputStream) content; - try { - parser.setInput(xmlContentStream, null); + parser = Xml.newPullParser(); + parser.setInput((InputStream)content, null); } catch (XmlPullParserException e) { - throw new RuntimeException("Error during AndroidXmlReader init", e); + throw new RuntimeException("Error during AndroidXmlReader init with message" + e.getMessage(), e); } } else { throw new IllegalArgumentException("Unsupported input content. Only InputStream is supported."); @@ -61,28 +58,28 @@ public class AndroidXmlReader implements XMLStreamReader { } @Override - public String getAttributeLocalName(int arg0) { - return parser.getAttributeName(arg0); + public String getAttributeLocalName(int index) { + return parser.getAttributeName(index); } @Override - public String getAttributeNamespace(int arg0) { - return parser.getAttributeName(arg0); + public String getAttributeNamespace(int index) { + return parser.getAttributeName(index); } @Override - public String getAttributePrefix(int arg0) { - return parser.getAttributePrefix(arg0); + public String getAttributePrefix(int index) { + return parser.getAttributePrefix(index); } @Override - public String getAttributeValue(int arg0) { - return parser.getAttributeValue(arg0); + public String getAttributeValue(int index) { + return parser.getAttributeValue(index); } @Override - public String getAttributeValue(String arg0, String arg1) { - String attributeValue = parser.getAttributeValue(arg0, arg1); + public String getAttributeValue(String namespaceURI, String localName) { + String attributeValue = parser.getAttributeValue(namespaceURI, localName); return attributeValue; } @@ -105,22 +102,18 @@ public class AndroidXmlReader implements XMLStreamReader { @Override public String getLocalName() { - // FIXME - String name = parser.getName(); - return name; + return parser.getName(); } @Override public QName getName() { final String namespaceUri = getNamespaceURI(); - // FIXME - QName qname = new QName() { + return new QName() { @Override public String getNamespaceURI() { return namespaceUri; } }; - return qname; } @Override @@ -135,7 +128,7 @@ public class AndroidXmlReader implements XMLStreamReader { final String prefix = tmp; // TODO Auto-generated method stub NamespaceContext nctx = new NamespaceContext() { - public String getPrefix(String arg0) { + public String getPrefix(String index) { return prefix; } }; @@ -158,56 +151,36 @@ public class AndroidXmlReader implements XMLStreamReader { } @Override - public String getNamespacePrefix(int arg0) { - // FIXME + public String getNamespacePrefix(int index) throws XMLStreamException { try { - String prefix = parser.getNamespacePrefix(arg0); - return prefix; + return parser.getNamespacePrefix(index); } catch (XmlPullParserException e) { - e.printStackTrace(); - throw new RuntimeException("Android", e); + throw new XMLStreamException("Got XmlPullParserException with message: " + e.getMessage(), e); } } @Override public String getNamespaceURI() { - // FIXME -// try { -// int depth = parser.getDepth(); -// String nsUri = parser.getNamespaceUri(depth); -// return nsUri; -// } catch (XmlPullParserException e) { -// e.printStackTrace(); -// throw new RuntimeException("Android", e); -// } - String nsUri = parser.getNamespace(); - return nsUri; + return parser.getNamespace(); } - - @Override - public String getNamespaceURI(int index) { - // FIXME + public String getNamespaceURI(int index) throws XMLStreamException { try { int nsCount = getNamespaceCount(); if(index > nsCount) { - throw new RuntimeException("Out of namespace index"); + throw new XMLStreamException("Out of namespace index"); } int depthAndIndex = parser.getDepth() + index - 1; - String namespaceUri = parser.getNamespaceUri(depthAndIndex); - return namespaceUri; + return parser.getNamespaceUri(depthAndIndex); } catch (XmlPullParserException e) { - e.printStackTrace(); - throw new RuntimeException("Android", e); + throw new XMLStreamException("Got XmlPullParserException with message: " + e.getMessage(), e); } } @Override - public String getNamespaceURI(String arg0) { - // FIXME - String namespaceUri = parser.getNamespace(arg0); - return namespaceUri; + public String getNamespaceURI(String prefix) { + return parser.getNamespace(prefix); } @Override @@ -222,58 +195,46 @@ public class AndroidXmlReader implements XMLStreamReader { @Override public boolean hasName() { - // FIXME return parser.getName() != null; } @Override public boolean hasNext() throws XMLStreamException { - // TODO Auto-generated method stub - int eventType; try { - eventType = parser.getEventType(); + return parser.getEventType() != XmlPullParser.END_DOCUMENT; } catch (XmlPullParserException e) { - throw new RuntimeException("Android", e); + throw new XMLStreamException("Got XmlPullParserException with message: " + e.getMessage(), e); } - return eventType != XmlPullParser.END_DOCUMENT; } @Override - public boolean isCharacters() { - // FIXME + public boolean isCharacters() throws XMLStreamException { try { return !parser.isWhitespace(); } catch (XmlPullParserException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - return false; + throw new XMLStreamException("Got XmlPullParserException with message: " + e.getMessage(), e); } } @Override - public boolean isEndElement() { - // TODO Auto-generated method stub + public boolean isEndElement() throws XMLStreamException { try { int eventType = parser.getEventType(); return eventType == XmlPullParser.END_DOCUMENT || eventType == XmlPullParser.END_TAG; } catch (XmlPullParserException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - throw new RuntimeException("Android", e); + throw new XMLStreamException("Got XmlPullParserException with message: " + e.getMessage(), e); } } @Override - public boolean isStartElement() { + public boolean isStartElement() throws XMLStreamException { try { int eventType = parser.getEventType(); return eventType == XmlPullParser.START_DOCUMENT || eventType == XmlPullParser.START_TAG; } catch (XmlPullParserException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - throw new RuntimeException("Android", e); + throw new XMLStreamException("Got XmlPullParserException with message: " + e.getMessage(), e); } } @@ -281,10 +242,10 @@ public class AndroidXmlReader implements XMLStreamReader { public void next() throws XMLStreamException { try { parser.next(); - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - throw new RuntimeException("Android", e); + } catch (XmlPullParserException e) { + throw new XMLStreamException("Got XmlPullParserException with message: " + e.getMessage(), e); + } catch (IOException e) { + throw new XMLStreamException("Got XmlPullParserException with message: " + e.getMessage(), e); } } @@ -293,26 +254,21 @@ public class AndroidXmlReader implements XMLStreamReader { try { return parser.nextTag(); } catch (XmlPullParserException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - throw new RuntimeException("Android", e); + throw new XMLStreamException("Got XmlPullParserException with message: " + e.getMessage(), e); } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - throw new RuntimeException("Android", e); + throw new XMLStreamException("Got XmlPullParserException with message: " + e.getMessage(), e); } } @Override public void require(int eventType, String namespace, String tag) throws XMLStreamException { - // TODO Auto-generated method stub try { int xmlPullEventType = mapEventType(eventType); parser.require(xmlPullEventType, namespace, tag); } catch (XmlPullParserException e) { - throw new XMLStreamException("Requirement not fulfilled", e) {}; + throw new XMLStreamException("Got XmlPullParserException with message: " + e.getMessage(), e); } catch (IOException e) { - throw new RuntimeException("Android", e); + throw new XMLStreamException("Got XmlPullParserException with message: " + e.getMessage(), e); } } @@ -328,4 +284,4 @@ public class AndroidXmlReader implements XMLStreamReader { eventType + "') for mapping."); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/39beefb4/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/xml/XMLStreamReader.java ---------------------------------------------------------------------- diff --git a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/xml/XMLStreamReader.java b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/xml/XMLStreamReader.java index a41c2e9..8f91335 100644 --- a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/xml/XMLStreamReader.java +++ b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/xml/XMLStreamReader.java @@ -4,7 +4,7 @@ * distributed with this work for additional information * regarding copyright ownership. The ASF licenses this file * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance + * "License") throws XMLStreamException; you may not use this file except in compliance * with the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 @@ -23,55 +23,55 @@ package org.apache.olingo.odata2.api.xml; */ public interface XMLStreamReader { - public abstract String getLocalName(); + public abstract String getLocalName() throws XMLStreamException; - public abstract String getNamespaceURI(); + public abstract String getNamespaceURI() throws XMLStreamException; - public abstract String getNamespaceURI(int pos); + public abstract String getNamespaceURI(int index) throws XMLStreamException; - public abstract void require(int startDocument, String namespace, String tag) throws XMLStreamException; + public abstract void require(int type, String namespaceURI, String localName) throws XMLStreamException; public abstract int nextTag() throws XMLStreamException; public abstract boolean hasNext() throws XMLStreamException; - public abstract String getAttributeValue(String o, String atomRel); + public abstract String getAttributeValue(String namespaceURI, String localName) throws XMLStreamException; - public abstract String getAttributeValue(int pos); + public abstract String getAttributeValue(int index) throws XMLStreamException; public abstract String getElementText() throws XMLStreamException; - public abstract boolean isStartElement(); + public abstract boolean isStartElement() throws XMLStreamException; public abstract void next() throws XMLStreamException; - public abstract boolean isEndElement(); + public abstract boolean isEndElement() throws XMLStreamException; - public abstract int getNamespaceCount(); + public abstract int getNamespaceCount() throws XMLStreamException; - public abstract String getNamespacePrefix(int i); + public abstract String getNamespacePrefix(int index) throws XMLStreamException; - public abstract NamespaceContext getNamespaceContext(); + public abstract NamespaceContext getNamespaceContext() throws XMLStreamException; - public abstract QName getName(); + public abstract QName getName() throws XMLStreamException; - public abstract String getNamespaceURI(String customPrefix); + public abstract String getNamespaceURI(String prefix) throws XMLStreamException; - public abstract boolean hasName(); + public abstract boolean hasName() throws XMLStreamException; public abstract void close() throws XMLStreamException; - public abstract String getText(); + public abstract String getText() throws XMLStreamException; - public abstract boolean isCharacters(); + public abstract boolean isCharacters() throws XMLStreamException; - public abstract String getAttributeLocalName(int i); + public abstract String getAttributeLocalName(int index) throws XMLStreamException; - public abstract String getAttributeNamespace(int i); + public abstract String getAttributeNamespace(int index) throws XMLStreamException; - public abstract String getAttributePrefix(int i); + public abstract String getAttributePrefix(int index) throws XMLStreamException; - public abstract int getAttributeCount(); + public abstract int getAttributeCount() throws XMLStreamException; - public abstract String getPrefix(); + public abstract String getPrefix() throws XMLStreamException; } http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/39beefb4/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/xml/XMLStreamWriter.java ---------------------------------------------------------------------- diff --git a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/xml/XMLStreamWriter.java b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/xml/XMLStreamWriter.java index c21c1fb..da13834 100644 --- a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/xml/XMLStreamWriter.java +++ b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/xml/XMLStreamWriter.java @@ -23,36 +23,35 @@ package org.apache.olingo.odata2.api.xml; */ public interface XMLStreamWriter { - public abstract void writeStartDocument() throws XMLStreamException; + void writeStartDocument() throws XMLStreamException; - public abstract void setPrefix(String prefixEdmx, String namespaceEdmx200706) throws XMLStreamException; + void setPrefix(String prefix, String uri) throws XMLStreamException; - public abstract void setDefaultNamespace(String defaultNamespace) throws XMLStreamException; + void setDefaultNamespace(String uri) throws XMLStreamException; - public abstract void writeStartElement(String namespaceEdmx200706, String edmx) throws XMLStreamException; + void writeAttribute(String localName, String value) throws XMLStreamException; - public abstract void writeAttribute(String name, String value) throws XMLStreamException; + void writeAttribute(String namespaceURI, String localName, String value) throws XMLStreamException; - public abstract void writeAttribute(String prefix, String namespace, String name, String - value) throws XMLStreamException; + void writeAttribute(String prefix, String namespaceURI, String localName, String value) throws XMLStreamException; - public abstract void writeNamespace(String prefix, String namespace) throws XMLStreamException; + void writeDefaultNamespace(String namespaceURI) throws XMLStreamException; - public abstract void writeStartElement(String name) throws XMLStreamException; + void writeNamespace(String prefix, String namespaceURI) throws XMLStreamException; - public abstract void writeDefaultNamespace(String namespace) throws XMLStreamException; + void writeStartElement(String localName) throws XMLStreamException; - public abstract void writeEndElement() throws XMLStreamException; + void writeStartElement(String namespaceURI, String localName) throws XMLStreamException; - public abstract void writeEndDocument() throws XMLStreamException; + void writeStartElement(String prefix, String localName, String namespaceURI) throws XMLStreamException; - public abstract void flush() throws XMLStreamException; + void writeStartDocument(String encoding, String version) throws XMLStreamException; - public abstract void writeCharacters(String text) throws XMLStreamException; + void writeEndElement() throws XMLStreamException; - public abstract void writeStartElement(String prefix, String name, String namespace) throws XMLStreamException; + void writeEndDocument() throws XMLStreamException; - void writeStartDocument(String defaultCharset, String xmlVersion) throws XMLStreamException; + void writeCharacters(String text) throws XMLStreamException; - void writeAttribute(String namespaceM200708, String mEtag, String etag) throws XMLStreamException; + void flush() throws XMLStreamException; } http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/39beefb4/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 f9666a5..41c9f8e 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 @@ -77,7 +77,7 @@ public class AtomServiceDocumentConsumer { } } - private CommonAttributesImpl parseCommonAttribute(final XMLStreamReader reader) { + private CommonAttributesImpl parseCommonAttribute(final XMLStreamReader reader) throws XMLStreamException { CommonAttributesImpl attribute = new CommonAttributesImpl(); List<ExtensionAttribute> extAttributes = new ArrayList<ExtensionAttribute>(); attribute.setBase(reader.getAttributeValue(null, FormatXml.XML_BASE)); @@ -277,7 +277,7 @@ public class AtomServiceDocumentConsumer { return extElement; } - private List<ExtensionAttribute> parseAttribute(final XMLStreamReader reader) { + private List<ExtensionAttribute> parseAttribute(final XMLStreamReader reader) throws XMLStreamException { List<ExtensionAttribute> extAttributes = new ArrayList<ExtensionAttribute>(); for (int i = 0; i < reader.getAttributeCount(); i++) { { http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/39beefb4/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntryConsumer.java ---------------------------------------------------------------------- diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntryConsumer.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntryConsumer.java index 45c17ad..7937a17 100644 --- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntryConsumer.java +++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntryConsumer.java @@ -95,7 +95,7 @@ public class XmlEntryConsumer { } } - private boolean isEntryEndTag(final XMLStreamReader reader) { + private boolean isEntryEndTag(final XMLStreamReader reader) throws XMLStreamException { return reader.isEndElement() && Edm.NAMESPACE_ATOM_2005.equals(reader.getNamespaceURI()) && FormatXml.ATOM_ENTRY.equals(reader.getLocalName()); @@ -388,7 +388,6 @@ public class XmlEntryConsumer { * @param navigationProperty * @param callback * @param isFeed - * @param entry * @throws EntityProviderException */ private void doCallback(final EntityProviderReadProperties readProperties, @@ -629,7 +628,8 @@ public class XmlEntryConsumer { * @throws EntityProviderException If no namespace uri definition is found for namespace prefix of property * (<code>tag</code>). */ - private boolean isEdmNamespaceProperty(final XMLStreamReader reader) throws EntityProviderException { + private boolean isEdmNamespaceProperty(final XMLStreamReader reader) + throws EntityProviderException, XMLStreamException { final String nsUri = reader.getNamespaceURI(); if (nsUri == null) { throw new EntityProviderException(EntityProviderException.INVALID_NAMESPACE.addContent(reader.getLocalName())); http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/39beefb4/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumer.java ---------------------------------------------------------------------- diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumer.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumer.java index 3330bad..9e08dd8 100644 --- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumer.java +++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumer.java @@ -181,7 +181,7 @@ public class XmlFeedConsumer { } } - private boolean isFeedEndTag(final XMLStreamReader reader) { + private boolean isFeedEndTag(final XMLStreamReader reader) throws XMLStreamException { return reader.isEndElement() && Edm.NAMESPACE_ATOM_2005.equals(reader.getNamespaceURI()) && FormatXml.ATOM_FEED.equals(reader.getLocalName()); @@ -193,7 +193,7 @@ public class XmlFeedConsumer { * @param reader xml reader with current position at a xml tag * @return map with all found namespaces of current xml tag */ - private Map<String, String> extractNamespacesFromTag(final XMLStreamReader reader) { + private Map<String, String> extractNamespacesFromTag(final XMLStreamReader reader) throws XMLStreamException { // collect namespaces Map<String, String> foundPrefix2NamespaceUri = new HashMap<String, String>(); int namespaceCount = reader.getNamespaceCount(); http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/39beefb4/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlMetadataConsumer.java ---------------------------------------------------------------------- diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlMetadataConsumer.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlMetadataConsumer.java index 6fa6ae2..00b9b8c 100644 --- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlMetadataConsumer.java +++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlMetadataConsumer.java @@ -769,7 +769,8 @@ public class XmlMetadataConsumer { } } - private CustomizableFeedMappings readCustomizableFeedMappings(final XMLStreamReader reader) { + private CustomizableFeedMappings readCustomizableFeedMappings(final XMLStreamReader reader) + throws XMLStreamException { String targetPath = reader.getAttributeValue(Edm.NAMESPACE_M_2007_08, XmlMetadataConstants.M_FC_TARGET_PATH); String sourcePath = reader.getAttributeValue(Edm.NAMESPACE_M_2007_08, XmlMetadataConstants.M_FC_SOURCE_PATH); String nsUri = reader.getAttributeValue(Edm.NAMESPACE_M_2007_08, XmlMetadataConstants.M_FC_NS_URI); @@ -882,7 +883,7 @@ public class XmlMetadataConsumer { return aElement; } - private List<AnnotationAttribute> readAnnotationAttribute(final XMLStreamReader reader) { + private List<AnnotationAttribute> readAnnotationAttribute(final XMLStreamReader reader) throws XMLStreamException { List<AnnotationAttribute> annotationAttributes = new ArrayList<AnnotationAttribute>(); for (int i = 0; i < reader.getAttributeCount(); i++) { String attributeNamespace = reader.getAttributeNamespace(i); @@ -920,7 +921,7 @@ public class XmlMetadataConsumer { } } - private void extractNamespaces(final XMLStreamReader reader) throws EntityProviderException { + private void extractNamespaces(final XMLStreamReader reader) throws EntityProviderException, XMLStreamException { int namespaceCount = reader.getNamespaceCount(); for (int i = 0; i < namespaceCount; i++) { String namespacePrefix = reader.getNamespacePrefix(i); http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/39beefb4/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/xml/AbstractXmlStreamFactory.java ---------------------------------------------------------------------- diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/xml/AbstractXmlStreamFactory.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/xml/AbstractXmlStreamFactory.java index d385e97..a8758f0 100644 --- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/xml/AbstractXmlStreamFactory.java +++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/xml/AbstractXmlStreamFactory.java @@ -42,14 +42,14 @@ public abstract class AbstractXmlStreamFactory implements XMLStreamWriterFactory return this; } - protected void applyProperties(XMLStreamReaderFactory factory, Map<String, Object> readProperties) { - for (Map.Entry<String, Object> name2Value : readProperties.entrySet()) { + protected void applyProperties(XMLStreamReaderFactory factory, Map<String, Object> properties) { + for (Map.Entry<String, Object> name2Value : properties.entrySet()) { factory.setReadProperty(name2Value.getKey(), name2Value.getValue()); } } - protected void applyProperties(XMLStreamWriterFactory factory, Map<String, Object> readProperties) { - for (Map.Entry<String, Object> name2Value : readProperties.entrySet()) { + protected void applyProperties(XMLStreamWriterFactory factory, Map<String, Object> properties) { + for (Map.Entry<String, Object> name2Value : properties.entrySet()) { factory.setWriteProperty(name2Value.getKey(), name2Value.getValue()); } } http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/39beefb4/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/xml/JavaxStaxReaderWrapper.java ---------------------------------------------------------------------- diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/xml/JavaxStaxReaderWrapper.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/xml/JavaxStaxReaderWrapper.java index 9afedc3..186ba71 100644 --- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/xml/JavaxStaxReaderWrapper.java +++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/xml/JavaxStaxReaderWrapper.java @@ -18,11 +18,10 @@ ******************************************************************************/ package org.apache.olingo.odata2.core.xml; -import org.apache.olingo.odata2.api.ep.EntityProviderException; -import org.apache.olingo.odata2.api.xml.*; - -import javax.xml.stream.XMLInputFactory; -import java.io.InputStream; +import org.apache.olingo.odata2.api.xml.NamespaceContext; +import org.apache.olingo.odata2.api.xml.QName; +import org.apache.olingo.odata2.api.xml.XMLStreamException; +import org.apache.olingo.odata2.api.xml.XMLStreamReader; /** */ http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/39beefb4/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/xml/JavaxStaxWriterWrapper.java ---------------------------------------------------------------------- diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/xml/JavaxStaxWriterWrapper.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/xml/JavaxStaxWriterWrapper.java index e25f5b4..7ffbcc2 100644 --- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/xml/JavaxStaxWriterWrapper.java +++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/xml/JavaxStaxWriterWrapper.java @@ -18,16 +18,11 @@ ******************************************************************************/ package org.apache.olingo.odata2.core.xml; -import org.apache.olingo.odata2.api.ep.EntityProviderException; import org.apache.olingo.odata2.api.xml.XMLStreamException; import org.apache.olingo.odata2.api.xml.XMLStreamWriter; -import org.apache.olingo.odata2.api.xml.XMLStreamWriterFactory; - -import javax.xml.stream.XMLOutputFactory; -import java.io.OutputStream; -import java.io.Writer; /** + * Wrapper for a Java Stax XMLStreamWriter. */ public class JavaxStaxWriterWrapper implements XMLStreamWriter { private final javax.xml.stream.XMLStreamWriter xmlStreamWriter; @@ -53,9 +48,9 @@ public class JavaxStaxWriterWrapper implements XMLStreamWriter { } - public void setDefaultNamespace(String defaultNamespace) throws XMLStreamException { + public void setDefaultNamespace(String uri) throws XMLStreamException { try { - xmlStreamWriter.setDefaultNamespace(defaultNamespace); + xmlStreamWriter.setDefaultNamespace(uri); } catch (javax.xml.stream.XMLStreamException e) { throw new XMLStreamException(e); } @@ -162,9 +157,9 @@ public class JavaxStaxWriterWrapper implements XMLStreamWriter { } @Override - public void writeAttribute(String namespaceUdi, String localName, String value) throws XMLStreamException { + public void writeAttribute(String namespaceUri, String localName, String value) throws XMLStreamException { try { - xmlStreamWriter.writeAttribute(namespaceUdi, localName, value); + xmlStreamWriter.writeAttribute(namespaceUri, localName, value); } catch (javax.xml.stream.XMLStreamException e) { throw new XMLStreamException(e); }
