You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2016/02/27 12:09:45 UTC
svn commit: r1732624 - in /webservices/axiom/trunk/aspects:
core-aspects/src/main/java/org/apache/axiom/core/stream/
core-aspects/src/main/java/org/apache/axiom/core/stream/sax/
om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/ om-aspec...
Author: veithen
Date: Sat Feb 27 11:09:45 2016
New Revision: 1732624
URL: http://svn.apache.org/viewvc?rev=1732624&view=rev
Log:
Simplify the serialization logic in OMSourcedElement.
Added:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/DocumentElementExtractingFilterHandler.java (with props)
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/StAXPullInput.java (with props)
Modified:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/XmlReader.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/sax/SAXReader.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXHelper.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSourcedElementSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/ds/DirectPushOMDataSourceReader.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/ds/PushOMDataSourceReader.java
Added: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/DocumentElementExtractingFilterHandler.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/DocumentElementExtractingFilterHandler.java?rev=1732624&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/DocumentElementExtractingFilterHandler.java (added)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/DocumentElementExtractingFilterHandler.java Sat Feb 27 11:09:45 2016
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * 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
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.core.stream;
+
+public final class DocumentElementExtractingFilterHandler extends XmlHandlerWrapper {
+ private int depth;
+
+ public DocumentElementExtractingFilterHandler(XmlHandler parent) {
+ super(parent);
+ }
+
+ @Override
+ public void startDocument(String inputEncoding, String xmlVersion, String xmlEncoding, boolean standalone) throws StreamException {
+ }
+
+ @Override
+ public void endDocument() throws StreamException {
+ }
+
+ @Override
+ public void startElement(String namespaceURI, String localName, String prefix) throws StreamException {
+ super.startElement(namespaceURI, localName, prefix);
+ depth++;
+ }
+
+ @Override
+ public void endElement() throws StreamException {
+ super.endElement();
+ depth--;
+ }
+
+ @Override
+ public void processDocumentTypeDeclaration(String rootName, String publicId, String systemId, String internalSubset) throws StreamException {
+ }
+
+ @Override
+ public void processCharacterData(Object data, boolean ignorable) throws StreamException {
+ if (depth > 0) {
+ super.processCharacterData(data, ignorable);
+ }
+ }
+
+ @Override
+ public void processProcessingInstruction(String piTarget, String piData) throws StreamException {
+ if (depth > 0) {
+ super.processProcessingInstruction(piTarget, piData);
+ }
+ }
+
+ @Override
+ public void processComment(String content) throws StreamException {
+ if (depth > 0) {
+ super.processComment(content);
+ }
+ }
+}
Propchange: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/DocumentElementExtractingFilterHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/XmlReader.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/XmlReader.java?rev=1732624&r1=1732623&r2=1732624&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/XmlReader.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/XmlReader.java Sat Feb 27 11:09:45 2016
@@ -19,5 +19,5 @@
package org.apache.axiom.core.stream;
public interface XmlReader {
- void proceed() throws StreamException;
+ boolean proceed() throws StreamException;
}
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/sax/SAXReader.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/sax/SAXReader.java?rev=1732624&r1=1732623&r2=1732624&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/sax/SAXReader.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/sax/SAXReader.java Sat Feb 27 11:09:45 2016
@@ -41,7 +41,7 @@ public final class SAXReader implements
}
@Override
- public void proceed() throws StreamException {
+ public boolean proceed() throws StreamException {
XMLReader reader = source.getXMLReader();
XmlHandlerContentHandler contentHandler = new XmlHandlerContentHandler(handler, expandEntityReferences);
reader.setContentHandler(contentHandler);
@@ -63,5 +63,6 @@ public final class SAXReader implements
} catch (SAXException ex) {
throw new StreamException(ex);
}
+ return true;
}
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXHelper.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXHelper.java?rev=1732624&r1=1732623&r2=1732624&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXHelper.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXHelper.java Sat Feb 27 11:09:45 2016
@@ -21,6 +21,7 @@ package org.apache.axiom.om.impl.common.
import org.apache.axiom.core.stream.StreamException;
import org.apache.axiom.core.stream.XmlHandler;
+import org.apache.axiom.core.stream.XmlReader;
import org.apache.axiom.ext.stax.DTDReader;
import org.apache.axiom.ext.stax.datahandler.DataHandlerReader;
import org.apache.axiom.om.DeferredParsingException;
@@ -67,7 +68,7 @@ import java.io.Closeable;
* To avoid this, the builder remembers exceptions thrown by the parser and rethrows
* them during a call to next().
*/
-public class StAXHelper {
+public class StAXHelper implements XmlReader {
private static final Log log = LogFactory.getLog(StAXHelper.class);
/** Field parser */
@@ -194,6 +195,11 @@ public class StAXHelper {
return _isClosed;
}
+ @Override
+ public boolean proceed() throws StreamException {
+ return next() == XMLStreamReader.END_DOCUMENT;
+ }
+
/**
* Forwards the parser one step further, if parser is not completed yet. If this is called after
* parser is done, then throw an OMException. If the cache is set to false, then returns the
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSourcedElementSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSourcedElementSupport.aj?rev=1732624&r1=1732623&r2=1732624&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSourcedElementSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSourcedElementSupport.aj Sat Feb 27 11:09:45 2016
@@ -22,9 +22,11 @@ import org.apache.axiom.core.Builder;
import org.apache.axiom.core.ClonePolicy;
import org.apache.axiom.core.CoreElement;
import org.apache.axiom.core.CoreNode;
+import org.apache.axiom.core.stream.DocumentElementExtractingFilterHandler;
import org.apache.axiom.core.stream.StreamException;
import org.apache.axiom.core.stream.XmlHandler;
-import org.apache.axiom.om.DeferredParsingException;
+import org.apache.axiom.core.stream.XmlInput;
+import org.apache.axiom.core.stream.XmlReader;
import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMDataSourceExt;
@@ -37,11 +39,11 @@ import org.apache.axiom.om.impl.common.D
import org.apache.axiom.om.impl.common.OMNamespaceImpl;
import org.apache.axiom.om.impl.common.builder.PlainXMLModel;
import org.apache.axiom.om.impl.common.builder.PushBuilder;
-import org.apache.axiom.om.impl.common.builder.StAXHelper;
import org.apache.axiom.om.impl.common.builder.StAXOMBuilder;
import org.apache.axiom.om.impl.common.util.OMDataSourceUtil;
import org.apache.axiom.om.impl.intf.AxiomSourcedElement;
import org.apache.axiom.om.impl.stream.ds.PushOMDataSourceInput;
+import org.apache.axiom.om.impl.stream.stax.StAXPullInput;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -411,31 +413,24 @@ public aspect AxiomSourcedElementSupport
} else if (cache&& OMDataSourceUtil.isDestructiveWrite(dataSource)) {
forceExpand();
defaultInternalSerialize(handler, true);
- // Note: if we can't determine the type (push/pull) of the OMDataSource, we
- // default to push
- // TODO: the serializer ignores namespaceURI and localName
- } else if (OMDataSourceUtil.isPullDataSource(dataSource)) {
- try {
- XMLStreamReader reader = dataSource.getReader();
- StAXHelper helper = new StAXHelper(reader, handler);
- while (helper.lookahead() != XMLStreamReader.START_ELEMENT) {
- helper.parserNext();
+ } else {
+ XmlInput input;
+ // Note: if we can't determine the type (push/pull) of the OMDataSource, we
+ // default to push
+ if (OMDataSourceUtil.isPullDataSource(dataSource)) {
+ try {
+ input = new StAXPullInput(dataSource.getReader());
+ } catch (XMLStreamException ex) {
+ throw new StreamException(ex);
}
- int depth = 0;
- do {
- switch (helper.next()) {
- case XMLStreamReader.START_ELEMENT: depth++; break;
- case XMLStreamReader.END_ELEMENT: depth--; break;
- }
- } while (depth > 0);
- reader.close();
- } catch (XMLStreamException ex) {
- // XMLStreamExceptions occurring while _writing_ are wrapped in an OutputException.
- // Therefore, if we get here, there must have been a problem while _reading_.
- throw new DeferredParsingException(ex);
+ } else {
+ input = new PushOMDataSourceInput(this, dataSource);
+ }
+ // TODO: the serializer ignores namespaceURI and localName
+ XmlReader reader = input.createReader(new DocumentElementExtractingFilterHandler(handler));
+ while (!reader.proceed()) {
+ // Just loop
}
- } else {
- new PushOMDataSourceInput(this, dataSource).createReader(handler).proceed();
}
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/ds/DirectPushOMDataSourceReader.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/ds/DirectPushOMDataSourceReader.java?rev=1732624&r1=1732623&r2=1732624&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/ds/DirectPushOMDataSourceReader.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/ds/DirectPushOMDataSourceReader.java Sat Feb 27 11:09:45 2016
@@ -35,11 +35,12 @@ final class DirectPushOMDataSourceReader
}
@Override
- public void proceed() throws StreamException {
+ public boolean proceed() throws StreamException {
try {
dataSource.serialize(writer);
} catch (XMLStreamException ex) {
throw new StreamException(ex);
}
+ return true;
}
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/ds/PushOMDataSourceReader.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/ds/PushOMDataSourceReader.java?rev=1732624&r1=1732623&r2=1732624&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/ds/PushOMDataSourceReader.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/ds/PushOMDataSourceReader.java Sat Feb 27 11:09:45 2016
@@ -45,7 +45,7 @@ final class PushOMDataSourceReader imple
}
@Override
- public void proceed() throws StreamException {
+ public boolean proceed() throws StreamException {
try {
XMLStreamWriter writer = new XmlHandlerStreamWriter(handler);
// Seed the namespace context with the namespace context from the parent
@@ -60,5 +60,6 @@ final class PushOMDataSourceReader imple
} catch (XMLStreamException ex) {
throw new StreamException(ex);
}
+ return true;
}
}
Added: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/StAXPullInput.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/StAXPullInput.java?rev=1732624&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/StAXPullInput.java (added)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/StAXPullInput.java Sat Feb 27 11:09:45 2016
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * 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
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.om.impl.stream.stax;
+
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.axiom.core.stream.XmlHandler;
+import org.apache.axiom.core.stream.XmlInput;
+import org.apache.axiom.core.stream.XmlReader;
+import org.apache.axiom.om.impl.common.builder.StAXHelper;
+
+public final class StAXPullInput implements XmlInput {
+ private final XMLStreamReader reader;
+
+ public StAXPullInput(XMLStreamReader reader) {
+ this.reader = reader;
+ }
+
+ @Override
+ public XmlReader createReader(XmlHandler handler) {
+ return new StAXHelper(reader, handler, null, true);
+ }
+}
Propchange: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/StAXPullInput.java
------------------------------------------------------------------------------
svn:eol-style = native