From 26bfdf48a7f68161c0720a3eafe8c6855266de4d Mon Sep 17 00:00:00 2001 From: Tomaz Cerar Date: Tue, 24 Feb 2015 16:16:28 +0100 Subject: [PATCH] make FormattingXMLStreamWriter public as wildfly testsuite utilizes it heavely --- .../staxmapper/FormattingXMLStreamWriter.java | 42 ++++++++++++++++++- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/jboss/staxmapper/FormattingXMLStreamWriter.java b/src/main/java/org/jboss/staxmapper/FormattingXMLStreamWriter.java index b64218f..385b513 100644 --- a/src/main/java/org/jboss/staxmapper/FormattingXMLStreamWriter.java +++ b/src/main/java/org/jboss/staxmapper/FormattingXMLStreamWriter.java @@ -36,7 +36,7 @@ * * @author David M. Lloyd */ -final class FormattingXMLStreamWriter implements XMLExtendedStreamWriter, XMLStreamConstants { +public final class FormattingXMLStreamWriter implements XMLExtendedStreamWriter, XMLStreamConstants { private static final String NO_NAMESPACE = new String(); private final XMLStreamWriter delegate; private final ArrayDeque attrQueue = new ArrayDeque(); @@ -63,7 +63,7 @@ private void indent() throws XMLStreamException { } } - public interface ArgRunnable { + private interface ArgRunnable { public void run(int arg) throws XMLStreamException; } @@ -81,6 +81,7 @@ private String nestUnspecifiedNamespace() { return clone; } + @Override public void writeStartElement(final String localName) throws XMLStreamException { ArrayDeque namespaces = unspecifiedNamespaces; String namespace = namespaces.getFirst(); @@ -110,6 +111,7 @@ public void run(int arg) throws XMLStreamException { indentEndElement = false; } + @Override public void writeStartElement(final String namespaceURI, final String localName) throws XMLStreamException { nestUnspecifiedNamespace(); @@ -131,6 +133,7 @@ public void run(int arg) throws XMLStreamException { indentEndElement = false; } + @Override public void writeStartElement(final String prefix, final String localName, final String namespaceURI) throws XMLStreamException { nestUnspecifiedNamespace(); @@ -152,6 +155,7 @@ public void run(int arg) throws XMLStreamException { indentEndElement = false; } + @Override public void writeEmptyElement(final String namespaceURI, final String localName) throws XMLStreamException { runAttrQueue(); nl(); @@ -160,6 +164,7 @@ public void writeEmptyElement(final String namespaceURI, final String localName) state = END_ELEMENT; } + @Override public void writeEmptyElement(final String prefix, final String localName, final String namespaceURI) throws XMLStreamException { runAttrQueue(); nl(); @@ -168,6 +173,7 @@ public void writeEmptyElement(final String prefix, final String localName, final state = END_ELEMENT; } + @Override public void writeEmptyElement(final String localName) throws XMLStreamException { String namespace = unspecifiedNamespaces.getFirst(); if (namespace != NO_NAMESPACE) { @@ -182,6 +188,7 @@ public void writeEmptyElement(final String localName) throws XMLStreamException state = END_ELEMENT; } + @Override public void writeEndElement() throws XMLStreamException { level--; if (state != START_ELEMENT) { @@ -215,20 +222,24 @@ private void runAttrQueue() throws XMLStreamException { } } + @Override public void writeEndDocument() throws XMLStreamException { delegate.writeEndDocument(); state = END_DOCUMENT; } + @Override public void close() throws XMLStreamException { delegate.close(); state = END_DOCUMENT; } + @Override public void flush() throws XMLStreamException { delegate.flush(); } + @Override public void writeAttribute(final String localName, final String value) throws XMLStreamException { attrQueue.add(new ArgRunnable() { public void run(int arg) throws XMLStreamException { @@ -241,6 +252,7 @@ public void run(int arg) throws XMLStreamException { }); } + @Override public void writeAttribute(final String prefix, final String namespaceURI, final String localName, final String value) throws XMLStreamException { attrQueue.add(new ArgRunnable() { public void run(int arg) throws XMLStreamException { @@ -249,6 +261,7 @@ public void run(int arg) throws XMLStreamException { }); } + @Override public void writeAttribute(final String namespaceURI, final String localName, final String value) throws XMLStreamException { attrQueue.add(new ArgRunnable() { public void run(int arg) throws XMLStreamException { @@ -257,6 +270,7 @@ public void run(int arg) throws XMLStreamException { }); } + @Override public void writeAttribute(final String localName, final String[] values) throws XMLStreamException { attrQueue.add(new ArgRunnable() { public void run(int arg) throws XMLStreamException { @@ -265,6 +279,7 @@ public void run(int arg) throws XMLStreamException { }); } + @Override public void writeAttribute(final String prefix, final String namespaceURI, final String localName, final String[] values) throws XMLStreamException { attrQueue.add(new ArgRunnable() { public void run(int arg) throws XMLStreamException { @@ -273,6 +288,7 @@ public void run(int arg) throws XMLStreamException { }); } + @Override public void writeAttribute(final String namespaceURI, final String localName, final String[] values) throws XMLStreamException { attrQueue.add(new ArgRunnable() { public void run(int arg) throws XMLStreamException { @@ -281,6 +297,7 @@ public void run(int arg) throws XMLStreamException { }); } + @Override public void writeAttribute(final String localName, final Iterable values) throws XMLStreamException { attrQueue.add(new ArgRunnable() { public void run(int arg) throws XMLStreamException { @@ -289,6 +306,7 @@ public void run(int arg) throws XMLStreamException { }); } + @Override public void writeAttribute(final String prefix, final String namespaceURI, final String localName, final Iterable values) throws XMLStreamException { attrQueue.add(new ArgRunnable() { public void run(int arg) throws XMLStreamException { @@ -297,6 +315,7 @@ public void run(int arg) throws XMLStreamException { }); } + @Override public void writeAttribute(final String namespaceURI, final String localName, final Iterable values) throws XMLStreamException { attrQueue.add(new ArgRunnable() { public void run(int arg) throws XMLStreamException { @@ -305,6 +324,7 @@ public void run(int arg) throws XMLStreamException { }); } + @Override public void writeNamespace(final String prefix, final String namespaceURI) throws XMLStreamException { attrQueue.add(new ArgRunnable() { public void run(int arg) throws XMLStreamException { @@ -313,6 +333,7 @@ public void run(int arg) throws XMLStreamException { }); } + @Override public void writeDefaultNamespace(final String namespaceURI) throws XMLStreamException { attrQueue.add(new ArgRunnable() { public void run(int arg) throws XMLStreamException { @@ -321,6 +342,7 @@ public void run(int arg) throws XMLStreamException { }); } + @Override public void writeComment(final String data) throws XMLStreamException { runAttrQueue(); nl(); @@ -362,6 +384,7 @@ public void writeComment(final String data) throws XMLStreamException { } } + @Override public void writeProcessingInstruction(final String target) throws XMLStreamException { runAttrQueue(); nl(); @@ -370,6 +393,7 @@ public void writeProcessingInstruction(final String target) throws XMLStreamExce state = PROCESSING_INSTRUCTION; } + @Override public void writeProcessingInstruction(final String target, final String data) throws XMLStreamException { runAttrQueue(); nl(); @@ -378,12 +402,14 @@ public void writeProcessingInstruction(final String target, final String data) t state = PROCESSING_INSTRUCTION; } + @Override public void writeCData(final String data) throws XMLStreamException { runAttrQueue(); delegate.writeCData(data); state = CDATA; } + @Override public void writeDTD(final String dtd) throws XMLStreamException { nl(); indent(); @@ -391,30 +417,35 @@ public void writeDTD(final String dtd) throws XMLStreamException { state = DTD; } + @Override public void writeEntityRef(final String name) throws XMLStreamException { runAttrQueue(); delegate.writeEntityRef(name); state = ENTITY_REFERENCE; } + @Override public void writeStartDocument() throws XMLStreamException { delegate.writeStartDocument(); nl(); state = START_DOCUMENT; } + @Override public void writeStartDocument(final String version) throws XMLStreamException { delegate.writeStartDocument(version); nl(); state = START_DOCUMENT; } + @Override public void writeStartDocument(final String encoding, final String version) throws XMLStreamException { delegate.writeStartDocument(encoding, version); nl(); state = START_DOCUMENT; } + @Override public void writeCharacters(final String text) throws XMLStreamException { runAttrQueue(); if (state != CHARACTERS) { @@ -434,33 +465,40 @@ public void writeCharacters(final String text) throws XMLStreamException { indentEndElement = true; } + @Override public void writeCharacters(final char[] text, final int start, final int len) throws XMLStreamException { runAttrQueue(); delegate.writeCharacters(text, start, len); state = CHARACTERS; } + @Override public String getPrefix(final String uri) throws XMLStreamException { return delegate.getPrefix(uri); } + @Override public void setPrefix(final String prefix, final String uri) throws XMLStreamException { delegate.setPrefix(prefix, uri); } + @Override public void setDefaultNamespace(final String uri) throws XMLStreamException { runAttrQueue(); delegate.setDefaultNamespace(uri); } + @Override public void setNamespaceContext(final NamespaceContext context) throws XMLStreamException { delegate.setNamespaceContext(context); } + @Override public NamespaceContext getNamespaceContext() { return delegate.getNamespaceContext(); } + @Override public Object getProperty(final String name) throws IllegalArgumentException { return delegate.getProperty(name); }